Changeset 4069

Timestamp:

Jan 30, 2022, 6:58:23 PM (3 years ago)

Author:

dcugnet

Message:

Fix in strings_mod ; parser routines taken from version 9 of ​https://svn.lmd.jussieu.fr/tracers-parser

Location:

LMDZ6/trunk/libf

Files:

• misc/strings_mod.F90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/misc/strings_mod.F90

@@ -355 +355 @@
   IF(n==0) RETURN
   str(1) = s1(1)
-  n=1; DO k=1,n1; IF(ANY(s1(1:k-1)==s1(k))) CYCLE; n=n+1; str(n)=s1(k); END DO
+  n=1; DO k=2,n1; IF(ANY(s1(1:k-1)==s1(k))) CYCLE; n=n+1; str(n)=s1(k); END DO
   IF(PRESENT(nb)) nb=n
 END SUBROUTINE strReduce_1

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -40 +40 @@
     USE indice_sol_mod
     USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, nqCO2
-    USE readTracFiles_mod, ONLY: phases_sep
+    USE readTracFiles_mod, ONLY: addPhase
     USE strings_mod,  ONLY: strIdx
     USE iophy
@@ -2270 +2270 @@
        itr = 0
        DO iq = 1, nqtot
-         IF(tracers(iq)%isH2Ofamily .OR. .NOT.tracers(iq)%isAdvected) CYCLE
+         IF(tracers(iq)%isH2Ofamily) CYCLE
          itr = itr+1
           DO  k = 1, klev
@@ -2280 +2280 @@
     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
+       tr_seri(:,:,strIdx(tracers(:)%name,addPhase('H2O','v',''))) = 0.0
     ENDIF
 !
@@ -5114 +5114 @@
     ENDDO
     !
-    IF (nqtot > nqo+1) THEN
+    IF (nqtot > nqo) THEN
        itr = 0
        DO iq = 1, nqtot