Changeset 4138

Timestamp:

Apr 26, 2022, 10:19:58 AM (2 years ago)

Author:

acozic

Message:

fixed two bug for coupling with inca
1- allow the possibility of having tracers names with H2O in it (like H2O2)
2- allow the possibility of having other water tracers in inca

Location:

LMDZ6/trunk/libf

Files:

• misc/readTracFiles_mod.f90 (modified) (1 diff)
• phylmd/infotrac_phy.F90 (modified) (1 diff)

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -1407 +1407 @@
   IF(PRESENT(iPhase)) iPhase = 1                                               !--- Default: gaseous phase
   IF(oldName(1:MIN(3,LEN_TRIM(oldName))) /= 'H2O') RETURN                      !--- Not a water descendant
+  IF(LEN_TRIM(oldName)>3) THEN; IF(INDEX(old_Phases,oldName(4:4))==0) RETURN; END IF 
+
+
   lerr = strParse(oldName, '_', tmp, n=nt)
   ip = strIdx([('H2O'//old_phases(ip:ip), ip=1, nphases)], tmp(1))             !--- Phase index (/=0 if any)

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -185 +185 @@
    conv_flg  = conv_flg_
    nqtot     = SIZE(tracers_)
-   nqo       = COUNT(delPhase(tracers%name)=='H2O' .AND. tracers%iGeneration==0)
+   nqo       = COUNT(delPhase(tracers%name)=='H2O' .AND. tracers%iGeneration==0 .AND. tracers%component=='lmdz')
    nbtr      = SIZE(conv_flg)
    nbIso     = SIZE(isotopes_)