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 #3949 from akva2/fix_build_dune2.6

Browse Source 
fixed: fix build with dune 2.6
This commit is contained in:
Arne Morten Kvarving 2022-06-20 14:51:20 +02:00 committed by GitHub
commit 3a6abf7f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/simulators/linalg/MatrixMarketSpecializations.hpp
View File

@ -9,6 +9,7 @@
#ifndef OPM_MATRIXMARKETSPECIALIZATIONS_HEADER_INCLUDED #ifndef OPM_MATRIXMARKETSPECIALIZATIONS_HEADER_INCLUDED
#define OPM_MATRIXMARKETSPECIALIZATIONS_HEADER_INCLUDED #define OPM_MATRIXMARKETSPECIALIZATIONS_HEADER_INCLUDED
#include <dune/common/version.hh>
#include <dune/istl/matrixmarket.hh> #include <dune/istl/matrixmarket.hh>
namespace Opm namespace Opm
@ -43,10 +44,12 @@ namespace MatrixMarketImpl
os << i << " " << j << std::endl; os << i << " " << j << std::endl;
} }
}; };
} // namespace MatrixMarketImpl
template<class M> #if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7)
struct mm_multipliers; namespace MatrixMarketImpl
{
#endif
template <typename T, int i, int j, typename A> template <typename T, int i, int j, typename A>
struct mm_multipliers<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>> struct mm_multipliers<BCRSMatrix<Opm::MatrixBlock<T,i,j>, A>>
{ {
@ -55,9 +58,9 @@ namespace MatrixMarketImpl
cols = j cols = j
}; };
}; };
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7)
} // namespace MatrixMarketImpl } // namespace MatrixMarketImpl
#endif
} // namespace Dune } // namespace Dune

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

@ -783,7 +783,8 @@ namespace Opm
} }
// make cpr weights for well by pure avarage of reservoir weights of the perforations // make cpr weights for well by pure avarage of reservoir weights of the perforations
if(not(this->isPressureControlled(well_state))){ if(not(this->isPressureControlled(well_state))){
auto well_weight = weights[0]*0.0; auto well_weight = weights[0];
well_weight = 0.0;
int num_perfs = 0; int num_perfs = 0;
for (size_t rowB = 0; rowB < this->duneB_.N(); ++rowB) { for (size_t rowB = 0; rowB < this->duneB_.N(); ++rowB) {
for (auto colB = this->duneB_[rowB].begin(), endB = this->duneB_[rowB].end(); colB != endB; ++colB) { for (auto colB = this->duneB_[rowB].begin(), endB = this->duneB_[rowB].end(); colB != endB; ++colB) {

3
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -2191,7 +2191,8 @@ namespace Opm
// use_well_weights is a quasiimpes formulation which is not implemented in multisegment // use_well_weights is a quasiimpes formulation which is not implemented in multisegment
int bhp_var_index = Bhp; int bhp_var_index = Bhp;
int nperf = 0; int nperf = 0;
auto cell_weights = weights[0]*0.0;// not need for not(use_well_weights) auto cell_weights = weights[0];// not need for not(use_well_weights)
cell_weights = 0.0;
assert(this->duneC_.M() == weights.size()); assert(this->duneC_.M() == weights.size());
const int welldof_ind = this->duneC_.M() + this->index_of_well_; const int welldof_ind = this->duneC_.M() + this->index_of_well_;
// do not assume anything about pressure controlled with use_well_weights (work fine with the assumtion also) // do not assume anything about pressure controlled with use_well_weights (work fine with the assumtion also)