Changeset 4638

Timestamp:

Jul 21, 2023, 10:42:49 AM (10 months ago)

Author:

acozic

Message:

Add a fix to homogenize type_trac between lmdz and dynamico
LMDZ had lost the backward compatibility of type_trac in list form. This commit makes it possible again

Location:

LMDZ6/trunk/libf

Files:

• dyn3d_common/infotrac.F90 (modified) (2 diffs)
• phylmd/infotrac_phy.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -162 +162 @@
    TYPE(trac_type), POINTER             :: t1, t(:)
    INTEGER :: ierr
+   CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type(s), parsed version
 
    CHARACTER(LEN=*), PARAMETER :: modname="init_infotrac"
@@ -175 +176 @@
    CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname)
 
+   lerr=strParse(type_trac, '|', types_trac, n=nt)
+   IF (nt .GT. 1) THEN
+      IF (nt .GT. 2) CALL abort_gcm(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
+      if (nt .EQ. 2) type_trac=types_trac(2)
+   ENDIF
+
+
+   
    !--- MESSAGE ABOUT THE CHOSEN CONFIGURATION
    msg1 = 'For type_trac = "'//TRIM(type_trac)//'":'

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -188 +188 @@
    TYPE(trac_type), POINTER             :: t1, t(:)
    INTEGER :: ierr
-
+   CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type(s), parsed version
+   
    CHARACTER(LEN=*), PARAMETER :: modname="init_infotrac_phy"
 !------------------------------------------------------------------------------------------------------------------------------
@@ -200 +201 @@
 
    CALL getin_p('type_trac',type_trac)
+
+   lerr=strParse(type_trac, '|', types_trac, n=nt)
+   IF (nt .GT. 1) THEN
+      IF (nt .GT. 2) CALL abort_physic(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
+      IF (nt .EQ. 2) type_trac=types_trac(2)
+   ENDIF
+
+   
    CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname)
    lInit = .NOT.ALLOCATED(tracers)