Changeset 4169 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Jun 16, 2022, 2:45:08 PM (2 years ago)

Author:

dcugnet

Message:

• Fix for multi-sections "tracer.def" files: type_trac is no longer a coma-saparated list (","), but is now a pipe-separated list ("|"), because the "getin" function replaces the comas by spaces.
• Small fix for INCA: keep the "config_inca" value different from "none" if ALL the sections names differ from "inca" or "inco".

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -201 +201 @@
     
    CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname)
-   IF(strParse(type_trac, ',', str, n=nt)) CALL abort_gcm(modname,'can''t parse "type_trac = '//TRIM(type_trac)//'"',1)
+   IF(strParse(type_trac, '|', str, n=nt)) CALL abort_gcm(modname,'can''t parse "type_trac = '//TRIM(type_trac)//'"',1)
 
    !---------------------------------------------------------------------------------------------------------------------------
@@ -238 +238 @@
       END SELECT
 
-      !--- DISABLE "config_inca" OPTION FOR A RUN WITHOUT "INCA" IF IT DIFFERS FROM "none"
-      IF(fmsg('Setting config_inca="none" as you do not couple with INCA model', &
-              modname, ALL(['inca', 'inco'] /= str(it)) .AND. config_inca /= 'none')) config_inca = 'none'
-
    !---------------------------------------------------------------------------------------------------------------------------
    END DO
    !---------------------------------------------------------------------------------------------------------------------------
+
+   !--- DISABLE "config_inca" OPTION FOR A RUN WITHOUT "INCA" IF IT DIFFERS FROM "none"
+   IF(fmsg('Setting config_inca="none" as you do not couple with INCA model', &
+           modname, ALL(str /= 'inca') .AND. ALL(str /= 'inco') .AND. config_inca /= 'none')) config_inca = 'none'
 
    nqCO2 = 0; IF(ANY(str == 'inco')) nqCO2 = 1