fixed: projection basis for XXX_CONT_RAISE_BASIS2

OPM · Oct 29, 2021 · d8d4d40 · d8d4d40
1 parent 7cfd247
commit d8d4d40
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/ASM/ASMmxBase.C b/src/ASM/ASMmxBase.C
@@ -245,7 +245,7 @@ ASMmxBase::SurfaceVec ASMmxBase::establishBases (Go::SplineSurface* surf,
   }
 
   if (type == FULL_CONT_RAISE_BASIS2 || type == REDUCED_CONT_RAISE_BASIS2)
-    std::swap(result[0], result[1]);
+    std::swap(result[0], result[1]), geoBasis = 1;
 
   return result;
 }

diff --git a/src/ASM/ASMs2Dmx.C b/src/ASM/ASMs2Dmx.C
@@ -183,7 +183,7 @@ bool ASMs2Dmx::generateFEMTopology ()
         ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE)
       projB = proj = ASMmxBase::raiseBasis(surf);
     else
-      projB = proj = m_basis.front()->clone();
+      projB = proj = m_basis[2-ASMmxBase::geoBasis]->clone();
   }
   delete surf;
   geomB = surf = m_basis[geoBasis-1]->clone();

diff --git a/src/ASM/ASMs3Dmx.C b/src/ASM/ASMs3Dmx.C
@@ -182,7 +182,7 @@ bool ASMs3Dmx::generateFEMTopology ()
         ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE)
       projB = proj = ASMmxBase::raiseBasis(svol);
     else
-      projB = proj = m_basis.front()->clone();
+      projB = proj = m_basis[2-ASMmxBase::geoBasis]->clone();
   }
   delete svol;
   geomB = svol = m_basis[geoBasis-1]->clone();

diff --git a/src/ASM/LR/ASMu2Dmx.C b/src/ASM/LR/ASMu2Dmx.C
@@ -215,7 +215,7 @@ bool ASMu2Dmx::generateFEMTopology ()
     }
     else {
       if (!projBasis)
-        projBasis = m_basis.front();
+        projBasis = m_basis[2-ASMmxBase::geoBasis];
       refBasis = projBasis;
     }
   }

diff --git a/src/ASM/LR/ASMu3Dmx.C b/src/ASM/LR/ASMu3Dmx.C
@@ -197,8 +197,11 @@ bool ASMu3Dmx::generateFEMTopology ()
         projBasis.reset(new LR::LRSplineVolume(otherBasis.get()));
         refBasis = projBasis;
       }
-    } else
-     projBasis = refBasis = m_basis[0];
+    } else {
+      if (!projBasis)
+        projBasis = m_basis[2-ASMmxBase::geoBasis];
+      refBasis = projBasis;
+    }
   }
   lrspline = m_basis[geoBasis-1];
   projBasis->generateIDs();