Changeset 3985 for LMDZ6/branches/LMDZ-tracers/libf/phylmd

Timestamp:

Sep 22, 2021, 6:11:35 PM (3 years ago)

Author:

dcugnet

Message:

• fix of the delPhase function.
• getvar1 and getvar2 fixed and modified to avoid the usage of files with several time records and make the calls rather short.
• works again with iadv==0
• no more issues with tracers numbers (nqo, nqtot, etc.)
• fixes in the algebrical reduction routine used for "isotopes_parems.def" (containing simple expressions with variables that have to be substituted).
• still to be validated numerically

File:

• LMDZ6/branches/LMDZ-tracers/libf/phylmd/infotrac_phy.F90 (modified) (3 diffs)

LMDZ6/branches/LMDZ-tracers/libf/phylmd/infotrac_phy.F90

@@ -3 +3 @@
   USE       strings_mod, ONLY: msg, fmsg, test, strIdx, int2str
 
-  USE readTracFiles_mod, ONLY: getKey_init, getKey, indexUpdate, delPhase
+  USE readTracFiles_mod, ONLY: getKey_init, getKey, indexUpdate, delPhase, phases_sep, known_phases, nphases
 
   USE trac_types_mod,    ONLY: tra, iso, kys
@@ -158 +158 @@
 
   CHARACTER(LEN=256) :: modname="init_infotrac_phy"
+  INTEGER :: iq
   LOGICAL :: lerr
 
@@ -188 +189 @@
 #ifdef CPP_StratAer
   IF (type_trac == 'coag') THEN
-    nbtr_bin=0
-    nbtr_sulgas=0
-    DO iq = 1, nqtrue
-      IF(tracers(iq)%name(1:3)=='BIN') nbtr_bin    = nbtr_bin   +1
-      IF(tracers(iq)%name(1:3)=='GAS') nbtr_sulgas = nbtr_sulgas+1
-      SELECT CASE(tracers(iq)%name)
-        CASE('BIN01');    id_BIN01_strat = iq - nqo; CALL msg('id_BIN01_strat=', id_BIN01_strat)
-        CASE('GASOCS');   id_OCS_strat   = iq - nqo; CALL msg('id_OCS_strat  =', id_OCS_strat)
-        CASE('GASSO2');   id_SO2_strat   = iq - nqo; CALL msg('id_SO2_strat  =', id_SO2_strat)
-        CASE('GASH2SO4'); id_H2SO4_strat = iq - nqo; CALL msg('id_H2SO4_strat=', id_H2SO4_strat)
-        CASE('GASTEST');  id_TEST_strat  = iq - nqo; CALL msg('id_TEST_strat =', id_TEST_strat)
-      END SELECT
-    END DO
-    CALL msg('nbtr_bin      =',nbtr_bin)
-    CALL msg('nbtr_sulgas   =',nbtr_sulgas)
+    nbtr_bin    = COUNT([(tracers(iq)%name(1:3)=='BIN', iq=1, nqtot)]); CALL msg('nbtr_bin       =', nbtr_bin)
+    nbtr_sulgas = COUNT([(tracers(iq)%name(1:3)=='GAS', iq=1, nqtot)]); CALL msg('nbtr_sulgas    =', nbtr_sulgas)
+    id_BIN01_strat = MAX(0, strIdx(tracers(:)%name, 'BIN01'   ) - nqo); CALL msg('id_BIN01_strat =', id_BIN01_strat)
+    id_OCS_strat   = MAX(0, strIdx(tracers(:)%name, 'GASOSC'  ) - nqo); CALL msg('id_OCS_strat   =',   id_OCS_strat)
+    id_SO2_strat   = MAX(0, strIdx(tracers(:)%name, 'GASSO2'  ) - nqo); CALL msg('id_SO2_strat   =',   id_SO2_strat)
+    id_H2SO4_strat = MAX(0, strIdx(tracers(:)%name, 'GASH2SO4') - nqo); CALL msg('id_H2SO4_strat =', id_H2SO4_strat)
+    id_TEST_strat  = MAX(0, strIdx(tracers(:)%name, 'GASTEST' ) - nqo); CALL msg('id_TEST_strat  =',  id_TEST_strat)
   END IF
 #endif