Changeset 4082 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Feb 28, 2022, 9:37:41 AM (3 years ago)

Author:

Ehouarn Millour

Message:

Bug fix in infotrac (introduced in r4063), nbtr and related arrays were not properly initialized.
Tests notheless show there is still an issue between serial and parallel handling of (non-water) tracers that needs be fixed.
EM

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -308 +308 @@
       CALL init_transport(hadv_inca, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
       ! DC passive CO2 tracer is at position 1: H2O was removed ; nqCO2/=0 in "inco" case only
+      ALLOCATE(conv_flg(nbtr),pbl_flg(nbtr),solsym(nbtr))
       conv_flg = [(  1,        ic=1, nqCO2),conv_flg_inca]
        pbl_flg = [(  1,        ic=1, nqCO2), pbl_flg_inca]
@@ -363 +364 @@
 
 #ifndef INCA
-   conv_flg = [(1, ic=1, nbtr)]                                      !--- Convection activated for all tracers
-    pbl_flg = [(1, ic=1, nbtr)]                                      !--- Boundary layer activated for all tracers
-   ALLOCATE(solsym(nbtr))
    CALL msg('Valeur de traceur.def :', modname)
    CALL msg('nombre total de traceurs '//TRIM(int2str(nqtrue)), modname)
@@ -374 +372 @@
    IF(planet_type == 'earth') nqo = COUNT(delPhase(tnom_0) == 'H2O') !--- for all planets except for Earth
    nbtr = nqtrue - nqo               
+   ALLOCATE(conv_flg(nbtr),pbl_flg(nbtr),solsym(nbtr))
+   conv_flg(1:nbtr) = 1                                     !--- Convection activated for all tracers
+   pbl_flg(1:nbtr) = 1                                     !--- Boundary layer activated for all tracers
 #endif
 
@@ -417 +418 @@
       CALL init_transport(hadv_inca, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
       ! DC passive CO2 tracer is at position 1: H2O was removed ; nqCO2/=0 in "inco" case only
+      
       conv_flg = [(  1       , k=1, nqCO2), conv_flg_inca]
       pbl_flg  = [(  1       , k=1, nqCO2), pbl_flg_inca]
@@ -440 +442 @@
       lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
       lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
+      ALLOCATE(solsym(nbtr))
+      conv_flg(1:nbtr)=1  !--- Convection activated for all tracers
+      pbl_flg(1:nbtr)=1   !--- Boundary layer activated for all tracers
 #endif
    !---------------------------------------------------------------------------------------------------------------------------
@@ -450 +455 @@
       lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
       ALLOCATE(solsym(nbtr))
-      conv_flg = [(1, it=1, nbtr)]
-       pbl_flg = [(1, it=1, nbtr)]
+      conv_flg(1:nbtr)=1  !--- Convection activated for all tracers
+       pbl_flg(1:nbtr)=1  !--- Boundary layer activated for all tracers
    !---------------------------------------------------------------------------------------------------------------------------
    END IF