Changeset 4005

Timestamp:

Nov 10, 2021, 10:40:20 AM (2 years ago)

Author:

Ehouarn Millour

Message:

Some cleanup around tracer name string length, and anticipate future needs and make default string max length larger (128 characters instead of 20).
EM

Location:

LMDZ6/trunk/libf

Files:

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

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -27 +27 @@
 
 ! Name variables
-  CHARACTER(len=20), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
-  CHARACTER(len=23), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
+  INTEGER,PARAMETER :: tname_lenmax=128 
+  CHARACTER(len=tname_lenmax), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
+  CHARACTER(len=tname_lenmax+3), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
 
 ! iadv  : index of trasport schema for each tracer
@@ -118 +119 @@
     CHARACTER(len=8), ALLOCATABLE, DIMENSION(:) :: solsym_inca
 
-    CHARACTER(len=30), ALLOCATABLE, DIMENSION(:) :: tnom_0  ! tracer short name
-    CHARACTER(len=30), ALLOCATABLE, DIMENSION(:) :: tnom_transp ! transporting fluid short name: CRisi
+    CHARACTER(len=tname_lenmax), ALLOCATABLE, DIMENSION(:) :: tnom_0  ! tracer short name
+    CHARACTER(len=tname_lenmax), ALLOCATABLE, DIMENSION(:) :: tnom_transp ! transporting fluid short name: CRisi
     CHARACTER(len=3), DIMENSION(30) :: descrq
     CHARACTER(len=1), DIMENSION(3)  :: txts
     CHARACTER(len=2), DIMENSION(9)  :: txtp
-    CHARACTER(len=23)               :: str1,str2
+    CHARACTER(len=tname_lenmax)               :: str1,str2
   
     INTEGER :: nqtrue  ! number of tracers read from tracer.def, without higer order of moment
@@ -130 +131 @@
     LOGICAL :: continu,nouveau_traceurdef
     INTEGER :: IOstatus ! gestion de la retrocompatibilite de traceur.def
-    CHARACTER(len=30) :: tchaine    
+    CHARACTER(len=2*tname_lenmax+1) :: tchaine    
 
     character(len=*),parameter :: modname="infotrac_init"
@@ -349 +350 @@
                 write(lunout,*) 'C''est la nouvelle version de traceur.def'
                 tnom_0(iq)=tchaine(1:iiq-1)
-                tnom_transp(iq)=tchaine(iiq+1:30)
+                tnom_transp(iq)=tchaine(iiq+1:)
              else
                 write(lunout,*) 'C''est l''ancienne version de traceur.def'
@@ -366 +367 @@
        WRITE(lunout,*) trim(modname),': nombre total de traceurs ',nqtrue
        DO iq=1,nqtrue
-          WRITE(lunout,*) hadv(iq),vadv(iq),tnom_0(iq),tnom_transp(iq)
+          WRITE(lunout,*) hadv(iq),vadv(iq),' ',trim(tnom_0(iq)),' ',trim(tnom_transp(iq))
        END DO
 
@@ -479 +480 @@
                 write(lunout,*) 'C''est la nouvelle version de traceur.def'
                 tnom_0(iq)=tchaine(1:iiq-1)
-                tnom_transp(iq)=tchaine(iiq+1:30)
+                tnom_transp(iq)=tchaine(iiq+1:)
              else
                 write(lunout,*) 'C''est l''ancienne version de traceur.def'
@@ -793 +794 @@
  
     ! inputs
-    INTEGER nqtrue
-    CHARACTER(len=30) tnom_0(nqtrue)
+    INTEGER,INTENT(IN) :: nqtrue
+    CHARACTER(len=*),INTENT(IN) :: tnom_0(nqtrue)
     
     ! locals    
@@ -801 +802 @@
     INTEGER, ALLOCATABLE,DIMENSION(:) :: nb_isoind
     INTEGER :: ntraceurs_zone_prec,iq,phase,ixt,iiso,izone
-    CHARACTER(len=19) :: tnom_trac
+    CHARACTER(len=tname_lenmax) :: tnom_trac
     INCLUDE "iniprint.h"
 

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -42 +42 @@
 
 ! Name variables
-  CHARACTER(len=20), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
-  CHARACTER(len=23), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
+  INTEGER,PARAMETER :: tname_lenmax=128 
+  CHARACTER(len=tname_lenmax), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
+  CHARACTER(len=tname_lenmax+3), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
 !$OMP THREADPRIVATE(tname,ttext)
 
@@ -138 +139 @@
     INTEGER,INTENT(IN) :: id_BIN01_strat_
 #endif
-    CHARACTER(len=20),INTENT(IN) :: tname_(nqtot_) ! tracer short name for restart and diagnostics
-    CHARACTER(len=23),INTENT(IN) :: ttext_(nqtot_) ! tracer long name for diagnostics
-    CHARACTER(len=4),INTENT(IN) :: type_trac_
+    CHARACTER(len=*),INTENT(IN) :: tname_(nqtot_) ! tracer short name for restart and diagnostics
+    CHARACTER(len=*),INTENT(IN) :: ttext_(nqtot_) ! tracer long name for diagnostics
+    CHARACTER(len=*),INTENT(IN) :: type_trac_
     INTEGER,INTENT(IN) :: niadv_ (nqtot_) ! equivalent dyn / physique
     INTEGER,INTENT(IN) :: conv_flg_(nbtr_)
     INTEGER,INTENT(IN) :: pbl_flg_(nbtr_)
-    CHARACTER(len=8),INTENT(IN) :: solsym_(nbtr_)
+    CHARACTER(len=*),INTENT(IN) :: solsym_(nbtr_)
     ! Isotopes:
     INTEGER,INTENT(IN) :: nqfils_(nqtot_)