--- MITgcm/model/inc/CPP_OPTIONS.h	1999/07/28 16:21:38	1.11
+++ 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.11 1999/07/28 16:21:38 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,12 +6,20 @@
 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
-#undef  ALLOW_KPP
+#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
-#undef  INCLUDE_CD_CODE
+#define  INCLUDE_CD_CODE
 
 C o Include/exclude code for open-boundary conditions
 #undef  ALLOW_OBCS
@@ -137,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
+
+
+