Changeset 8052

Timestamp:

Oct 27, 2010, 5:22:43 PM (14 years ago)

Author:

steve

Message:

Modified C code to take long arrays instead of int (caused error on 64 bit machine)

Location:

trunk/anuga_work/development/2010-projects/kv

Files:

• compile_all.py (added)
• kinematic_viscosity.py (modified) (1 diff)
• kinematic_viscosity_ext.c (modified) (4 diffs)
• kv_solver_new.py (deleted)
• test_all.py (added)
• test_kinematic_viscosity.py (modified) (4 diffs)
• test_kv_solver_new.py (deleted)

trunk/anuga_work/development/2010-projects/kv/kinematic_viscosity.py

@@ -1 @@
-from anuga.abstract_2d_finite_volumes.domain import Domain
+from anuga import Domain
 #from anuga.utilities.sparse import Sparse, Sparse_CSR
 from sparse import Sparse, Sparse_CSR #the new import

trunk/anuga_work/development/2010-projects/kv/kinematic_viscosity_ext.c

@@ -40 +40 @@
 }
 
-int build_geo_structure(int n, int tot_len, double *centroids, int *neighbours, double *edgelengths, double *edge_midpoints, int *geo_indices, double *geo_values) {
+int build_geo_structure(int n, 
+                        int tot_len, 
+                        double *centroids, 
+                        long *neighbours, 
+                        double *edgelengths, 
+                        double *edge_midpoints, 
+                        long *geo_indices, 
+                        double *geo_values) {
     int i, edge, edge_counted, j;
         double dist, this_x, this_y, other_x, other_y, edge_length;
@@ -75 +82 @@
 }
 
-int build_operator_matrix(int n, int tot_len, int *geo_indices, double *geo_values, double *h, double *boundary_heights, double *data, int *colind) {
+int build_operator_matrix(int n, 
+                          int tot_len, 
+                          long *geo_indices, 
+                          double *geo_values, 
+                          double *h, 
+                          double *boundary_heights, 
+                          double *data, 
+                          long *colind) {
         int i, k, edge, j[4], *sorted_j, this_index;
         double h_j, v[3], v_i; //v[k] = value of the interaction of edge k in a given triangle, v_i = (i,i) entry
@@ -151 +165 @@
     Py_DECREF(mesh);
     
-    err = build_geo_structure(n,tot_len, (double *)centroid_coordinates -> data, (int *)neighbours -> data, (double *)edgelengths->data, (double *)edge_midpoint_coordinates -> data, (int *)geo_indices -> data, (double *)geo_values -> data);
+    err = build_geo_structure(n,tot_len, 
+                             (double *)centroid_coordinates -> data, 
+                             (long *)neighbours -> data, 
+                             (double *)edgelengths->data, 
+                             (double *)edge_midpoint_coordinates -> data, 
+                             (long *)geo_indices -> data, 
+                             (double *)geo_values -> data);
     if (err != 0) {
         PyErr_SetString(PyExc_RuntimeError, "Could not build geo structure");
@@ -190 +210 @@
         colind = get_consecutive_array(kv_operator,"operator_colind");
         
-        err = build_operator_matrix(n,tot_len, (int *)geo_indices -> data, (double *)geo_values -> data, (double *)h -> data, (double *)boundary_heights -> data, (double *)_data -> data, (int *)colind -> data);
+        err = build_operator_matrix(n,tot_len, 
+                                                                (long *)geo_indices -> data, 
+                                                                (double *)geo_values -> data, 
+                                                                (double *)h -> data, 
+                                                                (double *)boundary_heights -> data, 
+                                                                (double *)_data -> data, 
+                                                                (long *)colind -> data);
     if (err != 0) {
         PyErr_SetString(PyExc_RuntimeError, "Could not get stage height interactions");

trunk/anuga_work/development/2010-projects/kv/test_kinematic_viscosity.py

@@ -1 @@
-from anuga.abstract_2d_finite_volumes.domain import Domain
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import Dirichlet_boundary
+from anuga.abstract_2d_finite_volumes.generic_domain import Generic_Domain
+from anuga import Dirichlet_boundary
 from kinematic_viscosity import Kinematic_Viscosity_Operator
 import numpy as num
@@ -21 +21 @@
                 boundary_map[(0,1)] = Dirichlet_boundary([1,1,2])
                 boundary_map[(0,2)] = Dirichlet_boundary([1,1,0])
-                domain = Domain(source=points,triangles=elements,boundary=boundary_map)
+                domain = Generic_Domain(source=points,triangles=elements,boundary=boundary_map)
                 return Kinematic_Viscosity_Operator(domain)
 
@@ -33 +33 @@
                 boundary_map[(1,0)] = Dirichlet_boundary([1,1,0])
                 boundary_map[(1,2)] = Dirichlet_boundary([1,2,1])
-                domain = Domain(source=points,triangles=elements,boundary=boundary_map)
+                domain = Generic_Domain(source=points,triangles=elements,boundary=boundary_map)
                 return Kinematic_Viscosity_Operator(domain)
 
@@ -146 +146 @@
                 U_mod[0,:] = U_new
                 assert num.allclose(U_new - operator1.dt * 2 * num.mat(A)*num.mat(U_mod), U[0,:])
+
 ################################################################################
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Kinematic_Viscosity, 'test')
+    suite = unittest.makeSuite(Test_Kinematic_Viscosity, 'test', verbose=True)
     runner = unittest.TextTestRunner()
     runner.run(suite)