diff --git a/Common/SmoothData.cpp b/Common/SmoothData.cpp
index 477b178ce254e400d982235705f718ccd98a40a0..80c24f8992e8cf509f65c4330f8a7db74026f141 100644
--- a/Common/SmoothData.cpp
+++ b/Common/SmoothData.cpp
@@ -26,6 +26,8 @@ xyzv::xyzv(const xyzv &other)
for(int i = 0; i < nbvals; i++)
vals[i] = other.vals[i];
}
+ else
+ vals = 0;
}
xyzv &xyzv::operator = (const xyzv &other)
@@ -103,7 +105,7 @@ void smooth_data::add_scale(double x, double y, double z, double scale_val)
std::set<xyzv, lessthanxyzv>::const_iterator it = c.find(xyz);
if(it == c.end()){
xyz.scale_update(scale_val);
- c.insert(xyz);
+ c.insert(xyz);
}
else {
// we can do this because we know that it will not destroy the set
diff --git a/Common/SmoothData.h b/Common/SmoothData.h
index 5765ffc9eb02776c249eb4465c3f5631a3092cf8..c3be8bc1a03c630e9961ddfb99d434fed05721ac 100644
--- a/Common/SmoothData.h
+++ b/Common/SmoothData.h
@@ -16,19 +16,21 @@ struct xyzv {
double x, y, z, *vals;
int nbvals;
int nboccurences;
- double scaleValue; // Added by Trevor Strickler for scaling last element layer in quadtri boundary layer to make better quality interfaces
+ // Added by Trevor Strickler for scaling last element layer in quadtri
+ // boundary layer to make better quality interfaces
+ double scaleValue;
int scale_numvals;
static double eps;
xyzv(double xx, double yy, double zz)
- : x(xx), y(yy), z(zz), vals(0), nbvals(0), nboccurences(0), scaleValue(1.0), scale_numvals(0) {} // Trevor Strickler modified
+ : x(xx), y(yy), z(zz), vals(0), nbvals(0), nboccurences(0),
+ scaleValue(1.0), scale_numvals(0) {}
~xyzv(){ if(vals) delete [] vals; }
- // these are needed for set<> operations since the default copy
- // constructor won't allocate *vals
+ // these are needed for set<> operations since the default copy constructor
+ // won't allocate *vals
xyzv(const xyzv & other);
xyzv & operator = (const xyzv &other);
void update(int n, double *v);
- void scale_update(double scale_val); // Trevor Strickler
-
+ void scale_update(double scale_val);
};
struct lessthanxyzv {
@@ -50,7 +52,7 @@ struct lessthanxyzv {
class smooth_data{
private:
- std::set<xyzv, lessthanxyzv> c;
+ std::set<xyzv, lessthanxyzv> c;
public:
typedef std::set<xyzv, lessthanxyzv>::iterator iter;
iter begin(){ return c.begin(); }
@@ -105,7 +107,7 @@ struct lessthanxyzn
class smooth_normals{
private:
float tol;
- std::set<xyzn, lessthanxyzn> c;
+ std::set<xyzn, lessthanxyzn> c;
public:
smooth_normals(double angle) : tol((float)angle) {}
void add(double x, double y, double z, double nx, double ny, double nz);
diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index 68bd1e8b0c989275d9effbbffd305a54f636c21e..80604e799a1bcdeee813606e18d82778d5d1a1d0 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -17,7 +17,8 @@
#include "closestPoint.h"
GEdge::GEdge(GModel *model, int tag, GVertex *_v0, GVertex *_v1)
- : GEntity(model, tag), _tooSmall(false), _cp(0), v0(_v0), v1(_v1), compound(0)
+ : GEntity(model, tag), _length(0.), _tooSmall(false), _cp(0),
+ v0(_v0), v1(_v1), compound(0)
{
if(v0) v0->addEdge(this);
if(v1 && v1 != v0) v1->addEdge(this);
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index b1c490452314734669f058115361178e4a2dcde4..515472f7b0ad105be45f061780fabc225f144549 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -63,8 +63,9 @@ GModel::GModel(std::string name)
: _maxVertexNum(0), _maxElementNum(0),
_checkPointedMaxVertexNum(0), _checkPointedMaxElementNum(0),
_name(name), _visible(1), _octree(0), _geo_internals(0),
- _occ_internals(0), _acis_internals(0), _fm_internals(0),
- _factory(0), _fields(0), _currentMeshEntity(0), normals(0)
+ _occ_internals(0), _sgeom_internals(0), _acis_internals(0),
+ _fm_internals(0), _factory(0), _fields(0), _currentMeshEntity(0),
+ normals(0)
{
partitionSize[0] = 0; partitionSize[1] = 0;
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index f7b69c2052cf00e9c3d9a83f06d5c7473b39a5e3..08de35b82016fc2aceaa6c6cbf9d20fd4c59048a 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -16,7 +16,8 @@
#include "VertexArray.h"
#include "boundaryLayersData.h"
-GRegion::GRegion(GModel *model, int tag) : GEntity (model, tag)
+GRegion::GRegion(GModel *model, int tag)
+ : GEntity (model, tag), compound(0)
{
resetMeshAttributes();
}
diff --git a/Geo/MVertex.h b/Geo/MVertex.h
index 945be239f5ed0eae2d74bc564fd689a4e4da1e31..6a6b7c4ff89649314d1f7be518e0cfc7dea3ffea 100644
--- a/Geo/MVertex.h
+++ b/Geo/MVertex.h
@@ -113,10 +113,10 @@ class MEdgeVertex : public MVertex{
MEdgeVertex(double x, double y, double z, GEntity *ge, double u, double lc = -1.0,
int num = 0)
- : MVertex(x, y, z, ge,num), _u(u), _lc(lc)
+ : MVertex(x, y, z, ge,num), _u(u), _lc(lc), bl_data(0)
{
}
- virtual ~MEdgeVertex(){}
+ virtual ~MEdgeVertex(){ if(bl_data) delete bl_data; }
virtual bool getParameter(int i, double &par) const { par = _u; return true; }
virtual bool setParameter(int i, double par){ _u = par; return true; }
double getLc() const { return _lc; }
@@ -129,10 +129,10 @@ class MFaceVertex : public MVertex{
MVertexBoundaryLayerData* bl_data;
MFaceVertex(double x, double y, double z, GEntity *ge, double u, double v, int num = 0)
- : MVertex(x, y, z, ge, num), _u(u), _v(v),bl_data(0)
+ : MVertex(x, y, z, ge, num), _u(u), _v(v), bl_data(0)
{
}
- virtual ~MFaceVertex(){if(bl_data) delete bl_data;}
+ virtual ~MFaceVertex(){ if(bl_data) delete bl_data; }
virtual bool getParameter(int i, double &par) const { par = (i ? _v : _u); return true; }
virtual bool setParameter(int i, double par)
{
diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp
index a4002f1f08c9a7077444b766e5f3d25337e10cfc..5762b8c0b0d837ebd0f6c824c452f37d98fd55ab 100644
--- a/Geo/gmshFace.cpp
+++ b/Geo/gmshFace.cpp
@@ -21,7 +21,7 @@
#endif
gmshFace::gmshFace(GModel *m, Surface *face)
- : GFace(m, face->Num), s(face)
+ : GFace(m, face->Num), s(face), isSphere(false), radius(0.)
{
resetMeshAttributes();
diff --git a/Mesh/Field.h b/Mesh/Field.h
index 1a2f78d7ca4074d64d332dae5b90090a6319f6f7..1711e8386b182452671af0449bb7a04c324f958c 100644
--- a/Mesh/Field.h
+++ b/Mesh/Field.h
@@ -77,7 +77,7 @@ class FieldOption {
class Field {
public:
- Field() {}
+ Field() : update_needed(false) {}
virtual ~Field();
int id;
std::map<std::string, FieldOption *> options;
@@ -87,12 +87,10 @@ class Field {
virtual double operator() (double x, double y, double z, GEntity *ge=0) = 0;
// anisotropic
virtual void operator() (double x, double y, double z, SMetric3 &, GEntity *ge=0){}
-
- //temporary
- virtual void operator()(double x,double y,double z,SVector3& v1,SVector3& v2,SVector3& v3,GEntity* ge=0){}
-
+ // temporary
+ virtual void operator()(double x, double y, double z, SVector3& v1, SVector3& v2,
+ SVector3& v3,GEntity* ge=0){}
bool update_needed;
- //void update(){ printf("up f \n"); return;}
virtual const char *getName() = 0;
#if defined(HAVE_POST)
void putOnView(PView * view, int comp = -1);
@@ -351,7 +349,7 @@ class GenericField : public Field{
~GenericField();
virtual double operator() (double x, double y, double z, GEntity *ge=0);
virtual const char *getName(){return "GenericField";};
-
+
// sets the callbacks
void setCallbackWithData(ptrfunction fct, void *data);
diff --git a/Solver/orthogonalTerm.h b/Solver/orthogonalTerm.h
index 5d0e5656c8a0da45390bec1a62cf92d97e5ecd84..8f55bc23e9f5c64b6793720cd484764cf4f7b1d5 100644
--- a/Solver/orthogonalTerm.h
+++ b/Solver/orthogonalTerm.h
@@ -16,15 +16,17 @@ class orthogonalTerm : public helmholtzTerm<double> {
bool withDof;
std::map<MVertex*, double > *_distance_map;
public:
- orthogonalTerm(GModel *gm, int iField, simpleFunction<double> *k,
- std::map<MVertex*, double > *distance_map)
- : helmholtzTerm<double>(gm, iField, iField, k, 0), withDof(false),
- _distance_map(distance_map) {}
+ orthogonalTerm(GModel *gm, int iField, simpleFunction<double> *k,
+ std::map<MVertex*, double > *distance_map)
+ : helmholtzTerm<double>(gm, iField, iField, k, 0), _pview(0), _dofView(0),
+ withDof(false), _distance_map(distance_map) {}
orthogonalTerm(GModel *gm, int iField, simpleFunction<double> *k, PView *pview)
- : helmholtzTerm<double>(gm, iField, iField, k, 0), _pview(pview), withDof(false) {}
- orthogonalTerm(GModel *gm, int iField, simpleFunction<double> *k,
- dofManager<double> *dofView)
- : helmholtzTerm<double>(gm, iField, iField, k, 0), _dofView(dofView), withDof(true) {}
+ : helmholtzTerm<double>(gm, iField, iField, k, 0), _pview(pview), _dofView(0),
+ withDof(false) {}
+ orthogonalTerm(GModel *gm, int iField, simpleFunction<double> *k,
+ dofManager<double> *dofView)
+ : helmholtzTerm<double>(gm, iField, iField, k, 0), _pview(0), _dofView(dofView),
+ withDof(true) {}
void elementVector(SElement *se, fullVector<double> &m) const
{
MElement *e = se->getMeshElement();