--- MITgcm/model/inc/CPP_OPTIONS.h	2003/03/07 05:31:47	1.19.6.2
+++ 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.6.2 2003/03/07 05:31:47 heimbach 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.
@@ -30,11 +30,11 @@
 
 cswdblk --- add ---
 C o Include/exclude code for bulk formula
-#define  ALLOW_BULK_FORCE
-#ifdef ALLOW_BULK_FORCE
+#define  ALLOW_BULKFORMULA
+#ifdef ALLOW_BULKFORMULA
 cswdice -- add ---
 C o allow seaice
-#define ALLOW_THERM_SEAICE
+#define ALLOW_TSEAICE
 cswdice -- end add ---
 
 C o try to conserve qnet and emp
@@ -163,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"