--- MITgcm/model/inc/CPP_OPTIONS.h	2003/05/01 06:10:19	1.19.4.4
+++ 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.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.22 2003/02/18 05:33:53 dimitri 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_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
@@ -165,3 +177,4 @@
 #ifdef INCLUDE_ECCO_PACKAGE
 #include "ECCO_CPPOPTIONS.h"
 #endif
+