--- MITgcm/model/inc/CPP_OPTIONS.h	1998/07/01 19:49:36	1.5
+++ MITgcm/model/inc/CPP_OPTIONS.h	2003/10/01 20:43:17	1.22.2.1
@@ -1,10 +1,69 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.5 1998/07/01 19:49:36 adcroft Exp $
-C
+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 $Name:  $
 
-C This enables the C-D grid method of integrating the Coriolis terms
-#define ALLOW_CD
+C CPP flags controlling particular source code features
 
-C This enables use of the diagnostics packages
-#define ALLOW_DIAGNOSTICS
+C o Include/exclude code for C-D grid method of integrating the 
+C   coriolis terms
+#define  INCLUDE_CD_CODE
 
+C o Include/exclude temperature forcing code
+C#define  INCLUDE_T_FORCING_CODE
+
+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
+#define INCLUDE_MOMENTUM_FORCING_CODE
+
+C o Include/exclude momentum eqn metric terms code
+#define INCLUDE_MOMENTUM_METRIC_TERM_CODE
+
+C o Include/exclude phi_hyd calculation code
+#define INCLUDE_PHIHYD_CALCULATION_CODE
+
+C o Include/exclude call to S/R CONVECT
+#define INCLUDE_CONVECT_CALL
+
+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 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
+#undef  OLD_ADV_BCS
+
+C o Use "OLD" UV geometry on sphere (definately *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
+#undef  OLD_UV_GEOMETRY
+
+C o Execution environment support options
 #include "CPP_EEOPTIONS.h"
+
+C o Include/exclude code specific to the ECCO/SEALION version.
+#undef INCLUDE_ECCO_PACKAGE
+#ifdef INCLUDE_ECCO_PACKAGE
+#include "ECCO_CPPOPTIONS.h"
+#endif