Changeset 3592 for LMDZ6/trunk/libf/phylmd/dyn1d/1D_interp_cases.h

Timestamp:

Oct 27, 2019, 5:48:03 PM (5 years ago)

Author:

fhourdin

Message:

Plein de petites corrections pour le format commun.
Semble fonctionner correctement pour ARMCU/REF et RICO/REF

File:

• LMDZ6/trunk/libf/phylmd/dyn1d/1D_interp_cases.h (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/dyn1d/1D_interp_cases.h

@@ -16 +16 @@
      &       ,uw_cas,vw_cas,q1_cas,q2_cas,tke_cas                                           &
 !
-     &       ,ts_prof_cas,plev_prof_cas,t_prof_cas,theta_prof_cas,thv_prof_cas  &
+     &       ,ts_prof_cas,ps_prof_cas,plev_prof_cas,t_prof_cas,theta_prof_cas,thv_prof_cas  &
      &       ,thl_prof_cas,qv_prof_cas,ql_prof_cas,qi_prof_cas                              &
      &       ,u_prof_cas,v_prof_cas,ug_prof_cas,vg_prof_cas,vitw_prof_cas,omega_prof_cas    &
@@ -163 +163 @@
 
       do l = 1, llm
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Modif w_mod_cas -> omega_mod_cas (MM+MPL 20170309)
-       omega2(l)= omega(l)/rg*airefi ! flxmass_w calcule comme ds physiq
+       !!! omega2(l)= omega(l)/rg*airefi ! flxmass_w calcule comme ds physiq
+       omega(l) = omega_mod_cas(l)
+       omega2(l)= omega_mod_cas(l)/rg*airefi ! flxmass_w calcule comme ds physiq
+
        alpha = rd*temp(l)*(1.+(rv/rd-1.)*q(l,1))/play(l)
 
@@ -170 +175 @@
         d_u_adv(l)=du_mod_cas(l)
         d_v_adv(l)=dv_mod_cas(l)
-        d_t_adv(l)=alpha*omega(l)/rcpd+dt_mod_cas(l)
+        !!! d_t_adv(l)=alpha*omega(l)/rcpd+dt_mod_cas(l)
+        !d_t_adv(l)=alpha*omega_mod_cas(l)/rcpd+dt_mod_cas(l)
+        d_t_adv(l)=dt_mod_cas(l)
+        !print*,'d_t_adv(l) ', alpha,omega_mod_cas(l),rcpd,dt_mod_cas(l)*86400,d_t_adv(l)*86400
         d_q_adv(l,1)=dq_mod_cas(l)
 
-        if (forc_w==1) then
-           d_q_adv(l,1)=d_q_adv(l,1)-d_q_dyn_z(l)
-           d_t_adv(l)=d_t_adv(l)-d_t_dyn_z(l)
-           d_v_adv(l)=d_v_adv(l)-d_v_dyn_z(l)
-           d_u_adv(l)=d_u_adv(l)-d_u_dyn_z(l)
-        endif
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! CONSERVE EN ATTENDANT QUE LE CAS EN QUESTION FONCTIONNE EN STD !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!if (forc_w==1) then
+!          d_q_adv(l,1)=d_q_adv(l,1)-d_q_dyn_z(l)
+!          d_t_adv(l)=d_t_adv(l)-d_t_dyn_z(l)
+!          d_v_adv(l)=d_v_adv(l)-d_v_dyn_z(l)
+!          d_u_adv(l)=d_u_adv(l)-d_u_dyn_z(l)
+!       endif
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
          
         if (trad.eq.1) then