Changeset 4268

Timestamp:

Sep 21, 2022, 10:41:03 AM (2 years ago)

Author:

dcugnet

Message:

Last (hopefully) fix for REPROBUS and exceptions about HNO3.

Location:

LMDZ6/trunk/libf

Files:

• dyn3d/dynetat0.F90 (modified) (2 diffs)
• dyn3dmem/dynetat0_loc.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d/dynetat0.F90

@@ -42 +42 @@
   INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase
   REAL    :: time, tab_cntrl(length)               !--- RUN PARAMS TABLE
-  LOGICAL :: lOldHNO3
+  LOGICAL :: lOldHNO3, ll
 !-------------------------------------------------------------------------------
   modname="dynetat0"
@@ -128 +128 @@
 
 !--- Tracers
-  lOldHNO3=.FALSE.
+  ll=.FALSE.
 #ifdef REPROBUS
   !--- Old convention: HNO3 = g+l and HNO3_g = g ; new convention: HNO3tot = g+l and HNO3 = g
-  lOldHNO3 = NF90_INQ_VARID(fID,var,vID), "inq", 'HNO3tot') /= NF90_NoErr
+  ll = NF90_INQ_VARID(fID,var,vID), "inq", 'HNO3tot') /= NF90_NoErr
 #endif
   DO iq=1,nqtot
     var = tracers(iq)%name
     oldVar = new2oldName(var)
-    lOldHNO3 = lOldHNO3 .AND. (var == 'HNO3' .OR. var == 'HNO3_g')
+    lOldHNO3 = ll .AND. (var == 'HNO3' .OR. var == 'HNO3_g')
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lOldHNO3) THEN             !=== REGULAR CASE

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -46 +46 @@
   REAL,             ALLOCATABLE :: ucov_glo(:,:),    q_glo(:,:), phis_glo(:)
   REAL,             ALLOCATABLE :: teta_glo(:,:)
-  LOGICAL :: lOldHNO3
+  LOGICAL :: lOldHNO3, ll
 !-------------------------------------------------------------------------------
   modname="dynetat0_loc"
@@ -152 +152 @@
 !--- Tracers
   ALLOCATE(q_glo(ip1jmp1,llm))
-  lOldHNO3=.FALSE.
+  ll=.FALSE.
 #ifdef REPROBUS
   !--- Old convention: HNO3 = g+l and HNO3_g = g ; new convention: HNO3tot = g+l and HNO3 = g
-  lOldHNO3 = NF90_INQ_VARID(fID,var,vID), "inq", 'HNO3tot') /= NF90_NoErr
+  ll = NF90_INQ_VARID(fID,var,vID), "inq", 'HNO3tot') /= NF90_NoErr
 #endif
   DO iq=1,nqtot
     var = tracers(iq)%name
     oldVar = new2oldName(var)
-    lOldHNO3 = lOldHNO3 .AND. (var == 'HNO3' .OR. var == 'HNO3_g')
+    lOldHNO3 = ll .AND. (var == 'HNO3' .OR. var == 'HNO3_g')
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lOldHNO3) THEN             !=== REGULAR CASE