--- MITgcm/verification/hs94.1x64x5/code_oad/CPP_OPTIONS.h	2013/06/21 17:36:31	1.1
+++ MITgcm/verification/hs94.1x64x5/code_oad/CPP_OPTIONS.h	2013/11/18 23:51:25	1.2
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/hs94.1x64x5/code_oad/CPP_OPTIONS.h,v 1.1 2013/06/21 17:36:31 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/hs94.1x64x5/code_oad/CPP_OPTIONS.h,v 1.2 2013/11/18 23:51:25 jmc Exp $
 C $Name:  $
 
 #ifndef CPP_OPTIONS_H
@@ -46,6 +46,9 @@
 C o Include/exclude nonHydrostatic code
 #undef ALLOW_NONHYDROSTATIC
 
+C o Allow to account for heating due to friction (and momentum dissipation)
+#undef ALLOW_FRICTION_HEATING
+
 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
@@ -121,6 +124,8 @@
 C   Although this method, inherited from ECCO setup, has been traditionally
 C   used for all adjoint built, work is in progress to allow to use the
 C   standard method also for adjoint built.
+#ifdef PACKAGES_CONFIG_H
 # include "ECCO_CPPOPTIONS.h"
+#endif
 
 #endif /* CPP_OPTIONS_H */