Changeset 8567

Timestamp:

Sep 9, 2012, 9:05:44 AM (13 years ago)

Author:

steve

Message:

C version of calc_sides

Location:

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• pmesh2domain.py (modified) (3 diffs)
• pmesh2domain_ext.c (modified) (5 diffs)

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

@@ -219 +219 @@
     return sides
 
-def calc_sides(triangles):
+def calc_sides_zip(triangles):
     '''Build dictionary mapping from sides (2-tuple of points)
     to left hand side neighbouring triangle
@@ -242 +242 @@
     return sides
 
-def calc_sides_c(triangles):
+def calc_sides(triangles):
     '''Build dictionary mapping from sides (2-tuple of points)
     to left hand side neighbouring triangle
@@ -256 +256 @@
 #    print type(triangles)
 
-    print ntriangles
+    #print ntriangles
 
     from pmesh2domain_ext import sides_dictionary_construct

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/pmesh2domain_ext.c

@@ -6 +6 @@
 #define DDATA(p) ((double*)(((PyArrayObject *)p)->data))
 #define IDATA(p) ((long*)(((PyArrayObject *)p)->data))
-#define LENDATA(p) ((long*)(((PyArrayObject *)p)->dimensions[0]))
+#define LENDATA(p) ((long)(((PyArrayObject *)p)->dimensions[0]))
 
 
@@ -16 +16 @@
         long *triangles;
         PyObject *pyobj_key;
-        PyObject *pyobj_value;
         PyObject *pyobj_sides;
         PyArrayObject *pyobj_triangles;
@@ -37 +36 @@
            c = int(triangle[2])
 
-           sides[a,b] = (id, 2) #(id, face)
-           sides[b,c] = (id, 0) #(id, face)
-           sides[c,a] = (id, 1) #(id, face)
+           sides[a,b] = 3*id+2 #(id, face)
+           sides[b,c] = 3*id+0 #(id, face)
+           sides[c,a] = 3*id+1 #(id, face)
          */
 
-        printf("numTriangle %d\n",numTriangle);
+        //printf("numTriangle %d\n",numTriangle);
 
         for(i=0; i<numTriangle; i++){
@@ -54 +53 @@
             PyTuple_SetItem( pyobj_key, 1, PyInt_FromLong( b ) );
             
-            pyobj_value = PyTuple_New( 2 );
-            PyTuple_SetItem( pyobj_value, 0, PyInt_FromLong( i ) );
-            PyTuple_SetItem( pyobj_value, 1, PyInt_FromLong( 2 ) );
-
-            PyDict_SetItem( pyobj_sides, pyobj_key, pyobj_value );
+            PyDict_SetItem( pyobj_sides, pyobj_key, PyInt_FromLong( 3*i+2 ) );
 
             Py_DECREF(pyobj_key);
-            Py_DECREF(pyobj_value);
             
             // sides[b,c] = (id, 0) #(id, face)
@@ -68 +62 @@
             PyTuple_SetItem( pyobj_key, 1, PyInt_FromLong( c ) );
             
-            pyobj_value = PyTuple_New( 2 );
-            PyTuple_SetItem( pyobj_value, 0, PyInt_FromLong( i ) );
-            PyTuple_SetItem( pyobj_value, 1, PyInt_FromLong( 0 ) );
-            
-            PyDict_SetItem( pyobj_sides, pyobj_key, pyobj_value );
+            PyDict_SetItem( pyobj_sides, pyobj_key, PyInt_FromLong( 3*i+0 ) );
 
             Py_DECREF(pyobj_key);
-            Py_DECREF(pyobj_value);
+
             
             // sides[c,a] = (id, 1) #(id, face)
             pyobj_key = PyTuple_New( 2 );
             PyTuple_SetItem( pyobj_key, 0, PyInt_FromLong( c ) );
-            PyTuple_SetItem( pyobj_key, 1, PyInt_FromLong( a) );
-            
-            pyobj_value = PyTuple_New( 2 );
-            PyTuple_SetItem( pyobj_value, 0, PyInt_FromLong( i ) );
-            PyTuple_SetItem( pyobj_value, 1, PyInt_FromLong( 1 ) );
-            
-            PyDict_SetItem( pyobj_sides, pyobj_key, pyobj_value );
+            PyTuple_SetItem( pyobj_key, 1, PyInt_FromLong( a ) );
+                      
+            PyDict_SetItem( pyobj_sides, pyobj_key, PyInt_FromLong( 3*i+1 ) );
 
             Py_DECREF(pyobj_key);
-            Py_DECREF(pyobj_value);
+
 
         }