--- MITgcm/model/inc/CPP_OPTIONS.h	2003/05/01 06:10:19	1.19.4.4
+++ MITgcm/model/inc/CPP_OPTIONS.h	2002/11/15 19:58:21	1.20
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.19.4.4 2003/05/01 06:10:19 dimitri Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.20 2002/11/15 19:58:21 cheisey Exp $
 C $Name:  $
 
   These lines are here to deliberately cause a compile-time error.
@@ -19,9 +19,6 @@
 C will be compiled.
 CEOP
 
-C o Include/exclude code for direct surface pressure solver
-#undef  ALLOW_DIRECT_SOLVER
-
 C o Include/exclude code for AIM package
 #undef  ALLOW_AIM
 
@@ -31,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_BULKFORMULA
+#ifdef ALLOW_BULKFORMULA
+cswdice -- add ---
+C o allow seaice
+#define ALLOW_TSEAICE
+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
@@ -151,12 +163,6 @@
 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"
 
@@ -165,3 +171,4 @@
 #ifdef INCLUDE_ECCO_PACKAGE
 #include "ECCO_CPPOPTIONS.h"
 #endif
+