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

[bugfix] add defunct_well_names to BlackoilModelEbos.

Browse Source
This commit is contained in:
Robert Kloefkorn 2016-12-02 11:13:06 +01:00
parent 2eca5d71e6
commit 42ab4d133f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/autodiff/FlowMainEbos.hpp
View File

@ -284,7 +284,8 @@ namespace Opm
Base::deck_->hasKeyword("VAPOIL"), Base::deck_->hasKeyword("VAPOIL"),
Base::eclipse_state_, Base::eclipse_state_,
*Base::output_writer_, *Base::output_writer_,
Base::threshold_pressures_)); Base::threshold_pressures_,
Base::defunct_well_names_));
} }
private: private:

12
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -103,7 +103,8 @@ public:
const bool has_vapoil, const bool has_vapoil,
std::shared_ptr<EclipseState> eclipse_state, std::shared_ptr<EclipseState> eclipse_state,
BlackoilOutputWriterEbos& output_writer, BlackoilOutputWriterEbos& output_writer,
const std::vector<double>& threshold_pressures_by_face) const std::vector<double>& threshold_pressures_by_face,
const std::unordered_set<std::string>& defunct_well_names)
: ebosSimulator_(ebosSimulator), : ebosSimulator_(ebosSimulator),
param_(param), param_(param),
model_param_(param), model_param_(param),
@ -118,6 +119,7 @@ public:
terminal_output_(param.getDefault("output_terminal", true)), terminal_output_(param.getDefault("output_terminal", true)),
output_writer_(output_writer), output_writer_(output_writer),
threshold_pressures_by_face_(threshold_pressures_by_face), threshold_pressures_by_face_(threshold_pressures_by_face),
defunct_well_names_( defunct_well_names ),
is_parallel_run_( false ) is_parallel_run_( false )
{ {
DUNE_UNUSED_PARAMETER(eclipse_state); DUNE_UNUSED_PARAMETER(eclipse_state);
@ -229,7 +231,8 @@ public:
props_.permeability(), props_.permeability(),
dynamic_list_econ_limited, dynamic_list_econ_limited,
is_parallel_run_, is_parallel_run_,
well_potentials ); well_potentials,
defunct_well_names_ );
const Wells* wells = wells_manager.c_wells(); const Wells* wells = wells_manager.c_wells();
WellState well_state; WellState well_state;
@ -733,6 +736,11 @@ protected:
std::unique_ptr<RateConverterType> rateConverter_; std::unique_ptr<RateConverterType> rateConverter_;
// Threshold pressures. // Threshold pressures.
std::vector<double> threshold_pressures_by_face_; std::vector<double> threshold_pressures_by_face_;
// The names of wells that should be defunct
// (e.g. in a parallel run when they are handeled by
// a different process)
std::unordered_set<std::string> defunct_well_names_;
// Whether this a parallel simulation or not // Whether this a parallel simulation or not
bool is_parallel_run_; bool is_parallel_run_;