--- MITgcm/model/inc/CPP_OPTIONS.h	2000/06/21 19:22:24	1.12
+++ MITgcm/model/inc/CPP_OPTIONS.h	2001/02/04 14:38:44	1.14
@@ -1,4 +1,5 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.12 2000/06/21 19:22:24 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.14 2001/02/04 14:38:44 cnh Exp $
+C $Name:  $
 C
 
 C 
@@ -10,11 +11,16 @@
 #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
@@ -140,3 +146,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
+
+
+