--- MITgcm/verification/internal_wave/code/CPP_OPTIONS.h	2001/05/29 14:02:00	1.5
+++ MITgcm/verification/internal_wave/code/CPP_OPTIONS.h	2003/05/27 13:52:01	1.7
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/internal_wave/code/CPP_OPTIONS.h,v 1.5 2001/05/29 14:02:00 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/internal_wave/code/CPP_OPTIONS.h,v 1.7 2003/05/27 13:52:01 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
@@ -124,7 +124,7 @@
 
 C o Allow the use of Non-Linear Free-Surface formulation
 C   this implies that surface thickness (hFactors) vary with time
-#undef NONLIN_FRSURF
+#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