Changeset 9719 for trunk/anuga_core/anuga/utilities/quantity_setting_functions.py

Timestamp:

Apr 2, 2015, 3:11:36 PM (10 years ago)

Author:

steve

Message:

Bring svn repo up to date with git repo

File:

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

trunk/anuga_core/anuga/utilities/quantity_setting_functions.py

@@ -509 +509 @@
             number_of_ip = ip.sum()
             ip = ip.nonzero()[0]
+
+            # Check that none of the ip points has an nan value
+            nan_ip = (quantityVal[ip] != quantityVal[ip]).nonzero()[0]
+
+            if len(nan_ip) > 0:
+                print len(nan_ip), ' points outside the nan_interpolation_region_polygon have nan values'
+                print 'This should not happen'
+                print 'The points have the following coordinates:'
+                print xy_array_trans[ip,:]
+                msg = "There are nan points outside of nan_interpolation_region_polygon, even after all fall-through's"
+                raise Exception(msg)
          
             if(number_of_ip < default_k_nearest_neighbours):
@@ -531 +542 @@
         if( min(isSet) != 1):
             print 'Some points remain as nan, which is not allowed'
-            unset_inds = (isSet!=1).nonzero()[0]
+            unset_inds = (isSet != 1).nonzero()[0]
             lui = min(5, len(unset_inds)) 
             print 'There are ', len(unset_inds), ' such points'
             print 'Here are a few:'
             for i in range(lui):
-                print x[unset_inds[i]]+xll, y[unset_inds[i]]+yll
+                print x[unset_inds[i]] + xll, y[unset_inds[i]] + yll
             raise Exception('It seems the input data needs to be fixed')