--- MITgcm/verification/natl_box/code/CPP_OPTIONS.h	2001/02/04 14:38:53	1.2
+++ MITgcm/verification/natl_box/code/CPP_OPTIONS.h	2001/05/29 14:02:00	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/natl_box/code/CPP_OPTIONS.h,v 1.2 2001/02/04 14:38:53 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/natl_box/code/CPP_OPTIONS.h,v 1.5 2001/05/29 14:02:00 adcroft Exp $
 C $Name:  $
 C
 
@@ -7,6 +7,9 @@
 C will be compiled.
 C
 
+C o Include/exclude code for AIM package
+#undef  ALLOW_AIM
+
 C o Include/exclude code for GM/Redi parameterization
 #undef  ALLOW_GMREDI
 
@@ -18,18 +21,21 @@
 #define  SHORTWAVE_HEATING
 #endif
 
+C o Include/exclude code for Shapiro filters
+#define ALLOW_SHAP_FILT
+
 C o Include/exclude code for C-D grid method of integrating the 
 C   coriolis terms
 #define  INCLUDE_CD_CODE
 
 C o Include/exclude code for open-boundary conditions
-#undef  ALLOW_OBCS
+#undef   ALLOW_OBCS
 
 C o Include/exclude diagnostics package interface code
-#define  INCLUDE_DIAGNOSTICS_INTERFACE_CODE
+#define  ALLOW_TIMEAVE
 
-C o Include/exclude latitude circle FFT filter
-#undef  INCLUDE_LAT_CIRC_FFT_FILTER_CODE
+C o Include/exclude zonal FFT filter code
+#undef  ALLOW_ZONAL_FILT
 
 C o Include/exclude temperature advection code
 #define  INCLUDE_T_ADVECTION_CODE
@@ -99,31 +105,9 @@
 C o Include/exclude phi_hyd calculation code
 #define INCLUDE_PHIHYD_CALCULATION_CODE
 
-C o Include/exclude prognostic variable shapiro filter code
-C   Note - Shapiro filter of prognostics variables requires the
-C          three steps "step forward including edges", filter, 
-C          "communicate edges".
-C           If the filtering code is included then we do not use the 
-C          pipelined "step forward including edges" in S/R DYNAMICS. 
-C          Instead the three steps are performed before DYNAMICS one 
-C          after another in an un-pipelined fashion.
-#undef  INCLUDE_SHAPIRO_FILTER_CODE
-#ifdef  INCLUDE_SHAPIRO_FILTER_CODE
-#undef  DO_PIPELINED_CORRECTION_STEP
-#endif
-#ifndef INCLUDE_SHAPIRO_FILTER_CODE
-#define DO_PIPELINED_CORRECTION_STEP
-#endif
-
-C o Include/exclude call to S/R FIND_RHO
-#define INCLUDE_FIND_RHO_CALL
-
 C o Include/exclude call to S/R CONVECT
 #define INCLUDE_CONVECT_CALL
 
-C o Include/exclude call to S/R CALC_ISOSLOPES
-#define INCLUDE_CALC_ISOSLOPES_CALL
-
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
@@ -134,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
@@ -153,5 +145,3 @@
 #include "ECCO_CPPOPTIONS.h"
 #endif
 
-
-