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

ASMuxD::assembleL2matrices

Browse Source 
fix condition for using model MNPC
This commit is contained in:
Arne Morten Kvarving 2023-09-04 12:28:09 +02:00
parent 9a4c48eac4
commit dbb7b41ade
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ASM/LR/ASMu2Drecovery.C
View File

@ -111,6 +111,7 @@ bool ASMu2D::assembleL2matrices (SparseMatrix& A, StdVector& B,
const LR::LRSplineSurface* itg = this->getBasis(ASM::INTEGRATION_BASIS);
const LR::LRSplineSurface* proj = this->getBasis(ASM::PROJECTION_BASIS);
const bool separateProjBasis = proj != itg;
const bool useModelMNPC = !separateProjBasis && this->getNoBasis() == 1;
const int p1 = proj->order(0);
const int p2 = proj->order(1);
@ -126,7 +127,7 @@ bool ASMu2D::assembleL2matrices (SparseMatrix& A, StdVector& B,
if (continuous && !wg) return false;
IntMat lmnpc;
if (separateProjBasis) {
if (!useModelMNPC) {
lmnpc.resize(proj->nElements());
for (const LR::Element* elm : proj->getAllElements()) {
lmnpc[elm->getId()].reserve(elm->nBasisFunctions());
@ -134,7 +135,7 @@ bool ASMu2D::assembleL2matrices (SparseMatrix& A, StdVector& B,
lmnpc[elm->getId()].push_back(f->getId());
}
}
const IntMat& gmnpc = separateProjBasis ? lmnpc : MNPC;
const IntMat& gmnpc = useModelMNPC ? MNPC : lmnpc;
A.preAssemble(gmnpc, gmnpc.size());
// === Assembly loop over all elements in the patch ==========================
@ -181,7 +182,7 @@ bool ASMu2D::assembleL2matrices (SparseMatrix& A, StdVector& B,
// Set up basis function size (for extractBasis subroutine)
size_t nbf = elm->nBasisFunctions();
const IntVec& mnpc = separateProjBasis ? gmnpc[ielp] : gmnpc[iel-1];
const IntVec& mnpc = useModelMNPC ? gmnpc[iel-1] : gmnpc[ielp];
// --- Integration loop over all Gauss points in each direction ------------
Matrix eA(nbf, nbf);

7
src/ASM/LR/ASMu3Drecovery.C
View File

@ -113,6 +113,7 @@ bool ASMu3D::assembleL2matrices (SparseMatrix& A, StdVector& B,
const LR::LRSplineVolume* itg = this->getBasis(ASM::INTEGRATION_BASIS);
const LR::LRSplineVolume* proj = this->getBasis(ASM::PROJECTION_BASIS);
const bool separateProjBasis = proj != itg;
const bool useModelMNPC = !separateProjBasis && this->getNoBasis() == 1;
const int p1 = proj->order(0);
const int p2 = proj->order(1);
@ -131,7 +132,7 @@ bool ASMu3D::assembleL2matrices (SparseMatrix& A, StdVector& B,
if (continuous && !wg) return false;
IntMat lmnpc;
if (separateProjBasis) {
if (!useModelMNPC) {
lmnpc.resize(proj->nElements());
for (const LR::Element* elm : proj->getAllElements()) {
lmnpc[elm->getId()].reserve(elm->nBasisFunctions());
@ -139,7 +140,7 @@ bool ASMu3D::assembleL2matrices (SparseMatrix& A, StdVector& B,
lmnpc[elm->getId()].push_back(f->getId());
}
}
const IntMat& gmnpc = separateProjBasis ? lmnpc : MNPC;
const IntMat& gmnpc = useModelMNPC ? MNPC : lmnpc;
A.preAssemble(gmnpc, gmnpc.size());
// === Assembly loop over all elements in the patch ==========================
@ -186,7 +187,7 @@ bool ASMu3D::assembleL2matrices (SparseMatrix& A, StdVector& B,
// Set up basis function size (for extractBasis subroutine)
size_t nbf = elm->nBasisFunctions();
const IntVec& mnpc = separateProjBasis ? gmnpc[ielp] : gmnpc[iel-1];
const IntVec& mnpc = useModelMNPC ? gmnpc[iel-1] : gmnpc[ielp];
// --- Integration loop over all Gauss points in each direction ------------