Changeset 5256 for LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

Timestamp:

Oct 22, 2024, 4:06:28 PM (4 days ago)

Author:

Laurent Fairhead

Message:

Rollback to revision 5254 as a no-commit policy is in place at this time
LF

File:

• LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (modified) (8 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -329 +329 @@
        d_deltat_ajs_cv, d_deltaq_ajs_cv, & ! due to dry adjustment of (w) before convection
                        ! tendencies of wake fractional area and wake number per unit area:
-       d_s_wk, d_s_a_wk,  d_dens_a_wk,  d_dens_wk, &  ! due to wakes
+       d_s_wk,  d_dens_a_wk,  d_dens_wk, &  ! due to wakes
 !!!       d_s_vdf, d_dens_a_vdf, d_dens_vdf, & ! due to vertical diffusion
 !!!       d_s_the, d_dens_a_the, d_dens_the, & ! due to thermals
@@ -1414 +1414 @@
     endif                                                                  !
     !======================================================================!
-#ifdef ISO
-#ifdef ISOVERIF
-        write(*,*) 'physiq 1421b: qx(1,1,:)=',qx(1,1,:)
-#endif
-#endif
 
 
@@ -4450 +4445 @@
                dt_a, dq_a, cv_gen,  &
                sigd, cin,  &
-               wake_deltat, wake_deltaq, wake_s, awake_s, wake_dens, awake_dens,  &
+               wake_deltat, wake_deltaq, wake_s, awake_dens, wake_dens,  &
                wake_dth, wake_h,  &
 !!               wake_pe, wake_fip, wake_gfl,  &
@@ -4460 +4455 @@
                wake_omg, wake_dp_deltomg,  &
                wake_spread, wake_Cstar, d_deltat_wk_gw,  &
-               d_deltat_wk, d_deltaq_wk, d_s_wk, d_s_a_wk, d_dens_wk, d_dens_a_wk &
+               d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_a_wk, d_dens_wk &
 #ifdef ISO
      &               ,xt_seri,dxt_dwn,dxt_a &
@@ -4500 +4495 @@
 
          CALL add_wake_tend &
-            (d_deltat_wk, d_deltaq_wk, d_s_wk, d_s_a_wk, d_dens_wk, d_dens_a_wk, wake_k, &
+            (d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_a_wk, d_dens_wk, wake_k, &
              'wake', abortphy &
 #ifdef ISO
@@ -4775 +4770 @@
                ,zqla,ztva &
 #ifdef ISO         
-     &      ,xt_therm,d_xt_ajs &
+     &      ,xt_env,d_xt_ajs &
 #ifdef DIAGISO         
      &      ,q_the,xt_the &
@@ -6562 +6557 @@
                 IF(flag_verbose_strataer) print *,'IN physiq_mod: min max d_q_emiss=',&
                      minval(d_q_emiss),maxval(d_q_emiss)
-#ifdef ISO
-       abort_message='isotopes pas encore dans emission volc H2O'
-       CALL abort_physic(modname,abort_message,1)
-#endif
 
                 CALL add_phys_tend(du0, dv0, dt0, d_q_emiss, dql0, dqi0, dqbs0, paprs, &
@@ -6957 +6948 @@
 
           print*,'avt add phys rep',abortphy
-#ifdef ISO
-       abort_message='isotopes pas encore dans rep'
-       CALL abort_physic(modname,abort_message,1)
-#endif
+
      CALL add_phys_tend &
             (du0,dv0,dt0,d_q_rep,d_ql_rep,d_qi_rep,dqbs0,paprs,&