--- MITgcm/model/inc/CPP_OPTIONS.h	2009/11/23 16:13:57	1.44
+++ MITgcm/model/inc/CPP_OPTIONS.h	2012/08/01 14:02:11	1.49
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.44 2009/11/23 16:13:57 mlosch Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/CPP_OPTIONS.h,v 1.49 2012/08/01 14:02:11 jmc Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -28,8 +28,8 @@
 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 code for single reduction Conjugate-Gradient solver
+#define ALLOW_SRCG
 
 C o Include/exclude nonHydrostatic code
 #undef ALLOW_NONHYDROSTATIC
@@ -42,6 +42,12 @@
 C   forcing fields, if no specific pkg (e.g., EXF) is used to compute them.
 #undef EXCLUDE_FFIELDS_LOAD
 
+C o Include/exclude balancing surface forcing fluxes code
+#undef ALLOW_BALANCE_FLUXES
+
+C o Include/exclude balancing surface forcing relaxation code
+#undef ALLOW_BALANCE_RELAX
+
 C o Include/exclude GM-like eddy stress in momentum code
 #undef ALLOW_EDDYPSI
 
@@ -57,6 +63,12 @@
 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
+#undef 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*
@@ -93,15 +105,13 @@
 C o Execution environment support options
 #include "CPP_EEOPTIONS.h"
 
-C o Include/exclude code specific to the ECCO/SEALION version.
-C   AUTODIFF or EXF package.
-C   Currently controled by a single header file
-C   For this to work, PACKAGES_CONFIG.h needs to be included!
-cph#if (defined (ALLOW_AUTODIFF) || \
-cph     defined (ALLOW_ECCO) || \
-cph     defined (ALLOW_EXF))
-cph# include "ECCO_CPPOPTIONS.h"
-cph#endif
+C o Include/exclude single header file containing multiple packages options
+C   (AUTODIFF, COST, CTRL, ECCO, EXF ...) instead of the standard way where
+C   each of the above pkg get its own options from its specific option file.
+C   Although this method, inherited from ECCO setup, has been traditionally
+C   used for all adjoint built, the alternative standard way is currently
+C   going through rehabilitation.
+c#include "ECCO_CPPOPTIONS.h"
 
 C o Allow full 3D specification of vertical diffusivity
 #ifdef ALLOW_DIFFKR_CONTROL