--- MITgcm/model/inc/CPP_OPTIONS.h	1998/11/30 23:45:24	1.7
+++ MITgcm/model/inc/CPP_OPTIONS.h	2000/11/13 16:32:57	1.13
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.7 1998/11/30 23:45:24 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.13 2000/11/13 16:32:57 heimbach Exp $
 C
 
 C 
@@ -6,10 +6,24 @@
 C will be compiled.
 C
 
+C o Include/exclude code for GM/Redi parameterization
+#undef  ALLOW_GMREDI
+
+C o Include/exclude code for KPP mixing scheme
+#define  ALLOW_KPP
+
+C o Shortwave heating as extra term in external_forcing.F
+#ifdef ALLOW_KPP
+#define  SHORTWAVE_HEATING
+#endif
+
 C o Include/exclude code for C-D grid method of integrating the 
 C   coriolis terms
 #define  INCLUDE_CD_CODE
 
+C o Include/exclude code for open-boundary conditions
+#undef  ALLOW_OBCS
+
 C o Include/exclude diagnostics package interface code
 #define  INCLUDE_DIAGNOSTICS_INTERFACE_CODE
 
@@ -19,7 +33,7 @@
 C o Include/exclude temperature advection code
 #define  INCLUDE_T_ADVECTION_CODE
 #ifdef   INCLUDE_T_ADVECTION_CODE
-#define  _ADT(a) a
+#define  _ADT(a)a
 #endif
 #ifndef  INCLUDE_T_ADVECTION_CODE
 #define  _ADT(a)
@@ -28,8 +42,8 @@
 C o Include/exclude temperature diffusion code
 #define  INCLUDE_T_DIFFUSION_CODE
 #ifdef   INCLUDE_T_DIFFUSION_CODE
-#define  _LPT(a) a
-#define  _BHT(a) a
+#define  _LPT(a)a
+#define  _BHT(a)a
 #endif
 #ifndef  INCLUDE_T_DIFFUSION_CODE
 #define  _LPT(a)
@@ -42,7 +56,7 @@
 C o Include/exclude momentum advection code
 #define  INCLUDE_MOMENTUM_ADVECTION_CODE
 #ifdef   INCLUDE_MOMENTUM_ADVECTION_CODE
-#define  _ADM(a) a
+#define  _ADM(a)a
 #endif
 #ifndef  INCLUDE_MOMENTUM_ADVECTION_CODE
 #define  _ADM(a)
@@ -51,7 +65,7 @@
 C o Include/exclude laplacian viscosity code
 #define  INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
 #ifdef   INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#define  _LPM(a) a
+#define  _LPM(a)a
 #endif
 #ifndef  INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
 #define  _LPM(a)
@@ -60,7 +74,7 @@
 C o Include/exclude biharmonic viscosity code
 #define  INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
 #ifdef   INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#define  _BHM(a) a
+#define  _BHM(a)a
 #endif
 #ifndef  INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
 #define  _BHM(a)
@@ -69,7 +83,7 @@
 C o Include/exclude gradient of phy_hyd code
 #define INCLUDE_GRADPH_CODE
 #ifdef  INCLUDE_GRADPH_CODE
-#define _PHM(a) a
+#define _PHM(a)a
 #endif
 #ifndef INCLUDE_GRADPH_CODE
 #define _PHM(a)
@@ -112,6 +126,13 @@
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
+C o Allow nonHydrostatic code
+#undef  ALLOW_NONHYDROSTATIC
+
+C o Use "natural" boundary conditions for salinity
+C   instead of the "virtual salt flux"
+#undef  USE_NATURAL_BCS
+
 C o Use "OLD" UV discretisation near boundaries (*not* recommended)
 C   Note - only works with  #undef NO_SLIP_LATERAL  in calc_mom_rhs.F
 C          because the old code did not have no-slip BCs
@@ -124,3 +145,12 @@
 
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"
+
+C o Include/exclude code specific to the ECCO/SEALION version.
+#undef INCLUDE_ECCO_PACKAGE
+#ifdef INCLUDE_ECCO_PACKAGE
+#include "ECCO_CPPOPTIONS.h"
+#endif
+
+
+