Changeset 4458


Ignore:
Timestamp:
May 16, 2007, 4:37:49 PM (17 years ago)
Author:
duncan
Message:

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

Location:
anuga_core/source/anuga
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/mesh_engine/mesh_engine.py

    r4449 r4458  
    106106    #print "mode", mode
    107107    if mode.find('n'):
     108        #pass
    108109        mode = 'j' + mode
    109110        # j- Jettisons vertices that are not part of the final
  • anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

    r4158 r4458  
    208208     
    209209  /* list of int's, used to keep track of which verts are connected to
    210      triangles. */
     210     triangles.
    211211  points_connected = (int *)malloc(out.numberofpoints*sizeof(int));
    212   /* lone_verts = (int *)malloc(out.numberofpoints*sizeof(int)); */
    213  
    214   /* Initialise lone vert list */
     212  lone_verts = (int *)malloc(out.numberofpoints*sizeof(int)); */
     213 
     214  /* Initialise lone vert list
    215215  for(i=0; i<out.numberofpoints;i++){
    216216    points_connected[i] = 0;
    217     /* lone_verts[i] = 0; */
    218   } 
     217     lone_verts[i] = 0;
     218  } */
     219   
    219220 
    220221  /* Add triangle list */
     
    229230    printf(" A vert index %i\n",out.trianglelist[i*3+1] );
    230231    printf(" A vert index %i\n",out.trianglelist[i*3+2] ); */
    231     points_connected[out.trianglelist[i*3]] = 1;
     232    /* points_connected[out.trianglelist[i*3]] = 1;
    232233    points_connected[out.trianglelist[i*3+1]] = 1;
    233     points_connected[out.trianglelist[i*3+2]] = 1;
     234    points_connected[out.trianglelist[i*3+2]] = 1;*/
    234235    /* lone_verts[out.trianglelist[i*3]] = 1;
    235236    lone_verts[out.trianglelist[i*3+1]] = 1;
     
    242243  /* convert the points_connected vector from a true(1) false(0) vector, where
    243244     index is the vert, to a vector of the lone verts, at the beggining
    244      of the vector. */
     245     of the vector.
    245246  write_here = 0;   
    246247  for(i=0; i<out.numberofpoints;i++){
    247     /* lone_verts[i-write_here] = lone_verts[i]; */
    248248    if (0 == points_connected[i]) {
    249249      points_connected[write_here] = i;
    250250      write_here ++;
    251251    }
    252   }   
     252  }   */
    253253  /* printf(" ******************** \n" );
    254254  for(i=0; i<write_here;i++){
     
    256256    } */
    257257 
     258  /*  *** since I'm passing -j in to the mode we don't need this list
    258259  listsize = write_here;
    259260  holderlist = PyList_New(listsize);
     
    264265  ii=PyString_FromString("lonepointlist");
    265266  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
     267  */
    266268     
    267269 
     
    405407    free(out.regionlist); out.regionlist=NULL;
    406408  }
    407   if(!points_connected ){
     409 
     410  /*if(!points_connected ){
    408411    free(points_connected ); points_connected =NULL;
    409   }     
     412    }     */
    410413  return Py_BuildValue((char *)"O", holder);
    411414}
  • anuga_core/source/anuga/pmesh/mesh.py

    r4382 r4458  
    15331533                                                   ObjectNeighbor[2])
    15341534            index += 1
    1535         genDict['lonepointlist'].sort()
    1536         genDict['lonepointlist'].reverse()       
    1537         for loner in genDict['lonepointlist']:
     1535        #genDict['lonepointlist'].sort()
     1536        #genDict['lonepointlist'].reverse()       
     1537        #for loner in genDict['lonepointlist']:
    15381538            # Remove the loner vertex
    15391539            #print "Removing the loner", loner
    1540             self.meshVertices.pop(loner)
     1540            #self.meshVertices.pop(loner)
    15411541
    15421542    def setMesh(self, genDict):
Note: See TracChangeset for help on using the changeset viewer.