Changeset 5481 for LMDZ6/trunk/libf/phylmd

Timestamp:

Jan 16, 2025, 8:14:15 PM (7 months 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

Location:

LMDZ6/trunk/libf/phylmd

Files:

• infotrac_phy.F90 (modified) (5 diffs)
• phyetat0_mod.f90 (modified) (1 diff)
• phyredem.f90 (modified) (1 diff)
• phys_output_mod.F90 (modified) (2 diffs)
• traclmdz_mod.f90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -80 +80 @@
 !  | nqDescen    | Number of the descendants   (all generations)        | nqdesc      | 1:nqtot                |
 !  | nqChildren  | Number of childs            (1st generation only)    | nqfils      | 1:nqtot                |
-!  | isAdvected  | Advected tracers flag (.TRUE. if iadv >= 0)          | /           | nqtrue  .TRUE. values  |
-!  | isInPhysics | Tracers not extracted from the main table in physics | /           | nqtottr .TRUE. values  |
+!  | isInPhysics | Advected tracers from the main table kept 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                 |
@@ -284 +283 @@
 
 !==============================================================================================================================
-! 3) Determine the advection scheme ; needed to compute the full tracers list, the long names, nqtot and %isAdvected
+! 3) Determine the advection scheme ; needed to compute the full tracers list, the long names and nqtot
 !==============================================================================================================================
    ALLOCATE(ttr(nqtot))
-   jq = nqtrue+1; tracers(:)%iadv = -1
+   jq = nqtrue+1
    DO iq = 1, nqtrue
       t1 => tracers(iq)
@@ -298 +297 @@
       IF(iad == -1) CALL abort_physic(modname, msg1, 1)
 
-      !--- SET FIELDS longName, isAdvected, isInPhysics
+      !--- SET FIELDS longName, isInPhysics
       t1%longName   = t1%name; IF(iad > 0) t1%longName=TRIM(t1%name)//descrq(iad)
-      t1%isAdvected = iad >= 0
-      t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O' .OR. t1%component /= 'lmdz' !=== MORE EXCEPTIONS ? CO2i, SURSAT CLOUD H2O
+      t1%isInPhysics= iad >= 0 .AND. (delPhase(t1%gen0Name) /= 'H2O' .OR. t1%component /= 'lmdz')
       ttr(iq)       = t1
 
@@ -314 +312 @@
       ttr(jq+1:jq+nm)%parent      = [ (TRIM(t1%parent)  //'-'//TRIM(suff(im)), im=1, nm) ]
       ttr(jq+1:jq+nm)%longName    = [ (TRIM(t1%longName)//'-'//TRIM(suff(im)), im=1, nm) ]
-      ttr(jq+1:jq+nm)%isAdvected  = [ (.FALSE., im=1, nm) ]
       ttr(jq+1:jq+nm)%isInPhysics = [ (.FALSE., im=1, nm) ]
       jq = jq + nm
@@ -383 +380 @@
    t => tracers
    CALL msg('Information stored in '//TRIM(modname)//': ', modname)
-   IF(dispTable('isssssssssiiiiiiii', ['iq  ', 'name', 'lNam', 'g0Nm', 'prnt', 'type', 'phas', 'comp',     &
-                       'isPh', 'isAd', 'iGen', 'iqPr', 'nqDe', 'nqCh', 'iGrp', 'iNam', 'iZon', 'iPha'],    &
-      cat(t%name, t%longName, t%gen0Name, t%parent, t%type, t%phase, t%component,                          &
-                                                         bool2str(t%isInPhysics), bool2str(t%isAdvected)), &
+   IF(dispTable('issssssssiiiiiiii', ['iq  ', 'name', 'lNam', 'g0Nm', 'prnt', 'type', 'phas', 'comp',      &
+                              'isPh', 'iGen', 'iqPr', 'nqDe', 'nqCh', 'iGrp', 'iNam', 'iZon', 'iPha'],     &
+      cat(t%name, t%longName, t%gen0Name, t%parent, t%type, t%phase, t%component, bool2str(t%isInPhysics)),&
       cat([(iq, iq=1, nqtot)], t%iGeneration, t%iqParent, t%nqDescen, t%nqChildren, t%iso_iGroup,          &
                   t%iso_iName, t%iso_iZone, t%iso_iPhase), nColMax=maxTableWidth, nHead=2, sub=modname))   &

LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90

@@ -525 +525 @@
      it = 0
      DO iq = 1, nqtot
-        IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+        IF(.NOT.tracers(iq)%isInPhysics) CYCLE
         it = it+1
         tname = tracers(iq)%name

LMDZ6/trunk/libf/phylmd/phyredem.f90

@@ -356 +356 @@
        it = 0
        DO iq = 1, nqtot
-          IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+          IF(.NOT.tracers(iq)%isInPhysics) CYCLE
           it = it+1
           CALL put_field(pass,"trs_"//tracers(iq)%name, "", trs(:, it))

LMDZ6/trunk/libf/phylmd/phys_output_mod.F90

@@ -513 +513 @@
           itr = 0; itrb = 0
           DO iq = 1, nqtot 
-            IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+            IF(.NOT.tracers(iq)%isInPhysics) CYCLE
             itr = itr + 1
             dn = 'd'//TRIM(tracers(iq)%name)//'_'
@@ -638 +638 @@
 
 !  DO iq=1,nqtot
-!    IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+!    IF(.NOT.tracers(iq)%isInPhysics) CYCLE
 !    WRITE(*,'(a,i1,a,10i3)')'trac(',iq,')%flag = ',o_trac(iq)%flag
 !    WRITE(*,'(a,i1,a)')'trac(',iq,')%name = '//TRIM(o_trac(iq)%name)

LMDZ6/trunk/libf/phylmd/traclmdz_mod.f90

@@ -261 +261 @@
     it = 0
     DO iq = 1, nqtot
-       IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+       IF(.NOT.tracers(iq)%isInPhysics) CYCLE
        it = it+1
        ! Test if tracer is zero everywhere. 
@@ -310 +310 @@
     
     USE yomcst_mod_h
-USE dimphy
+    USE dimphy
     USE infotrac_phy, ONLY: nbtr, pbl_flg
     USE strings_mod,  ONLY: int2str