--- MITgcm_contrib/dgoldberg/streamice/STREAMICE_OPTIONS.h	2012/05/14 16:46:56	1.2
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE_OPTIONS.h	2014/08/27 19:29:12	1.7
@@ -1,25 +1,29 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/STREAMICE_OPTIONS.h,v 1.2 2012/05/14 16:46:56 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/STREAMICE_OPTIONS.h,v 1.7 2014/08/27 19:29:12 dgoldberg Exp $
 C $Name:  $
 
 C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
 
-C CPP options file for MYPACKAGE
+C CPP options file for STREAMICE
 C
 C Use this file for selecting options within package "streamice"
 
 #ifndef STREAMICE_OPTIONS_H
 #define STREAMICE_OPTIONS_H
 #include "PACKAGES_CONFIG.h"
-#ifdef ALLOW_STREAMICE
-
 #include "CPP_OPTIONS.h"
 
+#ifdef ALLOW_STREAMICE
+
 C Place CPP define/undef flag here
 
-!#define STREAMICE_CONSTRUCT_MATRIX
+#define STREAMICE_CONSTRUCT_MATRIX
+#undef STREAMICE_HYBRID_STRESS
+#undef USE_ALT_RLOW
+#undef STREAMICE_GEOM_FILE_SETUP
+#undef STREAMICE_SMOOTH_FLOATATION
 
-#endif /* ALLOW_MYPACKAGE */
-#endif /* MYPACKAGE_OPTIONS_H */
+#endif /* ALLOW_STREAMICE */
+#endif /* STREAMICE_OPTIONS_H */
 
 CEH3 ;;; Local Variables: ***
 CEH3 ;;; mode:fortran ***