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

removed compiler warnings

Browse Source
This commit is contained in:
hnil 2022-05-18 13:51:39 +02:00 committed by Atgeirr Flø Rasmussen
parent 66c4a8c862
commit 8f4cf8a952
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@ -91,7 +91,6 @@ namespace Opm
using AbstractOperatorType = Dune::AssembledLinearOperator<Matrix, Vector, Vector>; using AbstractOperatorType = Dune::AssembledLinearOperator<Matrix, Vector, Vector>;
using AbstractPreconditionerType = Dune::PreconditionerWithUpdate<Vector, Vector>; using AbstractPreconditionerType = Dune::PreconditionerWithUpdate<Vector, Vector>;
using WellModelOperator = WellModelAsLinearOperator<WellModel, Vector, Vector>; using WellModelOperator = WellModelAsLinearOperator<WellModel, Vector, Vector>;
using ParOperatorType = WellModelGhostLastMatrixAdapter<Matrix, Vector, Vector, true>;
using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>; using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
constexpr static std::size_t pressureIndex = GetPropType<TypeTag, Properties::Indices>::pressureSwitchIdx; constexpr static std::size_t pressureIndex = GetPropType<TypeTag, Properties::Indices>::pressureSwitchIdx;
@ -457,8 +456,6 @@ namespace Opm
return false; return false;
} }
if (this->parameters_.cpr_reuse_setup_ == 4) { if (this->parameters_.cpr_reuse_setup_ == 4) {
const int newton_iteration = this->simulator_.model().newtonMethod().numIterations();
//bool create = newton_iteration == 0;
int step = this->parameters_.cpr_reuse_interval_; int step = this->parameters_.cpr_reuse_interval_;
bool create = ((calls_%step) == 0); bool create = ((calls_%step) == 0);
return create; return create;

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

@ -753,7 +753,7 @@ namespace Opm
addWellPressureEquations(PressureMatrix& jacobian, addWellPressureEquations(PressureMatrix& jacobian,
const BVector& weights, const BVector& weights,
const int pressureVarIndex, const int pressureVarIndex,
const bool use_well_weights, const bool /*use_well_weights*/,
const WellState& well_state) const const WellState& well_state) const
{ {
// Add the pressure contribution to the cpr system for the well // Add the pressure contribution to the cpr system for the well
@ -768,7 +768,7 @@ namespace Opm
const auto& bw = weights[row_index]; const auto& bw = weights[row_index];
double matel = 0.0; double matel = 0.0;
for(int i = 0; i< bw.size(); ++i){ for(size_t i = 0; i< bw.size(); ++i){
matel += bw[i]*(*colC)[seg_pressure_var_ind][i]; matel += bw[i]*(*colC)[seg_pressure_var_ind][i];
} }
jacobian[row_index][welldof_ind] += matel; jacobian[row_index][welldof_ind] += matel;
@ -799,7 +799,7 @@ namespace Opm
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) {
const auto col_index = colB.index(); const auto col_index = colB.index();
double matel = 0.0; double matel = 0.0;
for(int i = 0; i< bw.size(); ++i){ for(size_t i = 0; i< bw.size(); ++i){
matel += bw[i] *(*colB)[i][pressureVarIndex]; matel += bw[i] *(*colB)[i][pressureVarIndex];
} }
jacobian[welldof_ind][col_index] += matel; jacobian[welldof_ind][col_index] += matel;

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

@ -2257,8 +2257,7 @@ namespace Opm
const auto& bw = bweights[0]; const auto& bw = bweights[0];
double matel = 0; double matel = 0;
for (size_t i = 0; i < bw.size(); ++i) { for (size_t i = 0; i < bw.size(); ++i) {
const double w = bw[i]; matel += (*colB)[i][pressureVarIndex] * bw[i];
matel += (*colB)[i][pressureVarIndex] * bw[i];
} }
jacobian[welldof_ind][col_index] = matel; jacobian[welldof_ind][col_index] = matel;
} }

4
opm/simulators/wells/WellHelpers.hpp
View File

@ -238,8 +238,8 @@ namespace Opm {
DenseMatrix transposeDenseDynMatrix(const DenseMatrix& M) DenseMatrix transposeDenseDynMatrix(const DenseMatrix& M)
{ {
DenseMatrix tmp{M.cols(), M.rows()}; DenseMatrix tmp{M.cols(), M.rows()};
for (int i = 0; i < M.rows(); ++i) { for (size_t i = 0; i < M.rows(); ++i) {
for (int j = 0; j < M.cols(); ++j) { for (size_t j = 0; j < M.cols(); ++j) {
tmp[j][i] = M[i][j]; tmp[j][i] = M[i][j];
} }
} }