diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index 27668190c52443fab2e829cb844ca6520600946f..e7e91d7fa6d70bf36112b09308641f1ef7547820 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -12,8 +12,9 @@
#define SQU(a) ((a)*(a))
-// Cubic spline :
+// Cubic spline :
+/*
static void InterpolateBezier(Vertex *v[4], double t, Vertex &V)
{
V.lc = (1 - t) * v[1]->lc + t * v[2]->lc;
@@ -24,6 +25,7 @@ static void InterpolateBezier(Vertex *v[4], double t, Vertex &V)
V.Pos.Y = s[0]*v[0]->Pos.Y+s[1]*v[1]->Pos.Y+s[2]*v[2]->Pos.Y+s[3]*v[3]->Pos.Y;
V.Pos.Z = s[0]*v[0]->Pos.Z+s[1]*v[1]->Pos.Z+s[2]*v[2]->Pos.Z+s[3]*v[3]->Pos.Z;
}
+*/
static Vertex InterpolateCubicSpline(Vertex *v[4], double t)
{
@@ -237,7 +239,7 @@ static Vertex InterpolateUBS(Curve *Curve, double u, int derivee)
V.Pos.Z = pt.z();
return V;
}
- else
+ else
// return InterpolateCubicSpline(v, t, Curve->mat, derivee, t1, t2);
return InterpolateCubicSpline(v, t);
}
@@ -488,7 +490,7 @@ Vertex InterpolateCurve(Curve *c, double u, int derivee)
V.Pos.Y = pt.y();
V.Pos.Z = pt.z();
}
- else
+ else
InterpolateCatmullRom(v, t, V);
// V = InterpolateCubicSpline(v, t, c->mat, 0, t1, t2);
break;
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index b2ac9665f64617ddf1276b733cf2438ef20db2df..996b687174d0dc4a84c24cb05dab23e62015f1c6 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -671,7 +671,7 @@ void backgroundMesh::propagate1dMesh(GFace *_gf)
}
}
}
- }
+ }
}
simpleFunction<double> ONE(1.0);
@@ -773,12 +773,12 @@ inline double myAngle (const SVector3 &a, const SVector3 &b, const SVector3 &d){
return atan2 (sinTheta,cosTheta);
}
-// smoothness = h * (|grad (cos 4 a)| + |grad (sin 4 a)|)
+// smoothness = h * (|grad (cos 4 a)| + |grad (sin 4 a)|)
// smoothness is of order 1 if not smooth
// smoothness is of order h/L if smooth
// h --> mesh size
// L --> domain size
-double backgroundMesh::getSmoothness(MElement *e)
+double backgroundMesh::getSmoothness(MElement *e)
{
MVertex *v0 = _3Dto2D[e->getVertex(0)];
MVertex *v1 = _3Dto2D[e->getVertex(1)];
@@ -786,14 +786,14 @@ double backgroundMesh::getSmoothness(MElement *e)
std::map<MVertex*,double> :: const_iterator i0 = _angles.find (v0);
std::map<MVertex*,double> :: const_iterator i1 = _angles.find (v1);
std::map<MVertex*,double> :: const_iterator i2 = _angles.find (v2);
- double a[3] = {cos(4*i0->second),cos(4*i1->second),cos(4*i2->second)};
- double b[3] = {sin(4*i0->second),sin(4*i1->second),sin(4*i2->second)};
+ double a[3] = {cos(4*i0->second),cos(4*i1->second),cos(4*i2->second)};
+ double b[3] = {sin(4*i0->second),sin(4*i1->second),sin(4*i2->second)};
// printf("coucou\n");
double f[3];
- e->interpolateGrad(a,0,0,0,f);
+ e->interpolateGrad(a,0,0,0,f);
const double gradcos = sqrt (f[0]*f[0]+f[1]*f[1]+f[2]*f[2]);
- e->interpolateGrad(b,0,0,0,f);
- const double gradsin = sqrt (f[0]*f[0]+f[1]*f[1]+f[2]*f[2]);
+ e->interpolateGrad(b,0,0,0,f);
+ //const double gradsin = sqrt (f[0]*f[0]+f[1]*f[1]+f[2]*f[2]);
const double h = e->maxEdge();
return (gradcos /*+ gradsin*/) * h;
}
@@ -808,14 +808,14 @@ double backgroundMesh::getSmoothness(double u, double v, double w)
std::map<MVertex*,double> :: const_iterator i0 = _angles.find (v0);
std::map<MVertex*,double> :: const_iterator i1 = _angles.find (v1);
std::map<MVertex*,double> :: const_iterator i2 = _angles.find (v2);
- double a[3] = {cos(4*i0->second),cos(4*i1->second),cos(4*i2->second)};
- double b[3] = {sin(4*i0->second),sin(4*i1->second),sin(4*i2->second)};
+ double a[3] = {cos(4*i0->second),cos(4*i1->second),cos(4*i2->second)};
+ double b[3] = {sin(4*i0->second),sin(4*i1->second),sin(4*i2->second)};
// printf("coucou\n");
double f[3];
- e->interpolateGrad(a,0,0,0,f);
+ e->interpolateGrad(a,0,0,0,f);
const double gradcos = sqrt (f[0]*f[0]+f[1]*f[1]+f[2]*f[2]);
- e->interpolateGrad(b,0,0,0,f);
- const double gradsin = sqrt (f[0]*f[0]+f[1]*f[1]+f[2]*f[2]);
+ e->interpolateGrad(b,0,0,0,f);
+ //const double gradsin = sqrt (f[0]*f[0]+f[1]*f[1]+f[2]*f[2]);
const double h = e->maxEdge();
return (gradcos /*+ gradsin*/) * h;
}
@@ -832,7 +832,7 @@ void backgroundMesh::propagateCrossField(GFace *_gf)
// int NSMOOTH_NOW = 0;
for (unsigned int i = 0; i < _gf->triangles.size(); i++){
double smoothness = getSmoothness (_gf->triangles[i]);
- double val = smoothness < .5 ? 1.0 : 1.e-3 ;//exp(-absf/10);
+ double val = smoothness < .5 ? 1.0 : 1.e-3 ;//exp(-absf/10);
C.set(_gf->triangles[i],val);
}
// if (NSMOOTH_NOW == NSMOOTH) break;
@@ -1065,7 +1065,7 @@ double backgroundMesh::getAngle(double u, double v, double w) const
}
void backgroundMesh::print(const std::string &filename, GFace *gf,
- const std::map<MVertex*,double> &_whatToPrint, int smooth)
+ const std::map<MVertex*,double> &_whatToPrint, int smooth)
{
FILE *f = Fopen (filename.c_str(),"w");
fprintf(f,"View \"Background Mesh\"{\n");
@@ -1095,7 +1095,7 @@ void backgroundMesh::print(const std::string &filename, GFace *gf,
v2->x(),v2->y(),v2->z(),
v3->x(),v3->y(),v3->z(),itv1->second,itv2->second,itv3->second);
}
- else {
+ else {
GPoint p1 = gf->point(SPoint2(v1->x(),v1->y()));
GPoint p2 = gf->point(SPoint2(v2->x(),v2->y()));
GPoint p3 = gf->point(SPoint2(v3->x(),v3->y()));
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index 287daa268f611f53363fc379ab791b5ac8f47080..eb5f9cdcb2cc0535c3c1a09b9ace779f640e0b93 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -1786,7 +1786,7 @@ void bowyerWatsonParallelograms(GFace *gf,
double DT = (double)(t2-t1);
if (packed.size())
printf("points inserted DT %12.5E points per minute : %12.5E %d global searchs %d searchs per insertion\n",
- DT,60.*packed.size()/DT,N_GLOBAL_SEARCH,N_SEARCH / packed.size());
+ DT,60.*packed.size()/DT,N_GLOBAL_SEARCH, (int)(N_SEARCH/packed.size()));
transferDataStructure(gf, AllTris, DATA);
backgroundMesh::unset();
#if defined(HAVE_ANN)
diff --git a/Numeric/MetricBasis.cpp b/Numeric/MetricBasis.cpp
index 5a66ba26387db00bc2c57428cc7c536a5a915744..71076c6bf759bb2880026d3f31ced82bc59925d1 100644
--- a/Numeric/MetricBasis.cpp
+++ b/Numeric/MetricBasis.cpp
@@ -55,9 +55,8 @@ namespace {
}
MetricBasis::MetricBasis(int tag) :
- _type(ElementType::ParentTypeFromTag(tag)),
- _dim(ElementType::DimensionFromTag(tag)),
- _jacobian(NULL)
+ _jacobian(NULL), _type(ElementType::ParentTypeFromTag(tag)),
+ _dim(ElementType::DimensionFromTag(tag))
{
const bool serendip = false;
const int metOrder = metricOrder(tag);