--- MITgcm/verification/exp4/code/CPP_OPTIONS.h	2001/03/06 16:18:51	1.8
+++ MITgcm/verification/exp4/code/CPP_OPTIONS.h	2001/05/29 14:01:57	1.9
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/exp4/code/CPP_OPTIONS.h,v 1.8 2001/03/06 16:18:51 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/exp4/code/CPP_OPTIONS.h,v 1.9 2001/05/29 14:01:57 adcroft Exp $
 C $Name:  $
 C
 
@@ -22,7 +22,7 @@
 #endif
 
 C o Include/exclude code for Shapiro filters
-#define ALLOW_SHAP_FILT
+#undef  ALLOW_SHAP_FILT
 
 C o Include/exclude code for C-D grid method of integrating the 
 C   coriolis terms
@@ -118,6 +118,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
+#define 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