Changeset 4266

Timestamp:

Sep 21, 2022, 10:16:20 AM (2 years ago)

Author:

dcugnet

Message:

Fix for reprobus

Location:

LMDZ6/trunk/libf

Files:

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

LMDZ6/trunk/libf/dyn3d/dynetat0.F90

@@ -136 +136 @@
     var = tracers(iq)%name
     oldVar = new2oldName(var)
+    lOldHNO3 = lOldHNO3 .AND. (var == 'HNO3' .OR. var == 'HNO3_g')
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lOldHNO3) THEN             !=== REGULAR CASE
@@ -145 +146 @@
     !--------------------------------------------------------------------------------------------------------------------------
 #ifdef REPROBUS
-    ELSE IF(NF90_INQ_VARID(fID, 'HNO3_g', vID) == NF90_NoErr .AND. lOldHNO3.AND.var=='HNO3') THEN
+    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
+    ELSE IF(NF90_INQ_VARID(fID, 'HNO3',   vID) == NF90_NoErr .AND. 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)

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -160 +160 @@
     var = tracers(iq)%name
     oldVar = new2oldName(var)
+    lOldHNO3 = lOldHNO3 .AND. (var == 'HNO3' .OR. var == 'HNO3_g')
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lOldHNO3) THEN             !=== REGULAR CASE