Changeset 9094

Timestamp:

Apr 26, 2014, 1:56:02 PM (11 years ago)

Author:

steve

Message:

Change to deal with scipy interp1d function when it throws valueException

Location:

trunk/anuga_core/source/anuga

Files:

• __init__.py (modified) (1 diff)
• utilities/function_utils.py (modified) (1 diff)

trunk/anuga_core/source/anuga/__init__.py

@@ -160 +160 @@
 from anuga.operators.set_friction_operators import Depth_friction_operator 
 
+from anuga.operators.set_elevation_operator import Set_elevation_operator
+from anuga.operators.set_quantity_operator import Set_quantity_operator
+from anuga.operators.set_stage_operator import Set_stage_operator
+
+from anuga.operators.erosion_operators import Bed_shear_erosion_operator
+from anuga.operators.erosion_operators import Flat_slice_erosion_operator
+from anuga.operators.erosion_operators import Flat_fill_slice_erosion_operator
 
 #---------------------------

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

@@ -39 +39 @@
         t =0.0
 
+        #function(x,y,t)
         try:
             function(x,y,t)
-        except:
+        except TypeError:
             #print 'Problem calling with three arguments'
             try:
                 function(x,y)
-            except:
+            except TypeError:
                 #print 'Problem calling with 2 array arguments'
                 try:
                     function(t)
-                except:
+                except TypeError:
                     #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
+                except ValueError:
+                    #print 'problem calling out of range'
+                    return 't'
                 else:
                     return 't'
+            except ValueError:
+                return 'x,y'
             else:
                 return 'x,y'
+        except ValueError:
+            return 'x,y,t'
         else:
             return 'x,y,t'