Changeset 5481 for LMDZ6/trunk/libf/dyn3d_common/infotrac.f90

Timestamp:

Jan 16, 2025, 8:14:15 PM (13 hours ago)

Author:

dcugnet

Message:

Remove tracers attributes "isAdvected" and "isInPhysics" from infotrac (iadv is enough).
Remove tracers attribute "isAdvected" from infotrac_phy (isInPhysics is now equivalent
to former isInPhysics .AND. iadv > 0

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.f90 (modified) (5 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.f90

@@ -78 +78 @@
 !  | nqChildren  | Number of childs            (1st generation only)    | nqfils      | 1:nqtot                |
 !  | iadv        | Advection scheme number                              | iadv        | 1,2,10-20(exc.15,19),30|
-!  | isAdvected  | Advected tracers flag (.TRUE. if iadv >= 0)          | /           | nqtrue  .TRUE. values  |
-!  | isInPhysics | Tracers not extracted from the main table in physics | /           | nqtottr .TRUE. values  |
 !  | iso_iGroup  | Isotopes group index in isotopes(:)                  | /           | 1:nbIso                |
 !  | iso_iName   | Isotope  name  index in isotopes(iso_iGroup)%trac(:) | iso_indnum  | 1:niso                 |
@@ -260 +258 @@
 
 !==============================================================================================================================
-! 3) Determine the advection scheme choice for water and tracers "iadv" and the fields long name, isAdvected.
+! 3) Determine the advection scheme choice for water and tracers "iadv" and the field "long name".
 !     iadv = 1    "LMDZ-specific humidity transport" (for H2O vapour)          LMV
 !     iadv = 2    backward                           (for H2O liquid)          BAK
@@ -278 +276 @@
 !==============================================================================================================================
    ALLOCATE(ttr(nqtot))
-   jq = nqtrue+1; tracers(:)%iadv = -1
+   jq = nqtrue+1
    DO iq = 1, nqtrue
       t1 => tracers(iq)
@@ -289 +287 @@
       IF(iad == -1) CALL abort_gcm(modname, msg1, 1)
 
-      !--- SET FIELDS longName, iadv, isAdvected, isInPhysics
+      !--- SET FIELDS longName and iadv
       t1%longName   = t1%name; IF(iad > 0) t1%longName=TRIM(t1%name)//descrq(iad)
       t1%iadv       = iad
-      t1%isAdvected = iad >= 0
-      t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O' .OR. t1%component /= 'lmdz' !=== MORE EXCEPTIONS ? CO2i, SURSAT CLOUD H2O
       ttr(iq)       = t1
 
@@ -307 +303 @@
       ttr(jq+1:jq+nm)%longName    = [ (TRIM(t1%longName)//'-'//TRIM(suff(im)), im=1, nm) ]
       ttr(jq+1:jq+nm)%iadv        = [ (-iad,    im=1, nm) ]
-      ttr(jq+1:jq+nm)%isAdvected  = [ (.FALSE., im=1, nm) ]
       jq = jq + nm
    END DO