Ignore:
Timestamp:
Feb 12, 2025, 10:08:35 AM (10 days ago)
Author:
aborella
Message:

Revert merge with trunk

Location:
LMDZ6/branches/contrails
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/contrails

  • LMDZ6/branches/contrails/libf/misc/readTracFiles_mod.f90

    r5489 r5536  
    6161    INTEGER               :: nqChildren  = 0                    !--- Number of children  (first generation)
    6262    INTEGER               :: iadv        = 10                   !--- Advection scheme used
     63    LOGICAL               :: isAdvected  = .FALSE.              !--- "true" tracers: iadv > 0.   COUNT(isAdvected )=nqtrue
    6364    LOGICAL               :: isInPhysics = .TRUE.               !--- "true" tracers: in tr_seri. COUNT(isInPhysics)=nqtottr
    6465    INTEGER               :: iso_iGroup  = 0                    !--- Isotopes group index in isotopes(:)
    … …  
    184185!     * The "keys" component (of type keys_type) is in principle enough to store everything we could need.
    185186!     But some variables are stored as direct-access keys to make the code more readable and because they are used often.
    186 !     * Most of the direct-access keys are set in this module, but some are not (longName, iadv and isInPhysicsfor now).
     187!     * Most of the direct-access keys are set in this module, but some are not (longName, iadv, isAdvected for now).
    187188!     * Some of the direct-access keys must be updated (using the routine "setDirectKeys") is a subset of "tracers(:)"
    188189!     is extracted: the indexes are no longer valid for a subset (examples: iqParent, iqDescen).

  • LMDZ6/branches/contrails/libf/misc/wxios_mod.F90

    r5489 r5536  
    188188      ! On boucle sur les traceurs pour les ajouter au groupe puis fixer les attributs
    189189      DO iq = 1, nqtot
    190          IF(.NOT.tracers(iq)%isInPhysics) CYCLE
     190         IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
    191191         dn = 'd'//TRIM(tracers(iq)%name)//'_'
    192192
    … …  
    241241      ! On boucle sur les traceurs pour les ajouter au groupe puis fixer les attributs
    242242      DO iq = 1, nqtot
    243          IF(.NOT.tracers(iq)%isInPhysics) CYCLE
     243         IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
    244244         
    245245         unt = "kg m-2"
Note: See TracChangeset for help on using the changeset viewer.