Skip to content
Snippets Groups Projects

Master - transfer updates into WIP branch

Merged Julien Leclerc requested to merge master into Entrotough_julien
77 files
+ 3463
3277
Compare changes
  • Side-by-side
  • Inline

Files

@@ -183,6 +183,7 @@ public:
@@ -183,6 +183,7 @@ public:
}
}
}
}
Msg::Error("physical is not exist in this boundary group");
Msg::Error("physical is not exist in this boundary group");
 
return NULL;
};
};
@@ -418,7 +419,8 @@ public:
@@ -418,7 +419,8 @@ public:
int getNumberOfMechanicalKinematicVariables() const{
int getNumberOfMechanicalKinematicVariables() const{
if (getOrder() == 1) return 9;
if (getOrder() == 1) return 9;
else if (getOrder() == 2) return 9+27;
else if (getOrder() == 2) return 9+27;
else{Msg::Error("Order %d is not defined");};
else{Msg::Error("Order %d is not defined",getOrder());};
 
return 0.;
}
}
int getNumberOfConstitutiveExtraDofKinematicVariables() const{
int getNumberOfConstitutiveExtraDofKinematicVariables() const{
return _totalConDofNumber*4;
return _totalConDofNumber*4;
@@ -592,6 +594,7 @@ class nonLinearPeriodicBC: public nonLinearMicroBC{
@@ -592,6 +594,7 @@ class nonLinearPeriodicBC: public nonLinearMicroBC{
else if (i==1) return _YaddNewVertices;
else if (i==1) return _YaddNewVertices;
else if (i==2) return _ZaddNewVertices;
else if (i==2) return _ZaddNewVertices;
else Msg::Error("direction must be correctly defined addNewVertices(i)");
else Msg::Error("direction must be correctly defined addNewVertices(i)");
 
return 0;
};
};
whichMethod getPBCMethod() const{
whichMethod getPBCMethod() const{
@@ -603,6 +606,7 @@ class nonLinearPeriodicBC: public nonLinearMicroBC{
@@ -603,6 +606,7 @@ class nonLinearPeriodicBC: public nonLinearMicroBC{
else if (i==1) return _Ydegree;
else if (i==1) return _Ydegree;
else if (i==2) return _Zdegree;
else if (i==2) return _Zdegree;
else Msg::Error("direction must be correctly defined getPBCPolynomialDegree(i)");
else Msg::Error("direction must be correctly defined getPBCPolynomialDegree(i)");
 
return 0;
}
}
bool usingSerendipFlag() const {return _usingSerendip;};
bool usingSerendipFlag() const {return _usingSerendip;};
#endif //SWIG
#endif //SWIG
Loading