Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/dyn1d/1D_read_forc_cases.h

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/1D_read_forc_cases.h (modified) (6 diffs, 1 prop)

LMDZ5/branches/testing/libf/phylmd/dyn1d/1D_read_forc_cases.h

@@ +1 @@
+!
+! $Id$
+!
 !----------------------------------------------------------------------
 ! forcing_les = .T. : Impose a constant cooling 
@@ -323 +326 @@
       write(*,*) 'SST initiale mxcalc: ',tsurf,mxcalc
       do l = 1, llm
-! Ligne du dessous à decommenter si on lit theta au lieu de temp
+! Ligne du dessous ?? decommenter si on lit theta au lieu de temp
 !      temp(l) = t_mod(l)*(play(l)/pzero)**rkappa 
        temp(l) = t_mod(l) 
@@ -407 +410 @@
      &         ,ht_mod,hq_mod,hu_mod,hv_mod,w_mod,omega_mod,mxcalc)
 
-! Pour tester les advections horizontales de T et Q, on met w_mod et omega_mod à zero (MPL 20131108)
+! Pour tester les advections horizontales de T et Q, on met w_mod et omega_mod ?? zero (MPL 20131108)
 !     w_mod(:,:)=0.
 !     omega_mod(:,:)=0.
@@ -421 +424 @@
       write(*,*) 'SST initiale mxcalc: ',tsurf,mxcalc
       do l = 1, llm
-! Ligne du dessous à decommenter si on lit theta au lieu de temp
+! Ligne du dessous ?? decommenter si on lit theta au lieu de temp
        temp(l) = th_mod(l)*(play(l)/pzero)**rkappa 
 !      temp(l) = t_mod(l) 
@@ -733 +736 @@
 !Time interpolation for initial conditions using TOGA interpolation routine
          write(*,*) 'AVT 1ere INTERPOLATION: day,day1 = ',daytime,day1   
-      CALL interp_case_time(day,day1,annee_ref                &
-     &         ,year_ini_cas,day_ju_ini_cas,nt_cas,pdt_cas,nlev_cas       &
-     &         ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas               &
-     &         ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas           &
-     &         ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas             &
-     &         ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas                 &
-     &         ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas,u_prof_cas,v_prof_cas         &
-     &         ,ug_prof_cas,vg_prof_cas,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas     &
-     &         ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas,ht_prof_cas,vt_prof_cas,dtrad_prof_cas       &
-     &         ,dq_prof_cas,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas)
+      CALL interp_case_time(day,day1,annee_ref                                                              &
+!    &         ,year_ini_cas,day_ju_ini_cas,nt_cas,pdt_cas,nlev_cas                                         &
+     &         ,nt_cas,nlev_cas                                                                             &
+     &         ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas                                                     &
+     &         ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas                                                 &
+     &         ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas                                         &
+     &         ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas                                             &
+     &         ,uw_cas,vw_cas,q1_cas,q2_cas                                                                 &
+     &         ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas,u_prof_cas,v_prof_cas                       &
+     &         ,ug_prof_cas,vg_prof_cas,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas                   &
+     &         ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas,ht_prof_cas,vt_prof_cas,dtrad_prof_cas      &
+     &         ,dq_prof_cas,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas,ustar_prof_cas               &
+     &         ,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas)
 
 ! vertical interpolation using TOGA interpolation routine:
@@ -778 +784 @@
        d_u_adv(l) = (hv_mod_cas(l)+vv_mod_cas(l))
       enddo     
-       
+
+! In case fluxes are imposed
+       IF (ok_flux_surf) THEN
+       fsens=sens_prof_cas
+       flat=lat_prof_cas
+       ENDIF
+       IF (ok_prescr_ust) THEN
+       ust=ustar_prof_cas
+       print *,'ust=',ust
+       ENDIF
+
       endif !forcing_case
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!