Changeset 4893

Timestamp:

Dec 21, 2007, 10:12:29 AM (17 years ago)

Author:

duncan

Message:

comments

Location:

anuga_core/source/anuga/mesh_engine

Files:

• mesh_engine.py (modified) (1 diff)
• mesh_engine_c_layer.c (modified) (5 diffs)
• test_generate_mesh.py (modified) (1 diff)

anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -122 +122 @@
     #print "segatts", segatts
     #print "mode", mode
+    #print "yeah" 
     mesh_dict = triang.genMesh(points,segments,holes,regions,
                           pointatts,segatts, mode, segments.flat)

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -8 +8 @@
 
     This code interfaces pmesh directly with "triangle", a general        
-    purpose triangulation code. In doing so, Python Numeric data structures          
-    are passed to C for  use by "triangle" and the results are then          
+    purpose triangulation code. In doing so, Python Numeric data structures
+     are passed to C for  use by "triangle" and the results are then          
     converted back. This was accomplished using the Python/C API.            
                                                                            
@@ -35 +35 @@
      returned in the dic structre after they are used now, in alpha
      shape and mesh_engine.
-     
+
+     to return numeric arrays, check how it is done in 
+     quantity_ext.c compute_gradients
+          
      Precondition
      End list in the pointattributelist has to have the same length
@@ -83 +86 @@
   PyArrayObject *segmarkerlist;
   PyArrayObject *test;
+  
+  
+  PyArrayObject *r_test;
+  PyObject *R;
+
+  int dimensions[1];
+    
   REAL Attr;
-  int i, j, iatt, n, write_here;
+  int i, j, iatt, n, write_here,N;
   int a,b,c;
   int marker;
@@ -320 +330 @@
     Py_DECREF(ii); Py_DECREF(holderlist);
   }   
+  /*
+  // Testing passing a numeric array out
+  dimensions[0] = 4;
+  // Allocate space for return vectors a and b (don't DECREF)
+  // This is crashing - don't know why
+  r_test = (PyArrayObject *) PyArray_FromDims(1, dimensions, PyArray_DOUBLE);
+  */ 
+  
   /* Free in/out structure memory */
   
@@ -365 +383 @@
   
   /*Py_DECREF(holder);*/
-  return Py_BuildValue((char *)"O", holder);
+  R = Py_BuildValue((char *)"O", holder);
+  /*Py_DECREF(holder);* Try this to fix memory problems */
+  return R;
 }
 

anuga_core/source/anuga/mesh_engine/test_generate_mesh.py

@@ -42 +42 @@
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist, mode, test)
-
+        print "data", data
         self.failUnless(data['generatedtrianglelist'] ==[(1, 0, 2), (2, 3, 1)],
                         'trianglelist is wrong!')