Changeset 4124 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Apr 8, 2022, 4:47:04 PM (3 years ago)

Author:

dcugnet

Message:

Remove solsym, ok_isotopes (=niso>0), ok_isotrac (=nzone>0)

File:

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

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -16 +16 @@
    PUBLIC :: tracers, type_trac                            !--- Full tracers database, tracers type keyword
    PUBLIC :: nqtot,   nbtr,   nqo,   nqCO2,   nqtottr      !--- Main dimensions
-   PUBLIC :: solsym, conv_flg, pbl_flg                     !--- Tracers names + convection & boundary layer activation keys
+   PUBLIC :: conv_flg, pbl_flg                             !--- Convection & boundary layer activation keys
 
    !=== FOR ISOTOPES: General
@@ -36 +36 @@
    !=== OLD QUANTITIES OR ALIASES FOR OLDER NAMES (TO BE REMOVED SOON)
    PUBLIC :: ntraciso, ntraceurs_zone
-   PUBLIC :: ok_isotopes, ok_iso_verif, ok_isotrac, use_iso
+   PUBLIC :: ok_iso_verif, use_iso
    PUBLIC :: iso_num, iso_indnum, indnum_fn_num, niso_possibles
    PUBLIC :: qperemin, masseqmin, ratiomin
@@ -139 +139 @@
    REAL,    SAVE :: qperemin, masseqmin, ratiomin
    INTEGER, SAVE :: niso_possibles
-   LOGICAL, SAVE :: ok_isotopes, ok_iso_verif, ok_isotrac
+   LOGICAL, SAVE :: ok_iso_verif
    LOGICAL, SAVE, ALLOCATABLE ::       use_iso(:)
    INTEGER, SAVE, ALLOCATABLE ::       iso_num(:)               !--- idx in [1,niso_possibles] = f(1<=iq <=nqtot)
@@ -150 +150 @@
    INTEGER,             SAVE, ALLOCATABLE :: conv_flg(:), &     !--- Convection     activation ; needed for INCA        (nbtr)
                                               pbl_flg(:)        !--- Boundary layer activation ; needed for INCA        (nbtr)
-   CHARACTER(LEN=8),    SAVE, ALLOCATABLE ::   solsym(:)        !--- Names from INCA                                    (nbtr)
    LOGICAL, PARAMETER :: lOldCode = .TRUE.
 
@@ -379 +378 @@
       IF(ALL([2,3] /= nqo)) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
       ALLOCATE(hadv(nqtrue), conv_flg(nbtr), hadv_inca(nqINCA), conv_flg_inca(nqINCA), solsym_inca(nqINCA))
-      ALLOCATE(vadv(nqtrue),  pbl_flg(nbtr), vadv_inca(nqINCA),  pbl_flg_inca(nqINCA), solsym(nbtr))
+      ALLOCATE(vadv(nqtrue),  pbl_flg(nbtr), vadv_inca(nqINCA),  pbl_flg_inca(nqINCA))
       CALL init_transport(hadv_inca, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
       !--- Passive CO2 tracer is at position 1 because: H2O has been removed ; nqCO2/=0 in "inco" case only
       conv_flg(1:nbtr) = [(1,          k=1, nqCO2), conv_flg_inca]
        pbl_flg(1:nbtr) = [(1,          k=1, nqCO2),  pbl_flg_inca]
-       solsym (1:nbtr) = [('CO2     ', k=1, nqCO2),   solsym_inca]
       ALLOCATE(ttr(nqtrue))
       ttr(1:nqo+nqCO2)                    = tracers
@@ -390 +388 @@
       ttr(1+nqo:nqCO2+nqo   )%component   = 'co2i'
       ttr(1+nqo+nqCO2:nqtrue)%component   = 'inca'
-      ttr(1+nqo      :nqtrue)%name        = solsym
+      ttr(1+nqo      :nqtrue)%name        = [('CO2     ', k=1, nqCO2), solsym_inca]
       ttr(1+nqo+nqCO2:nqtrue)%parent      = tran0
       ttr(1+nqo+nqCO2:nqtrue)%phase       = 'g'
@@ -409 +407 @@
       lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
       lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
-      ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), solsym(nbtr))
+      ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr))
       conv_flg(1:nbtr) = [(1, it=1, nbtr)]                           !--- Convection activated for all tracers
        pbl_flg(1:nbtr) = [(1, it=1, nbtr)]                           !--- Boundary layer activated for all tracers
@@ -534 +532 @@
    nqtottr = nqtot-nqo*(1+ntiso)            !--- NO H2O-FAMILY    TRACER  IS      PASSED TO THE PHYSICS
 
-   ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), solsym(nbtr))
+   ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr))
 #ifndef INCA
    conv_flg(1:nbtr) = 1                                              !--- Convection activated for all tracers
@@ -540 +538 @@
 #else
    !--- Passive CO2 tracer is at position 1 because: H2O has been removed ; nqCO2/=0 in "inco" case only
-   conv_flg(1:nbtr) = [(  1,        ic=1, nqCO2),conv_flg_inca]
-    pbl_flg(1:nbtr) = [(  1,        ic=1, nqCO2), pbl_flg_inca]
-     solsym(1:nbtr) = [('CO2     ', ic=1, nqCO2),  solsym_inca]
+   conv_flg(1:nbtr) = [(1, ic=1, nqCO2),conv_flg_inca]
+    pbl_flg(1:nbtr) = [(1, ic=1, nqCO2), pbl_flg_inca]
 #endif
 
@@ -798 +795 @@
 
    !--- Isotopic quantities (to be removed soon)
-   ok_isotopes   = i%niso  > 0
-   ok_isotrac    = i%nzone > 0
    ok_iso_verif  = i%check
    niso_possibles = SIZE(tnom_iso)