OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4028 from akva2/reduce_dup

Browse Source 
changed: get rid of duplicate MatrixBlock headers/classes
This commit is contained in:
Markus Blatt
2022-09-09 15:30:30 +02:00
committed by GitHub
parent f36ac3eeed 1a348c0d29
commit a4360b4961
9 changed files with 167 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_invert.cpp
View File

@@ -21,7 +21,7 @@
#define BOOST_TEST_MODULE InvertSpecializationTest
#include <boost/test/unit_test.hpp>
#include <opm/simulators/linalg/MatrixBlock.hpp>
#include <opm/simulators/linalg/matrixblock.hh>
void checkIdentity(Dune::FieldMatrix<double, 4, 4> M) {
@@ -41,7 +41,7 @@ void checkIdentity(Dune::FieldMatrix<double, 4, 4> M) {
BOOST_AUTO_TEST_CASE(Invert4x4)
{
typedef Dune::FieldMatrix<double, 4, 4> BaseType;
using BaseType = Dune::FieldMatrix<double, 4, 4>;
BaseType matrix;
BaseType inverse;
@@ -55,19 +55,13 @@ BOOST_AUTO_TEST_CASE(Invert4x4)
matrix[3][0] = 5;
matrix[0][3] = 14;
double det = Dune::FMatrixHelp::invertMatrix(matrix, inverse);
double det = Opm::detail::invertMatrix4<Opm::detail::FMat4>(matrix, inverse);
BOOST_CHECK_CLOSE(4, det, 1e-14);
// check matrix * inverse close to identiy
checkIdentity(matrix.rightmultiply(inverse));
// check return identity matrix if singular matrix
inverse = 0.0;
double det2 = Dune::FMatrixHelp::invertMatrix(matrix_sing, inverse);
BOOST_CHECK_CLOSE(1.0, det2, 1e-14);
checkIdentity(inverse);
// check singular matrix
BOOST_CHECK_THROW(Opm::detail::invertMatrix4<Opm::detail::FMat4>(matrix_sing, inverse),
Opm::NumericalProblem);
}

6
tests/test_multmatrixtransposed.cpp
View File

@@ -21,10 +21,12 @@
#define BOOST_TEST_MODULE MultMatrixTransposed
#include <boost/test/unit_test.hpp>
#include <opm/simulators/linalg/MatrixBlock.hpp>
#include <opm/simulators/linalg/SmallDenseMatrixUtils.hpp>
#include <dune/common/fmatrix.hh>
using namespace Dune;
using namespace Opm::Detail;
using namespace Opm::detail;
BOOST_AUTO_TEST_CASE(testmultmatrixtrans)
{