--- MITgcm/model/inc/CPP_OPTIONS.h	2001/03/09 19:36:59	1.17
+++ MITgcm/model/inc/CPP_OPTIONS.h	2003/10/09 04:19:18	1.23
@@ -1,107 +1,21 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.17 2001/03/09 19:36:59 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.23 2003/10/09 04:19:18 edhill Exp $
 C $Name:  $
 
-  These lines are here to deliberately cause a compile-time error.
-  If you see these lines in your .F files or the compiler shows them
-  as an error then it means you have not placed your configuration
-  files in the appropriate place.
-  You need to place you own copy of CPP_OPTIONS.h in the include
-  path for the model.
-
-C
-
-C 
-C CPP flags controlling which code in included in the files that
-C will be compiled.
-C
+#include "PACKAGES_CONFIG.h"
 
-C o Include/exclude code for AIM package
-#undef  ALLOW_AIM
-
-C o Include/exclude code for GM/Redi parameterization
-#undef  ALLOW_GMREDI
-
-C o Include/exclude code for KPP mixing scheme
-#define  ALLOW_KPP
-
-C o Shortwave heating as extra term in external_forcing.F
-#ifdef ALLOW_KPP
-#define  SHORTWAVE_HEATING
-#endif
-
-C o Include/exclude code for Shapiro filters
-#define ALLOW_SHAP_FILT
+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
 
-C o Include/exclude code for open-boundary conditions
-#undef  ALLOW_OBCS
-
-C o Include/exclude diagnostics package interface code
-#define  ALLOW_TIMEAVE
-
-C o Include/exclude zonal FFT filter code
-#undef  ALLOW_ZONAL_FILT
-
-C o Include/exclude temperature advection code
-#define  INCLUDE_T_ADVECTION_CODE
-#ifdef   INCLUDE_T_ADVECTION_CODE
-#define  _ADT(a)a
-#endif
-#ifndef  INCLUDE_T_ADVECTION_CODE
-#define  _ADT(a)
-#endif
-
-C o Include/exclude temperature diffusion code
-#define  INCLUDE_T_DIFFUSION_CODE
-#ifdef   INCLUDE_T_DIFFUSION_CODE
-#define  _LPT(a)a
-#define  _BHT(a)a
-#endif
-#ifndef  INCLUDE_T_DIFFUSION_CODE
-#define  _LPT(a)
-#define  _BHT(a)
-#endif
-
 C o Include/exclude temperature forcing code
-#define  INCLUDE_T_FORCING_CODE
+C#define  INCLUDE_T_FORCING_CODE
 
-C o Include/exclude momentum advection code
-#define  INCLUDE_MOMENTUM_ADVECTION_CODE
-#ifdef   INCLUDE_MOMENTUM_ADVECTION_CODE
-#define  _ADM(a)a
-#endif
-#ifndef  INCLUDE_MOMENTUM_ADVECTION_CODE
-#define  _ADM(a)
-#endif
-
-C o Include/exclude laplacian viscosity code
-#define  INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#ifdef   INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#define  _LPM(a)a
-#endif
-#ifndef  INCLUDE_LP_MOMENTUM_DIFFUSION_CODE
-#define  _LPM(a)
-#endif
-
-C o Include/exclude biharmonic viscosity code
-#define  INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#ifdef   INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#define  _BHM(a)a
-#endif
-#ifndef  INCLUDE_BH_MOMENTUM_DIFFUSION_CODE
-#define  _BHM(a)
-#endif
-
-C o Include/exclude gradient of phy_hyd code
-#define INCLUDE_GRADPH_CODE
-#ifdef  INCLUDE_GRADPH_CODE
-#define _PHM(a)a
-#endif
-#ifndef INCLUDE_GRADPH_CODE
-#define _PHM(a)
+C o Shortwave heating as extra term in external_forcing.F
+C Note: this should be a run-time option and not necessarily dependent on KPP
+#ifdef ALLOW_KPP
+#define  SHORTWAVE_HEATING
 #endif
 
 C o Include/exclude momentum forcing code
@@ -120,12 +34,23 @@
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
 C o Allow nonHydrostatic code
-#undef  ALLOW_NONHYDROSTATIC
+#define 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
+
 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
@@ -144,4 +69,3 @@
 #ifdef INCLUDE_ECCO_PACKAGE
 #include "ECCO_CPPOPTIONS.h"
 #endif
-