Changeset 5221 for LMDZ6/branches/Amaury_dev/libf/phylmdiso

Timestamp:

Sep 23, 2024, 4:12:29 PM (4 months ago)

Author:

abarral

Message:

Merge r5196, r5199
Nb: skipping r5197 r5198 as they revert one-another

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/phylmdiso/isotopes_routines_mod.F90 (modified) (2 diffs)
• libf/phylmdiso/isotrac_mod.F90 (modified) (1 diff)
• libf/phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• libf/phylmdiso/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/isotopes_routines_mod.F90

@@ -16268 +16268 @@
    USE isotopes_mod,      ONLY: isoName,iso_HDO,iso_eau
    USE phyetat0_get_mod,  ONLY: phyetat0_get, phyetat0_srf
-   USE lmdz_readTracFiles, ONLY: new2oldH2O
-   USE lmdz_strings,       ONLY: strIdx, strTail, maxlen, msg, int2str
+   USE infotrac_phy, ONLY: new2oldH2O
+   USE lmdz_strings,       ONLY: strIdx, strHead, strTail, maxlen, msg, int2str
 #ifdef ISOVERIF
    USE isotopes_verif_mod
@@ -16308 +16308 @@
       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/branches/Amaury_dev/libf/phylmdiso/isotrac_mod.F90

@@ -3 +3 @@
 
 MODULE isotrac_mod
-  USE infotrac_phy,      ONLY: niso, ntiso, nzone
-  USE lmdz_readTracFiles, ONLY: delPhase
+  USE infotrac_phy,      ONLY: niso, ntiso, nzone, delPhase
   USE isotopes_mod,      ONLY: ridicule, get_in
   USE lmdz_abort_physic, ONLY: abort_physic

LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90

@@ -41 +41 @@
   USE lmdz_geometry,     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 lmdz_readTracFiles,ONLY: maxlen, new2oldH2O
+  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers, new2oldH2O
+  USE lmdz_readTracFiles,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/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -39 +39 @@
     USE lmdz_ioipsl_getin_p, ONLY: getin_p
     USE indice_sol_mod
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,ivap,iliq,isol
-    USE lmdz_readTracFiles, ONLY: addPhase
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, addPhase, ivap,iliq,isol
     USE lmdz_strings,  ONLY: strIdx
     USE iophy
@@ -2585 +2584 @@
        ENDDO
     ENDDO
-    
+
     ! Lea Raillard qs_ini for cloud phase param.
     qs_ini(:,:)=qs_seri(:,:)
@@ -5890 +5889 @@
        ENDIF
 
-       IF (aerosol_couple.AND.config_inca=='aero') THEN 
+       IF (aerosol_couple.AND.config_inca=='aero') THEN
           CALL radlwsw_inca  &
                (chemistry_couple, kdlon,kflev,dist, rmu0, fract, solaire, &