Changeset 4071 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Jan 31, 2022, 9:20:17 PM (3 years ago)

Author:

dcugnet

Message:

• Fix for unadvected tracers (iadv==0)
• The key %isH2Ofamily, from the derived type "trac_type", is replaced with the more general

key %isInPhysics, which is TRUE for tracers both in "qx" and "tr_seri".

Currently, FALSE for tracers descending on H2O (isotopes and tagging tracers included). Could be set to FALSE
for interactive CO2 (type_trac=='inco') or ice supersaturated cloud content (tranfered to "rneb_seri")

• Parser routines taken from version 10 of ​https://svn.lmd.jussieu.fr/tracers-parser

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• phyetat0.F90 (modified) (1 diff)
• phyredem.F90 (modified) (1 diff)
• phys_output_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmdiso/phyetat0.F90

@@ -471 +471 @@
      it = 0
      DO iq = 1, nqtot
-        IF(.NOT.tracers(iq)%isAdvected .OR. tracers(iq)%isH2Ofamily) CYCLE
+        IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
         it = it+1
         found=phyetat0_get(1,trs(:,it),"trs_"//TRIM(tracers(iq)%name), &

LMDZ6/trunk/libf/phylmdiso/phyredem.F90

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

LMDZ6/trunk/libf/phylmdiso/phys_output_mod.F90

@@ -504 +504 @@
           itr = 0
           DO iq = 1, nqtot 
-            IF(.NOT.tracers(iq)%isAdvected .OR. tracers(iq)%isH2Ofamily) CYCLE
+            IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
             itr = itr + 1
             dn = 'd'//TRIM(tracers(iq)%name)//'_'

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -2474 +2474 @@
        itr = 0
        DO iq = 1, nqtot
-         IF(tracers(iq)%isH2Ofamily) CYCLE
+         IF(.NOT.tracers(iq)%isInPhysics) CYCLE
          itr = itr+1
 !#ifdef ISOVERIF
@@ -2498 +2498 @@
        itr = 0
        do iq = 1, nqtot
-         IF(tracers(iq)%isH2Ofamily) CYCLE
+         IF(.NOT.tracers(iq)%isInPhysics) CYCLE
          itr = itr+1
          tr_ancien(:,:,itr)=tr_seri(:,:,itr)       
@@ -6531 +6531 @@
     itr = 0
     DO iq = 1, nqtot
-       IF(tracers(iq)%isH2Ofamily) CYCLE
+       IF(.NOT.tracers(iq)%isInPhysics) CYCLE
        itr = itr+1
        DO  k = 1, klev