Changeset 4241 for LMDZ6

Timestamp:

Sep 9, 2022, 4:33:13 PM (2 years ago)

Author:

dcugnet

Message:

Fix for reprobus: "types_trac" (parsed version of "type_trac" with "|") must
be used instead of type_trac most of the time.

Location:

LMDZ6/trunk/libf

Files:

• dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (3 diffs)
• phylmd/rrtm/lwu.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -140 +140 @@
 
   ! Initializations for Reprobus
-  IF (type_trac == 'repr') THEN
+  IF (ANY(types_trac == 'repr')) THEN
 #ifdef REPROBUS
     call Init_chem_rep_phys(klon_omp,nlayer)
@@ -151 +151 @@
 
 
-  IF (type_trac == 'repr') THEN
+  IF (ANY(types_trac == 'repr')) THEN
 #ifdef REPROBUS
     call init_reprobus_para( &
@@ -166 +166 @@
   END IF
 
-  IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
+  IF (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) THEN
 #ifdef INCA
      CALL init_inca_dim_reg(nbp_lon, nbp_lat - 1, &

LMDZ6/trunk/libf/phylmd/rrtm/lwu.F90

@@ -76 +76 @@
 #ifdef REPROBUS
 USE chem_rep, ONLY: rch42d, rn2o2d, rcfc112d, rcfc122d, ok_rtime2d
-USE infotrac_phy, ONLY : type_trac
+USE infotrac_phy, ONLY : types_trac
 #endif
 
@@ -321 +321 @@
       PABCU(JL,18,IC)=PABCU(JL,18,ICP1)+ ZUAER(JL,5)    *ZDUC(JL,IC)*ZDIFF
 #ifdef REPROBUS
-        IF (type_trac=='repr'.and. ok_rtime2d) THEN
+        IF (ANY(types_trac=='repr').and. ok_rtime2d) THEN
 !- CH4
       PABCU(JL,19,IC)=PABCU(JL,19,ICP1)&