Changeset 4389 for LMDZ6/trunk/libf/dynphy_lonlat/phylmd

Timestamp:

Jan 23, 2023, 11:28:51 AM (2 years ago)

Author:

dcugnet

Message:

• revert to original "type_trac" management:
  • 4 characters keyword (lmdz, Inca, repr, co2i, into, aeNP, coag
  • no longer a list of component with "|" separator
  • the parsed (with "|" separator) version "types_trac" is no longer used
  • the sole routine using a list of component is readTracFiles
• fix for INCA and CO2Aer modes: setGeneration is now a function, index corrections for had/vadv.

Location:

LMDZ6/trunk/libf/dynphy_lonlat/phylmd

Files:

• ce0l.F90 (modified) (1 diff)
• iniphysiq_mod.F90 (modified) (4 diffs)

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

@@ -23 +23 @@
   USE netcdf,         ONLY: NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR,    &
          NF90_INQUIRE_DIMENSION, NF90_INQ_DIMID, NF90_INQ_VARID, NF90_GET_VAR
-  USE infotrac,       ONLY: type_trac, init_infotrac
+  USE infotrac,       ONLY: init_infotrac
   USE dimphy,         ONLY: klon
   USE test_disvert_m, ONLY: test_disvert

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

@@ -16 +16 @@
   USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
   USE vertical_layers_mod, ONLY : init_vertical_layers
-  USE infotrac, ONLY: nbtr, type_trac, types_trac
+  USE infotrac, ONLY: nbtr, type_trac
 #ifdef CPP_StratAer
   USE infotrac_phy, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, &
@@ -140 +140 @@
 
   ! Initializations for Reprobus
-  IF (ANY(types_trac == 'repr')) THEN
+  IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
     call Init_chem_rep_phys(klon_omp,nlayer)
@@ -151 +151 @@
 
 
-  IF (ANY(types_trac == 'repr')) THEN
+  IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
     call init_reprobus_para( &
@@ -166 +166 @@
   END IF
 
-  IF (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) THEN
+  IF (ANY(type_trac == ['inca','inco'])) THEN
 #ifdef INCA
      CALL init_inca_dim_reg(nbp_lon, nbp_lat - 1, &