Changeset 8831 for trunk

Timestamp:

Apr 16, 2013, 7:09:04 PM (12 years ago)

Author:

steve

Message:

Error in the import statement in inundation_damage.py

Location:

trunk/anuga_core

Files:

• demos/cairns (modified) (1 prop)
• source/anuga/damage_modelling/inundation_damage.py (modified) (1 diff)
• source/anuga/shallow_water/shallow_water_domain.py (modified) (1 diff)

trunk/anuga_core/source/anuga/damage_modelling/inundation_damage.py

@@ -9 +9 @@
 
 try:
-    from scipyr.interpolate import interp1d
+    from scipy.interpolate import interp1d
     scipy_available = True
 except:

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -2342 +2342 @@
 ################################################################################
 
-def _raise_compile_exception():
-    """ Raise exception if compiler not available. """
-    msg = 'C implementations could not be accessed by %s.\n ' % __file__
-    msg += 'Make sure compile_all.py has been run as described in '
-    msg += 'the ANUGA installation guide.'
-    raise Exception(msg)
-
-from anuga.utilities import compile
-if not compile.can_use_C_extension('shallow_water_ext.c'):
-    _raise_compile_exception()
+#def _raise_compile_exception():
+#    """ Raise exception if compiler not available. """
+#    msg = 'C implementations could not be accessed by %s.\n ' % __file__
+#    msg += 'Make sure compile_all.py has been run as described in '
+#    msg += 'the ANUGA installation guide.'
+#    raise Exception(msg)
+#
+#from anuga.utilities import compile
+#if not compile.can_use_C_extension('shallow_water_ext.c'):
+#    _raise_compile_exception()
 
 if __name__ == "__main__":