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

ASMu2Dmx: use original spline for geometry with SUBGRID

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-09-07 10:59:38 +02:00
parent 772704b401
commit 07bd00da2d
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,10 +223,13 @@ bool ASMu2Dmx::generateFEMTopology ()
projB = m_basis[2-ASMmxBase::itgBasis]; projB = m_basis[2-ASMmxBase::itgBasis];
} }
if (ASMmxBase::Type == ASMmxBase::SUBGRID) if (ASMmxBase::Type == ASMmxBase::SUBGRID) {
projB2 = refB = createLR(*otherBasis); projB2 = refB = createLR(*otherBasis);
else geomB = m_basis[1];
} else {
refB = projB; refB = projB;
geomB = m_basis[itgBasis-1];
}
is_rational = tensorspline->rational(); is_rational = tensorspline->rational();
delete tensorspline; delete tensorspline;
@ -284,7 +287,6 @@ bool ASMu2Dmx::generateFEMTopology ()
std::cout <<"NEL = "<< nel <<" NNOD = "<< nnod << std::endl; std::cout <<"NEL = "<< nel <<" NNOD = "<< nnod << std::endl;
#endif #endif
geomB = m_basis[itgBasis-1];
this->generateBezierBasis(); this->generateBezierBasis();
this->generateBezierExtraction(); this->generateBezierExtraction();
@ -1208,13 +1210,8 @@ void ASMu2Dmx::copyRefinement (LR::LRSplineSurface* basis,
void ASMu2Dmx::swapProjectionBasis () void ASMu2Dmx::swapProjectionBasis ()
{ {
if (projB2) { if (projB2) {
ASMmxBase::itgBasis = ASMmxBase::itgBasis == 1 ? 2 : 1;
std::swap(projB, projB2); std::swap(projB, projB2);
std::swap(projThreadGroups, proj2ThreadGroups); std::swap(projThreadGroups, proj2ThreadGroups);
lrspline = m_basis[ASMmxBase::itgBasis-1];
geomB = lrspline;
this->generateBezierBasis();
this->generateBezierExtraction();
} }
} }

2
src/ASM/LR/Test/TestASMu2Dmx.C
View File

@ -287,7 +287,7 @@ TEST(TestASMu2Dmx, WriteSG)
str.str(""); str.str("");
EXPECT_TRUE(pch1.write(str, ASM::GEOMETRY_BASIS)); EXPECT_TRUE(pch1.write(str, ASM::GEOMETRY_BASIS));
EXPECT_EQ(str.str(), squareTH_p); EXPECT_EQ(str.str(), ASMuSquare::square);
str.str(""); str.str("");
EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS)); EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS));