--- MITgcm/model/inc/CPP_OPTIONS.h	2001/09/21 03:54:36	1.19
+++ MITgcm/model/inc/CPP_OPTIONS.h	2003/02/18 05:33:53	1.22
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.19 2001/09/21 03:54:36 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.22 2003/02/18 05:33:53 dimitri Exp $
 C $Name:  $
 
   These lines are here to deliberately cause a compile-time error.
@@ -28,6 +28,21 @@
 C o Include/exclude code for KPP mixing scheme
 #define  ALLOW_KPP
 
+cswdblk --- add ---
+C o Include/exclude code for bulk formula
+#define  ALLOW_BULK_FORCE
+#ifdef ALLOW_BULK_FORCE
+cswdice -- add ---
+C o allow seaice
+#define ALLOW_THERM_SEAICE
+cswdice -- end add ---
+
+C o try to conserve qnet and emp
+#define CONSERV_BULKF
+#endif
+cswdblk -- end add ---
+
+
 C o Shortwave heating as extra term in external_forcing.F
 #ifdef ALLOW_KPP
 #define  SHORTWAVE_HEATING
@@ -148,6 +163,12 @@
 C          because the old code did not have no-slip BCs
 #undef  OLD_UV_GEOMETRY
 
+C o Include/exclude IERS Special Bureau for the Oceans diagnostics
+#undef  ALLOW_SBO
+
+C o Include/exclude code for sea-ice model
+#undef  ALLOW_SEAICE
+
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"