Changeset 5252 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Oct 22, 2024, 2:09:45 PM (2 months ago)

Author:

abarral

Message:

Wrap uses of cpp key REPROBUS and CPP_STRATAER
Add REPROBUS wrapper

File:

• LMDZ6/trunk/libf/dyn3d/dynetat0.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/dyn3d/dynetat0.F90

@@ -25 +25 @@
 #endif
   USE iso_params_mod   ! tnat_* and alpha_ideal_*
-  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS
+  USE strings_mod, ONLY: strIdx
 
   IMPLICIT NONE
@@ -47 +48 @@
   CHARACTER(LEN=maxlen) :: mesg, var, modname, oldVar
   INTEGER, PARAMETER :: length=100
-  INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase
+  INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase, ix
   REAL    :: time, tnat, alpha_ideal, tab_cntrl(length)    !--- RUN PARAMS TABLE
   LOGICAL :: lSkip, ll, ltnat1
@@ -136 +137 @@
 !--- Tracers
   ll=.FALSE.
-#ifdef REPROBUS
+IF (CPPKEY_REPROBUS) THEN
   ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= NF90_NoErr                                 !--- DETECT OLD REPRO start.nc FILE
-#endif
+END IF
   ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
   DO iq=1,nqtot
@@ -144 +145 @@
     oldVar = new2oldH2O(var)
     lSkip = ll .AND. var == 'HNO3'                                                       !--- FORCE "HNO3_g" READING FOR "HNO3"
-#ifdef REPROBUS
+IF (CPPKEY_REPROBUS) THEN
     ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix)                          !--- REPROBUS HNO3 exceptions
-#endif
+END IF
 IF (CPPKEY_INCA) THEN
     IF(var == 'O3') oldVar = 'OX'                                                        !--- DEAL WITH INCA OZONE EXCEPTION