ASMs2Dmx: use original spline for geometry with SUBGRID

src/ASM/ASMs2Dmx.C

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

src/ASM/Test/TestASMs2Dmx.C

@@ -240,7 +240,7 @@ TEST(TestASMs2Dmx, WriteSG)
 
   str.str("");
   EXPECT_TRUE(pch1.write(str, ASM::GEOMETRY_BASIS));
-  EXPECT_EQ(str.str(), squareTH_p);
+  EXPECT_EQ(str.str(), ASMSquare::square);
 
   str.str("");
   EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS));