Skip to content
Snippets Groups Projects
Commit 92c3346c authored by Thomas Toulorge's avatar Thomas Toulorge
Browse files

Added computation of normals and 3D primary Jacobian from ideal element in... 

Added computation of normals and 3D primary Jacobian from ideal element in JacobianBasis. Worked on computation of inverse condition number.
parent 57e21f87
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Numeric/JacobianBasis.cpp
+ 57
− 24
View file @ 92c3346c
...@@ -34,7 +34,7 @@ inline double calcFrobNormSq3D(double M11, double M12, double M13, ...@@ -34,7 +34,7 @@ inline double calcFrobNormSq3D(double M11, double M12, double M13,
{ {
return M11*M11 + M12*M12 + M13*M13 return M11*M11 + M12*M12 + M13*M13
+ M21*M21 + M22*M22 + M23*M23 + M21*M21 + M22*M22 + M23*M23
+ M31*M21 + M32*M22 + M33*M33; + M31*M31 + M32*M32 + M33*M33;
} }
// Compute the squared Frobenius norm of the inverse of a matrix // Compute the squared Frobenius norm of the inverse of a matrix
...@@ -48,7 +48,7 @@ inline double calcFrobNormSqInv3D(double M11, double M12, double M13, ...@@ -48,7 +48,7 @@ inline double calcFrobNormSqInv3D(double M11, double M12, double M13,
I31 = M21*M32-M22*M31, I32 = M12*M31-M11*M32, I33 = M11*M22-M12*M21; I31 = M21*M32-M22*M31, I32 = M12*M31-M11*M32, I33 = M11*M22-M12*M21;
return (I11*I11 + I12*I12 + I13*I13 return (I11*I11 + I12*I12 + I13*I13
+ I21*I21 + I22*I22 + I23*I23 + I21*I21 + I22*I22 + I23*I23
+ I31*I21 + I32*I22 + I33*I33)*invD*invD; + I31*I31 + I32*I32 + I33*I33)*invD*invD;
} }
// Compute signed Jacobian and its gradients w.r.t. // Compute signed Jacobian and its gradients w.r.t.
...@@ -165,17 +165,17 @@ inline void calcIDI1D(double dxdX, double dxdY, double dxdZ, ...@@ -165,17 +165,17 @@ inline void calcIDI1D(double dxdX, double dxdY, double dxdZ,
+ dPhidX*dydZ * A8 + dPhidX*dydY * A9); + dPhidX*dydZ * A8 + dPhidX*dydY * A9);
const double dnInvJSqdxj = (dAdxj*JSq-2.*dJdxj*J*A)*JQuadInv; const double dnInvJSqdxj = (dAdxj*JSq-2.*dJdxj*J*A)*JQuadInv;
const double dnJSqdxj = 2.*dPhidX*dxdX; const double dnJSqdxj = 2.*dPhidX*dxdX;
IDI(i, j) = -0.5*(dnJSqdxj*nInvJSq+nJSq*dnInvJSqdxj)*invProd*sqrtInvProd; IDI(i, j) = -1.5 * (dnJSqdxj*nInvJSq+nJSq*dnInvJSqdxj)*invProd*sqrtInvProd;
const double dAdyj = 2.*(dPhidX*dzdZ * A2 + dPhidX*dzdY * A5 const double dAdyj = 2.*(dPhidX*dzdZ * A2 + dPhidX*dzdY * A5
- dxdZ*dPhidX * A8 - dxdY*dPhidX * A9); - dxdZ*dPhidX * A8 - dxdY*dPhidX * A9);
const double dnInvJSqdyj = (dAdyj*JSq-2.*dJdyj*J*A)*JQuadInv; const double dnInvJSqdyj = (dAdyj*JSq-2.*dJdyj*J*A)*JQuadInv;
const double dnJSqdyj = 2.*dPhidX*dydX; const double dnJSqdyj = 2.*dPhidX*dydX;
IDI(i, j+numMapNodes) = -0.5*(dnJSqdyj*nInvJSq+nJSq*dnInvJSqdyj)*invProd*sqrtInvProd; IDI(i, j+numMapNodes) = -1.5 * (dnJSqdyj*nInvJSq+nJSq*dnInvJSqdyj)*invProd*sqrtInvProd;
const double dAdzj = 2.*(-dydZ*dPhidX * A2 - dxdZ*dPhidX * A4 const double dAdzj = 2.*(-dydZ*dPhidX * A2 - dxdZ*dPhidX * A4
- dydY*dPhidX * A5 - dxdY*dPhidX * A6); - dydY*dPhidX * A5 - dxdY*dPhidX * A6);
const double dnInvJSqdzj = (dAdzj*JSq-2.*dJdzj*J*A)*JQuadInv; const double dnInvJSqdzj = (dAdzj*JSq-2.*dJdzj*J*A)*JQuadInv;
const double dnJSqdzj = 2.*dPhidX*dzdX; const double dnJSqdzj = 2.*dPhidX*dzdX;
IDI(i, j+2*numMapNodes) = -0.5 * (dnJSqdzj*nInvJSq + nJSq*dnInvJSqdzj) * invProd*sqrtInvProd; IDI(i, j+2*numMapNodes) = -1.5 * (dnJSqdzj*nInvJSq + nJSq*dnInvJSqdzj) * invProd*sqrtInvProd;
} }
} }
...@@ -213,19 +213,19 @@ inline void calcIDI2D(double dxdX, double dxdY, double dxdZ, ...@@ -213,19 +213,19 @@ inline void calcIDI2D(double dxdX, double dxdY, double dxdZ,
+ dPhidX*dydZ * A8 + (dPhidX*dydY - dPhidY*dydX) * A9); + dPhidX*dydZ * A8 + (dPhidX*dydY - dPhidY*dydX) * A9);
const double dnInvJSqdxj = (dAdxj*JSq-2.*dJdxj*J*A)*JQuadInv; const double dnInvJSqdxj = (dAdxj*JSq-2.*dJdxj*J*A)*JQuadInv;
const double dnJSqdxj = 2.*(dPhidX*dxdX + dPhidY*dxdY); const double dnJSqdxj = 2.*(dPhidX*dxdX + dPhidY*dxdY);
IDI(i, j) = -(dnJSqdxj*nInvJSq+nJSq*dnInvJSqdxj)*invProd*sqrtInvProd; IDI(i, j) = -1.5 * (dnJSqdxj*nInvJSq+nJSq*dnInvJSqdxj)*invProd*sqrtInvProd;
const double dAdyj = 2.*(dPhidY*dzdZ * A1 + dPhidX*dzdZ * A2 const double dAdyj = 2.*(dPhidY*dzdZ * A1 + dPhidX*dzdZ * A2
+ (dPhidX*dzdY - dPhidY*dzdX) * A5 - dxdZ*dPhidY * A7 + (dPhidX*dzdY - dPhidY*dzdX) * A5 - dxdZ*dPhidY * A7
- dxdZ*dPhidX * A8 + (dxdX*dPhidY - dxdY*dPhidX) * A9); - dxdZ*dPhidX * A8 + (dxdX*dPhidY - dxdY*dPhidX) * A9);
const double dnInvJSqdyj = (dAdyj*JSq-2.*dJdyj*J*A)*JQuadInv; const double dnInvJSqdyj = (dAdyj*JSq-2.*dJdyj*J*A)*JQuadInv;
const double dnJSqdyj = 2.*(dPhidX*dydX + dPhidY*dydY); const double dnJSqdyj = 2.*(dPhidX*dydX + dPhidY*dydY);
IDI(i, j+numMapNodes) = -(dnJSqdyj*nInvJSq+nJSq*dnInvJSqdyj)*invProd*sqrtInvProd; IDI(i, j+numMapNodes) = -1.5 * (dnJSqdyj*nInvJSq+nJSq*dnInvJSqdyj)*invProd*sqrtInvProd;
const double dAdzj = 2.*(-dydZ*dPhidY * A1 - dydZ*dPhidX * A2 const double dAdzj = 2.*(-dydZ*dPhidY * A1 - dydZ*dPhidX * A2
- dxdZ*dPhidY * A3 - dxdZ*dPhidX * A4 - dxdZ*dPhidY * A3 - dxdZ*dPhidX * A4
+ (dydX*dPhidY - dydY*dPhidX) * A5 + (dxdX*dPhidY - dxdY*dPhidX) * A6); + (dydX*dPhidY - dydY*dPhidX) * A5 + (dxdX*dPhidY - dxdY*dPhidX) * A6);
const double dnInvJSqdzj = (dAdzj*JSq-2.*dJdzj*J*A)*JQuadInv; const double dnInvJSqdzj = (dAdzj*JSq-2.*dJdzj*J*A)*JQuadInv;
const double dnJSqdzj = 2.*(dPhidX*dzdX + dPhidY*dzdY); const double dnJSqdzj = 2.*(dPhidX*dzdX + dPhidY*dzdY);
IDI(i, j+2*numMapNodes) = -(dnJSqdzj*nInvJSq + nJSq*dnInvJSqdzj) * invProd*sqrtInvProd; IDI(i, j+2*numMapNodes) = -1.5 * (dnJSqdzj*nInvJSq + nJSq*dnInvJSqdzj) * invProd*sqrtInvProd;
} }
} }
...@@ -386,6 +386,20 @@ void GradientBasis::mapFromIdealElement(fullMatrix<double> *dxyzdX, ...@@ -386,6 +386,20 @@ void GradientBasis::mapFromIdealElement(fullMatrix<double> *dxyzdX,
} }
} }
// Given Jac. det. from reference element, compute Jac. det. from ideal element
void GradientBasis::detJacFromIdealElement(double &dJ) const
{
static const double TriFact = 2./sqrt(3.), TetFact = sqrt(2.);
if (_idealDifferent) {
switch(_type) {
case TYPE_TRI: dJ *= TriFact; return;
case TYPE_PRI: dJ *= 0.5; return;
case TYPE_TET: dJ *= TetFact; return;
case TYPE_PYR: dJ *= 2.; return;
}
}
}
JacobianBasis::JacobianBasis(int tag, int jacOrder) : JacobianBasis::JacobianBasis(int tag, int jacOrder) :
_bezier(NULL), _tag(tag), _dim(ElementType::DimensionFromTag(tag)), _bezier(NULL), _tag(tag), _dim(ElementType::DimensionFromTag(tag)),
_jacOrder(jacOrder >= 0 ? jacOrder : jacobianOrder(tag)) _jacOrder(jacOrder >= 0 ? jacOrder : jacobianOrder(tag))
...@@ -534,9 +548,8 @@ double JacobianBasis::getPrimNormals1D(const fullMatrix<double> &nodesXYZ, fullM ...@@ -534,9 +548,8 @@ double JacobianBasis::getPrimNormals1D(const fullMatrix<double> &nodesXYZ, fullM
} }
// Computes (unit) normal to straight surface element at barycenter (with norm as return value) // Computes (unit) normal to straight surface element at barycenter (with norm as return value)
double JacobianBasis::getPrimNormal2D(const fullMatrix<double> &nodesXYZ, fullMatrix<double> &result) const double JacobianBasis::getPrimNormal2D(const fullMatrix<double> &nodesXYZ, fullMatrix<double> &result, bool ideal) const
{ {
fullVector<double> dxyzdXbar(3), dxyzdYbar(3); fullVector<double> dxyzdXbar(3), dxyzdYbar(3);
for (int j=0; j<numPrimMapNodes; j++) { for (int j=0; j<numPrimMapNodes; j++) {
dxyzdXbar(0) += primGradShapeBarycenterX(j)*nodesXYZ(j,0); dxyzdXbar(0) += primGradShapeBarycenterX(j)*nodesXYZ(j,0);
...@@ -550,17 +563,17 @@ double JacobianBasis::getPrimNormal2D(const fullMatrix<double> &nodesXYZ, fullMa ...@@ -550,17 +563,17 @@ double JacobianBasis::getPrimNormal2D(const fullMatrix<double> &nodesXYZ, fullMa
result(0,2) = dxyzdXbar(0) * dxyzdYbar(1) - dxyzdXbar(1) * dxyzdYbar(0); result(0,2) = dxyzdXbar(0) * dxyzdYbar(1) - dxyzdXbar(1) * dxyzdYbar(0);
result(0,1) = -dxyzdXbar(0) * dxyzdYbar(2) + dxyzdXbar(2) * dxyzdYbar(0); result(0,1) = -dxyzdXbar(0) * dxyzdYbar(2) + dxyzdXbar(2) * dxyzdYbar(0);
result(0,0) = dxyzdXbar(1) * dxyzdYbar(2) - dxyzdXbar(2) * dxyzdYbar(1); result(0,0) = dxyzdXbar(1) * dxyzdYbar(2) - dxyzdXbar(2) * dxyzdYbar(1);
const double norm0 = sqrt(result(0,0)*result(0,0)+result(0,1)*result(0,1)+result(0,2)*result(0,2)); double norm0 = sqrt(result(0,0)*result(0,0)+result(0,1)*result(0,1)+result(0,2)*result(0,2));
result(0,0) /= norm0; result(0,1) /= norm0; result(0,2) /= norm0; const double invNorm0 = 1./norm0;
result(0,0) *= invNorm0; result(0,1) *= invNorm0; result(0,2) *= invNorm0;
if (ideal) _gradBasis->detJacFromIdealElement(norm0);
return norm0; return norm0;
} }
// Returns absolute value of Jacobian of straight volume element at barycenter // Returns absolute value of Jacobian of straight volume element at barycenter
double JacobianBasis::getPrimJac3D(const fullMatrix<double> &nodesXYZ) const double JacobianBasis::getPrimJac3D(const fullMatrix<double> &nodesXYZ, bool ideal) const
{ {
double dxdX = 0, dydX = 0, dzdX = 0, dxdY = 0, dydY = 0, dzdY = 0, dxdZ = 0, dydZ = 0, dzdZ = 0; double dxdX = 0, dydX = 0, dzdX = 0, dxdY = 0, dydY = 0, dzdY = 0, dxdZ = 0, dydZ = 0, dzdZ = 0;
for (int j=0; j<numPrimMapNodes; j++) { for (int j=0; j<numPrimMapNodes; j++) {
dxdX += primGradShapeBarycenterX(j)*nodesXYZ(j,0); dxdX += primGradShapeBarycenterX(j)*nodesXYZ(j,0);
...@@ -574,10 +587,11 @@ double JacobianBasis::getPrimJac3D(const fullMatrix<double> &nodesXYZ) const ...@@ -574,10 +587,11 @@ double JacobianBasis::getPrimJac3D(const fullMatrix<double> &nodesXYZ) const
dzdZ += primGradShapeBarycenterZ(j)*nodesXYZ(j,2); dzdZ += primGradShapeBarycenterZ(j)*nodesXYZ(j,2);
} }
return fabs(calcDet3D(dxdX, dxdY, dxdZ, double dJ = fabs(calcDet3D(dxdX, dxdY, dxdZ,
dydX, dydY, dydZ, dydX, dydY, dydZ,
dzdX, dzdY, dzdZ)); dzdX, dzdY, dzdZ));
if (ideal) _gradBasis->detJacFromIdealElement(dJ);
return dJ;
} }
// Calculate (signed, possibly scaled) Jacobian for one element, with normal vectors to straight element // Calculate (signed, possibly scaled) Jacobian for one element, with normal vectors to straight element
...@@ -912,7 +926,7 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou ...@@ -912,7 +926,7 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou
case 1 : { case 1 : {
fullMatrix<double> normals(2,3); fullMatrix<double> normals(2,3);
const double invScale = getPrimNormals1D(nodesXYZ,normals); getPrimNormals1D(nodesXYZ,normals);
fullMatrix<double> dxyzdX(nJacNodes,3); fullMatrix<double> dxyzdX(nJacNodes,3);
gSMatX.mult(nodesXYZ, dxyzdX); gSMatX.mult(nodesXYZ, dxyzdX);
for (int i = 0; i < nJacNodes; i++) { for (int i = 0; i < nJacNodes; i++) {
...@@ -925,14 +939,15 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou ...@@ -925,14 +939,15 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou
const double nInvJSq = calcFrobNormSqInv3D(dxdX, dxdY, dxdZ, const double nInvJSq = calcFrobNormSqInv3D(dxdX, dxdY, dxdZ,
dydX, dydY, dydZ, dydX, dydY, dydZ,
dzdX, dzdY, dzdZ); dzdX, dzdY, dzdZ);
invCond(i) = 1./sqrt(nJSq*nInvJSq); invCond(i) = 3./sqrt(nJSq*nInvJSq);
} }
break; break;
} }
case 2 : { case 2 : {
fullMatrix<double> normal(1,3); fullMatrix<double> normal(1,3);
const double invScale = getPrimNormal2D(nodesXYZ,normal); const double scaleSq = getPrimNormal2D(nodesXYZ, normal, ideal), scale = sqrt(scaleSq);
normal(0, 0) *= scale; normal(0, 1) *= scale; normal(0, 2) *= scale;
fullMatrix<double> dxyzdX(nJacNodes,3), dxyzdY(nJacNodes,3); fullMatrix<double> dxyzdX(nJacNodes,3), dxyzdY(nJacNodes,3);
gSMatX.mult(nodesXYZ, dxyzdX); gSMatX.mult(nodesXYZ, dxyzdX);
gSMatY.mult(nodesXYZ, dxyzdY); gSMatY.mult(nodesXYZ, dxyzdY);
...@@ -947,7 +962,9 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou ...@@ -947,7 +962,9 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou
const double nInvJSq = calcFrobNormSqInv3D(dxdX, dxdY, dxdZ, const double nInvJSq = calcFrobNormSqInv3D(dxdX, dxdY, dxdZ,
dydX, dydY, dydZ, dydX, dydY, dydZ,
dzdX, dzdY, dzdZ); dzdX, dzdY, dzdZ);
invCond(i) = 2./sqrt(nJSq*nInvJSq); invCond(i) = 3./sqrt(nJSq*nInvJSq);
std::cout << "DBGTT: normal = (" << dxdZ << ", " << dydZ<< ", " << dzdZ
<< "), nJSq = " << nJSq << ", nInvJSq = " << nInvJSq << "\n";
} }
break; break;
} }
...@@ -976,6 +993,13 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou ...@@ -976,6 +993,13 @@ inline void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<dou
} }
} }
void JacobianBasis::getInvCondGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, fullVector<double> &invCond) const
{
getInvCondGeneral<true>(nJacNodes, gSMatX, gSMatY, gSMatZ, nodesXYZ, invCond);
}
// Calculate the inverse condition number in Frobenius norm and its gradients w.r.t. node position, // Calculate the inverse condition number in Frobenius norm and its gradients w.r.t. node position,
// with normal vectors to straight element for regularization. Evaluation points depend on the // with normal vectors to straight element for regularization. Evaluation points depend on the
// given matrices for shape function gradients. // given matrices for shape function gradients.
...@@ -1071,9 +1095,18 @@ inline void JacobianBasis::getInvCondAndGradientsGeneral(int nJacNodes, ...@@ -1071,9 +1095,18 @@ inline void JacobianBasis::getInvCondAndGradientsGeneral(int nJacNodes,
} }
break; break;
} }
} }
}
void JacobianBasis::getInvCondAndGradientsGeneral(int nJacNodes,
const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY,
const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ,
const fullMatrix<double> &normals,
fullMatrix<double> &IDI) const
{
getInvCondAndGradientsGeneral<true>(nJacNodes, gSMatX, gSMatY, gSMatZ, nodesXYZ, normals, IDI);
} }
void JacobianBasis::getSignedJacAndGradientsGeneral(int nJacNodes, void JacobianBasis::getSignedJacAndGradientsGeneral(int nJacNodes,
......
Numeric/JacobianBasis.h
+ 42
− 17
View file @ 92c3346c
...@@ -33,6 +33,7 @@ class GradientBasis { ...@@ -33,6 +33,7 @@ class GradientBasis {
void mapFromIdealElement(fullMatrix<double> *dxyzdX, void mapFromIdealElement(fullMatrix<double> *dxyzdX,
fullMatrix<double> *dxyzdY, fullMatrix<double> *dxyzdY,
fullMatrix<double> *dxyzdZ) const; fullMatrix<double> *dxyzdZ) const;
void detJacFromIdealElement(double &dJ) const;
}; };
...@@ -65,8 +66,8 @@ class JacobianBasis { ...@@ -65,8 +66,8 @@ class JacobianBasis {
// Jacobian evaluation methods // Jacobian evaluation methods
double getPrimNormals1D(const fullMatrix<double> &nodesXYZ, fullMatrix<double> &result) const; double getPrimNormals1D(const fullMatrix<double> &nodesXYZ, fullMatrix<double> &result) const;
double getPrimNormal2D(const fullMatrix<double> &nodesXYZ, fullMatrix<double> &result) const; double getPrimNormal2D(const fullMatrix<double> &nodesXYZ, fullMatrix<double> &result, bool ideal=false) const;
double getPrimJac3D(const fullMatrix<double> &nodesXYZ) const; double getPrimJac3D(const fullMatrix<double> &nodesXYZ, bool ideal=false) const;
inline void getSignedJacAndGradients(const fullMatrix<double> &nodesXYZ, inline void getSignedJacAndGradients(const fullMatrix<double> &nodesXYZ,
const fullMatrix<double> &normals, fullMatrix<double> &JDJ) const { const fullMatrix<double> &normals, fullMatrix<double> &JDJ) const {
getSignedJacAndGradientsGeneral(numJacNodes, _gradBasis->gradShapeMatX, getSignedJacAndGradientsGeneral(numJacNodes, _gradBasis->gradShapeMatX,
...@@ -77,6 +78,16 @@ class JacobianBasis { ...@@ -77,6 +78,16 @@ class JacobianBasis {
getSignedJacAndGradientsGeneral(numJacNodesFast,gradShapeMatXFast,gradShapeMatYFast, getSignedJacAndGradientsGeneral(numJacNodesFast,gradShapeMatXFast,gradShapeMatYFast,
gradShapeMatZFast,nodesXYZ,normals,JDJ); gradShapeMatZFast,nodesXYZ,normals,JDJ);
} }
inline void getInvCondAndGradients(const fullMatrix<double> &nodesXYZ,
const fullMatrix<double> &normals, fullMatrix<double> &IDI) const {
getInvCondAndGradientsGeneral(numJacNodes, _gradBasis->gradShapeMatX,
_gradBasis->gradShapeMatY, _gradBasis->gradShapeMatZ, nodesXYZ, normals, IDI);
}
inline void getInvCondAndGradientsFast(const fullMatrix<double> &nodesXYZ,
const fullMatrix<double> &normals, fullMatrix<double> &IDI) const {
getInvCondAndGradientsGeneral(numJacNodesFast,gradShapeMatXFast,gradShapeMatYFast,
gradShapeMatZFast,nodesXYZ,normals,IDI);
}
void getMetricMinAndGradients(const fullMatrix<double> &nodesXYZ, void getMetricMinAndGradients(const fullMatrix<double> &nodesXYZ,
const fullMatrix<double> &nodesXYZStraight, const fullMatrix<double> &nodesXYZStraight,
fullVector<double> &lambdaJ , fullMatrix<double> &gradLambdaJ) const; fullVector<double> &lambdaJ , fullMatrix<double> &gradLambdaJ) const;
...@@ -104,6 +115,13 @@ class JacobianBasis { ...@@ -104,6 +115,13 @@ class JacobianBasis {
inline void getScaledJacobianFast(const fullMatrix<double> &nodesXYZ, fullVector<double> &jacobian) const { inline void getScaledJacobianFast(const fullMatrix<double> &nodesXYZ, fullVector<double> &jacobian) const {
getScaledJacobianGeneral(numJacNodesFast,gradShapeMatXFast,gradShapeMatYFast,gradShapeMatZFast,nodesXYZ,jacobian); getScaledJacobianGeneral(numJacNodesFast,gradShapeMatXFast,gradShapeMatYFast,gradShapeMatZFast,nodesXYZ,jacobian);
} }
inline void getInvCond(const fullMatrix<double> &nodesXYZ, fullVector<double> &invCond) const {
getInvCondGeneral(numJacNodes, _gradBasis->gradShapeMatX,
_gradBasis->gradShapeMatY, _gradBasis->gradShapeMatZ, nodesXYZ, invCond);
}
inline void getInvCondFast(const fullMatrix<double> &nodesXYZ, fullVector<double> &invCond) const {
getInvCondGeneral(numJacNodesFast,gradShapeMatXFast,gradShapeMatYFast,gradShapeMatZFast,nodesXYZ,invCond);
}
// //
inline void lag2Bez(const fullVector<double> &jac, fullVector<double> &bez) const { inline void lag2Bez(const fullVector<double> &jac, fullVector<double> &bez) const {
getBezier()->matrixLag2Bez.mult(jac,bez); getBezier()->matrixLag2Bez.mult(jac,bez);
...@@ -126,14 +144,14 @@ class JacobianBasis { ...@@ -126,14 +144,14 @@ class JacobianBasis {
private : private :
template<bool scaling, bool ideal> template<bool scaling, bool ideal>
inline void getJacobianGeneral(int nJacNodes, const fullMatrix<double> &gSMatX, void getJacobianGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ, const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, fullVector<double> &jacobian) const; const fullMatrix<double> &nodesXYZ, fullVector<double> &jacobian) const;
template<bool scaling, bool ideal> template<bool scaling, bool ideal>
inline void getJacobianGeneral(int nJacNodes, const fullMatrix<double> &gSMatX, void getJacobianGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ, const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesX, const fullMatrix<double> &nodesY, const fullMatrix<double> &nodesX, const fullMatrix<double> &nodesY,
const fullMatrix<double> &nodesZ, fullMatrix<double> &jacobian) const; const fullMatrix<double> &nodesZ, fullMatrix<double> &jacobian) const;
void getSignedJacobianGeneral(int nJacNodes, const fullMatrix<double> &gSMatX, void getSignedJacobianGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ, const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, fullVector<double> &jacobian) const; const fullMatrix<double> &nodesXYZ, fullVector<double> &jacobian) const;
...@@ -150,7 +168,7 @@ class JacobianBasis { ...@@ -150,7 +168,7 @@ class JacobianBasis {
const fullMatrix<double> &nodesZ, fullMatrix<double> &jacobian) const; const fullMatrix<double> &nodesZ, fullMatrix<double> &jacobian) const;
template<bool ideal> template<bool ideal>
inline void getSignedJacAndGradientsGeneral(int nJacNodes, const fullMatrix<double> &gSMatX, void getSignedJacAndGradientsGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ, const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &normals, const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &normals,
fullMatrix<double> &JDJ) const; fullMatrix<double> &JDJ) const;
...@@ -160,15 +178,22 @@ class JacobianBasis { ...@@ -160,15 +178,22 @@ class JacobianBasis {
fullMatrix<double> &JDJ) const; fullMatrix<double> &JDJ) const;
template<bool ideal> template<bool ideal>
inline void getInvCondGeneral(int nJacNodes, const fullMatrix<double> &gSMatX, void getInvCondGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ, const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, fullVector<double> &invCond) const; const fullMatrix<double> &nodesXYZ, fullVector<double> &invCond) const;
void getInvCondGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, fullVector<double> &invCond) const;
template<bool ideal> template<bool ideal>
inline void getInvCondAndGradientsGeneral(int nJacNodes, const fullMatrix<double> &gSMatX, void getInvCondAndGradientsGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ, const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &normals, const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &normals,
fullMatrix<double> &IDI) const; fullMatrix<double> &IDI) const;
void getInvCondAndGradientsGeneral(int nJacNodes, const fullMatrix<double> &gSMatX,
const fullMatrix<double> &gSMatY, const fullMatrix<double> &gSMatZ,
const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &normals,
fullMatrix<double> &IDI) const;
}; };
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment