Changeset 4459

Timestamp:

May 16, 2007, 4:42:58 PM (17 years ago)

Author:

duncan

Message:

clean up

File:

• anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c (modified) (4 diffs)

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -90 +90 @@
   PyObject  *ii;
   
-  int *points_connected;
-  int *lone_verts;
-  
   /* used for testing numeric arrays*/
   int n_test;     
@@ -205 +202 @@
     { index : [ coordinates, [connections], Attribute ] } 
   */
-  holder = PyDict_New();
-     
-  /* list of int's, used to keep track of which verts are connected to
-     triangles. 
-  points_connected = (int *)malloc(out.numberofpoints*sizeof(int));
-   lone_verts = (int *)malloc(out.numberofpoints*sizeof(int)); */ 
-  
-  /* Initialise lone vert list 
-  for(i=0; i<out.numberofpoints;i++){
-    points_connected[i] = 0;
-     lone_verts[i] = 0;
-  } */
-    
+  holder = PyDict_New();    
   
   /* Add triangle list */
@@ -227 +212 @@
                                     out.trianglelist[i*3  ], out.trianglelist [i*3+1], out.trianglelist [i*3+2]);    
     PyList_SetItem(holderlist,i, mlist);
-    /* printf(" A vert index %i\n",out.trianglelist[i*3] );
-    printf(" A vert index %i\n",out.trianglelist[i*3+1] );
-    printf(" A vert index %i\n",out.trianglelist[i*3+2] ); */
-    /* points_connected[out.trianglelist[i*3]] = 1;
-    points_connected[out.trianglelist[i*3+1]] = 1;
-    points_connected[out.trianglelist[i*3+2]] = 1;*/
-    /* lone_verts[out.trianglelist[i*3]] = 1;
-    lone_verts[out.trianglelist[i*3+1]] = 1;
-    lone_verts[out.trianglelist[i*3+2]] = 1; */
-    /*  printf(" Add triangle list \n");*/
   }    
   ii=PyString_FromString("generatedtrianglelist");
   PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
-  
-  /* convert the points_connected vector from a true(1) false(0) vector, where
-     index is the vert, to a vector of the lone verts, at the beggining
-     of the vector. 
-  write_here = 0;   
-  for(i=0; i<out.numberofpoints;i++){
-    if (0 == points_connected[i]) {
-      points_connected[write_here] = i;
-      write_here ++;
-    }
-  }   */
-  /* printf(" ******************** \n" );
-  for(i=0; i<write_here;i++){
-    printf(" A vert index %i\n",points_connected[i] );
-    } */
-  
-  /*  *** since I'm passing -j in to the mode we don't need this list
-  listsize = write_here;
-  holderlist = PyList_New(listsize);
-  for(i=0; i<listsize;i++){
-   PyObject *mlist = Py_BuildValue((char *)"i", points_connected[i]);    
-    PyList_SetItem(holderlist,i, mlist);
-  }
-  ii=PyString_FromString("lonepointlist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist); 
-  */
-     
-  
+     
   /* Add pointlist */
   listsize = out.numberofpoints;
@@ -408 +356 @@
   }
   
-  /*if(!points_connected ){
-    free(points_connected ); points_connected =NULL;
-    }     */
   return Py_BuildValue((char *)"O", holder);
 }