OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 12:36:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

adding well collection to StandardWellsDense

Browse Source 
to make StandardWellsDense have access to the group information.
This commit is contained in:
Kai Bao 2017-01-09 10:36:17 +01:00
parent 941689722f
commit 4b47fa52ca
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -252,7 +252,7 @@ public:
// Run a multiple steps of the solver depending on the time step control. // Run a multiple steps of the solver depending on the time step control.
solver_timer.start(); solver_timer.start();
const WellModel well_model(wells, model_param_, terminal_output_); const WellModel well_model(wells, &(wells_manager.wellCollection()), model_param_, terminal_output_);
auto solver = createSolver(well_model); auto solver = createSolver(well_model);

16
opm/autodiff/StandardWellsDense.hpp
View File

@ -35,6 +35,7 @@
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/wells/DynamicListEconLimited.hpp> #include <opm/core/wells/DynamicListEconLimited.hpp>
#include <opm/core/wells/WellCollection.hpp>
#include <opm/autodiff/VFPProperties.hpp> #include <opm/autodiff/VFPProperties.hpp>
#include <opm/autodiff/VFPInjProperties.hpp> #include <opm/autodiff/VFPInjProperties.hpp>
#include <opm/autodiff/VFPProdProperties.hpp> #include <opm/autodiff/VFPProdProperties.hpp>
@ -81,10 +82,12 @@ enum WellVariablePositions {
// --------- Public methods --------- // --------- Public methods ---------
StandardWellsDense(const Wells* wells_arg, StandardWellsDense(const Wells* wells_arg,
WellCollection* well_collection,
const ModelParameters& param, const ModelParameters& param,
const bool terminal_output) const bool terminal_output)
: wells_active_(wells_arg!=nullptr) : wells_active_(wells_arg!=nullptr)
, wells_(wells_arg) , wells_(wells_arg)
, well_collection_(well_collection)
, param_(param) , param_(param)
, terminal_output_(terminal_output) , terminal_output_(terminal_output)
, well_perforation_densities_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0) , well_perforation_densities_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
@ -1575,9 +1578,22 @@ enum WellVariablePositions {
} }
WellCollection* wellCollection() const
{
return well_collection_;
}
protected: protected:
bool wells_active_; bool wells_active_;
const Wells* wells_; const Wells* wells_;
// Well collection is used to enforce the group control
WellCollection* well_collection_;
ModelParameters param_; ModelParameters param_;
bool terminal_output_; bool terminal_output_;