--- MITgcm/verification/internal_wave/code/CPP_OPTIONS.h	2001/02/20 14:48:03	1.3
+++ MITgcm/verification/internal_wave/code/CPP_OPTIONS.h	2003/05/22 19:59:28	1.6
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/internal_wave/code/CPP_OPTIONS.h,v 1.3 2001/02/20 14:48:03 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/internal_wave/code/CPP_OPTIONS.h,v 1.6 2003/05/22 19:59:28 adcroft Exp $
 C $Name:  $
 C
 
@@ -32,7 +32,7 @@
 #define  ALLOW_OBCS
 
 C o Include/exclude diagnostics package interface code
-#define  INCLUDE_DIAGNOSTICS_INTERFACE_CODE
+#define  ALLOW_TIMEAVE
 
 C o Include/exclude zonal FFT filter code
 #undef  ALLOW_ZONAL_FILT
@@ -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
+#define 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