--- MITgcm/verification/natl_box/code/GMREDI_OPTIONS.h	2009/06/26 23:12:51	1.1
+++ MITgcm/verification/natl_box/code/GMREDI_OPTIONS.h	2011/12/24 01:17:53	1.2
@@ -1,17 +1,17 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/natl_box/code/GMREDI_OPTIONS.h,v 1.1 2009/06/26 23:12:51 jahn Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/natl_box/code/GMREDI_OPTIONS.h,v 1.2 2011/12/24 01:17:53 jmc Exp $
 C $Name:  $
 
 C CPP options file for GM/Redi package
-C
 C Use this file for selecting options within the GM/Redi package
 
 #ifndef GMREDI_OPTIONS_H
 #define GMREDI_OPTIONS_H
 #include "PACKAGES_CONFIG.h"
-#ifdef ALLOW_GMREDI
-
 #include "CPP_OPTIONS.h"
 
+#ifdef ALLOW_GMREDI
+C     Package-specific Options & Macros go here
+
 C Designed to simplify the Ajoint code:
 C #define GMREDI_WITH_STABLE_ADJOINT
 C -- exclude the clipping/tapering part of the code that is not used
@@ -19,6 +19,7 @@
 C #define GM_EXCLUDE_FM07_TAP
 C #define GM_EXCLUDE_AC02_TAP
 C #define GM_EXCLUDE_TAPERING
+C #define GM_EXCLUDE_SUBMESO
 
 C This allows to use Visbeck et al formulation to compute K_GM+Redi
 #undef GM_VISBECK_VARIABLE_K
@@ -28,16 +29,18 @@
 
 C This allows the leading diagonal (top two rows) to be non-unity
 C (a feature required when tapering adiabatically).
-#undef  GM_NON_UNITY_DIAGONAL
+#undef GM_NON_UNITY_DIAGONAL
 
 C Allows to use different values of K_GM and K_Redi ; also to
 C be used with the advective form (Bolus velocity) of GM
-#undef  GM_EXTRA_DIAGONAL
+#undef GM_EXTRA_DIAGONAL
 
 C Allows to use the advective form (Bolus velocity) of GM
 C  instead of the Skew-Flux form (=default)
-#undef  GM_BOLUS_ADVEC
+#undef GM_BOLUS_ADVEC
 
+C Allows to use the Boundary-Value-Problem method to evaluate GM Bolus transport
+#undef GM_BOLUS_BVP
 
 #endif /* ALLOW_GMREDI */
 #endif /* GMREDI_OPTIONS_H */