Changeset 4263 for LMDZ6/trunk/libf/phylmd

Timestamp:

Sep 21, 2022, 9:35:28 AM (3 years ago)

Author:

dcugnet

Message:

Fixes for INCO, CO2i AND REPROBUS, mostly because some sections are specific to type_trac=="lmdz",
which is not always equivalent to ANY(types_trac=='lmdz).
Also force the water phases to get tracers(*)%component='lmdz' so that nqo can be correctly computed.

Location:

LMDZ6/trunk/libf/phylmd

Files:

• phyetat0.F90 (modified) (2 diffs)
• phyredem.F90 (modified) (2 diffs)
• phys_output_write_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/phyetat0.F90 ¶

@@ -23 +23 @@
   USE geometry_mod,     ONLY: longitude_deg, latitude_deg
   USE iostart,          ONLY: close_startphy, get_field, get_var, open_startphy
-  USE infotrac_phy,     ONLY: nqtot, nbtr, types_trac, tracers
+  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, types_trac, tracers
   USE traclmdz_mod,     ONLY: traclmdz_from_restart
   USE carbon_cycle_mod, ONLY: carbon_cycle_tr, carbon_cycle_cpl, co2_send
@@ -456 +456 @@
         found=phyetat0_get(1,co2_send,"co2_send","co2 send",co2_ppm)
      ENDIF
-  ELSE IF (ANY(types_trac == 'lmdz')) THEN
+  ELSE IF (type_trac == 'lmdz') THEN
      it = 0
      DO iq = 1, nqtot

LMDZ6/trunk/libf/phylmd/phyredem.F90 ¶

@@ -35 +35 @@
   USE iostart, ONLY: open_restartphy, close_restartphy, enddef_restartphy, put_field, put_var
   USE traclmdz_mod, ONLY : traclmdz_to_restart
-  USE infotrac_phy, ONLY: types_trac, nqtot, tracers, nbtr
+  USE infotrac_phy, ONLY: type_trac, types_trac, nqtot, tracers, nbtr
   USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic, epsfra
@@ -336 +336 @@
 
     ! trs from traclmdz_mod
-    ELSE IF (ANY(types_trac == 'lmdz')) THEN
+    ELSE IF (type_trac == 'lmdz') THEN
        CALL traclmdz_to_restart(trs)
        it = 0

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 ¶

@@ -25 +25 @@
 
     USE dimphy, ONLY: klon, klev, klevp1
-    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, types_trac, tracers, niso, ntiso
+    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, type_trac, types_trac, tracers, niso, ntiso
     USE strings_mod,  ONLY: maxlen
     USE mod_phys_lmdz_para, ONLY: is_north_pole_phy,is_south_pole_phy
@@ -2548 +2548 @@
            CALL histwrite_phy(o_flx_co2_bb,    fco2_bb)
 
-         ELSE IF ((ANY(types_trac=='lmdz') .OR. ANY(types_trac=='coag')) .AND. ALL(types_trac /= 'inca')) THEN
+         ELSE IF (ANY(type_trac==['lmdz|coag','lmdz     ','coag     '])) THEN
            itr = 0
            DO iq = 1, nqtot