Skip to content
Snippets Groups Projects
Commit dec5e748 authored by Tristan Carrier Baudouin's avatar Tristan Carrier Baudouin
Browse files

correction of error in R-tree algorithm

parent 38351943
No related branches found
No related tags found
No related merge requests found
...@@ -314,8 +314,6 @@ void Filler::treat_model(){ ...@@ -314,8 +314,6 @@ void Filler::treat_model(){
GModel* model = GModel::current(); GModel* model = GModel::current();
GModel::riter it; GModel::riter it;
Frame_field::init_model();
for(it=model->firstRegion();it!=model->lastRegion();it++) for(it=model->firstRegion();it!=model->lastRegion();it++)
{ {
gr = *it; gr = *it;
...@@ -323,8 +321,6 @@ void Filler::treat_model(){ ...@@ -323,8 +321,6 @@ void Filler::treat_model(){
treat_region(gr); treat_region(gr);
} }
} }
Frame_field::clear();
} }
void Filler::treat_region(GRegion* gr){ void Filler::treat_region(GRegion* gr){
...@@ -349,6 +345,7 @@ void Filler::treat_region(GRegion* gr){ ...@@ -349,6 +345,7 @@ void Filler::treat_region(GRegion* gr){
std::set<MVertex*>::iterator it; std::set<MVertex*>::iterator it;
RTree<Node*,double,3,double> rtree; RTree<Node*,double,3,double> rtree;
Frame_field::init_model();
octree = new MElementOctree(gr->model()); octree = new MElementOctree(gr->model());
for(i=0;i<gr->getNumMeshElements();i++){ for(i=0;i<gr->getNumMeshElements();i++){
...@@ -438,6 +435,7 @@ void Filler::treat_region(GRegion* gr){ ...@@ -438,6 +435,7 @@ void Filler::treat_region(GRegion* gr){
for(i=0;i<garbage.size();i++) delete garbage[i]; for(i=0;i<garbage.size();i++) delete garbage[i];
for(i=0;i<new_vertices.size();i++) delete new_vertices[i]; for(i=0;i<new_vertices.size();i++) delete new_vertices[i];
new_vertices.clear(); new_vertices.clear();
Frame_field::clear();
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment