diff --git a/Solver/elasticitySolver.h b/Solver/elasticitySolver.h index 58331aa5aaeb1465594b390f5ecec968e5c64551..6e1b59747119d1c4449c4956c5bffb891efe2238 100644 --- a/Solver/elasticitySolver.h +++ b/Solver/elasticitySolver.h @@ -23,23 +23,23 @@ struct LagrangeMultiplierField { double _tau; SVector3 _d; simpleFunction<double> _f; - LagrangeMultiplierField() : g(0),_tag(0){} + LagrangeMultiplierField() : _tag(0), g(0){} }; struct elasticField { int _tag; // tag for the dofManager groupOfElements *g; // support for this field double _E, _nu; // specific elastic datas (should be somewhere else) - elasticField () : g(0),_tag(0){} + elasticField () : _tag(0), g(0){} }; struct BoundaryCondition { + int _tag; // tag for the dofManager enum location{UNDEF,ON_VERTEX,ON_EDGE,ON_FACE,ON_VOLUME}; location onWhat; // on vertices or elements - int _tag; // tag for the dofManager groupOfElements *g; // support for this BC - BoundaryCondition() : g(0),_tag(0),onWhat(UNDEF) {} + BoundaryCondition() : _tag(0),onWhat(UNDEF),g(0) {} }; struct dirichletBC : public BoundaryCondition @@ -74,7 +74,7 @@ class elasticitySolver std::vector<dirichletBC> allDirichlet; public: - elasticitySolver(int tag) : _tag(tag),LagSpace(0),pAssembler(0),LagrangeMultiplierSpace(0) {} + elasticitySolver(int tag) : _tag(tag),pAssembler(0),LagSpace(0),LagrangeMultiplierSpace(0) {} elasticitySolver(GModel *model, int tag); diff --git a/Solver/linearSystemGMM.h b/Solver/linearSystemGMM.h index fa72c935921481c073e44f9c4c80e1620c639480..a1f1ca6f29fa22ad669d80b8af69315afc646d69 100644 --- a/Solver/linearSystemGMM.h +++ b/Solver/linearSystemGMM.h @@ -80,7 +80,7 @@ class linearSystemGmm : public linearSystem<scalar> { virtual double normInfRightHandSide() const { double nor = 0.; double temp; - for(int i=0;i<_b->size();i++){ + for(unsigned int i=0;i<_b->size();i++){ temp = (*_b)[i]; if(temp<0) temp = -temp; if(nor<temp) nor=temp; diff --git a/Solver/terms.h b/Solver/terms.h index 59f126eee0a7d34210592c60474d409ab209698c..98d6e7379d24d9ff616efaee78cdae187d413097 100644 --- a/Solver/terms.h +++ b/Solver/terms.h @@ -391,7 +391,7 @@ template<class T1> class LoadTermOnBorder : public LinearTerm<T1> public : - LoadTermOnBorder(FunctionSpace<T1>& space1_,simpleFunction<typename TensorialTraits<T1>::ValType> &Load_, double eqfac = 1.0) :LinearTerm<T1>(space1_),Load(Load_),_eqfac(eqfac) {} + LoadTermOnBorder(FunctionSpace<T1>& space1_,simpleFunction<typename TensorialTraits<T1>::ValType> &Load_, double eqfac = 1.0) : LinearTerm<T1>(space1_), _eqfac(eqfac), Load(Load_) {} virtual ~LoadTermOnBorder() {} virtual void get(MElement *ele,int npts,IntPt *GP,fullVector<double> &m)