Changeset 4046 for LMDZ6/trunk/libf/phylmdiso/infotrac_phy.F90

Timestamp:

Dec 15, 2021, 11:18:49 PM (2 years ago)

Author:

dcugnet

Message:

First commit for new tracers.

• parser routines readTracFiles, strings_mod and tracer_types added in misc using revision 4 of ​https://svn.lmd.jussieu.fr/tracers-parser
• tested in sequential and parallel mode using ioipsl.
• for now, only two fields of "tracers(:)" derived type vector are used: "name" and "longName".

File:

• LMDZ6/trunk/libf/phylmdiso/infotrac_phy.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmdiso/infotrac_phy.F90

@@ -7 +7 @@
 ! the dynamics (could be further cleaned) and is initialized using values
 ! provided by the dynamics
+
+  USE readTracFiles_mod, ONLY: trac_type, maxlen, delPhase
 
 ! nqtot : total number of tracers and higher order of moment, water vapor and liquid included
@@ -41 +43 @@
 !$OMP THREADPRIVATE(nqperes)
 
-! Name variables
-  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)
-
-!! iadv  : index of trasport schema for each tracer
-!  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: iadv
+! Tracers parameters
+  TYPE(trac_type), TARGET, ALLOCATABLE, SAVE :: tracers(:)
+!$OMP THREADPRIVATE(tracers)
 
 ! niadv : vector keeping the coorspondance between all tracers(nqtot) treated in the 
@@ -107 +104 @@
 CONTAINS
 
-  SUBROUTINE init_infotrac_phy(nqtot_,nqo_,nbtr_,nqtottr_,nqCO2_,tname_,ttext_,type_trac_,&
+  SUBROUTINE init_infotrac_phy(nqtot_,nqo_,nbtr_,nqtottr_,nqCO2_,tracers_,type_trac_,&
                                niadv_,conv_flg_,pbl_flg_,solsym_,&
                                nqfils_,nqdesc_,nqdesc_tot_,iqfils_,iqpere_,&
@@ -139 +136 @@
     INTEGER,INTENT(IN) :: id_BIN01_strat_
 #endif
-    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) :: tracers_(nqtot_) ! tracers descriptors
     CHARACTER(len=*),INTENT(IN) :: type_trac_
     INTEGER,INTENT(IN) :: niadv_ (nqtot_) ! equivalent dyn / physique
@@ -179 +175 @@
     nqCO2=nqCO2_
     nqtottr=nqtottr_
+    ALLOCATE(tracers(nqtot)); tracers(:) = tracers_(:)
 #ifdef CPP_StratAer
     nbtr_bin=nbtr_bin_
@@ -187 +184 @@
     id_BIN01_strat=id_BIN01_strat_
 #endif
-    ALLOCATE(tname(nqtot))
-    tname(:) = tname_(:)
-    ALLOCATE(ttext(nqtot))
-    ttext(:) = ttext_(:)
     type_trac = type_trac_
     ALLOCATE(niadv(nqtot))