Changeset 4265 for LMDZ6

Timestamp:

Sep 21, 2022, 9:58:03 AM (2 years ago)

Author:

dcugnet

Message:

Add modifications for sequantial version of dynetat0 + fix in reprobus case.

Location:

LMDZ6/trunk/libf

Files:

• dyn3d/dynetat0.F90 (modified) (3 diffs)
• dyn3dmem/dynetat0_loc.F90 (modified) (3 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
 !-------------------------------------------------------------------------------
   modname="dynetat0"
@@ -127 +128 @@
 
 !--- Tracers
+  lOldHNO3=.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
+#endif
   DO iq=1,nqtot
     var = tracers(iq)%name
     oldVar = new2oldName(var)
     !--------------------------------------------------------------------------------------------------------------------------
-    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN                                 !=== REGULAR CASE
+    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lOldHNO3) THEN             !=== REGULAR CASE
       CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var)
     !--------------------------------------------------------------------------------------------------------------------------
@@ -137 +143 @@
       CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
       CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",oldVar)
+    !--------------------------------------------------------------------------------------------------------------------------
+#ifdef REPROBUS
+    ELSE IF(NF90_INQ_VARID(fID, 'HNO3_g', vID) == NF90_NoErr .AND. lOldHNO3.AND.var=='HNO3') THEN
+      CALL msg('Tracer <HNO3_g> is used for <HNO3> (old convention)', modname)           !=== REPROBUS: HNO3_g INSTEAD OF HNO3
+      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var)
+    ELSE IF(NF90_INQ_VARID(fID, 'HNO3', vID)lOldHNO3 .AND. var == 'HNO3tot') THEN
+      CALL msg('Tracer <HNO3> is used for <HNO3tot> (old convention)', modname)          !=== REPROBUS: HNO3 INSTEAD OF HNO3tot
+      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var)
+#endif
     !--------------------------------------------------------------------------------------------------------------------------
 #ifdef INCA

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -152 +152 @@
 !--- Tracers
   ALLOCATE(q_glo(ip1jmp1,llm))
+  lOldHNO3=.FALSE.
 #ifdef REPROBUS
-!--- Old convention: HNO3 = g+l and HNO3_g = g ; new convention: HNO3tot = g+l and HNO3 = g
+  !--- 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
 #endif
@@ -159 +160 @@
     var = tracers(iq)%name
     oldVar = new2oldName(var)
+    !--------------------------------------------------------------------------------------------------------------------------
+    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lOldHNO3) THEN             !=== REGULAR CASE
+      CALL get_var2(var,q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
+    !--------------------------------------------------------------------------------------------------------------------------
+    ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == NF90_NoErr) THEN                         !=== OLD NAME
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
+      CALL get_var2(oldVar, q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
+    !--------------------------------------------------------------------------------------------------------------------------
 #ifdef REPROBUS
-    IF(lOldHNO3 .AND. var == 'HNO3') THEN                                                !=== REPROBUS: HNO3_g INSTEAD OF HNO3
+    ELSE IF(lOldHNO3 .AND. var == 'HNO3') THEN                                           !=== REPROBUS: HNO3_g INSTEAD OF HNO3
       CALL msg('Tracer <HNO3_g> is used for <HNO3> (old convention)', modname)
       CALL get_var2( 'HNO3_g', q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
@@ -167 +176 @@
       CALL get_var2( 'HNO3', q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
 #endif
-    !--------------------------------------------------------------------------------------------------------------------------
-    ELSE IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN                            !=== REGULAR CASE
-      CALL get_var2(var,q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
-    !--------------------------------------------------------------------------------------------------------------------------
-    ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == NF90_NoErr) THEN                         !=== OLD NAME
-      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
-      CALL get_var2(oldVar, q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
-    !--------------------------------------------------------------------------------------------------------------------------
 #ifdef INCA
     ELSE IF(NF90_INQ_VARID(fID, 'OX',   vID) == NF90_NoErr .AND. var == 'O3') THEN       !=== INCA: OX INSTEAD OF O3