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

ASMuxDmx: restructure basis establishment

Browse Source 
make it (almost) similar to code in structured ASMs
This commit is contained in:
Arne Morten Kvarving 2023-08-29 12:37:54 +02:00
parent 809a650bc4
commit 005f8f24b1
2 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ASM/LR/ASMu2Dmx.C
View File

@ -220,34 +220,25 @@ bool ASMu2Dmx::generateFEMTopology ()
for (size_t b = 0; b < svec.size(); b++)
m_basis.push_back(createLR(*svec[b]));
// we need to project on something that is not one of our bases
if (ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS1 ||
ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS2 ||
ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE ||
ASMmxBase::Type == ASMmxBase::SUBGRID) {
Go::SplineSurface* otherBasis = nullptr;
if (!projB)
otherBasis = ASMmxBase::raiseBasis(tensorspline);
std::unique_ptr<Go::SplineSurface> otherBasis(ASMmxBase::raiseBasis(tensorspline));
if (ASMmxBase::Type == ASMmxBase::SUBGRID) {
refB = createLR(*otherBasis);
if (!projB)
projB = m_basis.front();
projB2 = refB;
}
else {
if (!projB)
projB = createLR(*otherBasis);
refB = projB;
}
delete otherBasis;
}
else {
if (!projB)
// we need to project on something that is not one of our bases
if (!projB) {
if (ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS1 ||
ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS2 ||
ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE)
projB = createLR(*otherBasis);
else if (ASMmxBase::Type == ASMmxBase::SUBGRID)
projB = m_basis.front();
else // FULL_CONT_RAISE_BASISx
projB = m_basis[2-ASMmxBase::geoBasis];
refB = projB;
}
if (ASMmxBase::Type == ASMmxBase::SUBGRID)
projB2 = refB = createLR(*otherBasis);
else
refB = projB;
is_rational = tensorspline->rational();
delete tensorspline;
tensorspline = nullptr;

37
src/ASM/LR/ASMu3Dmx.C
View File

@ -208,29 +208,30 @@ bool ASMu3Dmx::generateFEMTopology ()
for (size_t b = 0; b < vvec.size(); b++)
m_basis.push_back(std::make_shared<LR::LRSplineVolume>(vvec[b].get()));
// make a backup as establishBases resets it
int geoB = ASMmxBase::geoBasis;
std::shared_ptr<Go::SplineVolume> otherBasis =
ASMmxBase::establishBases(tensorspline,
ASMmxBase::FULL_CONT_RAISE_BASIS1).front();
geoBasis = geoB;
// we need to project on something that is not one of our bases
if (ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS1 ||
ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE ||
ASMmxBase::Type == ASMmxBase::SUBGRID) {
// make a backup as establishBases resets it
int geoB = ASMmxBase::geoBasis;
std::shared_ptr<Go::SplineVolume> otherBasis =
ASMmxBase::establishBases(tensorspline,
ASMmxBase::FULL_CONT_RAISE_BASIS1).front();
geoBasis = geoB;
if (ASMmxBase::Type == ASMmxBase::SUBGRID) {
refB = std::make_shared<LR::LRSplineVolume>(otherBasis.get());
if (!projB) {
if (ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS1 ||
ASMmxBase::Type == ASMmxBase::REDUCED_CONT_RAISE_BASIS2 ||
ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE)
projB = std::make_shared<LR::LRSplineVolume>(otherBasis.get());
else if (ASMmxBase::Type == ASMmxBase::SUBGRID)
projB = m_basis.front();
refB->generateIDs();
projB2 = refB;
} else
refB = projB = std::make_shared<LR::LRSplineVolume>(otherBasis.get());
} else {
if (!projB)
else // FULL_CONT_RAISE_BASISx
projB = m_basis[2-ASMmxBase::geoBasis];
refB = projB;
}
if (ASMmxBase::Type == ASMmxBase::SUBGRID)
projB2 = refB = std::make_shared<LR::LRSplineVolume>(otherBasis.get());
else
refB = projB;
delete tensorspline;
tensorspline = nullptr;
}