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

ASMs2Dmx: use original spline for geometry with SUBGRID

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-08-31 14:10:39 +02:00
parent 6ac805a569
commit dcd7067064
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ASM/ASMs2Dmx.C
View File

@ -220,12 +220,15 @@ bool ASMs2Dmx::generateFEMTopology ()
projB = m_basis[2-itgBasis].get(); projB = m_basis[2-itgBasis].get();
} }
if (ASMmxBase::Type == ASMmxBase::SUBGRID) if (ASMmxBase::Type == ASMmxBase::SUBGRID) {
projB2 = ASMmxBase::raiseBasis(surf); projB2 = ASMmxBase::raiseBasis(surf);
geomB = m_basis[1].get();
} else
geomB = m_basis[itgBasis-1].get();
delete surf; delete surf;
} }
geomB = surf = m_basis[itgBasis-1].get(); surf = m_basis[itgBasis-1].get();
nb.clear(); nb.clear();
nb.reserve(m_basis.size()); nb.reserve(m_basis.size());

2
src/ASM/Test/TestASMs2Dmx.C
View File

@ -240,7 +240,7 @@ TEST(TestASMs2Dmx, 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(), ASMSquare::square);
str.str(""); str.str("");
EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS)); EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS));