OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: use adjustBasis in ASMmxBase::raiseBasis

Browse Source 
for surfaces and volumes
This commit is contained in:
Arne Morten Kvarving 2023-09-07 20:30:24 +02:00
parent 5bfae73494
commit 5dae005582
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/ASM/ASMmxBase.C
View File

@ -394,21 +394,9 @@ Go::SplineSurface* ASMmxBase::raiseBasis (Go::SplineSurface* surf)
{
// Create a C^p-1 basis of one degree higher than *surf
// but keep lines of reduced continuity
std::array<Go::BsplineBasis,2> basis;
for (size_t idx = 0; idx < 2; ++idx) {
std::vector<double> knots;
surf->basis(idx).knotsSimple(knots);
std::vector<int> mult;
surf->basis(idx).knotMultiplicities(mult);
std::vector<int> cont(knots.size());
cont.front() = cont.back() = -1;
int order = idx == 0 ? surf->order_u() : surf->order_v();
for (size_t i = 1; i < knots.size()-1; ++i)
cont[i] = order - (mult[i] == 1 ? 1 : mult[i]+1);
std::vector<double> newknot = SplineUtils::buildKnotVector(order, knots, cont);
basis[idx] = Go::BsplineBasis(order+1, newknot.begin(), newknot.end());
}
using Op = SplineUtils::AdjustOp;
std::array<Go::BsplineBasis,2> basis{SplineUtils::adjustBasis(surf->basis(0),Op::Raise),
SplineUtils::adjustBasis(surf->basis(1),Op::Raise)};
// Compute parameter values of the Greville points
std::array<RealArray,2> ug;
@ -453,21 +441,10 @@ Go::SplineVolume* ASMmxBase::raiseBasis (Go::SplineVolume* svol)
{
// Create a C^p-1 basis of one degree higher than *svol
// but keep lines of reduced continuity
std::array<Go::BsplineBasis,3> basis;
for (size_t idx = 0; idx < 3; ++idx) {
std::vector<double> knots;
svol->basis(idx).knotsSimple(knots);
std::vector<int> mult;
svol->basis(idx).knotMultiplicities(mult);
std::vector<int> cont(knots.size());
cont.front() = cont.back() = -1;
int order = svol->order(idx);
for (size_t i = 1; i < knots.size()-1; ++i)
cont[i] = order - (mult[i] == 1 ? 1 : mult[i]+1);
std::vector<double> newknot = SplineUtils::buildKnotVector(order, knots, cont);
basis[idx] = Go::BsplineBasis(order+1, newknot.begin(), newknot.end());
}
using Op = SplineUtils::AdjustOp;
std::array<Go::BsplineBasis,3> basis{SplineUtils::adjustBasis(svol->basis(0),Op::Raise),
SplineUtils::adjustBasis(svol->basis(1),Op::Raise),
SplineUtils::adjustBasis(svol->basis(2),Op::Raise)};
// Compute parameter values of the Greville points
std::array<RealArray,3> ug;