Changeset 4403 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Jan 30, 2023, 9:27:31 PM (3 years ago)

Author:

dcugnet

Message:

• fix for isotopic tagging tracers
• modify strHead/strTail: last argument (optional) has the same convention as INDEX: if lBackward==.TRUE., search the pattern starting from the end of the string (default=.FALSE.)
• consolidate and simplify the new2oldH2O routine

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• isotopes_routines_mod.F90 (modified) (2 diffs)
• isotrac_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -16516 +16516 @@
 #endif
      xtrain_fall, xtsnow_fall, ql_ancien, xtl_ancien, qs_ancien, xts_ancien, fxtevap, xtsol
-   USE indice_sol_mod,    ONLY: nbsrf  
+   USE indice_sol_mod,    ONLY: nbsrf
    USE isotopes_mod,      ONLY: isoName,iso_HDO,iso_eau
    USE phyetat0_get_mod,  ONLY: phyetat0_get, phyetat0_srf
    USE readTracFiles_mod, ONLY: new2oldH2O
-   USE strings_mod,       ONLY: strIdx, strHead, strTail, maxlen, msg, int2str
+   USE strings_mod,       ONLY: strIdx, strTail, maxlen, msg, int2str
 #ifdef ISOVERIF
    USE isotopes_verif_mod
@@ -16558 +16558 @@
 
       outiso = isoName(ixt)
-      oldIso = strTail(new2oldH2O(outiso), '_', lFirst=.TRUE.)
+      oldIso = strTail(new2oldH2O(outiso), '_')            !--- Remove "H2O_" from "H2O_<iso>[_<tag>]"
       ! on lit seulement si ixt<=niso ou si on initialise les traceurs d'après fichier:
 #ifdef ISOTRAC

LMDZ6/trunk/libf/phylmdiso/isotrac_mod.F90

@@ -149 +149 @@
    USE isotopes_mod, ONLY: iso_eau, ntracisoOR, initialisation_iso
    USE dimphy,       ONLY: klon, klev
-   USE  strings_mod, ONLY: int2str, strStack, strTail, strHead, fmsg
+   USE  strings_mod, ONLY: int2str, strStack, strTail, strHead, strIdx, fmsg
 
    IMPLICIT NONE
@@ -658 +658 @@
    END DO
 
-   index_zone = [(INDEX(isoZone, strTail(         isoName(ixt) ,'_')), ixt=1, ntiso)]
-   index_iso  = [(INDEX(isoName, strHead(delPhase(isoName(ixt)),'_')), ixt=1, ntiso)]
+   index_zone = [(strIdx(isoZone, strTail(isoName(ixt) ,'_',.TRUE.)), ixt=1, ntiso)]
+   index_iso  = [(strIdx(isoName, strHead(isoName(ixt) ,'_',.TRUE.)), ixt=1, ntiso)]
    itZonIso_loc = itZonIso(:,:)
 #ifdef ISOVERIF