From 136a04255295301471abd4710d8822eded889a03 Mon Sep 17 00:00:00 2001
From: Tristan Carrier Baudouin <tristan.carrier@uclouvain.be>
Date: Fri, 13 Sep 2013 09:06:44 +0000
Subject: [PATCH] Store the directions in the GFaces of the model to avoid
recomputing them after the 3D meshing. These changes should have no impact
unless the option R-tree (experimental) is selected.
---
Geo/GFace.h | 4 +-
Mesh/directions3D.cpp | 448 +++++++++++++++---------------------------
Mesh/directions3D.h | 10 +-
Mesh/meshGFace.cpp | 152 +++++++++++++-
Mesh/meshGFace.h | 10 +-
5 files changed, 323 insertions(+), 301 deletions(-)
diff --git a/Geo/GFace.h b/Geo/GFace.h
index 938f29a521..d7d5d55932 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -338,7 +338,9 @@ class GFace : public GEntity
// get the boundary layer columns
BoundaryLayerColumns *getColumns () {return &_columns;}
-
+ std::vector<SPoint3> storage1; //directions storage
+ std::vector<SVector3> storage2; //directions storage
+ std::vector<SVector3> storage3; //directions storage
};
#endif
diff --git a/Mesh/directions3D.cpp b/Mesh/directions3D.cpp
index 1c355b1d7c..a782f75c87 100644
--- a/Mesh/directions3D.cpp
+++ b/Mesh/directions3D.cpp
@@ -22,98 +22,56 @@
#include "linearSystemFull.h"
#endif
-
-
/****************class Frame_field****************/
Frame_field::Frame_field(){}
void Frame_field::init_region(GRegion* gr){
- // Fill in a ANN tree with the bondary cross field of region gr
#if defined(HAVE_ANN)
- int index;
- MVertex* vertex;
+ // Fill in a ANN tree with the boundary cross field of region gr
+ unsigned int i;
GFace* gf;
std::list<GFace*> faces;
- STensor3 m(1.0);
-
+ std::list<GFace*>::iterator it;
+
Nearest_point::init_region(gr);
-
+
faces = gr->faces();
-
- temp.clear();
+
field.clear();
-
- for( std::list<GFace*>::iterator it=faces.begin();it!=faces.end();it++){
+
+ for(it=faces.begin();it!=faces.end();it++){
gf = *it;
- init_face(gf);
+ init_face(gf);
}
-
- ANNpointArray duplicate = annAllocPts(temp.size(),3);
-
- index = 0;
- for(std::map<MVertex*,STensor3>::iterator it=temp.begin(); it != temp.end(); it++){
- vertex = it->first;
- m = it->second;
- duplicate[index][0] = vertex->x();
- duplicate[index][1] = vertex->y();
- duplicate[index][2] = vertex->z();
- field.push_back(std::pair<MVertex*,STensor3>(vertex,m));
- index++;
+
+ ANNpointArray duplicate = annAllocPts(field.size(),3);
+
+ for(i=0;i<field.size();i++){
+ duplicate[i][0] = field[i].first.x();
+ duplicate[i][1] = field[i].first.y();
+ duplicate[i][2] = field[i].first.z();
}
-
- kd_tree = new ANNkd_tree(duplicate, temp.size(), 3);
+
+ kd_tree = new ANNkd_tree(duplicate,field.size(),3);
#endif
}
void Frame_field::init_face(GFace* gf){
- // Fills the auxiliary std::map "temp" with a pair <vertex, STensor3>
+ // Fills the auxiliary std::map "field" with a pair <SPoint3, STensor3>
// for each vertex of the face gf.
unsigned int i;
- int j;
- bool ok;
- double average_x,average_y;
- SPoint2 point;
- SVector3 v1,v2,v3;
- MVertex* vertex;
- MElement* element;
- MElementOctree* octree;
+ SPoint3 point;
+ SVector3 v1;
+ SVector3 v2;
+ SVector3 v3;
STensor3 m(1.0);
-
- if(gf->geomType()==GEntity::CompoundSurface){
- ((GFaceCompound*)gf)->deleteInternals();
- ((GFaceCompound*)gf)->parametrize();
- }
- backgroundMesh::set(gf);
- octree = backgroundMesh::current()->get_octree();
-
- for(i=0;i<gf->getNumMeshElements();i++){
- element = gf->getMeshElement(i);
-
- average_x = 0.0;
- average_y = 0.0;
-
- for(j=0;j<element->getNumVertices();j++){
- vertex = element->getVertex(j);
- reparamMeshVertexOnFace(vertex,gf,point);
- average_x = average_x + point.x();
- average_y = average_y + point.y();
- }
-
- average_x = average_x/element->getNumVertices();
- average_y = average_y/element->getNumVertices();
-
- for(j=0;j<element->getNumVertices();j++){
- vertex = element->getVertex(j);
-
- if(gf->geomType()==GEntity::CompoundSurface){
- ok = translate(gf,octree,vertex,SPoint2(average_x,average_y),v1,v2);
- }
- else{
- ok = improved_translate(gf,vertex,v1,v2);
- }
-
- if(ok){
+
+ for(i=0;i<gf->storage1.size();i++){
+ point = gf->storage1[i];
+ v1 = gf->storage2[i];
+ v2 = gf->storage3[i];
+
v1.normalize();
v2.normalize();
v3 = crossprod(v1,v2);
@@ -127,119 +85,34 @@ void Frame_field::init_face(GFace* gf){
m.set_m13(v3.x());
m.set_m23(v3.y());
m.set_m33(v3.z());
- temp.insert(std::pair<MVertex*,STensor3>(vertex,m));
- }
- }
+ field.push_back(std::pair<SPoint3,STensor3>(point,m));
}
}
-bool Frame_field::translate(GFace* gf,MElementOctree* octree,MVertex* vertex,SPoint2 corr,SVector3& v1,SVector3& v2){
- bool ok;
- double k;
- double size;
- double angle;
- double delta_x;
- double delta_y;
- double x,y;
- double x1,y1;
- double x2,y2;
- SPoint2 point;
- GPoint gp1;
- GPoint gp2;
-
- ok = true;
- k = 0.0001;
- reparamMeshVertexOnFace(vertex,gf,point);
- x = point.x();
- y = point.y();
- size = backgroundMesh::current()->operator()(x,y,0.0)*get_ratio(gf,corr);
- angle = backgroundMesh::current()->getAngle(x,y,0.0);
-
- delta_x = k*size*cos(angle);
- delta_y = k*size*sin(angle);
-
- x1 = x + delta_x;
- y1 = y + delta_y;
- x2 = x + delta_y;
- y2 = y - delta_x;
-
- if(!inside_domain(octree,x1,y1)){
- x1 = x - delta_x;
- y1 = y - delta_y;
- if(!inside_domain(octree,x1,y1)) ok = false;
- }
- if(!inside_domain(octree,x2,y2)){
- x2 = x - delta_y;
- y2 = y + delta_x;
- if(!inside_domain(octree,x2,y2)) ok = false;
- }
-
- ok = true; //?
-
- if(ok){
- gp1 = gf->point(x1,y1);
- gp2 = gf->point(x2,y2);
- v1 = SVector3(gp1.x()-vertex->x(),gp1.y()-vertex->y(),gp1.z()-vertex->z());
- v2 = SVector3(gp2.x()-vertex->x(),gp2.y()-vertex->y(),gp2.z()-vertex->z());
- }
- else{
- v1 = SVector3(1.0,0.0,0.0);
- v2 = SVector3(0.0,1.0,0.0);
- }
- return ok;
-}
-
-bool Frame_field::improved_translate(GFace* gf,MVertex* vertex,SVector3& v1,SVector3& v2){
- double x,y;
- double angle;
- SPoint2 point;
- SVector3 s1,s2;
- SVector3 normal;
- SVector3 basis_u,basis_v;
- Pair<SVector3,SVector3> derivatives;
-
- reparamMeshVertexOnFace(vertex,gf,point);
- x = point.x();
- y = point.y();
-
- angle = backgroundMesh::current()->getAngle(x,y,0.0);
- derivatives = gf->firstDer(point);
-
- s1 = derivatives.first();
- s2 = derivatives.second();
- normal = crossprod(s1,s2);
-
- basis_u = s1;
- basis_u.normalize();
- basis_v = crossprod(normal,basis_u);
- basis_v.normalize();
-
- v1 = basis_u*cos(angle) + basis_v*sin(angle);
- v2 = crossprod(v1,normal);
-
- return 1;
-}
-
STensor3 Frame_field::search(double x,double y,double z){
// Determines the frame/cross at location (x,y,z)
- int index=0;
+ int index = 0;
#if defined(HAVE_ANN)
ANNpoint query;
ANNidxArray indices;
ANNdistArray distances;
-
+
+ if(field.size()==0){
+ return STensor3(1.0);
+ }
+
query = annAllocPt(3);
query[0] = x;
query[1] = y;
query[2] = z;
-
+
indices = new ANNidx[1];
distances = new ANNdist[1];
-
+
double e = 0.0;
kd_tree->annkSearch(query,1,indices,distances,e);
index = indices[0];
-
+
annDeallocPt(query);
delete[] indices;
delete[] distances;
@@ -256,119 +129,105 @@ STensor3 Frame_field::combine(double x,double y,double z){
SVector3 vec1,vec2,vec3;
SVector3 final1,final2;
STensor3 m(1.0),m2(1.0);
-
+
m = search(x,y,z);
m2 = m;
ok = Nearest_point::search(x,y,z,vec);
-
+ vec.normalize();
+
if(ok){
vec1 = SVector3(m.get_m11(),m.get_m21(),m.get_m31());
- vec2 = SVector3(m.get_m12(),m.get_m22(),m.get_m32());
- vec3 = SVector3(m.get_m13(),m.get_m23(),m.get_m33());
-
- val1 = fabs(dot(vec,vec1));
- val2 = fabs(dot(vec,vec2));
- val3 = fabs(dot(vec,vec3));
-
- if(val1<=val2 && val1<=val3){
- other = vec1;
- }
- else if(val2<=val1 && val2<=val3){
+ vec2 = SVector3(m.get_m12(),m.get_m22(),m.get_m32());
+ vec3 = SVector3(m.get_m13(),m.get_m23(),m.get_m33());
+
+ val1 = fabs(dot(vec,vec1));
+ val2 = fabs(dot(vec,vec2));
+ val3 = fabs(dot(vec,vec3));
+
+ if(val1<=val2 && val1<=val3){
+ other = vec1;
+ }
+ else if(val2<=val1 && val2<=val3){
other = vec2;
- }
- else{
- other = vec3;
- }
-
- final1 = crossprod(vec,other);
- final1.normalize();
- final2 = crossprod(vec,final1);
-
+ }
+ else{
+ other = vec3;
+ }
+
+ final1 = crossprod(vec,other);
+ final1.normalize();
+ final2 = crossprod(vec,final1);
+ final2.normalize();
+
m2.set_m11(vec.x());
- m2.set_m21(vec.y());
- m2.set_m31(vec.z());
- m2.set_m12(final1.x());
- m2.set_m22(final1.y());
- m2.set_m32(final1.z());
- m2.set_m13(final2.x());
- m2.set_m23(final2.y());
- m2.set_m33(final2.z());
+ m2.set_m21(vec.y());
+ m2.set_m31(vec.z());
+ m2.set_m12(final1.x());
+ m2.set_m22(final1.y());
+ m2.set_m32(final1.z());
+ m2.set_m13(final2.x());
+ m2.set_m23(final2.y());
+ m2.set_m33(final2.z());
}
-
+
return m2;
}
-bool Frame_field::inside_domain(MElementOctree* octree,double x,double y){
- MElement* element;
- element = (MElement*)octree->find(x,y,0.0,2,true);
- if(element!=NULL) return 1;
- else return 0;
-}
-
-double Frame_field::get_ratio(GFace* gf,SPoint2 point){
- double val;
- double uv[2];
- double tab[3];
-
- uv[0] = point.x();
- uv[1] = point.y();
- buildMetric(gf,uv,tab);
- val = 1.0/pow(tab[0]*tab[2]-tab[1]*tab[1],0.25);
- return val;
-}
-
-void Frame_field::print_segment(SPoint3 p1,SPoint3 p2,double val1, double val2, std::ofstream& file){
+void Frame_field::print_segment(SPoint3 p1,SPoint3 p2,double val1,double val2,std::ofstream& file){
file << "SL ("
<< p1.x() << ", " << p1.y() << ", " << p1.z() << ", "
<< p2.x() << ", " << p2.y() << ", " << p2.z() << ")"
- << "{" << val1 << "," << val2 << "};\n";
+ << "{" << val1 << "," << val2 << "};\n";
}
void Frame_field::print_field1(){
// Saves a file with the surface cross field contained in Frame_field.temp
// Frame_field.temp is constructed by Frame_field::init_region
+ unsigned int i;
double k;
- SPoint3 p;
+ double color1;
+ double color2;
+ SPoint3 point;
SPoint3 p1,p2,p3,p4,p5,p6;
- MVertex* vertex;
- std::map<MVertex*,STensor3>::iterator it;
STensor3 m(1.0);
-
+
k = 0.05;
std::ofstream file("frame1.pos");
file << "View \"cross field\" {\n";
-
- for(it=temp.begin();it!=temp.end();it++){
- vertex = it->first;
- m = it->second;
-
- p = SPoint3(vertex->x(),vertex->y(),vertex->z());
- p1 = SPoint3(vertex->x() + k*m.get_m11(),
- vertex->y() + k*m.get_m21(),
- vertex->z() + k*m.get_m31());
- p2 = SPoint3(vertex->x() - k*m.get_m11(),
- vertex->y() - k*m.get_m21(),
- vertex->z() - k*m.get_m31());
- p3 = SPoint3(vertex->x() + k*m.get_m12(),
- vertex->y() + k*m.get_m22(),
- vertex->z() + k*m.get_m32());
- p4 = SPoint3(vertex->x() - k*m.get_m12(),
- vertex->y() - k*m.get_m22(),
- vertex->z() - k*m.get_m32());
- p5 = SPoint3(vertex->x() + k*m.get_m13(),
- vertex->y() + k*m.get_m23(),
- vertex->z() + k*m.get_m33());
- p6 = SPoint3(vertex->x() - k*m.get_m13(),
- vertex->y() - k*m.get_m23(),
- vertex->z() - k*m.get_m33());
- double val1=10, val2=20;
- print_segment(p,p1,val1,val2,file);
- print_segment(p,p2,val1,val2,file);
- print_segment(p,p3,val1,val2,file);
- print_segment(p,p4,val1,val2,file);
- print_segment(p,p5,val1,val2,file);
- print_segment(p,p6,val1,val2,file);
+ color1 = 10.0;
+ color2 = 20.0;
+
+ for(i=0;i<field.size();i++){
+ point = field[i].first;
+ m = field[i].second;
+
+ p1 = SPoint3(point.x() + k*m.get_m11(),
+ point.y() + k*m.get_m21(),
+ point.z() + k*m.get_m31());
+ p2 = SPoint3(point.x() - k*m.get_m11(),
+ point.y() - k*m.get_m21(),
+ point.z() - k*m.get_m31());
+ p3 = SPoint3(point.x() + k*m.get_m12(),
+ point.y() + k*m.get_m22(),
+ point.z() + k*m.get_m32());
+ p4 = SPoint3(point.x() - k*m.get_m12(),
+ point.y() - k*m.get_m22(),
+ point.z() - k*m.get_m32());
+ p5 = SPoint3(point.x() + k*m.get_m13(),
+ point.y() + k*m.get_m23(),
+ point.z() + k*m.get_m33());
+ p6 = SPoint3(point.x() - k*m.get_m13(),
+ point.y() - k*m.get_m23(),
+ point.z() - k*m.get_m33());
+
+ print_segment(point,p1,color1,color2,file);
+ print_segment(point,p2,color1,color2,file);
+ print_segment(point,p3,color1,color2,file);
+ print_segment(point,p4,color1,color2,file);
+ print_segment(point,p5,color1,color2,file);
+ print_segment(point,p6,color1,color2,file);
}
+
file << "};\n";
}
@@ -377,51 +236,57 @@ void Frame_field::print_field2(GRegion* gr){
unsigned int i;
int j;
double k;
- SPoint3 p;
+ double color1;
+ double color2;
+ SPoint3 point;
SPoint3 p1,p2,p3,p4,p5,p6;
MVertex* vertex;
MElement* element;
STensor3 m(1.0);
-
+
k = 0.05;
std::ofstream file("frame2.pos");
file << "View \"cross field\" {\n";
-
+ color1 = 10.0;
+ color2 = 20.0;
+
for(i=0;i<gr->getNumMeshElements();i++){
element = gr->getMeshElement(i);
- for(j=0;j<element->getNumVertices();j++){
- vertex = element->getVertex(j);
- if(vertex->onWhat()->dim()>2){
- m = search(vertex->x(),vertex->y(),vertex->z());
- p = SPoint3(vertex->x(),vertex->y(),vertex->z());
- p1 = SPoint3(vertex->x() + k*m.get_m11(),
- vertex->y() + k*m.get_m21(),
- vertex->z() + k*m.get_m31());
- p2 = SPoint3(vertex->x() - k*m.get_m11(),
- vertex->y() - k*m.get_m21(),
- vertex->z() - k*m.get_m31());
- p3 = SPoint3(vertex->x() + k*m.get_m12(),
- vertex->y() + k*m.get_m22(),
- vertex->z() + k*m.get_m32());
- p4 = SPoint3(vertex->x() - k*m.get_m12(),
- vertex->y() - k*m.get_m22(),
- vertex->z() - k*m.get_m32());
- p5 = SPoint3(vertex->x() + k*m.get_m13(),
- vertex->y() + k*m.get_m23(),
- vertex->z() + k*m.get_m33());
- p6 = SPoint3(vertex->x() - k*m.get_m13(),
- vertex->y() - k*m.get_m23(),
- vertex->z() - k*m.get_m33());
- double val1=10, val2=20;
- print_segment(p,p1,val1,val2,file);
- print_segment(p,p2,val1,val2,file);
- print_segment(p,p3,val1,val2,file);
- print_segment(p,p4,val1,val2,file);
- print_segment(p,p5,val1,val2,file);
- print_segment(p,p6,val1,val2,file);
- }
+ for(j=0;j<element->getNumVertices();j++){
+ vertex = element->getVertex(j);
+ if(vertex->onWhat()->dim()>2){
+ point = SPoint3(vertex->x(),vertex->y(),vertex->z());
+ m = search(vertex->x(),vertex->y(),vertex->z());
+
+ p1 = SPoint3(point.x() + k*m.get_m11(),
+ point.y() + k*m.get_m21(),
+ point.z() + k*m.get_m31());
+ p2 = SPoint3(point.x() - k*m.get_m11(),
+ point.y() - k*m.get_m21(),
+ point.z() - k*m.get_m31());
+ p3 = SPoint3(point.x() + k*m.get_m12(),
+ point.y() + k*m.get_m22(),
+ point.z() + k*m.get_m32());
+ p4 = SPoint3(point.x() - k*m.get_m12(),
+ point.y() - k*m.get_m22(),
+ point.z() - k*m.get_m32());
+ p5 = SPoint3(point.x() + k*m.get_m13(),
+ point.y() + k*m.get_m23(),
+ point.z() + k*m.get_m33());
+ p6 = SPoint3(point.x() - k*m.get_m13(),
+ point.y() - k*m.get_m23(),
+ point.z() - k*m.get_m33());
+
+ print_segment(point,p1,color1,color2,file);
+ print_segment(point,p2,color1,color2,file);
+ print_segment(point,p3,color1,color2,file);
+ print_segment(point,p4,color1,color2,file);
+ print_segment(point,p5,color1,color2,file);
+ print_segment(point,p6,color1,color2,file);
+ }
}
}
+
file << "};\n";
}
@@ -434,7 +299,6 @@ GRegion* Frame_field::test(){
void Frame_field::clear(){
Nearest_point::clear();
- temp.clear();
field.clear();
#if defined(HAVE_ANN)
delete kd_tree->thePoints();
@@ -1167,6 +1031,10 @@ void Size_field::init_region(GRegion* gr){
for(it=faces.begin();it!=faces.end();it++){
gf = *it;
+ if(gf->geomType()==GEntity::CompoundSurface){
+ ((GFaceCompound*)gf)->deleteInternals();
+ ((GFaceCompound*)gf)->parametrize();
+ }
backgroundMesh::set(gf);
for(i=0;i<gf->getNumMeshElements();i++){
@@ -1412,6 +1280,7 @@ GRegion* Size_field::test(){
}
void Size_field::clear(){
+ backgroundMesh::unset();
delete octree;
boundary.clear();
}
@@ -1719,8 +1588,7 @@ void Nearest_point::clear(){
/****************static declarations****************/
-std::map<MVertex*,STensor3> Frame_field::temp;
-std::vector<std::pair<MVertex*,STensor3> > Frame_field::field;
+std::vector<std::pair<SPoint3,STensor3> > Frame_field::field;
std::map<MVertex*, STensor3> Frame_field::crossField;
std::map<MEdge, double, Less_Edge> Frame_field::crossDist;
std::map<MVertex*,std::set<MVertex*> > Frame_field::vertex_to_vertices;
diff --git a/Mesh/directions3D.h b/Mesh/directions3D.h
index b52f7947b1..4f7d55b46d 100644
--- a/Mesh/directions3D.h
+++ b/Mesh/directions3D.h
@@ -25,8 +25,7 @@ struct lowerThan {
class Frame_field{
private:
- static std::map<MVertex*, STensor3> temp;
- static std::vector<std::pair<MVertex*, STensor3> > field;
+ static std::vector<std::pair<SPoint3,STensor3> > field;
static std::map<MVertex*, STensor3> crossField;
static std::map<MEdge, double, Less_Edge> crossDist;
static std::vector<MVertex*> listVertices;
@@ -38,12 +37,8 @@ class Frame_field{
public:
static void init_region(GRegion*);
static void init_face(GFace*);
- static bool translate(GFace*,MElementOctree*,MVertex*,SPoint2,SVector3&,SVector3&);
- static bool improved_translate(GFace*,MVertex*,SVector3&,SVector3&);
static STensor3 search(double,double,double);
static STensor3 combine(double,double,double);
- static bool inside_domain(MElementOctree*,double,double);
- static double get_ratio(GFace*,SPoint2);
static void print_field1();
static void print_field2(GRegion*);
static void print_segment(SPoint3,SPoint3,double,double,std::ofstream&);
@@ -62,8 +57,7 @@ class Frame_field{
static double smoothRegion(GRegion *gr, int n);
static double smooth();
static double findBarycenter(std::map<MVertex*, std::set<MVertex*> >::const_iterator iter, STensor3 &m0);
- static void save(const std::vector<std::pair<SPoint3, STensor3> > data,
- const std::string& filename);
+ static void save(const std::vector<std::pair<SPoint3, STensor3> > data, const std::string& filename);
static void saveCrossField(const std::string& filename, double scale, bool full=true);
static void continuousCrossField(GRegion *gr, GFace *gf);
static void recur_connect_vert(FILE*fi, int count, MVertex *v,STensor3 &cross, std::multimap<MVertex*,MVertex*> &v2v, std::set<MVertex*> &touched);
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 27213055de..5bca57be8e 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1346,7 +1346,11 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
gf->additionalVertices.end());
gf->additionalVertices.clear();
- return true;
+ if(CTX::instance()->mesh.algo3d==ALGO_3D_RTREE){
+ directions_storage(gf);
+ }
+
+ return true;
}
// this function buils a list of vertices (BDS) that are consecutive
@@ -2498,3 +2502,149 @@ void orientMeshGFace::operator()(GFace *gf)
for(unsigned int k = 0; k < gf->getNumMeshElements(); k++)
gf->getMeshElement(k)->reverse();
}
+
+void directions_storage(GFace* gf){
+ bool ok;
+ unsigned int i;
+ int j;
+ MVertex* vertex;
+ MElement* element;
+ SVector3 v1;
+ SVector3 v2;
+ MElementOctree* octree;
+ std::set<MVertex*> vertices;
+ std::set<MVertex*>::iterator it;
+
+ vertices.clear();
+
+ for(i=0;i<gf->getNumMeshElements();i++){
+ element = gf->getMeshElement(i);
+ for(j=0;j<element->getNumVertices();j++){
+ vertex = element->getVertex(j);
+ vertices.insert(vertex);
+ }
+ }
+
+ backgroundMesh::set(gf);
+ octree = backgroundMesh::current()->get_octree();
+
+ gf->storage1.clear();
+ gf->storage2.clear();
+ gf->storage3.clear();
+
+ for(it=vertices.begin();it!=vertices.end();it++){
+ ok = 0;
+
+ if(!gf->getCompound()){
+ if(gf->geomType()==GEntity::CompoundSurface){
+ ok = translate(gf,octree,*it,SPoint2(0.0,0.0),v1,v2);
+ }
+ else{
+ ok = improved_translate(gf,*it,v1,v2);
+ }
+ }
+
+ if(ok){
+ gf->storage1.push_back(SPoint3((*it)->x(),(*it)->y(),(*it)->z()));
+ gf->storage2.push_back(v1);
+ gf->storage3.push_back(v2);
+ }
+ }
+
+ backgroundMesh::unset();
+}
+
+bool translate(GFace* gf,MElementOctree* octree,MVertex* vertex,SPoint2 corr,SVector3& v1,SVector3& v2){
+ bool ok;
+ double k;
+ double size;
+ double angle;
+ double delta_x;
+ double delta_y;
+ double x,y;
+ double x1,y1;
+ double x2,y2;
+ SPoint2 point;
+ GPoint gp1;
+ GPoint gp2;
+
+ ok = true;
+ k = 0.0001;
+ reparamMeshVertexOnFace(vertex,gf,point);
+ x = point.x();
+ y = point.y();
+ size = backgroundMesh::current()->operator()(x,y,0.0)/**get_ratio(gf,corr)*/;
+ angle = backgroundMesh::current()->getAngle(x,y,0.0);
+
+ delta_x = k*size*cos(angle);
+ delta_y = k*size*sin(angle);
+
+ x1 = x + delta_x;
+ y1 = y + delta_y;
+ x2 = x + delta_y;
+ y2 = y - delta_x;
+
+ if(!inside_domain(octree,x1,y1)){
+ x1 = x - delta_x;
+ y1 = y - delta_y;
+ if(!inside_domain(octree,x1,y1)) ok = false;
+ }
+ if(!inside_domain(octree,x2,y2)){
+ x2 = x - delta_y;
+ y2 = y + delta_x;
+ if(!inside_domain(octree,x2,y2)) ok = false;
+ }
+
+ ok = true; //?
+
+ if(ok){
+ gp1 = gf->point(x1,y1);
+ gp2 = gf->point(x2,y2);
+ v1 = SVector3(gp1.x()-vertex->x(),gp1.y()-vertex->y(),gp1.z()-vertex->z());
+ v2 = SVector3(gp2.x()-vertex->x(),gp2.y()-vertex->y(),gp2.z()-vertex->z());
+ }
+ else{
+ v1 = SVector3(1.0,0.0,0.0);
+ v2 = SVector3(0.0,1.0,0.0);
+ }
+ return ok;
+}
+
+bool improved_translate(GFace* gf,MVertex* vertex,SVector3& v1,SVector3& v2){
+ double x,y;
+ double angle;
+ SPoint2 point;
+ SVector3 s1,s2;
+ SVector3 normal;
+ SVector3 basis_u,basis_v;
+ Pair<SVector3,SVector3> derivatives;
+
+ reparamMeshVertexOnFace(vertex,gf,point);
+ x = point.x();
+ y = point.y();
+
+ angle = backgroundMesh::current()->getAngle(x,y,0.0);
+ derivatives = gf->firstDer(point);
+
+ s1 = derivatives.first();
+ s2 = derivatives.second();
+ normal = crossprod(s1,s2);
+
+ basis_u = s1;
+ basis_u.normalize();
+ basis_v = crossprod(normal,basis_u);
+ basis_v.normalize();
+
+ v1 = basis_u*cos(angle) + basis_v*sin(angle);
+ v2 = crossprod(v1,normal);
+ v2.normalize();
+
+ return 1;
+}
+
+bool inside_domain(MElementOctree* octree,double x,double y){
+ MElement* element;
+ element = (MElement*)octree->find(x,y,0.0,2,true);
+ if(element!=NULL) return 1;
+ else return 0;
+}
diff --git a/Mesh/meshGFace.h b/Mesh/meshGFace.h
index 3eb7be382d..dc731b7550 100644
--- a/Mesh/meshGFace.h
+++ b/Mesh/meshGFace.h
@@ -9,6 +9,9 @@
#include <vector>
#include <set>
#include <list>
+#include "SPoint2.h"
+#include "SVector3.h"
+#include "MElementOctree.h"
class GEdge;
class GFace;
@@ -60,4 +63,9 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
bool debug = true,
std::list<GEdge*> *replacement_edges = 0);
-#endif
+void directions_storage(GFace*);
+bool translate(GFace*,MElementOctree*,MVertex*,SPoint2,SVector3&,SVector3&);
+bool improved_translate(GFace*,MVertex*,SVector3&,SVector3&);
+bool inside_domain(MElementOctree*,double,double);
+
+#endif
\ No newline at end of file
--
GitLab