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

Modified blob creation in mesh quality optimizer to take "onlyValidity" parameter into account

parent d8c2e61e
Branches
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ struct QualPatchDefParameters : public MeshOptPatchDef ...@@ -27,6 +27,7 @@ struct QualPatchDefParameters : public MeshOptPatchDef
virtual int inPatch(const SPoint3 &badBary, double limDist, virtual int inPatch(const SPoint3 &badBary, double limDist,
MElement *el, GEntity* gEnt) const; MElement *el, GEntity* gEnt) const;
private: private:
bool _onlyValidity;
bool _excludeQuad, _excludeHex, _excludePrism, _excludeBL; bool _excludeQuad, _excludeHex, _excludePrism, _excludeBL;
double _idealJacMin, _invCondNumMin; double _idealJacMin, _invCondNumMin;
double _distanceFactor; double _distanceFactor;
...@@ -35,6 +36,7 @@ private: ...@@ -35,6 +36,7 @@ private:
QualPatchDefParameters::QualPatchDefParameters(const MeshQualOptParameters &p) QualPatchDefParameters::QualPatchDefParameters(const MeshQualOptParameters &p)
{ {
_onlyValidity = p.onlyValidity;
_excludeQuad = p.excludeQuad; _excludeQuad = p.excludeQuad;
_excludeHex = p.excludeHex; _excludeHex = p.excludeHex;
_excludePrism = p.excludePrism; _excludePrism = p.excludePrism;
...@@ -73,13 +75,17 @@ double QualPatchDefParameters::elBadness(MElement *el, GEntity* gEnt) const ...@@ -73,13 +75,17 @@ double QualPatchDefParameters::elBadness(MElement *el, GEntity* gEnt) const
if (itBLEl != blc->_toFirst.end()) return 1.; if (itBLEl != blc->_toFirst.end()) return 1.;
} }
} }
// double jMin, jMax; if (_onlyValidity) {
// el->idealJacRange(jMin, jMax); double jMin, jMax;
// return jMin-_idealJacMin; el->idealJacRange(jMin, jMax);
return jMin-_idealJacMin;
}
else {
double iCNMin, iCNMax; double iCNMin, iCNMax;
el->signedInvCondNumRange(iCNMin, iCNMax); el->signedInvCondNumRange(iCNMin, iCNMax);
return iCNMin-_invCondNumMin; return iCNMin-_invCondNumMin;
} }
}
double QualPatchDefParameters::maxDistance(MElement *el) const double QualPatchDefParameters::maxDistance(MElement *el) const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment