--- MITgcm/model/inc/CPP_OPTIONS.h	2007/11/28 00:18:16	1.42
+++ MITgcm/model/inc/CPP_OPTIONS.h	2008/08/21 15:51:55	1.43
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.42 2007/11/28 00:18:16 dimitri Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.43 2008/08/21 15:51:55 jmc Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -22,9 +22,6 @@
 C o Allow latitudinally varying BryanLewis79 vertical diffusivity
 #undef ALLOW_BL79_LAT_VARY
 
-C o Allow full 3D specification of vertical diffusivity
-#undef ALLOW_3D_DIFFKR
-
 C o Include/exclude Implicit vertical advection code
 #define INCLUDE_IMPLVERTADV_CODE
 
@@ -37,11 +34,14 @@
 C o Include pressure loading code
 #define ATMOSPHERIC_LOADING
 
-C o exclude/allow external forcing-fields load 
+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
@@ -50,6 +50,10 @@
 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 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*
@@ -96,5 +100,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 */