--- MITgcm/model/inc/CPP_OPTIONS.h	1998/12/15 21:01:31	1.9
+++ 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.9 1998/12/15 21:01:31 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
 
@@ -112,9 +126,12 @@
 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
+#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
@@ -128,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
+
+
+