Changeset 8920

Timestamp:

Jun 14, 2013, 9:13:24 PM (12 years ago)

Author:

steve

Message:

Small changes to deal with spatial functions

Location:

trunk/anuga_core/source

Files:

• anuga/shallow_water/boundaries.py (modified) (1 diff)
• anuga/utilities/function_utils.py (modified) (4 diffs)
• anuga_validation_tests/case_studies/okushiri/Benchmark_2_input.tms (modified) (previous)

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

@@ -496 +496 @@
 
     This function is a thin wrapper around the generic File_boundary. The
-    difference between the file_boundary and field_boundary is only that the
-    field_boundary will allow you to change the level of the stage height when
+    difference between the File_boundary and Field_boundary is only that the
+    Field_boundary will allow you to change the level of the stage height when
     you read in the boundary condition. This is very useful when running
     different tide heights in the same area as you need only to convert one
     boundary condition to a SWW file, ideally for tide height of 0 m
-    (saving disk space). Then you can use field_boundary to read this SWW file
+    (saving disk space). Then you can use Field_boundary to read this SWW file
     and change the stage height (tide) on the fly depending on the scenario.
     """

trunk/anuga_core/source/anuga/utilities/function_utils.py

@@ -5 +5 @@
 from anuga.fit_interpolate.interpolate import Modeltime_too_early
 from anuga.fit_interpolate.interpolate import Modeltime_too_late
+
+import warnings
+#warnings.filterwarnings('default')
 
 def determine_function_type(function):
@@ -40 +43 @@
                     function(t)
                 except:
-                    print 'problem calling with one scalar argument'
+                    #print 'problem calling with one scalar argument'
                     msg = 'Input argument cannot be called as f(t), f(x,y) or f(x,y,t)'
                     raise Exception, msg
@@ -66 +69 @@
             else:
                 # Pass control to default left function
+
+                warnings.warn('Using default_left_value')
                 if callable(default_left_value):
                     result = default_left_value(t)
@@ -77 +82 @@
             else:
                 # Pass control to default right function
+
+                warnings.warn('Using default_right_value')
                 if callable(default_right_value):
                     result = default_right_value(t)