Changeset 4046 for LMDZ6/trunk/libf/dyn3d

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

Files:

• dynetat0.f90 (modified) (4 diffs)
• dynredem.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/dyn3d/dynetat0.f90

@@ -10 +10 @@
                          NF90_CLOSE, NF90_GET_VAR
   USE control_mod, ONLY: planet_type
+  USE strings_mod, ONLY: maxlen
   USE assert_eq_m, ONLY: assert_eq
   USE comvert_mod, ONLY: pa,preff
@@ -36 +37 @@
 !===============================================================================
 ! Local variables:
-  CHARACTER(LEN=256) :: msg, var, modname
+  CHARACTER(LEN=maxlen) :: msg, var, modname
   INTEGER, PARAMETER :: length=100
   INTEGER :: iq, fID, vID, idecal!, iml, jml, lml, nqt
@@ -126 +127 @@
 !--- Tracers
   DO iq=1,nqtot
-    var=tname(iq)
+    var=TRIM(tracers(iq)%name)
     IF(NF90_INQ_VARID(fID,var,vID)==NF90_NoErr) THEN
       CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var); CYCLE
@@ -153 +154 @@
   INTEGER,          INTENT(IN) :: n1, n2
   CHARACTER(LEN=*), INTENT(IN) :: str1, str2
-  CHARACTER(LEN=100) :: s1, s2
+  CHARACTER(LEN=maxlen) :: s1, s2
   IF(n1/=n2) THEN
     s1='value of '//TRIM(str1)//' ='

LMDZ6/trunk/libf/dyn3d/dynredem.F90

@@ -12 +12 @@
                     NF90_64BIT_OFFSET
   USE dynredem_mod, ONLY: cre_var, put_var1, put_var2, err, modname, fil
+  USE strings_mod, ONLY: maxlen
   USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
                               nivsig,nivsigs
@@ -38 +39 @@
   REAL    :: tab_cntrl(length)                     !--- RUN PARAMETERS TABLE
 !   For NetCDF:
-  CHARACTER(LEN=30) :: unites
+  CHARACTER(LEN=maxlen) :: unites
   INTEGER :: indexID
   INTEGER :: rlonuID, rlonvID, rlatuID, rlatvID
@@ -145 +146 @@
   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])
@@ -196 +197 @@
   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
 !===============================================================================
@@ -231 +232 @@
 
 !--- 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"
       fil="start_trac.nc"