OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: ignore singular points in evalSolution

Browse Source 
instead of setting gradient to 0
This commit is contained in:
Arne Morten Kvarving 2021-08-11 09:23:42 +02:00
parent e9ef9039bb
commit 1f43156434
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ASM/ASMs2Dmx.C
View File

@ -1171,15 +1171,11 @@ bool ASMs2Dmx::evalSolution (Matrix& sField, const IntegrandBase& integrand,
// Compute Jacobian inverse of the coordinate mapping and
// basis function derivatives w.r.t. Cartesian coordinates
fe.detJxW = utl::Jacobian(Jac,fe.grad(geoBasis),Xtmp,dNxdu[geoBasis-1]);
if (fe.detJxW == 0.0) continue; // skip singular points
for (size_t b = 1; b <= m_basis.size(); b++)
if (b != (size_t)geoBasis)
{
if (fe.detJxW == 0.0)
fe.grad(b).clear();
else
fe.grad(b).multiply(dNxdu[b-1],Jac);
}
fe.grad(b).multiply(dNxdu[b-1],Jac);
// Cartesian coordinates of current integration point
utl::Point X4(Xtmp*fe.basis(geoBasis),{fe.u,fe.v});

8
src/ASM/ASMs2DmxLag.C
View File

@ -526,15 +526,11 @@ bool ASMs2DmxLag::evalSolution (Matrix& sField, const IntegrandBase& integrand,
// Compute the Jacobian inverse
fe.detJxW = utl::Jacobian(Jac,fe.grad(geoBasis),Xnod,dNxdu[geoBasis-1]);
if (fe.detJxW == 0.0) continue; // skip singular points
for (size_t b = 1; b <= nxx.size(); b++)
if (b != (size_t)geoBasis)
{
if (fe.detJxW == 0.0)
fe.grad(b).clear();
else
fe.grad(b).multiply(dNxdu[b-1],Jac);
}
fe.grad(b).multiply(dNxdu[b-1],Jac);
// Now evaluate the solution field
if (!integrand.evalSol(solPt,fe,Xnod*fe.basis(geoBasis),MNPC[iel-1],elem_size,nb))

8
src/ASM/ASMs3Dmx.C
View File

@ -1213,15 +1213,11 @@ bool ASMs3Dmx::evalSolution (Matrix& sField, const IntegrandBase& integrand,
// Compute Jacobian inverse of the coordinate mapping and
// basis function derivatives w.r.t. Cartesian coordinates
fe.detJxW = utl::Jacobian(Jac,fe.grad(geoBasis),Xtmp,dNxdu[geoBasis-1]);
if (fe.detJxW == 0.0) continue; // skip singular points
for (size_t b = 1; b <= m_basis.size(); b++)
if (b != (size_t)geoBasis)
{
if (fe.detJxW == 0.0)
fe.grad(b).clear();
else
fe.grad(b).multiply(dNxdu[b-1],Jac);
}
fe.grad(b).multiply(dNxdu[b-1],Jac);
// Cartesian coordinates of current integration point
utl::Point X4(Xtmp * fe.basis(geoBasis),{fe.u,fe.v,fe.w});

8
src/ASM/ASMs3DmxLag.C
View File

@ -594,15 +594,11 @@ bool ASMs3DmxLag::evalSolution (Matrix& sField, const IntegrandBase& integrand,
// Compute the Jacobian inverse
fe.detJxW = utl::Jacobian(Jac,fe.grad(geoBasis),Xnod,dNxdu[geoBasis-1]);
if (fe.detJxW == 0.0) continue; // skip singular points
for (size_t b = 1; b <= nxx.size(); b++)
if (b != (size_t)geoBasis)
{
if (fe.detJxW == 0.0)
fe.grad(b).clear();
else
fe.grad(b).multiply(dNxdu[b-1],Jac);
}
fe.grad(b).multiply(dNxdu[b-1],Jac);
// Now evaluate the solution field
if (!integrand.evalSol(solPt,fe,Xnod*fe.basis(geoBasis),MNPC[iel-1],elem_size,nb))