--- MITgcm/model/inc/CPP_OPTIONS.h	2001/03/30 22:18:17	1.17.2.1
+++ MITgcm/model/inc/CPP_OPTIONS.h	2002/11/21 19:11:42	1.21
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.17.2.1 2001/03/30 22:18:17 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.21 2002/11/21 19:11:42 cheisey Exp $
 C $Name:  $
 
   These lines are here to deliberately cause a compile-time error.
@@ -10,10 +10,14 @@
 
 C
 
-C 
+CBOP
+C !ROUTINE: CPP_OPTIONS.h
+C !INTERFACE: 
+C include "CPP_OPTIONS.h"
+C !DESCRIPTION:
 C CPP flags controlling which code in included in the files that
 C will be compiled.
-C
+CEOP
 
 C o Include/exclude code for AIM package
 #undef  ALLOW_AIM
@@ -24,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