Skip to content
Snippets Groups Projects
Commit 3dc8b6c6 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix compile without solver module

parent 8a9d90d2
No related branches found
No related tags found
No related merge requests found
...@@ -229,6 +229,9 @@ class GFaceCompound : public GFace { ...@@ -229,6 +229,9 @@ class GFaceCompound : public GFace {
SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const{} SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const{}
virtual SPoint2 getCoordinates(MVertex *v) const { return SPoint2(); } virtual SPoint2 getCoordinates(MVertex *v) const { return SPoint2(); }
void parametrize() const {} void parametrize() const {}
virtual std::list<GFace*> getCompounds() const { return std::list<GFace*>(); }
GPoint intersectionWithCircle (const SVector3 &n1, const SVector3 &n2, const SVector3 &p,
const double &d, double uv[2]) const { return GPoint(); }
}; };
#endif #endif
......
...@@ -93,6 +93,9 @@ class highOrderTools ...@@ -93,6 +93,9 @@ class highOrderTools
} }
void applyGlobalSmoothing (){} void applyGlobalSmoothing (){}
void ensureMinimumDistorsion (double threshold){} void ensureMinimumDistorsion (double threshold){}
double applySmoothingTo (GFace *gf, double tres = 0.1, bool mixed = false){ return 0.; }
void applySmoothingTo(std::vector<MElement*> & all, GFace *gf){}
double applySmoothingTo (std::vector<MElement*> &all, double threshold, bool mixed){ return 0.; }
}; };
#endif #endif
......
...@@ -1515,7 +1515,7 @@ static void printParamGrid(GFace *gf, std::vector<MVertex*> vert1, std::vector<M ...@@ -1515,7 +1515,7 @@ static void printParamGrid(GFace *gf, std::vector<MVertex*> vert1, std::vector<M
} }
static void createRegularTwoCircleGrid (Centerline *center, GFace *gf) static void createRegularTwoCircleGrid (Centerline *center, GFace *gf)
{ {
#if defined(HAVE_ANN)
std::list<GEdge*> bedges = gf->edges(); std::list<GEdge*> bedges = gf->edges();
std::list<GEdge*>::iterator itb = bedges.begin(); std::list<GEdge*>::iterator itb = bedges.begin();
std::list<GEdge*>::iterator ite = bedges.end(); ite--; std::list<GEdge*>::iterator ite = bedges.end(); ite--;
...@@ -1565,7 +1565,6 @@ static void createRegularTwoCircleGrid (Centerline *center, GFace *gf) ...@@ -1565,7 +1565,6 @@ static void createRegularTwoCircleGrid (Centerline *center, GFace *gf)
vert2 = vert_temp; vert2 = vert_temp;
} }
#if defined(HAVE_ANN)
ANNpointArray nodes = annAllocPts(N, 3); ANNpointArray nodes = annAllocPts(N, 3);
ANNidxArray index = new ANNidx[1]; ANNidxArray index = new ANNidx[1];
ANNdistArray dist = new ANNdist[1]; ANNdistArray dist = new ANNdist[1];
...@@ -1593,7 +1592,6 @@ static void createRegularTwoCircleGrid (Centerline *center, GFace *gf) ...@@ -1593,7 +1592,6 @@ static void createRegularTwoCircleGrid (Centerline *center, GFace *gf)
delete[]index; delete[]index;
delete[]dist; delete[]dist;
annDeallocPts(nodes); annDeallocPts(nodes);
#endif;
MVertex *v0 = vert1[0]; SPoint2 p0; reparamMeshVertexOnFace(v0, gf, p0); MVertex *v0 = vert1[0]; SPoint2 p0; reparamMeshVertexOnFace(v0, gf, p0);
MVertex *v1 = vert1[N/2]; SPoint2 p1; reparamMeshVertexOnFace(v1, gf, p1); MVertex *v1 = vert1[N/2]; SPoint2 p1; reparamMeshVertexOnFace(v1, gf, p1);
...@@ -1642,12 +1640,11 @@ static void createRegularTwoCircleGrid (Centerline *center, GFace *gf) ...@@ -1642,12 +1640,11 @@ static void createRegularTwoCircleGrid (Centerline *center, GFace *gf)
q); q);
printParamGrid(gf, vert1, vert2, e01,e10,e23,e32,e02,e13, q); printParamGrid(gf, vert1, vert2, e01,e10,e23,e32,e02,e13, q);
#endif;
} }
static bool meshGeneratorElliptic(GFace *gf, bool debug = true) static bool meshGeneratorElliptic(GFace *gf, bool debug = true)
{ {
#if defined(HAVE_ANN) #if defined(HAVE_ANN)
Centerline *center = 0; Centerline *center = 0;
FieldManager *fields = GModel::current()->getFields(); FieldManager *fields = GModel::current()->getFields();
...@@ -1668,8 +1665,9 @@ static bool meshGeneratorElliptic(GFace *gf, bool debug = true) ...@@ -1668,8 +1665,9 @@ static bool meshGeneratorElliptic(GFace *gf, bool debug = true)
} }
else return false; else return false;
#else
return false;
#endif #endif
} }
static bool meshGeneratorPeriodic(GFace *gf, bool debug = true) static bool meshGeneratorPeriodic(GFace *gf, bool debug = true)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment