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

use getBasis(ASM::PROJECTION) in ASMuxD::refine

Browse Source 
and restructure a little to make code more readable.
This commit is contained in:
Arne Morten Kvarving 2023-08-25 12:41:53 +02:00
parent c3bb2447cd
commit 00486b30e8
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ASM/LR/ASMu2D.C
View File

@ -2766,13 +2766,17 @@ const RealArray& ASMu2D::InterfaceChecker::getIntersections (int iel, int edge,
bool ASMu2D::refine (const LR::RefineData& prm, Vectors& sol)
{
bool ok = this->ASMLRSpline::refine(prm,sol);
if (!ok || !this->separateProjectionBasis() ||
prm.elements.size() + prm.errors.size() == 0)
return ok;
if (!this->ASMLRSpline::refine(prm,sol))
return false;
LR::LRSplineSurface* proj = static_cast<LR::LRSplineSurface*>(projB.get());
// check if refinement was actually done
if (prm.elements.size() + prm.errors.size() == 0)
return true;
if (!this->separateProjectionBasis())
return true;
LR::LRSplineSurface* proj = this->getBasis(ASM::PROJECTION_BASIS);
for (const LR::Meshline* line : lrspline->getAllMeshlines())
if (line->span_u_line_)
proj->insert_const_v_edge(line->const_par_,
@ -2783,11 +2787,12 @@ bool ASMu2D::refine (const LR::RefineData& prm, Vectors& sol)
line->start_, line->stop_,
line->multiplicity());
projB->generateIDs();
proj->generateIDs();
IFEM::cout <<"Refined projection basis: "<< projB->nElements()
<<" elements "<< projB->nBasisFunctions() <<" nodes."
IFEM::cout <<"Refined projection basis: "<< proj->nElements()
<<" elements "<< proj->nBasisFunctions() <<" nodes."
<< std::endl;
return true;
}

23
src/ASM/LR/ASMu3D.C
View File

@ -2334,14 +2334,25 @@ void ASMu3D::extendRefinementDomain (IntSet& refineIndices,
bool ASMu3D::refine (const LR::RefineData& prm, Vectors& sol)
{
bool ok = this->ASMLRSpline::refine(prm,sol);
if (!ok || !this->separateProjectionBasis() ||
prm.elements.size() + prm.errors.size() == 0)
return ok;
if (!this->ASMLRSpline::refine(prm,sol))
return false;
// TODO: check this
// check if refinement was actually done
if (prm.elements.size() + prm.errors.size() == 0)
return true;
if (!this->separateProjectionBasis())
return true;
LR::LRSplineVolume* proj = this->getBasis(ASM::PROJECTION_BASIS);
for (const LR::MeshRectangle* rect : lrspline->getAllMeshRectangles())
std::static_pointer_cast<LR::LRSplineVolume>(projB)->insert_line(rect->copy());
proj->insert_line(rect->copy());
proj->generateIDs();
IFEM::cout <<"Refined projection basis: "<< proj->nElements()
<<" elements "<< proj->nBasisFunctions() <<" nodes."
<< std::endl;
return true;
}