Skip to content

Commit

Permalink
rename functions getNumJacNodes()
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajohnen
ajohnen committed Jan 17, 2020
1 parent d6ff6ac commit d76abce
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 39 deletions.
6 changes: 2 additions & 4 deletions Geo/MElement.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,9 @@ void MElement::scaledJacRange(double &jmin, double &jmax, GEntity *ge) const
jmin = jmax = 1.0;
#if defined(HAVE_MESH)
const JacobianBasis *jac = getJacobianFuncSpace();
const int numJacNodes = jac->getNumJacNodes();
fullMatrix<double> nodesXYZ(jac->getNumMapNodes(), 3);
getNodesCoord(nodesXYZ);
fullVector<double> SJi(numJacNodes);
fullVector<double> SJi(jac->getNumSamplingPnts());
jac->getScaledJacobian(nodesXYZ, SJi);
if(ge && (ge->dim() == 2) && ge->haveParametrization()) {
// If parametrized surface entity provided...
Expand Down Expand Up @@ -384,10 +383,9 @@ void MElement::idealJacRange(double &jmin, double &jmax, GEntity *ge)
jmin = jmax = 1.0;
#if defined(HAVE_MESH)
const JacobianBasis *jac = getJacobianFuncSpace();
const int numJacNodes = jac->getNumJacNodes();
fullMatrix<double> nodesXYZ(jac->getNumMapNodes(), 3);
getNodesCoord(nodesXYZ);
fullVector<double> iJi(numJacNodes);
fullVector<double> iJi(jac->getNumSamplingPnts());
jac->getSignedIdealJacobian(nodesXYZ, iJi);
const int nEd = getNumEdges(), dim = getDim();
double sumEdLength = 0.;
Expand Down
12 changes: 6 additions & 6 deletions Mesh/qualityMeasuresJacobian.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ namespace jacobianBasedQuality {

// Sample jacobian determinant
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
fullVector<double> coeffLag(jfs->getNumJacNodes());
fullVector<double> coeffLag(jfs->getNumSamplingPnts());
el->getNodesCoord(nodesXYZ);
jfs->getSignedJacobian(nodesXYZ, coeffLag, normals);

Expand Down Expand Up @@ -302,7 +302,7 @@ namespace jacobianBasedQuality {

// Sample gradients and jacobian determinant
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
fullVector<double> coeffDetLag(jacBasis->getNumJacNodes());
fullVector<double> coeffDetLag(jacBasis->getNumSamplingPnts());
fullMatrix<double> coeffMatLag(gradBasis->getNumSamplingPoints(), 9);
el->getNodesCoord(nodesXYZ);
jacBasis->getSignedJacobian(nodesXYZ, coeffDetLag, normals);
Expand Down Expand Up @@ -348,7 +348,7 @@ namespace jacobianBasedQuality {

// Sample gradients and jacobian determinant
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
fullVector<double> coeffDetLag(jacBasis->getNumJacNodes());
fullVector<double> coeffDetLag(jacBasis->getNumSamplingPnts());
fullMatrix<double> coeffMatLag(gradBasis->getNumSamplingPoints(), 9);
el->getNodesCoord(nodesXYZ);
jacBasis->getSignedIdealJacobian(nodesXYZ, coeffDetLag, normals);
Expand Down Expand Up @@ -427,7 +427,7 @@ namespace jacobianBasedQuality {
// Sample jacobian determinant
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
el->getNodesCoord(nodesXYZ);
jac.resize(jacBasis->getNumJacNodes());
jac.resize(jacBasis->getNumSamplingPnts());
jacBasis->getSignedJacobian(nodesXYZ, jac, normals);
}

Expand All @@ -444,7 +444,7 @@ namespace jacobianBasedQuality {

// Sample gradients and jacobian determinant
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
fullVector<double> determinant(jacBasis->getNumJacNodes());
fullVector<double> determinant(jacBasis->getNumSamplingPnts());
fullMatrix<double> gradients(gradBasis->getNumSamplingPoints(), 9);
el->getNodesCoord(nodesXYZ);
jacBasis->getSignedJacobian(nodesXYZ, determinant);
Expand All @@ -471,7 +471,7 @@ namespace jacobianBasedQuality {

// Sample gradients and jacobian determinant
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
fullVector<double> determinant(jacBasis->getNumJacNodes());
fullVector<double> determinant(jacBasis->getNumSamplingPnts());
fullMatrix<double> gradients(gradBasis->getNumSamplingPoints(), 9);
el->getNodesCoord(nodesXYZ);
jacBasis->getSignedIdealJacobian(nodesXYZ, determinant);
Expand Down
6 changes: 3 additions & 3 deletions Numeric/JacobianBasis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ class JacobianBasis {

// Get methods
inline int getJacOrder() const { return _data.getSpaceOrder(); }
inline int getNumJacNodes() const { return numSamplingPnts; }
inline int getNumJacNodesFast() const { return numSamplingPntsFast; }
inline int getNumSamplingPnts() const { return numSamplingPnts; }
inline int getNumSamplingPntsFast() const { return numSamplingPntsFast; }
inline int getNumMapNodes() const { return numMapNodes; }
inline int getNumPrimJacNodes() const { return numPrimSamplingPnts; }
inline int getNumPrimSamplingPnts() const { return numPrimSamplingPnts; }
inline int getNumPrimMapNodes() const { return numPrimMapNodes; }
inline FuncSpaceData getFuncSpaceData() const { return _data; }

Expand Down
52 changes: 26 additions & 26 deletions contrib/MeshOptimizer/Patch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ void Patch::initScaledJac()
if(_nBezEl.empty()) {
_nBezEl.resize(nEl());
for(int iEl = 0; iEl < nEl(); iEl++)
_nBezEl[iEl] = _el[iEl]->getJacobianFuncSpace()->getNumJacNodes();
_nBezEl[iEl] = _el[iEl]->getJacobianFuncSpace()->getNumSamplingPnts();
}

// Set normals to 2D elements (with magnitude of inverse Jacobian) or initial
Expand All @@ -355,7 +355,7 @@ void Patch::initMetricMin()
if(_nBezEl.empty()) {
_nBezEl.resize(nEl());
for(int iEl = 0; iEl < nEl(); iEl++)
_nBezEl[iEl] = _el[iEl]->getJacobianFuncSpace()->getNumJacNodes();
_nBezEl[iEl] = _el[iEl]->getJacobianFuncSpace()->getNumSamplingPnts();
}
}

Expand Down Expand Up @@ -412,9 +412,9 @@ void Patch::scaledJacAndGradients(int iEl, std::vector<double> &sJ,
std::vector<double> &gSJ)
{
const JacobianBasis *jacBasis = _el[iEl]->getJacobianFuncSpace();
const int &numJacNodes = _nBezEl[iEl];
const int &numSamplingPnts = _nBezEl[iEl];
const int &numMapNodes = _nNodEl[iEl];
fullMatrix<double> JDJ(numJacNodes, 3 * numMapNodes + 1);
fullMatrix<double> JDJ(numSamplingPnts, 3 * numMapNodes + 1);

// Coordinates of nodes
fullMatrix<double> nodesXYZ(numMapNodes, 3), normals(_dim, 3);
Expand All @@ -434,21 +434,21 @@ void Patch::scaledJacAndGradients(int iEl, std::vector<double> &sJ,
bezierCoeff BDB(jacBasis->getFuncSpaceData(), JDJ);

// Scaled jacobian
for(int l = 0; l < numJacNodes; l++) sJ[l] = BDB(l, 3 * numMapNodes);
for(int l = 0; l < numSamplingPnts; l++) sJ[l] = BDB(l, 3 * numMapNodes);

// Gradients of the scaled jacobian
int iPC = 0;
std::vector<SPoint3> gXyzV(numJacNodes);
std::vector<SPoint3> gUvwV(numJacNodes);
std::vector<SPoint3> gXyzV(numSamplingPnts);
std::vector<SPoint3> gUvwV(numSamplingPnts);
for(int i = 0; i < numMapNodes; i++) {
int &iFVi = _el2FV[iEl][i];
if(iFVi >= 0) {
for(int l = 0; l < numJacNodes; l++)
for(int l = 0; l < numSamplingPnts; l++)
gXyzV[l] =
SPoint3(BDB(l, i + 0 * numMapNodes), BDB(l, i + 1 * numMapNodes),
BDB(l, i + 2 * numMapNodes));
_coordFV[iFVi]->gXyz2gUvw(_uvw[iFVi], gXyzV, gUvwV);
for(int l = 0; l < numJacNodes; l++) {
for(int l = 0; l < numSamplingPnts; l++) {
gSJ[indGSJ(iEl, l, iPC)] = gUvwV[l][0];
if(_nPCFV[iFVi] >= 2) gSJ[indGSJ(iEl, l, iPC + 1)] = gUvwV[l][1];
if(_nPCFV[iFVi] == 3) gSJ[indGSJ(iEl, l, iPC + 2)] = gUvwV[l][2];
Expand All @@ -462,12 +462,12 @@ void Patch::metricMinAndGradients(int iEl, std::vector<double> &lambda,
std::vector<double> &gradLambda)
{
const JacobianBasis *jacBasis = _el[iEl]->getJacobianFuncSpace();
const int &numJacNodes = jacBasis->getNumJacNodes();
const int &numSamplingPnts = jacBasis->getNumSamplingPnts();
const int &numMapNodes = jacBasis->getNumMapNodes();
const int &numPrimMapNodes = jacBasis->getNumPrimMapNodes();
fullVector<double> lambdaJ(numJacNodes), lambdaB(numJacNodes);
fullMatrix<double> gradLambdaJ(numJacNodes, 2 * numMapNodes);
fullMatrix<double> gradLambdaB(numJacNodes, 2 * numMapNodes);
fullVector<double> lambdaJ(numSamplingPnts), lambdaB(numSamplingPnts);
fullMatrix<double> gradLambdaJ(numSamplingPnts, 2 * numMapNodes);
fullMatrix<double> gradLambdaB(numSamplingPnts, 2 * numMapNodes);

// Coordinates of nodes
fullMatrix<double> nodesXYZ(numMapNodes, 3),
Expand All @@ -493,21 +493,21 @@ void Patch::metricMinAndGradients(int iEl, std::vector<double> &lambda,
gradLambdaB = gradLambdaJ;

int iPC = 0;
std::vector<SPoint3> gXyzV(numJacNodes);
std::vector<SPoint3> gUvwV(numJacNodes);
for(int l = 0; l < numJacNodes; l++) {
std::vector<SPoint3> gXyzV(numSamplingPnts);
std::vector<SPoint3> gUvwV(numSamplingPnts);
for(int l = 0; l < numSamplingPnts; l++) {
lambda[l] = lambdaB(l);
}
for(int i = 0; i < numMapNodes; i++) {
int &iFVi = _el2FV[iEl][i];
if(iFVi >= 0) {
for(int l = 0; l < numJacNodes; l++) {
for(int l = 0; l < numSamplingPnts; l++) {
gXyzV[l] =
SPoint3(gradLambdaB(l, i + 0 * numMapNodes),
gradLambdaB(l, i + 1 * numMapNodes), /*BDB(l,i+2*nbNod)*/ 0.);
}
_coordFV[iFVi]->gXyz2gUvw(_uvw[iFVi], gXyzV, gUvwV);
for(int l = 0; l < numJacNodes; l++) {
for(int l = 0; l < numSamplingPnts; l++) {
gradLambda[indGSJ(iEl, l, iPC)] = gUvwV[l][0];
if(_nPCFV[iFVi] >= 2) gradLambda[indGSJ(iEl, l, iPC + 1)] = gUvwV[l][1];
if(_nPCFV[iFVi] == 3) gradLambda[indGSJ(iEl, l, iPC + 2)] = gUvwV[l][2];
Expand Down Expand Up @@ -768,7 +768,7 @@ void Patch::initIdealJac()
if(_nIJacEl.empty()) {
_nIJacEl.resize(nEl());
for(int iEl = 0; iEl < nEl(); iEl++)
_nIJacEl[iEl] = _el[iEl]->getJacobianFuncSpace()->getNumJacNodes();
_nIJacEl[iEl] = _el[iEl]->getJacobianFuncSpace()->getNumSamplingPnts();
}

// Set normals to 2D elements (with magnitude of inverse Jacobian) or initial
Expand All @@ -795,9 +795,9 @@ void Patch::idealJacAndGradients(int iEl, std::vector<double> &iJ,
std::vector<double> &gIJ)
{
const JacobianBasis *jacBasis = _el[iEl]->getJacobianFuncSpace();
const int &numJacNodes = _nIJacEl[iEl];
const int &numSamplingPnts = _nIJacEl[iEl];
const int &numMapNodes = _nNodEl[iEl];
fullMatrix<double> JDJ(numJacNodes, 3 * numMapNodes + 1);
fullMatrix<double> JDJ(numSamplingPnts, 3 * numMapNodes + 1);

// Coordinates of nodes
fullMatrix<double> nodesXYZ(numMapNodes, 3), normals(_dim, 3);
Expand All @@ -817,20 +817,20 @@ void Patch::idealJacAndGradients(int iEl, std::vector<double> &iJ,
bezierCoeff BDB(jacBasis->getFuncSpaceData(), JDJ);

// Scaled jacobian
for(int l = 0; l < numJacNodes; l++) iJ[l] = BDB(l, 3 * numMapNodes);
for(int l = 0; l < numSamplingPnts; l++) iJ[l] = BDB(l, 3 * numMapNodes);

// Gradients of the scaled jacobian
int iPC = 0;
std::vector<SPoint3> gXyzV(numJacNodes);
std::vector<SPoint3> gUvwV(numJacNodes);
std::vector<SPoint3> gXyzV(numSamplingPnts);
std::vector<SPoint3> gUvwV(numSamplingPnts);
for(int i = 0; i < numMapNodes; i++) {
int &iFVi = _el2FV[iEl][i];
if(iFVi >= 0) {
for(int l = 0; l < numJacNodes; l++)
for(int l = 0; l < numSamplingPnts; l++)
gXyzV[l] = SPoint3(BDB(l, i), BDB(l, i + numMapNodes),
BDB(l, i + 2 * numMapNodes));
_coordFV[iFVi]->gXyz2gUvw(_uvw[iFVi], gXyzV, gUvwV);
for(int l = 0; l < numJacNodes; l++) {
for(int l = 0; l < numSamplingPnts; l++) {
gIJ[indGIJac(iEl, l, iPC)] = gUvwV[l][0];
if(_nPCFV[iFVi] >= 2) gIJ[indGIJac(iEl, l, iPC + 1)] = gUvwV[l][1];
if(_nPCFV[iFVi] == 3) gIJ[indGIJac(iEl, l, iPC + 2)] = gUvwV[l][2];
Expand Down

0 comments on commit d76abce

Please sign in to comment.