Skip to content
Snippets Groups Projects
Commit 8e376c8b authored by Boris Sedji's avatar Boris Sedji
Browse files

No commit message

No commit message
parent 4599b9a4
No related branches found
No related tags found
No related merge requests found
...@@ -23,23 +23,23 @@ struct LagrangeMultiplierField { ...@@ -23,23 +23,23 @@ struct LagrangeMultiplierField {
double _tau; double _tau;
SVector3 _d; SVector3 _d;
simpleFunction<double> _f; simpleFunction<double> _f;
LagrangeMultiplierField() : g(0),_tag(0){} LagrangeMultiplierField() : _tag(0), g(0){}
}; };
struct elasticField { struct elasticField {
int _tag; // tag for the dofManager int _tag; // tag for the dofManager
groupOfElements *g; // support for this field groupOfElements *g; // support for this field
double _E, _nu; // specific elastic datas (should be somewhere else) double _E, _nu; // specific elastic datas (should be somewhere else)
elasticField () : g(0),_tag(0){} elasticField () : _tag(0), g(0){}
}; };
struct BoundaryCondition struct BoundaryCondition
{ {
int _tag; // tag for the dofManager
enum location{UNDEF,ON_VERTEX,ON_EDGE,ON_FACE,ON_VOLUME}; enum location{UNDEF,ON_VERTEX,ON_EDGE,ON_FACE,ON_VOLUME};
location onWhat; // on vertices or elements location onWhat; // on vertices or elements
int _tag; // tag for the dofManager
groupOfElements *g; // support for this BC groupOfElements *g; // support for this BC
BoundaryCondition() : g(0),_tag(0),onWhat(UNDEF) {} BoundaryCondition() : _tag(0),onWhat(UNDEF),g(0) {}
}; };
struct dirichletBC : public BoundaryCondition struct dirichletBC : public BoundaryCondition
...@@ -74,7 +74,7 @@ class elasticitySolver ...@@ -74,7 +74,7 @@ class elasticitySolver
std::vector<dirichletBC> allDirichlet; std::vector<dirichletBC> allDirichlet;
public: 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); elasticitySolver(GModel *model, int tag);
......
...@@ -80,7 +80,7 @@ class linearSystemGmm : public linearSystem<scalar> { ...@@ -80,7 +80,7 @@ class linearSystemGmm : public linearSystem<scalar> {
virtual double normInfRightHandSide() const { virtual double normInfRightHandSide() const {
double nor = 0.; double nor = 0.;
double temp; double temp;
for(int i=0;i<_b->size();i++){ for(unsigned int i=0;i<_b->size();i++){
temp = (*_b)[i]; temp = (*_b)[i];
if(temp<0) temp = -temp; if(temp<0) temp = -temp;
if(nor<temp) nor=temp; if(nor<temp) nor=temp;
......
...@@ -391,7 +391,7 @@ template<class T1> class LoadTermOnBorder : public LinearTerm<T1> ...@@ -391,7 +391,7 @@ template<class T1> class LoadTermOnBorder : public LinearTerm<T1>
public : 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 ~LoadTermOnBorder() {}
virtual void get(MElement *ele,int npts,IntPt *GP,fullVector<double> &m) virtual void get(MElement *ele,int npts,IntPt *GP,fullVector<double> &m)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment