adjust some CPP-flags

mjlosch · May 24, 2024 · 6603bd3 · 6603bd3
1 parent 848d369
commit 6603bd3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/model/src/initialise_varia.F b/model/src/initialise_varia.F
@@ -107,7 +107,7 @@ SUBROUTINE INITIALISE_VARIA( myThid )
 #include "PARAMS.h"
 #include "DYNVARS.h"
 #include "SURFACE.h"
-#ifdef ALLOW_AUTODIFF_TAMC
+#ifdef ALLOW_AUTODIFF
 # include "GRID.h"
 # include "FFIELDS.h"
 # if ( defined ALLOW_CTRL && defined ALLOW_GENTIM2D_CONTROL )

diff --git a/pkg/obcs/obcs_fields_load.F b/pkg/obcs/obcs_fields_load.F
@@ -72,8 +72,8 @@ SUBROUTINE OBCS_FIELDS_LOAD( myTime, myIter, myThid )
 
 C     if external forcing (exf) package is enabled (useEXF=T), all loading of
 C     external fields is done by exf
-#if ( defined ALLOW_OBCS && defined ALLOW_OBCS_PRESCRIBE && \
-      !defined EXCLUDE_FFIELDS_LOAD )
+#ifndef EXCLUDE_FFIELDS_LOAD
+#if ( defined ALLOW_OBCS && defined ALLOW_OBCS_PRESCRIBE )
 
 C     !LOCAL VARIABLES:
 C     === Local arrays ===
@@ -759,7 +759,8 @@ SUBROUTINE OBCS_TIME_INTERP_YZ(
         ENDDO
        ENDDO
 
-#endif /* ALLOW_OBCS AND ALLOW_OBCS_PRESCRIBE and not EXCLUDE_FFIELDS_LOAD */
+#endif /* ALLOW_OBCS AND ALLOW_OBCS_PRESCRIBE */
+#endif /* ndef EXCLUDE_FFIELDS_LOAD */
 
        RETURN
        END
diff --git a/pkg/obcs/obcs_init_variables.F b/pkg/obcs/obcs_init_variables.F
@@ -365,24 +365,22 @@ SUBROUTINE OBCS_INIT_VARIABLES( myThid )
 #ifdef ALLOW_DEBUG
        IF (debugMode) CALL DEBUG_CALL('OBCS_CALC',myThid)
 #endif
-#ifdef ALLOW_AUTODIFF_TAMC
-# ifdef ALLOW_OBCS_STEVENS
-#  ifdef ALLOW_OBCS_EAST
+#if ( defined ALLOW_AUTODIFF_TAMC && defined ALLOW_OBCS_STEVENS )
+# ifdef ALLOW_OBCS_EAST
 CADJ STORE OBEsStevens = tapelev_init, key = 1
 CADJ STORE OBEtStevens = tapelev_init, key = 1
-#  endif
-#  ifdef ALLOW_OBCS_WEST
+# endif
+# ifdef ALLOW_OBCS_WEST
 CADJ STORE OBWsStevens = tapelev_init, key = 1
 CADJ STORE OBWtStevens = tapelev_init, key = 1
-#  endif
-#  ifdef ALLOW_OBCS_SOUTH
+# endif
+# ifdef ALLOW_OBCS_SOUTH
 CADJ STORE OBSsStevens = tapelev_init, key = 1
 CADJ STORE OBStStevens = tapelev_init, key = 1
-#  endif
-#  ifdef ALLOW_OBCS_NORTH
+# endif
+# ifdef ALLOW_OBCS_NORTH
 CADJ STORE OBNsStevens = tapelev_init, key = 1
 CADJ STORE OBNtStevens = tapelev_init, key = 1
-#  endif
 # endif
 #endif
        CALL OBCS_CALC( startTime, nIter0,