Changeset 4046 for LMDZ6/trunk/libf/dyn3dmem

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/dyn3dmem

Files:

• dynetat0_loc.F90 (modified) (4 diffs)
• dynredem_loc.F90 (modified) (5 diffs)
• initdynav_loc.F (modified) (1 diff)
• inithist_loc.F (modified) (1 diff)
• writedynav_loc.F (modified) (2 diffs)
• writehist_loc.F (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -11 +11 @@
       NF90_NOWRITE, NF90_CLOSE, NF90_INQUIRE_VARIABLE,  NF90_GET_VAR, NF90_NoErr
   USE control_mod, ONLY: planet_type
+  USE strings_mod, ONLY: maxlen
   USE assert_eq_m, ONLY: assert_eq
   USE comvert_mod, ONLY: pa,preff
@@ -39 +40 @@
 !===============================================================================
 ! Local variables:
-  CHARACTER(LEN=256) :: msg, var, modname
+  CHARACTER(LEN=maxlen) :: msg, var, modname
   INTEGER, PARAMETER :: length=100
   INTEGER :: iq, fID, vID, idecal, ierr
@@ -152 +153 @@
   ALLOCATE(q_glo(ip1jmp1,llm))
   DO iq=1,nqtot
-    var=tname(iq)
+    var=TRIM(tracers(iq)%name)
 #ifdef INCA
     IF (var .eq. "O3" ) THEN 
@@ -191 +192 @@
   INTEGER,          INTENT(IN) :: n1, n2
   CHARACTER(LEN=*), INTENT(IN) :: str1, str2
-  CHARACTER(LEN=256) :: s1, s2
+  CHARACTER(LEN=maxlen) :: s1, s2
   IF(n1/=n2) THEN
     s1='value of '//TRIM(str1)//' ='

LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.F90

@@ -14 +14 @@
                     NF90_64BIT_OFFSET
   USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
+  USE strings_mod, ONLY: maxlen
   USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
                          nivsig,nivsigs
@@ -41 +42 @@
   REAL    :: phis_glo(ip1jmp1)
 !   For NetCDF:
-  CHARACTER(LEN=30) :: unites
+  CHARACTER(LEN=maxlen) :: unites
   INTEGER :: indexID
   INTEGER :: rlonuID, rlonvID, rlatuID, rlatvID
@@ -151 +152 @@
   CALL cre_var(nid,"teta" ,"Temperature",[rlonvID,rlatuID,sID,timID])
   DO iq=1,nqtot
-    CALL cre_var(nid,tname(iq),ttext(iq),[rlonvID,rlatuID,sID,timID])
+    CALL cre_var(nid,tracers(iq)%name,tracers(iq)%longName,[rlonvID,rlatuID,sID,timID])
   END DO
   CALL cre_var(nid,"masse","Masse d air"    ,[rlonvID,rlatuID,sID,timID])
@@ -204 +205 @@
   INTEGER, PARAMETER :: length=100
   REAL               :: tab_cntrl(length) ! tableau des parametres du run
-  CHARACTER(LEN=256) :: var, dum
+  CHARACTER(LEN=maxlen) :: var, dum
   LOGICAL            :: lread_inca
 !===============================================================================
@@ -248 +249 @@
 
 !--- Save tracers
-  DO iq=1,nqtot; var=tname(iq); ierr=-1
+  DO iq=1,nqtot; var=TRIM(tracers(iq)%name); ierr=-1
     IF(lread_inca) THEN                  !--- Possibly read from "start_trac.nc"
 !$OMP MASTER      

LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.F

@@ -252 +252 @@
 C
 !        DO iq=1,nqtot
-!          call histdef(histaveid, ttext(iq), ttext(iq), '-',
+!          call histdef(histaveid, tracers(iq)%name,
+!     .                            tracers(iq)%longName, '-',
 !     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
 !     .             32, 'ave(X)', t_ops, t_wrt)

LMDZ6/trunk/libf/dyn3dmem/inithist_loc.F

@@ -253 +253 @@
 C
 !        DO iq=1,nqtot
-!          call histdef(histid, ttext(iq), ttext(iq), '-',
+!          call histdef(histid, tracers(iq)%name, 
+!     .             tracers(iq)%longName, '-', 
 !     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
 !     .             32, 'inst(X)', t_ops, t_wrt)

LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.F

@@ -11 +11 @@
       USE parallel_lmdz
       USE misc_mod
-      USE infotrac, ONLY : nqtot, ttext
+      USE infotrac, ONLY : nqtot
       use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid
       USE comconst_mod, ONLY: cpp
@@ -177 +177 @@
 !!$OMP MASTER      
 !        DO iq=1,nqtot
-!          call histwrite(histaveid, ttext(iq), itau_w, q(ijb:ije,:,iq), 
-!     .                   iip1*jjn*llm, ndexu)
+!          call histwrite(histaveid, tracers(iq)%longName, itau_w, &
+!     .                   q(ijb:ije,:,iq), iip1*jjn*llm, ndexu)
 !        enddo
 !!$OMP END MASTER

LMDZ6/trunk/libf/dyn3dmem/writehist_loc.F

@@ -11 +11 @@
       USE parallel_lmdz
       USE misc_mod
-      USE infotrac, ONLY : nqtot, ttext
+      USE infotrac, ONLY : nqtot
       use com_io_dyn_mod, only : histid,histvid,histuid
       USE comconst_mod, ONLY: cpp
@@ -177 +177 @@
 !!$OMP MASTER      
 !        DO iq=1,nqtot
-!          call histwrite(histid, ttext(iq), itau_w, q(ijb:ije,:,iq), 
-!     .                   iip1*jjn*llm, ndexu)
+!          call histwrite(histid, tracers(iq)%longName, itau_w, 
+!     .                   q(ijb:ije,:,iq), iip1*jjn*llm, ndexu)
 !        enddo
 !!$OMP END MASTER