Changeset 4458

Timestamp:

May 16, 2007, 4:37:49 PM (18 years ago)

Author:

duncan

Message:

removing code to handle lone verts. Triangle does it now.

Location:

anuga_core/source/anuga

Files:

• mesh_engine/mesh_engine.py (modified) (1 diff)
• mesh_engine/mesh_engine_c_layer.c (modified) (6 diffs)
• pmesh/mesh.py (modified) (1 diff)

anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -106 +106 @@
     #print "mode", mode
     if mode.find('n'):
+        #pass
         mode = 'j' + mode
         # j- Jettisons vertices that are not part of the final

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -208 +208 @@
      
   /* list of int's, used to keep track of which verts are connected to
-     triangles. */
+     triangles. 
   points_connected = (int *)malloc(out.numberofpoints*sizeof(int));
-  /* lone_verts = (int *)malloc(out.numberofpoints*sizeof(int)); */ 
-  
-  /* Initialise lone vert list */
+   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; */
-  }  
+     lone_verts[i] = 0;
+  } */
+    
   
   /* Add triangle list */
@@ -229 +230 @@
     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;
     points_connected[out.trianglelist[i*3+1]] = 1;
-    points_connected[out.trianglelist[i*3+2]] = 1;
+    points_connected[out.trianglelist[i*3+2]] = 1;*/
     /* lone_verts[out.trianglelist[i*3]] = 1;
     lone_verts[out.trianglelist[i*3+1]] = 1;
@@ -242 +243 @@
   /* 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. */
+     of the vector. 
   write_here = 0;   
   for(i=0; i<out.numberofpoints;i++){
-    /* lone_verts[i-write_here] = lone_verts[i]; */
     if (0 == points_connected[i]) {
       points_connected[write_here] = i;
       write_here ++;
     }
-  }   
+  }   */
   /* printf(" ******************** \n" );
   for(i=0; i<write_here;i++){
@@ -256 +256 @@
     } */
   
+  /*  *** since I'm passing -j in to the mode we don't need this list
   listsize = write_here;
   holderlist = PyList_New(listsize);
@@ -264 +265 @@
   ii=PyString_FromString("lonepointlist");
   PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist); 
+  */
      
   
@@ -405 +407 @@
     free(out.regionlist); out.regionlist=NULL;
   }
-  if(!points_connected ){
+  
+  /*if(!points_connected ){
     free(points_connected ); points_connected =NULL;
-  }     
+    }     */
   return Py_BuildValue((char *)"O", holder);
 }

anuga_core/source/anuga/pmesh/mesh.py

@@ -1533 +1533 @@
                                                    ObjectNeighbor[2])
             index += 1
-        genDict['lonepointlist'].sort() 
-        genDict['lonepointlist'].reverse()       
-        for loner in genDict['lonepointlist']:
+        #genDict['lonepointlist'].sort() 
+        #genDict['lonepointlist'].reverse()       
+        #for loner in genDict['lonepointlist']:
             # Remove the loner vertex
             #print "Removing the loner", loner
-            self.meshVertices.pop(loner)
+            #self.meshVertices.pop(loner)
 
     def setMesh(self, genDict):