ASMs3Dmx: use original spline for geometry with SUBGRID

src/ASM/ASMs3Dmx.C

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

src/ASM/Test/TestASMs3Dmx.C

@@ -471,7 +471,7 @@ TEST(TestASMs3Dmx, WriteSG)
 
   str.str("");
   EXPECT_TRUE(pch1.write(str, ASM::GEOMETRY_BASIS));
-  EXPECT_EQ(str.str(), cubeTH_p);
+  EXPECT_EQ(str.str(), ASMCube::cube);
 
   str.str("");
   EXPECT_TRUE(pch1.write(str, ASM::PROJECTION_BASIS));