Changeset 4046 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Dec 15, 2021, 11:18:49 PM (3 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".

Location:

LMDZ6/trunk/libf/dyn3d_common

Files:

• infotrac.F90 (modified) (10 diffs)
• initdynav.F90 (modified) (2 diffs)
• inithist.F (modified) (2 diffs)
• writedynav.F90 (modified) (2 diffs)
• writehist.F (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -2 +2 @@
 !
 MODULE infotrac
+
+  USE readTracFiles_mod, ONLY: trac_type, isot_type, maxlen, ancestor, delPhase
 
 ! nqtot : total number of tracers and higher order of moment, water vapor and liquid included
@@ -26 +28 @@
   INTEGER, SAVE :: nqCO2
 
-! 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
+! DC: derived types containing informations about tracers and isotopes
+  TYPE(trac_type), TARGET,  SAVE, ALLOCATABLE ::  tracers(:)    !=== TRACERS DESCRIPTORS VECTOR
+  TYPE(isot_type), TARGET,  SAVE, ALLOCATABLE :: isotopes(:)    !=== ISOTOPES PARAMETERS VECTOR
 
 ! iadv  : index of trasport schema for each tracer
@@ -119 +120 @@
     CHARACTER(len=8), ALLOCATABLE, DIMENSION(:) :: solsym_inca
 
-    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=maxlen), ALLOCATABLE, DIMENSION(:) :: tnom_0  ! tracer short name
+    CHARACTER(len=maxlen), 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=tname_lenmax)               :: str1,str2
+    CHARACTER(len=maxlen)           :: str1,str2
   
     INTEGER :: nqtrue  ! number of tracers read from tracer.def, without higer order of moment
@@ -131 +132 @@
     LOGICAL :: continu,nouveau_traceurdef
     INTEGER :: IOstatus ! gestion de la retrocompatibilite de traceur.def
-    CHARACTER(len=2*tname_lenmax+1) :: tchaine    
+    CHARACTER(len=maxlen) :: tchaine    
 
     character(len=*),parameter :: modname="infotrac_init"
@@ -349 +350 @@
              if (nouveau_traceurdef) then
                 write(lunout,*) 'C''est la nouvelle version de traceur.def'
-                tnom_0(iq)=tchaine(1:iiq-1)
-                tnom_transp(iq)=tchaine(iiq+1:)
+                tnom_0(iq)=TRIM(tchaine(1:iiq-1))
+                tnom_transp(iq)=TRIM(tchaine(iiq+1:))
              else
                 write(lunout,*) 'C''est l''ancienne version de traceur.def'
@@ -563 +564 @@
 ! Allocate variables with total number of tracers, nqtot
 !
-    ALLOCATE(tname(nqtot), ttext(nqtot))
+    ALLOCATE(tracers(nqtot))
     ALLOCATE(iadv(nqtot), niadv(nqtot))
 
@@ -587 +588 @@
       
        str1=tnom_0(iq)
-       tname(new_iq)= tnom_0(iq)
+       tracers(new_iq)%name=TRIM(tnom_0(iq))
        IF (iadv(new_iq)==0) THEN
-          ttext(new_iq)=trim(str1)
+          tracers(new_iq)%longName=trim(str1)
        ELSE
-          ttext(new_iq)=trim(tnom_0(iq))//descrq(iadv(new_iq))
+          tracers(new_iq)%longName=trim(tnom_0(iq))//descrq(iadv(new_iq))
        ENDIF
 
        ! schemas tenant compte des moments d'ordre superieur
-       str2=ttext(new_iq)
+       str2=TRIM(tracers(new_iq)%longName)
        IF (iadv(new_iq)==20) THEN
           DO jq=1,3
              new_iq=new_iq+1
              iadv(new_iq)=-20
-             ttext(new_iq)=trim(str2)//txts(jq)
-             tname(new_iq)=trim(str1)//txts(jq)
+             tracers(new_iq)%longName=trim(str2)//txts(jq)
+             tracers(new_iq)%name=trim(str1)//txts(jq)
           END DO
        ELSE IF (iadv(new_iq)==30) THEN
@@ -607 +608 @@
              new_iq=new_iq+1
              iadv(new_iq)=-30
-             ttext(new_iq)=trim(str2)//txtp(jq)
-             tname(new_iq)=trim(str1)//txtp(jq)
+             tracers(new_iq)%longName=trim(str2)//txtp(jq)
+             tracers(new_iq)%name=trim(str1)//txtp(jq)
           END DO
        ENDIF
@@ -628 +629 @@
 
     WRITE(lunout,*) trim(modname),': Information stored in infotrac :'
-    WRITE(lunout,*) trim(modname),': iadv  niadv tname  ttext :'
+    WRITE(lunout,*) trim(modname),': iadv  niadv  name  long_name :'
 
     DO iq=1,nqtot
-       WRITE(lunout,*) iadv(iq),niadv(iq), ' ',trim(tname(iq)),' ',trim(ttext(iq))
+       WRITE(lunout,*) iadv(iq),niadv(iq), ' ',trim(tracers(iq)%name),' ',trim(tracers(iq)%longName)
     END DO
 
@@ -802 +803 @@
     INTEGER, ALLOCATABLE,DIMENSION(:) :: nb_isoind
     INTEGER :: ntraceurs_zone_prec,iq,phase,ixt,iiso,izone
-    CHARACTER(len=tname_lenmax) :: tnom_trac
+    CHARACTER(len=maxlen) :: tnom_trac
     INCLUDE "iniprint.h"
 

LMDZ6/trunk/libf/dyn3d_common/initdynav.F90

@@ -6 +6 @@
   USE IOIPSL
 #endif
-  USE infotrac, ONLY : nqtot, ttext
+  USE infotrac, ONLY : nqtot
   use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid, &
        dynhistave_file,dynhistvave_file,dynhistuave_file
@@ -158 +158 @@
 
   !        DO iq=1,nqtot
-  !          call histdef(histaveid, ttext(iq), ttext(iq), '-', &
+  !          call histdef(histaveid, tracers(iq)%name, &
+  !                                  tracers(iq)%longName, '-',  &
   !                  iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
   !                  32, 'ave(X)', t_ops, t_wrt)

LMDZ6/trunk/libf/dyn3d_common/inithist.F

@@ -7 +7 @@
        USE IOIPSL
 #endif
-       USE infotrac, ONLY : nqtot, ttext
+       USE infotrac, ONLY : nqtot
        use com_io_dyn_mod, only : histid,histvid,histuid,               &
      &                        dynhist_file,dynhistv_file,dynhistu_file
@@ -157 +157 @@
 !
 !        DO iq=1,nqtot
-!          call histdef(histid, ttext(iq),  ttext(iq), '-',
+!          call histdef(histid, tracers(iq)%name, 
+!                               tracers(iq)%longName, '-',
 !     .             iip1, jjp1, thoriid, llm, 1, llm, zvertiid,
 !     .             32, 'inst(X)', t_ops, t_wrt)

LMDZ6/trunk/libf/dyn3d_common/writedynav.F90

@@ -6 +6 @@
   USE ioipsl
 #endif
-  USE infotrac, ONLY : nqtot, ttext
+  USE infotrac, ONLY : nqtot
   use com_io_dyn_mod, only : histaveid, histvaveid, histuaveid
   USE comconst_mod, ONLY: cpp
@@ -106 +106 @@
 
   !  DO iq=1, nqtot
-  !       call histwrite(histaveid, ttext(iq), itau_w, q(:, :, iq), &
-  !                   iip1*jjp1*llm, ndexu)
+  !       call histwrite(histaveid, tracers(iq)%longName, itau_w, &
+  !                   q(:, :, iq), iip1*jjp1*llm, ndexu)
   ! enddo
 

LMDZ6/trunk/libf/dyn3d_common/writehist.F

@@ -7 +7 @@
       USE ioipsl
 #endif
-      USE infotrac, ONLY : nqtot, ttext
+      USE infotrac, ONLY : nqtot
       use com_io_dyn_mod, only : histid,histvid,histuid
       USE temps_mod, ONLY: itau_dyn
@@ -100 +100 @@
 C
 !        DO iq=1,nqtot
-!          call histwrite(histid, ttext(iq), itau_w, q(:,:,iq), 
-!     .                   iip1*jjp1*llm, ndexu)
+!          call histwrite(histid, tracers(iq)%longName, itau_w, 
+!     .                   q(:,:,iq), iip1*jjp1*llm, ndexu)
 !        enddo
 !C