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 #4300 from akva2/msw_simplify_invert

Browse Source 
MSWellHelpers: reverse order of template parameters
This commit is contained in:
Bård Skaflestad 2022-12-01 00:02:35 +01:00 committed by GitHub
commit 2e15513b43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/wells/MSWellHelpers.cpp
View File

@ -139,7 +139,7 @@ applyUMFPack(const MatrixType& D,
#endif // HAVE_UMFPACK #endif // HAVE_UMFPACK
} }
template <typename MatrixType, typename VectorType> template <typename VectorType, typename MatrixType>
Dune::Matrix<typename MatrixType::block_type> Dune::Matrix<typename MatrixType::block_type>
invertWithUMFPack(const MatrixType& D, std::shared_ptr<Dune::UMFPack<MatrixType> >& linsolver) invertWithUMFPack(const MatrixType& D, std::shared_ptr<Dune::UMFPack<MatrixType> >& linsolver)
{ {
@ -332,7 +332,7 @@ using Mat = Dune::BCRSMatrix<Dune::FieldMatrix<double,Dim,Dim>>;
std::shared_ptr<Dune::UMFPack<Mat<Dim>>>&, \ std::shared_ptr<Dune::UMFPack<Mat<Dim>>>&, \
Vec<Dim>); \ Vec<Dim>); \
template Dune::Matrix<typename Mat<Dim>::block_type> \ template Dune::Matrix<typename Mat<Dim>::block_type> \
invertWithUMFPack<Mat<Dim>,Vec<Dim>>(const Mat<Dim>& D, \ invertWithUMFPack<Vec<Dim>,Mat<Dim>>(const Mat<Dim>& D, \
std::shared_ptr<Dune::UMFPack<Mat<Dim>>>&); std::shared_ptr<Dune::UMFPack<Mat<Dim>>>&);
INSTANCE_UMF(2) INSTANCE_UMF(2)

2
opm/simulators/wells/MSWellHelpers.hpp
View File

@ -49,7 +49,7 @@ namespace mswellhelpers
/// Applies umfpack and checks for singularity /// Applies umfpack and checks for singularity
template <typename MatrixType, typename VectorType> template <typename VectorType, typename MatrixType>
Dune::Matrix<typename MatrixType::block_type> Dune::Matrix<typename MatrixType::block_type>
invertWithUMFPack(const MatrixType& D, invertWithUMFPack(const MatrixType& D,
std::shared_ptr<Dune::UMFPack<MatrixType> >& linsolver); std::shared_ptr<Dune::UMFPack<MatrixType> >& linsolver);

2
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -727,7 +727,7 @@ namespace Opm
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
addWellContributions(SparseMatrixAdapter& jacobian) const addWellContributions(SparseMatrixAdapter& jacobian) const
{ {
const auto invDuneD = mswellhelpers::invertWithUMFPack<DiagMatWell, BVectorWell>(this->duneD_, this->duneDSolver_); const auto invDuneD = mswellhelpers::invertWithUMFPack<BVectorWell>(this->duneD_, this->duneDSolver_);
// We need to change matrix A as follows // We need to change matrix A as follows
// A -= C^T D^-1 B // A -= C^T D^-1 B