Skip to content
Snippets Groups Projects
Commit 0f1ab0ea authored by Amaury Johnen's avatar Amaury Johnen
Browse files

fix bug compile

parent 891bab04
Branches
Tags
No related merge requests found
...@@ -312,7 +312,7 @@ inline void calcGradInvCondNum3D(double dxdX, double dxdY, double dxdZ, ...@@ -312,7 +312,7 @@ inline void calcGradInvCondNum3D(double dxdX, double dxdY, double dxdZ,
CondNumBasis::CondNumBasis(int tag, int cnOrder) : CondNumBasis::CondNumBasis(int tag, int cnOrder) :
_dim(ElementType::DimensionFromTag(tag)), _tag(tag), _dim(ElementType::DimensionFromTag(tag)),
_condNumOrder(cnOrder >= 0 ? cnOrder : condNumOrder(tag)) _condNumOrder(cnOrder >= 0 ? cnOrder : condNumOrder(tag))
{ {
if ( ElementType::ParentTypeFromTag(tag) == TYPE_TRIH){ if ( ElementType::ParentTypeFromTag(tag) == TYPE_TRIH){
...@@ -433,10 +433,10 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes, ...@@ -433,10 +433,10 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes,
} }
case 3 : { case 3 : {
/* FIXME Amaury if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){ if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){
for (int i = 0; i < nCondNumNodes; i++) condNum(i) = 1.; for (int i = 0; i < nCondNumNodes; i++) condNum(i) = 1.;
break; break;
}*/ }
fullMatrix<double> dxyzdX(nCondNumNodes, 3), dxyzdY(nCondNumNodes, 3), dxyzdZ(nCondNumNodes, 3); fullMatrix<double> dxyzdX(nCondNumNodes, 3), dxyzdY(nCondNumNodes, 3), dxyzdZ(nCondNumNodes, 3);
gSMatX.mult(nodesXYZ, dxyzdX); gSMatX.mult(nodesXYZ, dxyzdX);
gSMatY.mult(nodesXYZ, dxyzdY); gSMatY.mult(nodesXYZ, dxyzdY);
...@@ -530,7 +530,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes, ...@@ -530,7 +530,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes,
} }
case 3 : { case 3 : {
/* FIXME Amaury if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){ if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){
for (int i = 0; i < nCondNumNodes; i++) { for (int i = 0; i < nCondNumNodes; i++) {
for (int j = 0; j < _nMapNodes; j++) { for (int j = 0; j < _nMapNodes; j++) {
IDI(i,j) = 0.; IDI(i,j) = 0.;
...@@ -540,7 +540,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes, ...@@ -540,7 +540,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes,
IDI(i,3*_nMapNodes) = 1.; IDI(i,3*_nMapNodes) = 1.;
} }
break; break;
}*/ }
fullMatrix<double> dxyzdX(nCondNumNodes,3), dxyzdY(nCondNumNodes,3), dxyzdZ(nCondNumNodes,3); fullMatrix<double> dxyzdX(nCondNumNodes,3), dxyzdY(nCondNumNodes,3), dxyzdZ(nCondNumNodes,3);
gSMatX.mult(nodesXYZ, dxyzdX); gSMatX.mult(nodesXYZ, dxyzdX);
gSMatY.mult(nodesXYZ, dxyzdY); gSMatY.mult(nodesXYZ, dxyzdY);
......
...@@ -15,7 +15,7 @@ class CondNumBasis { ...@@ -15,7 +15,7 @@ class CondNumBasis {
private: private:
const GradientBasis *_gradBasis; const GradientBasis *_gradBasis;
const int _dim, _condNumOrder; const int _tag, _dim, _condNumOrder;
fullVector<double> primGradShapeBarycenterX, primGradShapeBarycenterY, fullVector<double> primGradShapeBarycenterX, primGradShapeBarycenterY,
primGradShapeBarycenterZ; primGradShapeBarycenterZ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment