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

Changed: No default value on the number of bases

Browse Source
This commit is contained in:
Knut Morten Okstad
2021-10-02 08:11:10 +02:00
parent b4ac1494a2
commit bb95b66a7c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ASM/BlockElmMats.h
View File

@@ -23,7 +23,7 @@
coupling, where the element matrices typically consist of blocks resulting
from the various integrands. The block sub-matrices are stitched together into
an element-level Newton matrix corresponding to all DOFs of the element by the
getNewtonMatrix method.
getNewtonMatrix() method.
*/
class BlockElmMats : public ElmMats
@@ -31,8 +31,8 @@ class BlockElmMats : public ElmMats
public:
//! \brief The constructor initializes the block information arrays.
//! \param[in] nBlk Number of matrix blocks (in each direction, row & column)
//! \param[in] nb Number of bases (> 1 for mixed problems)
explicit BlockElmMats(size_t nBlk, size_t nb = 1) : blockInfo(nBlk), basisInfo(nb) {}
//! \param[in] nBas Number of bases (> 1 for mixed problems)
BlockElmMats(size_t nBlk, size_t nBas) : blockInfo(nBlk), basisInfo(nBas) {}
//! \brief Empty destructor.
virtual ~BlockElmMats() {}
@@ -59,9 +59,7 @@ public:
//! \brief Returns the element-level Newton matrix.
virtual const Matrix& getNewtonMatrix() const;
//! \brief Returns the element-level right-hand-side vector
//! associated with the Newton matrix.
//! \brief Returns the element-level right-hand-side vector.
virtual const Vector& getRHSVector() const;
private:

8
src/ASM/Test/TestBlockElmMats.C
View File

@@ -17,7 +17,7 @@
TEST(TestBlockElmMats, 1Basis2BlocksDiag)
{
BlockElmMats mats(2);
BlockElmMats mats(2, 1);
mats.resize(3, 3);
ASSERT_TRUE(mats.redim(1, 2, 1));
@@ -44,7 +44,7 @@ TEST(TestBlockElmMats, 1Basis2BlocksDiag)
TEST(TestBlockElmMats, 1Basis2BlocksSymmetric)
{
BlockElmMats mats(2);
BlockElmMats mats(2, 1);
mats.resize(4, 3);
ASSERT_TRUE(mats.redim(1, 2, 1));
@@ -76,7 +76,7 @@ TEST(TestBlockElmMats, 1Basis2BlocksSymmetric)
TEST(TestBlockElmMats, 1Basis2BlocksSkewSymmetric)
{
BlockElmMats mats(2);
BlockElmMats mats(2, 1);
mats.resize(4, 3);
ASSERT_TRUE(mats.redim(1, 2, 1));
@@ -108,7 +108,7 @@ TEST(TestBlockElmMats, 1Basis2BlocksSkewSymmetric)
TEST(TestBlockElmMats, 1Basis2BlocksFull)
{
BlockElmMats mats(2);
BlockElmMats mats(2, 1);
mats.resize(5, 3);
ASSERT_TRUE(mats.redim(1, 2, 1));