Changeset 2973

Timestamp:

Jul 31, 2017, 3:41:02 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Bypassing the call to phytrac when not needed.
Controlled by iflag_phytrac read in physiq.def and which is 0
by default (thus no call to phytrac by default)
LF

Location:

LMDZ5/trunk/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• phys_output_write_mod.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/clesphys.h

@@ -91 +91 @@
        LOGICAL :: adjust_tropopause
        LOGICAL :: ok_daily_climoz
+! flag to bypass or not the phytrac module
+       INTEGER :: iflag_phytrac
 
        COMMON/clesphys/                                                 &
@@ -137 +139 @@
      &     , iflag_ice_thermo, ok_gwd_rando, NSW, iflag_albedo          &
      &     , ok_chlorophyll,ok_conserv_q, adjust_tropopause             &
-     &     , ok_daily_climoz, ok_all_xml
+     &     , ok_daily_climoz, ok_all_xml                                &
+     &     , iflag_phytrac
      
        save /clesphys/

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -1906 +1906 @@
 #endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       IF (iflag_phytrac == 1 ) then
        IF (nqtot.GE.nqo+1) THEN
           DO iq=nqo+1, nqtot
@@ -1936 +1937 @@
           ENDDO
        ENDIF
+       ENDIF   !(iflag_phytrac==1)
+
 
        IF (.NOT.vars_defined) THEN

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -1237 +1237 @@
        fl_cor_ebil = 0 ! by default, no correction to ensure energy conservation
        CALL getin_p('fl_cor_ebil',fl_cor_ebil)
+       iflag_phytrac = 0 ! by default we do not want to call phytrac
+       CALL getin_p('iflag_phytrac',iflag_phytrac)
     ENDIF
 
@@ -4258 +4260 @@
     ENDIF
 
+    IF (iflag_phytrac == 1 ) THEN
+
 #ifdef CPP_Dust
       CALL       phytracr_spl ( debut,lafin , jD_cur,jH_cur,iflag_con,       &  ! I
@@ -4301 +4305 @@
          tr_seri)
 #endif
+    ENDIF    ! (iflag_phytrac=1)
 
     IF (offline) THEN