From dc7282618894cc1aebb9c7ad343144884779a492 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 31 Aug 2023 14:11:11 +0200 Subject: [PATCH] ASMs2Dmx: use projection grid for geometry with DIV_COMPATIBLE --- src/ASM/ASMs2Dmx.C | 4 +++- src/ASM/Test/TestASMs2Dmx.C | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ASM/ASMs2Dmx.C b/src/ASM/ASMs2Dmx.C index be128b35..b14213f5 100644 --- a/src/ASM/ASMs2Dmx.C +++ b/src/ASM/ASMs2Dmx.C @@ -223,7 +223,9 @@ bool ASMs2Dmx::generateFEMTopology () if (ASMmxBase::Type == ASMmxBase::SUBGRID) { projB2 = ASMmxBase::raiseBasis(surf); geomB = m_basis[1].get(); - } else + } else if (ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE) + geomB = projB; + else geomB = m_basis[itgBasis-1].get(); delete surf; diff --git a/src/ASM/Test/TestASMs2Dmx.C b/src/ASM/Test/TestASMs2Dmx.C index 8eefd67e..68006111 100644 --- a/src/ASM/Test/TestASMs2Dmx.C +++ b/src/ASM/Test/TestASMs2Dmx.C @@ -206,7 +206,7 @@ TEST(TestASMs2Dmx, WriteRT) str.str(""); EXPECT_TRUE(pch1.write(str, ASM::GEOMETRY_BASIS)); - EXPECT_EQ(str.str(), ASMSquare::square); + EXPECT_EQ(str.str(), squareFRTH_1); str.str(""); EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS));