--- MITgcm/verification/OpenAD/code_oad/GMREDI_OPTIONS.h	2011/07/14 22:27:22	1.2
+++ MITgcm/verification/OpenAD/code_oad/GMREDI_OPTIONS.h	2011/12/24 01:17:54	1.3
@@ -1,39 +1,43 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/OpenAD/code_oad/GMREDI_OPTIONS.h,v 1.2 2011/07/14 22:27:22 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/OpenAD/code_oad/GMREDI_OPTIONS.h,v 1.3 2011/12/24 01:17:54 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  exclude the clipping/tapering part of the code that is not used
+C #define GMREDI_WITH_STABLE_ADJOINT
+C -- exclude the clipping/tapering part of the code that is not used
 #define GM_EXCLUDE_CLIPPING
-#define GM_EXCLUDE_AC02_TAP
 #define GM_EXCLUDE_FM07_TAP
+#define GM_EXCLUDE_AC02_TAP
 #undef GM_EXCLUDE_TAPERING
 #define GM_EXCLUDE_SUBMESO
 
 C This allows to use Visbeck et al formulation to compute K_GM+Redi
 #undef GM_VISBECK_VARIABLE_K
+C Use old calculation (before 2007/05/24) of Visbeck etal K_GM+Redi
+C (which depends on tapering scheme)
+#undef OLD_VISBECK_CALC
 
 C This allows the leading diagonal (top two rows) to be non-unity
 C (a feature required when tapering adiabatically).
-#define  GM_NON_UNITY_DIAGONAL
+#define 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
-#define  GM_EXTRA_DIAGONAL
+#define GM_EXTRA_DIAGONAL
 
 C Allows to use the advective form (Bolus velocity) of GM
 C  instead of the Skew-Flux form (=default)
-#define  GM_BOLUS_ADVEC
+#define GM_BOLUS_ADVEC
 
 C Allows to use the Boundary-Value-Problem method to evaluate GM Bolus transport
 #undef GM_BOLUS_BVP
@@ -41,3 +45,6 @@
 #endif /* ALLOW_GMREDI */
 #endif /* GMREDI_OPTIONS_H */
 
+CEH3 ;;; Local Variables: ***
+CEH3 ;;; mode:fortran ***
+CEH3 ;;; End: ***