--- MITgcm/model/inc/CPP_OPTIONS.h	2002/11/15 19:58:21	1.20
+++ 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.20 2002/11/15 19:58:21 cheisey 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.
@@ -30,11 +30,11 @@
 
 cswdblk --- add ---
 C o Include/exclude code for bulk formula
-#define  ALLOW_BULKFORMULA
-#ifdef ALLOW_BULKFORMULA
+#define  ALLOW_BULK_FORCE
+#ifdef ALLOW_BULK_FORCE
 cswdice -- add ---
 C o allow seaice
-#define ALLOW_TSEAICE
+#define ALLOW_THERM_SEAICE
 cswdice -- end add ---
 
 C o try to conserve qnet and emp