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 #2615 from atgeirr/split-files

Browse Source 
Split file to ensure correct authorship and license is applied.
This commit is contained in:
Markus Blatt 2020-05-13 15:02:54 +02:00 committed by GitHub
commit 46ab154396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 66 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -156,6 +156,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/linalg/ISTLSolverEbos.hpp opm/simulators/linalg/ISTLSolverEbos.hpp
opm/simulators/linalg/ISTLSolverEbosFlexible.hpp opm/simulators/linalg/ISTLSolverEbosFlexible.hpp
opm/simulators/linalg/MatrixBlock.hpp opm/simulators/linalg/MatrixBlock.hpp
opm/simulators/linalg/MatrixMarketSpecializations.hpp
opm/simulators/linalg/OwningBlockPreconditioner.hpp opm/simulators/linalg/OwningBlockPreconditioner.hpp
opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp
opm/simulators/linalg/ParallelOverlappingILU0.hpp opm/simulators/linalg/ParallelOverlappingILU0.hpp
@ -165,6 +166,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/linalg/PressureTransferPolicy.hpp opm/simulators/linalg/PressureTransferPolicy.hpp
opm/simulators/linalg/PreconditionerFactory.hpp opm/simulators/linalg/PreconditionerFactory.hpp
opm/simulators/linalg/PreconditionerWithUpdate.hpp opm/simulators/linalg/PreconditionerWithUpdate.hpp
opm/simulators/linalg/WriteSystemMatrixHelper.hpp
opm/simulators/linalg/findOverlapRowsAndColumns.hpp opm/simulators/linalg/findOverlapRowsAndColumns.hpp
opm/simulators/linalg/getQuasiImpesWeights.hpp opm/simulators/linalg/getQuasiImpesWeights.hpp
opm/simulators/linalg/setupPropertyTree.hpp opm/simulators/linalg/setupPropertyTree.hpp

63
opm/simulators/linalg/MatrixMarketSpecializations.hpp Normal file
View File

@ -0,0 +1,63 @@
/*
The content of this file is based on the file dune/istl/matrixmarket.hh in
the Dune module dune-istl.
The license of this file is therefore the same as that of Dune, see
https://www.dune-project.org/about/license/
*/
#ifndef OPM_MATRIXMARKETSPECIALIZATIONS_HEADER_INCLUDED
#define OPM_MATRIXMARKETSPECIALIZATIONS_HEADER_INCLUDED
#include <dune/istl/matrixmarket.hh>
namespace Opm
{
template<typename T, int i, int j>
class MatrixBlock;
}
namespace Dune
{
namespace MatrixMarketImpl
{
template <typename T, int i, int j, typename A>
struct mm_header_printer<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{
static void print(std::ostream& os)
{
os << "%%MatrixMarket matrix coordinate ";
os << mm_numeric_type<T>::str() << " general" << std::endl;
}
};
template <typename T, int i, int j, typename A>
struct mm_block_structure_header<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{
using M = BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>;
static void print(std::ostream& os, const M&)
{
os << "% ISTL_STRUCT blocked ";
os << i << " " << j << std::endl;
}
};
} // namespace MatrixMarketImpl
template<class M>
struct mm_multipliers;
template <typename T, int i, int j, typename A>
struct mm_multipliers<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{
enum {
rows = i,
cols = j
};
};
} // namespace Dune
#endif

49
opm/simulators/linalg/WriteSystemMatrixHelper.hpp
View File

@ -21,55 +21,8 @@
#define OPM_WRITESYSTEMMATRIXHELPER_HEADER_INCLUDED #define OPM_WRITESYSTEMMATRIXHELPER_HEADER_INCLUDED
#include <dune/istl/matrixmarket.hh> #include <dune/istl/matrixmarket.hh>
#include <opm/simulators/linalg/MatrixMarketSpecializations.hpp>
namespace Opm
{
template<typename T, int i, int j>
class MatrixBlock;
}
namespace Dune
{
namespace MatrixMarketImpl
{
template <typename T, int i, int j, typename A>
struct mm_header_printer<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{
static void print(std::ostream& os)
{
os << "%%MatrixMarket matrix coordinate ";
os << mm_numeric_type<T>::str() << " general" << std::endl;
}
};
template <typename T, int i, int j, typename A>
struct mm_block_structure_header<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{
using M = BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>;
static void print(std::ostream& os, const M&)
{
os << "% ISTL_STRUCT blocked ";
os << i << " " << j << std::endl;
}
};
} // namespace MatrixMarketImpl
template<class M>
struct mm_multipliers;
template <typename T, int i, int j, typename A>
struct mm_multipliers<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{
enum {
rows = i,
cols = j
};
};
} // namespace Dune
namespace Opm namespace Opm
{ {