--- MITgcm/model/inc/CPP_OPTIONS.h	2006/04/05 15:42:14	1.35
+++ MITgcm/model/inc/CPP_OPTIONS.h	2012/03/15 00:41:29	1.46
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.35 2006/04/05 15:42:14 mlosch Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.46 2012/03/15 00:41:29 jmc Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -19,18 +19,32 @@
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
+C o Allow latitudinally varying BryanLewis79 vertical diffusivity
+#undef ALLOW_BL79_LAT_VARY
+
 C o Include/exclude Implicit vertical advection code
 #define INCLUDE_IMPLVERTADV_CODE
 
 C o Include/exclude AdamsBashforth-3rd-Order code
 #undef ALLOW_ADAMSBASHFORTH_3
 
+C o Include/exclude code for single reduction cg-solver
+#undef ALLOW_SRCG
+
 C o Include/exclude nonHydrostatic code
 #undef ALLOW_NONHYDROSTATIC
 
 C o Include pressure loading code
 #define ATMOSPHERIC_LOADING
 
+C o exclude/allow external forcing-fields load
+C   this allows to read & do simple linear time interpolation of oceanic
+C   forcing fields, if no specific pkg (e.g., EXF) is used to compute them.
+#undef EXCLUDE_FFIELDS_LOAD
+
+C o Include/exclude GM-like eddy stress in momentum code
+#undef ALLOW_EDDYPSI
+
 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
@@ -39,6 +53,16 @@
 C   this implies that surface thickness (hFactors) vary with time
 #undef NONLIN_FRSURF
 
+C o Allow mass source or sink of Fluid in the interior
+C   (3-D generalisation of oceanic real-fresh water flux)
+#undef ALLOW_ADDFLUID
+
+C o Choices for implicit solver routines solve_*diagonal.F
+C   The following has low memory footprint, but not suitable for AD
+#define SOLVE_DIAGONAL_LOWMEMORY
+C   The following one suitable for AD but does not vectorize
+#undef SOLVE_DIAGONAL_KINNER
+
 C o ALLOW isotropic scaling of harmonic and bi-harmonic terms when
 C   using an locally isotropic spherical grid with (dlambda) x (dphi*cos(phi))
 C *only for use on a lat-lon grid*
@@ -46,6 +70,10 @@
 C   it is set/unset again in other header fields (e.g., GAD_OPTIONS.h).
 C   The definition of the flag is commented to avoid interference with
 C   such other header files.
+C   The preferred method is specifying a value for viscAhGrid or viscA4Grid
+C   in data which is then automatically scaled by the grid size;
+C   the old method of specifying viscAh/viscA4 and this flag is provided
+C   for completeness only (and for use with the adjoint).
 C#define ISOTROPIC_COS_SCALING
 
 C o This flag selects the form of COSINE(lat) scaling of bi-harmonic term.
@@ -63,6 +91,11 @@
 C          because the old code did not have no-slip BCs
 #undef  OLD_ADV_BCS
 
+C o Use LONG.bin, LATG.bin, etc., initialization for ini_curviliear_grid.F
+C   Default is to use "new" grid files (OLD_GRID_IO undef) but OLD_GRID_IO
+C   is still useful with, e.g., single-domain curvilinear configurations.
+#undef OLD_GRID_IO
+
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"
 
@@ -76,5 +109,15 @@
 cph# include "ECCO_CPPOPTIONS.h"
 cph#endif
 
+C o Allow full 3D specification of vertical diffusivity
+#ifdef ALLOW_DIFFKR_CONTROL
+C - Need to be defined if using DIFFKR_CONTROL
+C   (alternatively, could have put this in ECCO_CPPOPTIONS)
+#define ALLOW_3D_DIFFKR
+#else
+C - otherwise, can be turned on or off hereafter:
+#undef  ALLOW_3D_DIFFKR
+#endif /* ALLOW_DIFFKR_CONTROL */
+
 #endif /* CPP_OPTIONS_H */