Skip to content

Commit d8d4d40

Browse files
committed
fixed: projection basis for XXX_CONT_RAISE_BASIS2
1 parent 7cfd247 commit d8d4d40

5 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/ASM/ASMmxBase.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ ASMmxBase::SurfaceVec ASMmxBase::establishBases (Go::SplineSurface* surf,
245245
}
246246

247247
if (type == FULL_CONT_RAISE_BASIS2 || type == REDUCED_CONT_RAISE_BASIS2)
248-
std::swap(result[0], result[1]);
248+
std::swap(result[0], result[1]), geoBasis = 1;
249249

250250
return result;
251251
}

src/ASM/ASMs2Dmx.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ bool ASMs2Dmx::generateFEMTopology ()
183183
ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE)
184184
projB = proj = ASMmxBase::raiseBasis(surf);
185185
else
186-
projB = proj = m_basis.front()->clone();
186+
projB = proj = m_basis[2-ASMmxBase::geoBasis]->clone();
187187
}
188188
delete surf;
189189
geomB = surf = m_basis[geoBasis-1]->clone();

src/ASM/ASMs3Dmx.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ bool ASMs3Dmx::generateFEMTopology ()
182182
ASMmxBase::Type == ASMmxBase::DIV_COMPATIBLE)
183183
projB = proj = ASMmxBase::raiseBasis(svol);
184184
else
185-
projB = proj = m_basis.front()->clone();
185+
projB = proj = m_basis[2-ASMmxBase::geoBasis]->clone();
186186
}
187187
delete svol;
188188
geomB = svol = m_basis[geoBasis-1]->clone();

src/ASM/LR/ASMu2Dmx.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ bool ASMu2Dmx::generateFEMTopology ()
215215
}
216216
else {
217217
if (!projBasis)
218-
projBasis = m_basis.front();
218+
projBasis = m_basis[2-ASMmxBase::geoBasis];
219219
refBasis = projBasis;
220220
}
221221
}

src/ASM/LR/ASMu3Dmx.C

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,11 @@ bool ASMu3Dmx::generateFEMTopology ()
197197
projBasis.reset(new LR::LRSplineVolume(otherBasis.get()));
198198
refBasis = projBasis;
199199
}
200-
} else
201-
projBasis = refBasis = m_basis[0];
200+
} else {
201+
if (!projBasis)
202+
projBasis = m_basis[2-ASMmxBase::geoBasis];
203+
refBasis = projBasis;
204+
}
202205
}
203206
lrspline = m_basis[geoBasis-1];
204207
projBasis->generateIDs();

0 commit comments

Comments
 (0)