Changeset 3957 for LMDZ6/branches/LMDZ-tracers/libf/dyn3d_common

Timestamp:

Jul 11, 2021, 11:39:01 PM (3 years ago)

Author:

dcugnet

Message:

In readTracFiles: the separator between the tracer name and its phase is no longer hardcoded and equal to "-",
but is a parameter ("phases_sep") which default value is "_".
Few more fixes.

File:

• LMDZ6/branches/LMDZ-tracers/libf/dyn3d_common/infotrac.F90 (modified) (8 diffs)

LMDZ6/branches/LMDZ-tracers/libf/dyn3d_common/infotrac.F90

@@ -1 +1 @@
 MODULE infotrac
 
-  USE       strings_mod, ONLY: msg, find, strIdx,  strFind,  strHead, dispTable, testFile, cat, get_in,  &
+  USE       strings_mod, ONLY: msg, find, strIdx,  strFind,  strHead, dispTable, testFile, cat, get_in,   &
                               fmsg, test, int2str, strParse, strTail, strReduce, strStack, modname
-  USE readTracFiles_mod, ONLY: readTracersFiles, getKey_init, nphases, delPhase, aliasTracer, &
-                        tran0, readIsotopesFile, getKey, known_phases, addPhase, indexUpdate, initIsotopes
+  USE readTracFiles_mod, ONLY: readTracersFiles, getKey_init, nphases, delPhase, old_phases, aliasTracer, &
+            phases_sep, tran0, readIsotopesFile, getKey, known_phases, addPhase, indexUpdate, initIsotopes
   USE trac_types_mod,    ONLY: tra, iso, kys
 
@@ -45 +45 @@
 !  |--------------------+----------------------+-----------------+---------------+----------------------------|
 !  | water in different |    water tagging     |  water isotopes | other tracers | additional tracers moments |
-!  | phases: H2O-[gls]  |      isotopes        |                 |               |  for higher order schemes  |
+!  | phases: H2O_[gls]  |      isotopes        |                 |               |  for higher order schemes  |
 !  |--------------------+----------------------+-----------------+---------------+----------------------------|
 !  |                    |                      |                 |               |                            |
@@ -184 +184 @@
   CHARACTER(LEN=2)   ::   suff(9)                                    !--- Suffixes for schemes of order 3 or 4 (Prather)
   CHARACTER(LEN=3)   :: descrq(30)                                   !--- Advection scheme description tags
-  CHARACTER(LEN=4)   :: oldH2O(3)                                    !--- Old water name for the three phases
+  CHARACTER(LEN=256) :: oldH2O(3)                                    !--- Old water name for the three phases
   CHARACTER(LEN=256) :: newH2O                                       !--- New water name
   CHARACTER(LEN=256) :: msg1, msg2                                   !--- Strings for messages
@@ -283 +283 @@
       IF(planet_type=='earth') THEN                                  !--- Default for Earth
         nqo = 2; nbtr = 2
-        tracers(:)%name = ['H2O-g','H2O-l','RN   ','PB   ']
-        tracers(:)%prnt = [tran0  ,tran0  ,tran0  ,tran0  ]
-        tracers(:)%igen = [1      ,1      ,1      ,1      ]
-        hadv            = [14     ,10     ,10     ,10     ]
-        vadv            = [14     ,10     ,10     ,10     ]
+        tracers(:)%name = ['H2O'//phases_sep//'g', 'H2O'//phases_sep//'l', 'RN   ', 'PB   ']
+        tracers(:)%prnt = [tran0, tran0, tran0, tran0]
+        tracers(:)%igen = [1    , 1    , 1    , 1    ]
+        hadv            = [14   , 10   , 10   , 10   ]
+        vadv            = [14   , 10   , 10   , 10   ]
       ELSE                                                           !--- Default for other planets
         nqo = 0; nbtr = 1
@@ -329 +329 @@
         DO ip = 1, SIZE(oldH2O)
           ix = strIdx(tracers(:)%name,oldH2O(ip))                    !--- Old name of water in a specific phase (ix/=0)
+          newH2O = 'H2O'//phases_sep//known_phases(ip:ip)            !--- Corresponding new name
+          IF(ix == 0) ix = strIdx(tracers(:)%name,newH2O)            !--- New name in an old format file (to be avoided...)
           IF(ix == 0) CYCLE
-          newH2O = 'H2O-'//known_phases(ip:ip)                       !--- Corresponding new name
           nqo = nqo+1; tracers(ix)%name = newH2O                     !--- One more water phase ; replace old name with one
           tracers(strFind(tracers(:)%nam1,oldH2O(ip)))%nam1 = newH2O
@@ -341 +342 @@
     CASE DEFAULT                                                     !=== FOUND NEW STYLE TRACERS CONFIG FILE(S)
     !--------------------------------------------------------------------------------------------------------------------------
-      nqo    = 2; IF(ANY(tracers(:)%name == 'H2O-s')) nqo=3
+      nqo    = 2; IF(ANY(tracers(:)%name == 'H2O'//phases_sep//'s')) nqo=3
       nqtrue = SIZE(tracers, DIM=1)
       nbtr   = nqtrue - nqo
@@ -353 +354 @@
   IF(.NOT.ALLOCATED(conv_flg)) conv_flg = [(1, it=1, nbtr)]
   IF(.NOT.ALLOCATED( pbl_flg))  pbl_flg = [(1, it=1, nbtr)]
+!print*,'nqo, nbtr = ',nqo,nbtr
+!stop
 
 #ifdef CPP_StratAer
@@ -466 +469 @@
 
     !--- iadv = 14 IS ONLY VALID FOR WATER VAPOUR
-    IF(fmsg(iad==14 .AND. t1%name(1:5)/='H2O-g', 'WARNING ! '//TRIM(msg1)//', found for "' &
+    IF(fmsg(iad==14 .AND. t1%name(1:5)/='H2O'//phases_sep//'g', 'WARNING ! '//TRIM(msg1)//', found for "' &
                  //TRIM(t1%name)//'" but only valid for water vapour ! Setting iadv=10 for "'//TRIM(t1%name)//'".')) t1%iadv=10
   END DO