Changeset 5199 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Sep 18, 2024, 11:22:37 PM (2 months ago)

Author:

dcugnet

Message:

The "readTracFiles_mod" module usage is restricted to "infotrac" and" infotrac_phy" routines.
The internal routines or quantities of this module are now accessible through these these two routines:

addPhase, delPhase, new2oldH2O, newHNO3, oldHNO3

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• isotopes_routines_mod.F90 (modified) (2 diffs)
• isotrac_mod.F90 (modified) (1 diff)
• phyetat0_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -16419 +16419 @@
    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, strTail, maxlen, msg, int2str
+   USE infotrac_phy,      ONLY: new2oldH2O
+   USE strings_mod,       ONLY: strIdx, strHead, strTail, maxlen, msg, int2str
 #ifdef ISOVERIF
    USE isotopes_verif_mod
@@ -16459 +16459 @@
       outiso = isoName(ixt)
       oldIso = strTail(new2oldH2O(outiso), '_')            !--- Remove "H2O_" from "H2O_<iso>[_<tag>]"
-      i = INDEX(outiso, '_', .TRUE.)
-      oldIso2 = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso)) ! CR 2023: on ajoute cette possibilité aussi, elle correspond au cas le plus récent.
+      oldIso2= TRIM(strHead(outiso,'_'))//strTail(outiso,'_') ! CR 2023: most recent possibility
 !      write(*,*) 'tmp 16541:'
 !      write(*,*) 'outiso=',outiso

LMDZ6/trunk/libf/phylmdiso/isotrac_mod.F90

@@ -3 +3 @@
 
 MODULE isotrac_mod
-  USE infotrac_phy,      ONLY: niso, ntiso, nzone
-  USE readTracFiles_mod, ONLY: delPhase
-  USE isotopes_mod,      ONLY: ridicule, get_in
+  USE infotrac_phy, ONLY: niso, ntiso, nzone, delPhase
+  USE isotopes_mod, ONLY: ridicule, get_in
 
   IMPLICIT NONE

LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90

@@ -40 +40 @@
   USE geometry_mod,     ONLY: longitude_deg, latitude_deg
   USE iostart,          ONLY: close_startphy, get_field, get_var, open_startphy
-  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers
-  USE readTracFiles_mod,ONLY: maxlen, new2oldH2O
+  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers, new2oldH2O
+  USE strings_mod,      ONLY: maxlen
   USE traclmdz_mod,     ONLY: traclmdz_from_restart
   USE carbon_cycle_mod, ONLY: carbon_cycle_init, carbon_cycle_cpl, carbon_cycle_tr, carbon_cycle_rad, co2_send, RCO2_glo

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -39 +39 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
     USE indice_sol_mod
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,ivap,iliq,isol
-    USE readTracFiles_mod, ONLY: addPhase
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,addPhase, ivap, iliq, isol
     USE strings_mod,  ONLY: strIdx
     USE iophy