Changeset 4389 for LMDZ6/trunk/libf/phylmd/tracinca_mod.F90

Timestamp:

Jan 23, 2023, 11:28:51 AM (20 months 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.

File:

• LMDZ6/trunk/libf/phylmd/tracinca_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/tracinca_mod.F90

@@ -18 +18 @@
     ! This subroutine initialize some control varaibles. 
 
-    USE infotrac_phy, ONLY: nbtr, types_trac
+    USE infotrac_phy, ONLY: nbtr, type_trac
     IMPLICIT NONE
     
@@ -30 +30 @@
 
     !--- COHERENCE TEST BETWEEN "type_trac" AND "config_inca"
-    IF((ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) .AND. ALL(config_inca /= ['aero', 'aeNP', 'chem']))&
-       CALL abort_gcm('tracinca_init', 'INCA enabled, but unknown config_inca = "'//TRIM(config_inca)//'".'          &
-                             //'Please modify "run.def"', 1)
+    IF(ANY(type_trac == ['inca','inco']) .AND. ALL(config_inca /= ['aero','aeNP','chem'])) CALL abort_gcm('tracinca_init', &
+       'INCA enabled, but unknown config_inca = "'//TRIM(config_inca)//'". Please modify "run.def"', 1)
 
     !--- PROBLEM IF "config_inca" DIFFERS FROM "none" AND INCA HAS NOT BEEN ACTIVATED
-    IF(ALL(types_trac /= 'inca') .AND. ALL(types_trac /= 'inco')  .AND.     config_inca /= 'none') &
-       CALL abort_gcm('tracinca_init', 'INCA disabled, but config_inca = "'//TRIM(config_inca)//'" should be "none".'&
-                             //'Please modify "run.def"', 1)
+    IF(ALL(type_trac /= ['inca','inco'])  .AND.    config_inca /= 'none')                  CALL abort_gcm('tracinca_init', &
+       'INCA disabled, but config_inca = "'//TRIM(config_inca)//'" should be "none". Please modify "run.def"', 1)
 
   END SUBROUTINE tracinca_init