Changeset 4140

Timestamp:

Apr 29, 2022, 6:37:44 PM (2 years ago)

Author:

lfalletti

Message:

Fixed bug for coupling with reprobus

• rm of a call Init_chem_rep_phys that was set twice
• add of hybrid coordinates in reprobus outputs (for CMIP6 dr2xml)
• bug fix to take into account H2Orep tracer name

Location:

LMDZ6/trunk/libf

Files:

• dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (1 diff)
• misc/readTracFiles_mod.f90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -173 +173 @@
   END IF
 
-  IF (type_trac == 'repr') THEN
-#ifdef REPROBUS
-     CALL Init_chem_rep_phys(klon_omp,nbp_lev)
-#endif
-  END IF
-
 !$OMP END PARALLEL
 

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -1403 +1403 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tmp(:)
   INTEGER :: ix, ip, it, nt
-  LOGICAL :: lerr
+  LOGICAL :: lerr, lH2O
   newName = oldName
   IF(PRESENT(iPhase)) iPhase = 1                                               !--- Default: gaseous phase
-  IF(oldName(1:MIN(3,LEN_TRIM(oldName))) /= 'H2O') RETURN                      !--- Not a water descendant
+  lH2O=.FALSE.
+  IF(LEN_TRIM(oldName)>3) THEN
+    lH2O = oldName(1:3)=='H2O' .AND. INDEX(old_phases,oldName(4:4))/=0     !---H2O<phase>*, with phase=="v", "l", "i" or "r"
+    IF(LEN_TRIM(oldName) > 4) lH2O = lH2O .AND. oldName(5:5)=='_'          !---H2O<phase>_*, with phase=="v", "l", "i" or "r"
+  END IF
+  IF(.NOT.lH2O) RETURN
   IF(LEN_TRIM(oldName)>3) THEN; IF(INDEX(old_Phases,oldName(4:4))==0) RETURN; END IF 
 

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -5099 +5099 @@
     ENDIF
 
+    IF (type_trac == 'repr') THEN
+#ifdef REPROBUS
+        CALL coord_hyb_rep(paprs, pplay, aps, bps, ap, bp, cell_area)
+#endif
+    ENDIF
 
     !