changed: drop ASMu2D::getParametricArea
just use LR::Element::area directly
This commit is contained in:
1 parent
47af45a21e
commit
fd9e17bacb
3 files changed
+10
-24
No files matched your search
+6
-18
@@ -886,21 +886,6 @@ void ASMu2D::constrainNode (double xi, double eta, int dof, int code)
|
||||
|
||||
#define DERR -999.99
|
||||
|
||||
double ASMu2D::getParametricArea (int iel) const
|
||||
{
|
||||
#ifdef INDEX_CHECK
|
||||
if (iel < 1 || iel > lrspline->nElements())
|
||||
{
|
||||
std::cerr <<" *** ASMu2D::getParametricArea: Element index "<< iel
|
||||
<<" out of range [1,"<< lrspline->nElements() <<"]."<< std::endl;
|
||||
return DERR;
|
||||
}
|
||||
#endif
|
||||
|
||||
return lrspline->getElement(iel-1)->area();
|
||||
}
|
||||
|
||||
|
||||
double ASMu2D::getParametricLength (int iel, int dir) const
|
||||
{
|
||||
#ifdef INDEX_CHECK
|
||||
@@ -1154,8 +1139,10 @@ bool ASMu2D::integrate (Integrand& integrand,
|
||||
double param[3] = { 0.0, 0.0, 0.0 };
|
||||
Vec4 X(param,time.t);
|
||||
|
||||
const LR::Element* el = lrspline->getElement(iel-1);
|
||||
|
||||
// Get element area in the parameter space
|
||||
double dA = 0.25*this->getParametricArea(iel);
|
||||
double dA = 0.25*el->area();
|
||||
if (dA < 0.0)
|
||||
{
|
||||
ok = false;
|
||||
@@ -1181,7 +1168,6 @@ bool ASMu2D::integrate (Integrand& integrand,
|
||||
ok = false;
|
||||
}
|
||||
|
||||
const LR::Element* el = lrspline->getElement(iel-1);
|
||||
if (integrand.getIntegrandType() & Integrand::G_MATRIX)
|
||||
{
|
||||
// Element size in parametric space
|
||||
@@ -1436,8 +1422,10 @@ bool ASMu2D::integrate (Integrand& integrand,
|
||||
Matrix3D d2Ndu2, Hess;
|
||||
Vec4 X(nullptr,time.t);
|
||||
|
||||
const LR::Element* el = lrspline->getElement(iel-1);
|
||||
|
||||
// Get element area in the parameter space
|
||||
double dA = 0.25*this->getParametricArea(iel);
|
||||
double dA = 0.25*el->area();
|
||||
if (dA < 0.0)
|
||||
{
|
||||
ok = false;
|
||||
|
||||
@@ -600,9 +600,6 @@ protected:
|
||||
//! \param[in] basisNum Which basis to get Greville point parameters for
|
||||
bool getGrevilleParameters(RealArray& prm, int dir, int basisNum = 1) const;
|
||||
|
||||
//! \brief Returns the area in the parameter space for an element.
|
||||
//! \param[in] iel 1-based element index
|
||||
double getParametricArea(int iel) const;
|
||||
//! \brief Returns boundary edge length in the parameter space for an element.
|
||||
//! \param[in] iel 1-based element index
|
||||
//! \param[in] dir Local index of the boundary edge
|
||||
|
||||
@@ -365,7 +365,8 @@ bool ASMu2Dmx::integrate (Integrand& integrand,
|
||||
fe.iel = MLGE[geoEl-1];
|
||||
|
||||
// Get element area in the parameter space
|
||||
double dA = 0.25*this->getParametricArea(geoEl);
|
||||
const LR::Element* el = lrspline->getElement(geoEl-1);
|
||||
double dA = 0.25*el->area();
|
||||
if (dA < 0.0)
|
||||
{
|
||||
ok = false; // topology error (probably logic error)
|
||||
@@ -385,8 +386,8 @@ bool ASMu2Dmx::integrate (Integrand& integrand,
|
||||
if (integrand.getIntegrandType() & Integrand::G_MATRIX)
|
||||
{
|
||||
// Element size in parametric space
|
||||
dXidu[0] = lrspline->getElement(geoEl-1)->umax() - lrspline->getElement(geoEl-1)->umin();
|
||||
dXidu[1] = lrspline->getElement(geoEl-1)->vmax() - lrspline->getElement(geoEl-1)->vmin();
|
||||
dXidu[0] = el->umax() - el->umin();
|
||||
dXidu[1] = el->vmax() - el->vmin();
|
||||
}
|
||||
|
||||
// Initialize element quantities
|
||||
|
||||
Reference in new issue
Block a user