--- MITgcm/model/inc/CPP_OPTIONS.h	2003/10/01 20:43:17	1.22.2.1
+++ MITgcm/model/inc/CPP_OPTIONS.h	2003/10/15 14:00:40	1.25
@@ -1,11 +1,16 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.22.2.1 2003/10/01 20:43:17 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.25 2003/10/15 14:00:40 edhill Exp $
 C $Name:  $
 
+#ifndef CPP_OPTIONS_H
+#define CPP_OPTIONS_H
+
+#include "PACKAGES_CONFIG.h"
+
 C CPP flags controlling particular source code features
 
 C o Include/exclude code for C-D grid method of integrating the 
 C   coriolis terms
-#define  INCLUDE_CD_CODE
+#undef  INCLUDE_CD_CODE
 
 C o Include/exclude temperature forcing code
 C#define  INCLUDE_T_FORCING_CODE
@@ -31,23 +36,19 @@
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
-C o Allow nonHydrostatic code
-#define ALLOW_NONHYDROSTATIC
+C o Include/exclude nonHydrostatic code
+#undef ALLOW_NONHYDROSTATIC
 
 C o Include pressure loading code
 #define ATMOSPHERIC_LOADING
 
-C o Use "natural" boundary conditions for salinity
-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
+#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
@@ -67,3 +68,6 @@
 #ifdef INCLUDE_ECCO_PACKAGE
 #include "ECCO_CPPOPTIONS.h"
 #endif
+
+#endif /* CPP_OPTIONS_H */
+