Changeset 4120 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Apr 5, 2022, 3:44:30 PM (3 years ago)

Author:

dcugnet

Message:

• New water names: H2Ov, H2Ol, H2Oi, H2Or -> H2O_g, H2O_l, H2O_s, H2O_r.
• Corrections for the lOldCode=.FALSE., not activated yet.

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• phys_output_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmdiso/phys_output_mod.F90

@@ -35 +35 @@
     USE iophy 
     USE dimphy
-    USE infotrac_phy, ONLY: nqtot, tracers, type_trac, niso, ntraciso, maxlen
+    USE infotrac_phy, ONLY: nqtot, tracers, type_trac, niso, ntraciso
+    USE strings_mod,  ONLY: maxlen
     USE ioipsl
     USE phys_cal_mod, only : hour, calend

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, nqCO2, ok_isotopes
-    USE readTracFiles_mod, ONLY: phases_sep
-    USE strings_mod,  ONLY: strIdx
+    USE infotrac, ONLY: iso_num, iso_indnum
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, nqCO2, ok_isotopes, indnum_fn_num
+    USE readTracFiles_mod, ONLY: addPhase
+    USE strings_mod,  ONLY: strIdx, strStack, int2str
     USE iophy
     USE limit_read_mod, ONLY : init_limit_read
@@ -126 +127 @@
 #ifdef ISO
     USE infotrac_phy, ONLY:  &
-        iqiso,iso_indnum,ok_isotrac,niso, ntraciso
+        iqiso,ok_isotrac,niso, ntraciso
      USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,iso_O17,iso_HTO, &
         & bidouille_anti_divergence,ok_bidouille_wake, &
@@ -1392 +1393 @@
        IF ((iflag_ice_thermo.gt.0).and.(nqo==2)) THEN
           WRITE (lunout, *) ' iflag_ice_thermo==1 requires 3 H2O tracers ', &
-               '(H2Ov, H2Ol, H2Oi) but nqo=', nqo, '. Might as well stop here.'
+               '(H2O_g, H2O_l, H2O_s) but nqo=', nqo, '. Might as well stop here.'
           abort_message='see above'
           CALL abort_physic(modname,abort_message,1)
@@ -1405 +1406 @@
        IF (ok_ice_sursat.AND.(nqo.NE.4)) THEN
           WRITE (lunout, *) ' ok_ice_sursat=y requires 4 H2O tracers ', &
-               '(H2Ov, H2Ol, H2Oi, rnebi) but nqo=', nqo, '. Might as well stop here.'
+               '(H2O_g, H2O_l, H2O_s, H2O_r) but nqo=', nqo, '. Might as well stop here.'
           abort_message='see above'
           CALL abort_physic(modname,abort_message,1)
@@ -2433 +2434 @@
       endif !if (nqo.eq.3) then
 #endif
-      if (ixt.gt.niso) then
-      write(*,*) 'izone,iiso=',tracers(iqiso(ixt,ivap))%iso_iZone,iso_indnum(iqiso(ixt,ivap))  
-      endif
+      if (ixt.gt.niso) write(*,*) 'izone=',tracers(iqiso(ixt,ivap))%iso_iZone 
       DO k = 1, klev
        DO i = 1, klon
@@ -2494 +2493 @@
     ELSE
 ! DC: make sure the final "1" index was meant for 1st H2O phase (vapor) !!!
-!       tr_seri(:,:,strIdx(tracers(:)%name,'H2O'//phases_sep//'g')) = 0.0
-       tr_seri(:,:,strIdx(tracers(:)%name,'H2Ov')) = 0.0
+       tr_seri(:,:,strIdx(tracers(:)%name,addPhase('H2O','g'))) = 0.0
     ENDIF
 !