diff --git a/Common/Options.cpp b/Common/Options.cpp index e5fe4fe33a7ab6bbcabd51a5bd3397d19feb4c72..fde99c8175c59cfbb89dd2c12deeb50fb9689b10 100644 --- a/Common/Options.cpp +++ b/Common/Options.cpp @@ -5158,7 +5158,7 @@ double opt_mesh_quality_type(OPT_ARGS_NUM) if(CTX::instance()->mesh.qualityType != val) CTX::instance()->mesh.changed |= (ENT_LINE | ENT_SURFACE | ENT_VOLUME); CTX::instance()->mesh.qualityType = (int)val; - if(CTX::instance()->mesh.qualityType < 0 || CTX::instance()->mesh.qualityType > 3) + if(CTX::instance()->mesh.qualityType < 0 || CTX::instance()->mesh.qualityType > 4) CTX::instance()->mesh.qualityType = 0; } #if defined(HAVE_FLTK) diff --git a/Geo/GModelVertexArrays.cpp b/Geo/GModelVertexArrays.cpp index 21bde1de96bd979bbe5a9348fde0d21f525d0f4a..7b1445e4c28deb404c459759fc2cc7844e498807 100644 --- a/Geo/GModelVertexArrays.cpp +++ b/Geo/GModelVertexArrays.cpp @@ -103,12 +103,14 @@ bool isElementVisible(MElement *ele) if(!ele->getVisibility()) return false; if(CTX::instance()->mesh.qualitySup) { double q; - if(CTX::instance()->mesh.qualityType == 3) + if(CTX::instance()->mesh.qualityType == 4) q = ele->distoShapeMeasure(); - else if(CTX::instance()->mesh.qualityType == 2) + else if(CTX::instance()->mesh.qualityType == 3) q = ele->rhoShapeMeasure(); - else if(CTX::instance()->mesh.qualityType == 1) + else if(CTX::instance()->mesh.qualityType == 2) q = ele->gammaShapeMeasure(); + else if(CTX::instance()->mesh.qualityType == 1) + q = ele->minSIGEShapeMeasure(); else q = ele->minSICNShapeMeasure(); if(q < CTX::instance()->mesh.qualityInf || diff --git a/Mesh/qualityMeasuresJacobian.cpp b/Mesh/qualityMeasuresJacobian.cpp index 8f85c43c71de7a27d814eb5558bc990649bb6b0c..97eb1da16e508001473a02a6e1d30d1e91510fe8 100644 --- a/Mesh/qualityMeasuresJacobian.cpp +++ b/Mesh/qualityMeasuresJacobian.cpp @@ -435,10 +435,10 @@ void sampleIGEMeasure(MElement *el, int deg, double &min, double &max) const JacobianBasis *jacBasis = BasisFactory::getJacobianBasis(jacDetSpace); fullVector<double> coeffDeterminant(jacBasis->getNumJacNodes()); - jacBasis->getSignedIdealJacobian(nodesXYZ, coeffDeterminant); + jacBasis->getSignedJacobian(nodesXYZ, coeffDeterminant); fullMatrix<double> coeffMatLag(gradBasis->getNumSamplingPoints(), 9); - gradBasis->getAllIdealGradientsFromNodes(nodesXYZ, coeffMatLag); + gradBasis->getAllGradientsFromNodes(nodesXYZ, coeffMatLag); fullMatrix<double> v; computeCoeffLengthVectors_(coeffMatLag, v, type);