Changeset 9514

Timestamp:

Jan 27, 2015, 10:29:26 PM (10 years ago)

Author:

steve

Message:

Adding in setup.py files for each anuga sub module

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/quantity.py (modified) (2 diffs)
• abstract_2d_finite_volumes/setup.py (added)
• advection/setup.py (added)
• alpha_shape/setup.py (added)
• caching/setup.py (added)
• culvert_flows/setup.py (added)
• damage_modelling/setup.py (added)
• file/setup.py (added)
• fit_interpolate/setup.py (added)
• geometry/setup.py (added)
• load_mesh/loadASCII.py (modified) (2 diffs)
• load_mesh/setup.py (added)
• mesh_engine/setup.py (added)
• parallel/test/test_all.py (modified) (1 diff)
• parallel/test/test_parallel_boyd_box_operator.py (modified) (3 diffs)
• utilities/sww_merge.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ +1 @@
+
 """Class Quantity - Implements values at each triangular element
 
@@ -844 +845 @@
         msg = ('Exactly one of the arguments numeric, quantity, function, '
                'geospatial_data, or filename must be present.')
-        assert L.count(None) == len(L)-1, msg
+
+        count = 0
+        for entry in L:
+            if entry is None:
+                count = count + 1
+                
+        assert count == len(L)-1, msg
 
         if location == 'edges':

trunk/anuga_core/source/anuga/load_mesh/loadASCII.py

@@ -663 +663 @@
         #print 'mesh vertex attributes', mesh['vertex_attributes'].shape
         
-        if (mesh['vertex_attributes'] != None and
+        if (mesh['vertex_attributes'] is not None and
             (mesh['vertex_attributes'].shape[0] > 0 and
              mesh['vertex_attributes'].shape[1] > 0)):
@@ -707 +707 @@
         outfile.variables['triangles'][:] = mesh['triangles']
         outfile.variables['triangle_neighbors'][:] = mesh['triangle_neighbors']
-        if (mesh['triangle_tags'] != None and
+        if (mesh['triangle_tags'] is not None and
             (mesh['triangle_tags'].shape[1] > 0)):
             outfile.createDimension('num_of_triangle_tag_chars',

trunk/anuga_core/source/anuga/parallel/test/test_all.py

@@ -23 +23 @@
 #List files that should be excluded from the testing process.
 #E.g. if they are known to fail and under development
-exclude_files = ['test_failure.py', 'test_parallel_boyd_pipe_operator.py', 'test_parallel_boyd_box_op_apron.py']
+exclude_files = ['test_parallel_boyd_pipe_operator.py', 'test_parallel_boyd_box_op_apron.py']
 
 # Directories that should not be searched for test files.

trunk/anuga_core/source/anuga/parallel/test/test_parallel_boyd_box_operator.py

@@ -243 +243 @@
 
         if verbose: print 'P%d control_data = %s' %(myid, control_data)
-    else:
+    else:  # parallel
         stage = domain.get_quantity('stage')
         
@@ -265 +265 @@
                 if verbose: 
                     print 'P%d average stage, control = %s, actual = %s' %(myid, control_data[samples], average_stage)
-
                     print 'P%d average xmom, control = %s, actual = %s' %(myid, control_data[samples+1], average_xmom)
-
                     print 'P%d average ymom, control = %s, actual = %s' %(myid, control_data[samples+2], average_ymom)
-
                     print 'P%d average volume, control = %s, actual = %s' %(myid, control_data[samples+3], average_volume)
-
                     print 'P%d average depth, control = %s, actual = %s' %(myid, control_data[samples+4], average_depth)
-
 
         assert(success)
@@ -286 +281 @@
 class Test_parallel_boyd_box_operator(unittest.TestCase):
     def test_parallel_operator(self):
-        #print "Expect this test to fail if not run from the parallel directory."
+        #print "Expect this test to fail if not run from the parallel/test directory."
         result = os.system("mpirun -np %d python test_parallel_boyd_box_operator.py" % nprocs)
         assert_(result == 0)

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

@@ -430 +430 @@
             q = fid.variables[quantity]
             out_s_c_quantities[quantity][ftri_l2g] = \
-                         num.array(q,dtype=num.float32)[ftri_ids]
+                         num.array(q).astype(num.float32)[ftri_ids]
 
         
@@ -439 +439 @@
             for i in range(n_steps):
                 out_d_c_quantities[quantity][i][ftri_l2g] = \
-                           num.array(q[i],dtype=num.float32)[ftri_ids]
+                           num.array(q[i]).astype(num.float32)[ftri_ids]
 
 
@@ -677 +677 @@
             q = fid.variables[quantity]
             out_s_quantities[quantity][g_vids] = \
-                         num.array(q,dtype=num.float32)[l_vids]
+                         num.array(q).astype(num.float32)[l_vids]
+                         #num.array(q,dtype=num.float32)[l_vids]
 
 
@@ -684 +685 @@
             q = fid.variables[quantity]
             out_s_c_quantities[quantity][f_gids] = \
-                         num.array(q,dtype=num.float32)[f_ids]
+                         num.array(q).astype(num.float32)[f_ids]
+                         #num.array(q,dtype=num.float32)[f_ids]