Changeset 2689 for inundation/pyvolution

Timestamp:

Apr 11, 2006, 1:10:37 PM (18 years ago)

Author:

duncan

Message:

fixing depreciated warning messages

Location:

inundation/pyvolution

Files:

• least_squares.py (modified) (3 diffs)
• shallow_water.py (modified) (1 diff)

inundation/pyvolution/least_squares.py

@@ -973 +973 @@
             msg += 'Alternatively, set smoothing parameter alpha to a small '
             msg += 'positive value,\ne.g. 1.0e-3.'
-            raise msg
+            raise Exception(msg)
 
 
@@ -1242 +1242 @@
                 if x is None or y is None:
                     msg = 'Either point_id or x and y must be specified'
-                    raise msg
+                    raise Exception(msg)
             else:
                 if self.interpolation_points is None:
@@ -1248 +1248 @@
                           'with a list of interpolation points before parameter ' +\
                           'point_id can be used'
-                    raise msg
+                    raise Exception(msg)
 
 
         msg = 'Time interval [%s:%s]' %(self.T[0], self.T[1])
         msg += ' does not match model time: %s\n' %t
-        if t < self.T[0]: raise msg
-        if t > self.T[-1]: raise msg
+        if t < self.T[0]: raise Exception(msg)
+        if t > self.T[-1]: raise Exception(msg)
 
         oldindex = self.index #Time index

inundation/pyvolution/shallow_water.py

@@ -1310 +1310 @@
             msg = 'Force field %s must be either a scalar' %f
             msg += ' or a vector function'
-            raise msg
+            raise Exception(msg)
     return f