Changeset 4429 for LMDZ6/trunk

Timestamp:

Feb 10, 2023, 2:35:11 PM (21 months ago)

Author:

dcugnet

Message:

Fix for old tracers files and inca: all the keys must be accessible using "getKey", even
the "explicit" keys from "tracers" accessible withe the "%" sign. "parent" was missing.

Location:

LMDZ6/trunk/libf

Files:

• dyn3d_common/infotrac.F90 (modified) (3 diffs)
• phylmd/infotrac_phy.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -161 +161 @@
    TYPE(trac_type), ALLOCATABLE, TARGET :: ttr(:)
    TYPE(trac_type), POINTER             :: t1, t(:)
+   TYPE(keys_type), POINTER :: k
    INTEGER :: ierr
 
@@ -243 +244 @@
       vadv(1:nqo+nqCO2) = vad(:); vadv(1+nqo+nqCO2:nqtrue) = vadv_inca
       CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
+      DO iq = 1, nqtrue
+         t1 => tracers(iq)
+         CALL addKey_1('name',      t1%name,      t1%keys)
+         CALL addKey_1('component', t1%component, t1%keys)
+         CALL addKey_1('parent',    t1%parent,    t1%keys)
+         CALL addKey_1('phase',     t1%phase,     t1%keys)
+      END DO
       IF(setGeneration(tracers)) CALL abort_gcm(modname,'See above',1) !- SET FIELDS %iGeneration, %gen0Name
       DEALLOCATE(had, hadv_inca, vad, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
@@ -263 +271 @@
    !---------------------------------------------------------------------------------------------------------------------------
 
+#ifdef REPROBUS
    !--- Transfert the number of tracers to Reprobus
-#ifdef REPROBUS
    CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name)
-#endif
-
+
+#endif
 !==============================================================================================================================
 ! 2) Calculate nqtot, number of tracers needed (greater if advection schemes 20 or 30 have been chosen).

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -271 +271 @@
       vadv(1:nqo+nqCO2) = vad(:); vadv(1+nqo+nqCO2:nqtrue) = vadv_inca
       CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
+      DO iq = 1, nqtrue
+         t1 => tracers(iq)
+         CALL addKey_1('name',      t1%name,      t1%keys)
+         CALL addKey_1('component', t1%component, t1%keys)
+         CALL addKey_1('parent',    t1%parent,    t1%keys)
+         CALL addKey_1('phase',     t1%phase,     t1%keys)
+      END DO
       IF(setGeneration(tracers)) CALL abort_gcm(modname,'See below',1) !- SET FIELDS %iGeneration, %gen0Name
       DEALLOCATE(had, hadv_inca, vad, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)