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

Enable matrix dumping also without MPI.

Browse Source 
Also remove the need for the reinterpret_cast by adding some extra
implementation details for more general block matrices.
This commit is contained in:
Atgeirr Flø Rasmussen
2020-05-08 10:27:11 +02:00
parent 9476dfc35a
commit 329036612b
2 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,46 @@
#include <dune/istl/matrixmarket.hh>
namespace Dune
{
namespace MatrixMarketImpl
{
template <typename Block, typename A>
struct mm_header_printer<BCRSMatrix<Block, A>>
{
static void print(std::ostream& os)
{
using Value = typename Block::value_type;
os << "%%MatrixMarket matrix coordinate ";
os << mm_numeric_type<Value>::str() << " general" << std::endl;
}
};
template <typename Block, typename A>
struct mm_block_structure_header<BCRSMatrix<Block, A>>
{
using M = BCRSMatrix<Block, A>;
static void print(std::ostream& os, const M&)
{
os << "% ISTL_STRUCT blocked ";
os << Block::rows << " " << Block::cols << std::endl;
}
};
} // namespace MatrixMarketImpl
template <typename Block, typename A>
struct mm_multipliers<BCRSMatrix<Block, A>>
{
enum {
rows = Block::rows,
cols = Block::cols
};
};
} // namespace Dune
namespace Opm
{
namespace Helper
@@ -30,7 +70,7 @@ namespace Helper
void writeSystem(const SimulatorType& simulator,
const MatrixType& matrix,
const VectorType& rhs,
const Communicator* comm)
[[maybe_unused]] const Communicator* comm)
{
std::string dir = simulator.problem().outputDir();
if (dir == ".") {
@@ -56,18 +96,24 @@ namespace Helper
std::string prefix = full_path.string();
{
std::string filename = prefix + "matrix_istl";
#if HAVE_MPI
if (comm != nullptr) { // comm is not set in serial runs
Dune::storeMatrixMarket(matrix, filename, *comm, true);
} else {
Dune::storeMatrixMarket(matrix, filename);
} else
#endif
{
Dune::storeMatrixMarket(matrix, filename + ".mm");
}
}
{
std::string filename = prefix + "rhs_istl";
#if HAVE_MPI
if (comm != nullptr) { // comm is not set in serial runs
Dune::storeMatrixMarket(rhs, filename, *comm, true);
} else {
Dune::storeMatrixMarket(rhs, filename);
} else
#endif
{
Dune::storeMatrixMarket(rhs, filename + ".mm");
}
}
}