--- MITgcm/model/inc/CPP_OPTIONS.h	2001/03/06 16:17:05	1.16
+++ MITgcm/model/inc/CPP_OPTIONS.h	2002/11/21 19:11:42	1.21
@@ -1,11 +1,23 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.16 2001/03/06 16:17:05 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.
+  If you see these lines in your .F files or the compiler shows them
+  as an error then it means you have not placed your configuration
+  files in the appropriate place.
+  You need to place you own copy of CPP_OPTIONS.h in the include
+  path for the model.
+
 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
@@ -16,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
@@ -118,6 +145,14 @@
 C   instead of the "virtual salt flux"
 #undef  USE_NATURAL_BCS
 
+C o Use "Exact Convervation" of fluid in Free-Surface formulation
+C   so that d/dt(eta) is exactly equal to - Div.Transport
+#undef EXACT_CONSERV
+
+C o Allow the use of Non-Linear Free-Surface formulation
+C   this implies that surface thickness (hFactors) vary with time
+#undef NONLIN_FRSURF
+
 C o Use "OLD" UV discretisation near boundaries (*not* recommended)
 C   Note - only works with  #undef NO_SLIP_LATERAL  in calc_mom_rhs.F
 C          because the old code did not have no-slip BCs