Changeset 5091 for LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90

Timestamp:

Jul 20, 2024, 11:17:09 PM (4 months ago)

Author:

abarral

Message:

Move lmdz_netcdf_format.F90 -> lmdz_cppkeys_wrapper.F90 to handle other CPP keys
Replace all (except wrapper) use of CPP_PHYS by fortran logical
Refactor makelmdz_fcm (put blocks into functions, use modern bash)

File:

• LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90 (modified) (2 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90

@@ -19 +19 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
   IMPLICIT NONE
@@ -140 +141 @@
     ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix)                          !--- REPROBUS HNO3 exceptions
 #endif
-#ifdef INCA
-    IF(var == 'O3') oldVar = 'OX'                                                        !--- DEAL WITH INCA OZONE EXCEPTION
-#endif
+    IF (CPPKEY_INCA) THEN
+      IF(var == 'O3') oldVar = 'OX'                                                        !--- DEAL WITH INCA OZONE EXCEPTION
+    END IF
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lSkip) THEN                !=== REGULAR CASE: AVAILABLE VARIABLE