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

rename altProjThreadGroups to proj2ThreadGroups

Browse Source
This commit is contained in:
Arne Morten Kvarving
2023-08-29 10:32:43 +02:00
parent 505d9d9a6c
commit 59ad91c245
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ASM/LR/ASMu2Dmx.C
View File

@@ -1080,7 +1080,7 @@ void ASMu2Dmx::generateThreadGroups (const Integrand& integrand, bool silence,
LR::generateThreadGroups(threadGroups,threadBasis,secConstraint);
LR::generateThreadGroups(projThreadGroups,projB.get());
if (projB2)
LR::generateThreadGroups(altProjThreadGroups,projB2.get());
LR::generateThreadGroups(proj2ThreadGroups,projB2.get());
std::vector<const LR::LRSpline*> bases;
for (const SplinePtr& basis : m_basis)
@@ -1217,7 +1217,7 @@ void ASMu2Dmx::swapProjectionBasis ()
if (projB2) {
ASMmxBase::geoBasis = ASMmxBase::geoBasis == 1 ? 2 : 1;
std::swap(projB, projB2);
std::swap(projThreadGroups, altProjThreadGroups);
std::swap(projThreadGroups, proj2ThreadGroups);
lrspline = m_basis[ASMmxBase::geoBasis-1];
geomB = lrspline;
this->generateBezierBasis();

2
src/ASM/LR/ASMu2Dmx.h
View File

@@ -271,7 +271,7 @@ private:
LR::LRSplineSurface* threadBasis; //!< Basis for thread groups
SplinePtr refBasis; //!< Basis to refine based on
ThreadGroups altProjThreadGroups; //!< Element groups for multi-threaded assembly - alternative projection basis
ThreadGroups proj2ThreadGroups; //!< Element groups for multi-threaded assembly - second projection basis
};
#endif

4
src/ASM/LR/ASMu3Dmx.C
View File

@@ -957,7 +957,7 @@ void ASMu3Dmx::generateThreadGroups (const Integrand& integrand, bool silence,
LR::generateThreadGroups(threadGroups,threadBasis,secConstraint);
LR::generateThreadGroups(projThreadGroups,projB.get());
if (projB2)
LR::generateThreadGroups(altProjThreadGroups,projB2.get());
LR::generateThreadGroups(proj2ThreadGroups,projB2.get());
std::vector<const LR::LRSpline*> bases;
for (const SplinePtr& basis : m_basis)
@@ -1025,7 +1025,7 @@ void ASMu3Dmx::swapProjectionBasis ()
if (projB2) {
ASMmxBase::geoBasis = ASMmxBase::geoBasis == 1 ? 2 : 1;
std::swap(projB, projB2);
std::swap(projThreadGroups, altProjThreadGroups);
std::swap(projThreadGroups, proj2ThreadGroups);
}
}

2
src/ASM/LR/ASMu3Dmx.h
View File

@@ -238,7 +238,7 @@ private:
const std::vector<Matrices>& bezierExtractmx; //!< Bezier extraction matrices
std::vector<Matrices> myBezierExtractmx; //!< Bezier extraction matrices
ThreadGroups altProjThreadGroups; //!< Element groups for multi-threaded assembly - alternative projection basis
ThreadGroups proj2ThreadGroups; //!< Element groups for multi-threaded assembly - second projection basis
};
#endif