Changeset 5251 for LMDZ6/trunk/libf/dyn3dmem

Timestamp:

Oct 22, 2024, 12:31:08 PM (15 months ago)

Author:

abarral

Message:

Wrap uses of cpp key INCA
Add INCA wrapper

Location:

LMDZ6/trunk/libf/dyn3dmem

Files:

• dynetat0_loc.F90 (modified) (2 diffs)
• leapfrog_loc.F90 (modified) (9 diffs)

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -26 +26 @@
 #endif
   USE iso_params_mod   ! tnat_* and alpha_ideal_*
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
   IMPLICIT NONE
@@ -171 +172 @@
     ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix)                          !--- REPROBUS HNO3 exceptions
 #endif
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
     IF(var == 'O3') oldVar = 'OX'                                                        !--- DEAL WITH INCA OZONE EXCEPTION
-#endif
+END IF
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lSkip) THEN                !=== REGULAR CASE: AVAILABLE VARIABLE

LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.F90

@@ -46 +46 @@
          xios_set_current_context, &
          using_xios
+   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
   IMPLICIT NONE
@@ -1519 +1520 @@
      endif
 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
      IF (ANY(type_trac == ['inca','inco'])) THEN
         CALL finalize_inca
@@ -1529 +1530 @@
 !$OMP END MASTER
      ENDIF
-#endif
+END IF
 #ifdef REPROBUS
      if (type_trac == 'repr') CALL finalize_reprobus
@@ -1576 +1577 @@
 !$OMP END MASTER
 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
           IF (ANY(type_trac == ['inca','inco'])) THEN
              CALL finalize_inca
@@ -1586 +1587 @@
 !$OMP END MASTER
           ENDIF
-#endif
+END IF
 #ifdef REPROBUS
           if (type_trac == 'repr') CALL finalize_reprobus
@@ -1749 +1750 @@
 !$OMP END MASTER
 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
              IF (ANY(type_trac == ['inca','inco'])) THEN
                 CALL finalize_inca
@@ -1760 +1761 @@
              ENDIF
 
-#endif
+END IF
 #ifdef REPROBUS
              if (type_trac == 'repr') CALL finalize_reprobus
@@ -1863 +1864 @@
 !$OMP END MASTER
 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
   IF (ANY(type_trac == ['inca','inco'])) THEN
      CALL finalize_inca
@@ -1874 +1875 @@
   ENDIF
 
-#endif
+END IF
 #ifdef REPROBUS
   if (type_trac == 'repr') CALL finalize_reprobus