Changeset 6183

Timestamp:

Apr 22, 2026, 1:22:57 PM (12 days ago)

Author:

Laurent Fairhead

Message:

Using iflag_phytrac flag to bypass cv3_tracer which is not needed if phytrac is not called (and therefore savinua some execution time)

Location:

LMDZ6/trunk/libf

Files:

• phylmd/cva_driver_mod.f90 (modified) (2 diffs)
• phylmd/lmdz_cv_ini.f90 (modified) (6 diffs)
• phylmd/physiq_mod.F90 (modified) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/cva_driver_mod.f90

@@ -111 +111 @@
 ! **************************************************************
 
-   USE lmdz_cv_ini, ONLY: prt_level, lunout
+USE lmdz_cv_ini, ONLY: prt_level, lunout, iflag_phytrac
   !!!USE lmdz_cv_ini, ONLY: fl_cor_ebil
   USE cv3_routines_mod, ONLY : cv3_prelim, cv3_feed, cv3_undilute1, cv3_trigger, cv3_undilute2, cv3_epmax_fn_cape, cv3_closure, cv3_mixing, cv3_unsat, cv3_yield, cv3_tracer, cv3_incrcount
@@ -1251 +1251 @@
 !^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    IF (iflag_con==3) THEN
+    IF (iflag_phytrac) THEN
+
+      IF (iflag_con==3) THEN
 !RomP >>>
         if (prt_level >= 9) &
              PRINT *, 'cva_driver -> cv3_tracer'
-      CALL cv3_tracer(nloc, len, ncum, nd, nd, &
+        CALL cv3_tracer(nloc, len, ncum, nd, nd, &
                      ment, sigij, da, phi, phi2, d1a, dam, &
                      ep, vprecip, elij, clw, epmlmMm, eplaMm, &
                      icb, inb)
 !RomP <<<
+      END IF
     END IF
 

LMDZ6/trunk/libf/phylmd/lmdz_cv_ini.f90

@@ -14 +14 @@
           nl, nlp, nlm
   PUBLIC :: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl,  &
-          clmci, eps, epsi, epsim1, ginv, hrd, grav, keep_bug_indices_cv3_tracer, restore_bug_cvdn
+          clmci, eps, epsi, epsim1, ginv, hrd, grav, keep_bug_indices_cv3_tracer, restore_bug_cvdn, iflag_phytrac
 
   PUBLIC :: retv,rtt,r ! From ymocst_mod_h
@@ -46 +46 @@
   REAL ejectliq
   REAL ejectice
+  INTEGER iflag_phytrac
 
   !$OMP THREADPRIVATE(sigdz, spfac, pbcrit, ptcrit, elcrit, tlcrit, coef_peel, omtrain, dtovsh, dpbase, &
   !$OMP      dttrig, dtcrit, tau, beta, alpha, alpha1, T_top_max, tau_stop, noconv_stop, wbmax, &
   !$OMP      delta, betad, ejectliq, ejectice, flag_wb, flag_epKEorig, cv_flag_feed, noff, minorig, &
-  !$OMP      nl, nlp, nlm)
+  !$OMP      nl, nlp, nlm, iflag_phytrac)
 
   ! Thermodynamical constants for convectL:
@@ -161 +162 @@
 
 
-SUBROUTINE cv_ini(iflag_con_IN,iflag_ice_thermo_IN,rcpd_IN,rcpv_IN,rcw_IN,rv_IN,rcs_IN,rd_IN,rlvtt_IN,rlstt_IN,rg_IN,retv_IN,rtt_IN,r_IN,nd,k_upper,delt,fl_cor_ebil_IN,prt_level_IN, lunout_IN)
+SUBROUTINE cv_ini(iflag_con_IN,iflag_ice_thermo_IN,rcpd_IN,rcpv_IN,rcw_IN,rv_IN,rcs_IN,rd_IN,rlvtt_IN,rlstt_IN,rg_IN,&
+                retv_IN,rtt_IN,r_IN,nd,k_upper,delt,fl_cor_ebil_IN,prt_level_IN, lunout_IN, iflag_phytrac_IN)
   
 
@@ -177 +179 @@
 integer, intent(in) :: prt_level_IN, lunout_IN,fl_cor_ebil_IN
 
+INTEGER, intent(in) :: iflag_phytrac_IN
+
     CALL cv_ini_previously_in_conf_phys
     CALL cv_thermo(iflag_con_IN,rcpd_IN,rcpv_IN,rcw_IN,rv_IN,rcs_IN,rd_IN,rlvtt_IN,rlstt_IN,rg_IN)
@@ -185 +189 @@
     prt_level=prt_level_IN
     lunout=lunout_IN
+    iflag_phytrac=iflag_phytrac_IN
 
     IF ( iflag_con_IN==30 ) then ! Previously un cv_driver
@@ -376 +381 @@
 
 
-
     WRITE (*, *) 't_top_max=', t_top_max
     WRITE (*, *) 'dpbase=', dpbase

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -1695 +1695 @@
                      k_upper_cv
              ENDIF
-       CALL cv_ini(iflag_con,iflag_ice_thermo,rcpd,rcpv,rcw,rv,rcs,rd,rlvtt,rlstt,rg,retv,rtt,r,klev,k_upper_cv,phys_tstep,fl_cor_ebil,prt_level,lunout)
+       CALL cv_ini(iflag_con,iflag_ice_thermo,rcpd,rcpv,rcw,rv,rcs,rd,rlvtt,rlstt,rg,retv,rtt,r,klev,k_upper_cv,phys_tstep,fl_cor_ebil,&
+               prt_level,lunout, iflag_phytrac)
 
 

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -1812 +1812 @@
                        k_upper_cv
                ENDIF
-         CALL cv_ini(iflag_con,iflag_ice_thermo,rcpd,rcpv,rcw,rv,rcs,rd,rlvtt,rlstt,rg,retv,rtt,r,klev,k_upper_cv,phys_tstep,fl_cor_ebil,prt_level,lunout)
+         CALL cv_ini(iflag_con,iflag_ice_thermo,rcpd,rcpv,rcw,rv,rcs,rd,rlvtt,rlstt,rg,retv,rtt,r,klev,k_upper_cv,phys_tstep,&
+                 fl_cor_ebil, prt_level,lunout, iflag_phytrac)
     
        CALL wake_ini(iflag_wake,rg,rd,rv,prt_level)