Changeset 9341 for trunk/anuga_core/source/anuga

Timestamp:

Sep 19, 2014, 5:05:42 PM (11 years ago)

Author:

davies

Message:

Slight fix to quantity_setting_functions + work on template scripts

File:

• trunk/anuga_core/source/anuga/utilities/quantity_setting_functions.py (modified) (2 diffs)

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

@@ -198 +198 @@
 
             # Get indices fInds of points in pi which are not set
-            if(pi is 'All'):
+            if(pi == 'All'):
                 fInside=(1-isSet)
                 fInds=(fInside==1).nonzero()[0]
             else:
-                if(pi is 'Extent' and type(fi) is str and os.path.exists(fi)):
+                if(pi == 'Extent' and type(fi) is str and os.path.exists(fi)):
                     # Here fi MUST be a gdal-compatible raster
                     # Then we get the extent from the raster itself
@@ -250 +250 @@
                 isSet[fInds]=1
 
-        if(not min(isSet)==1):
+        if( min(isSet) != 1):
             raise Exception, 'Some points were not inside any polygon'