--- MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h	2003/01/21 19:37:33	1.6
+++ MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h	2003/10/24 05:52:05	1.7
@@ -1,16 +1,20 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h,v 1.6 2003/01/21 19:37:33 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/global_ocean.90x40x15/code_ad/GMREDI_OPTIONS.h,v 1.7 2003/10/24 05:52:05 edhill Exp $
 C $Name:  $
 
 C CPP options file for GM/Redi package
 C
 C Use this file for selecting options within the GM/Redi package
 C
-C GM/Redi is enabled with ALLOW_GMREDI in CPP_OPTIONS.h
-
-#include "CPP_OPTIONS.h"
+#ifndef GMREDI_OPTIONS_H
+#define GMREDI_OPTIONS_H
+#include "PACKAGES_CONFIG.h"
+#include "AD_CONFIG.h"
 
 #ifdef ALLOW_GMREDI
 
+#include "CPP_OPTIONS.h"
+ 
+
 C Designed to simplify the Ajoint code:
 C  exclude the clipping/tapering part of the code that is not used
 #define GM_EXCLUDE_CLIPPING
@@ -30,7 +34,9 @@
 
 C Allows to use the advective form (Bolus velocity) of GM
 C  instead of the Skew-Flux form (=default)
-#define  GM_BOLUS_ADVEC
+#undef  GM_BOLUS_ADVEC
 
 
 #endif /* ALLOW_GMREDI */
+#endif /* GMREDI_OPTIONS_H */
+