OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removing well potentails from WellsManager

Browse Source
This commit is contained in:
Kai Bao 2017-04-05 12:43:21 +02:00
parent 44924b9ee9
commit 29372e287c
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/core/wells/WellsManager.cpp
View File

@ -331,7 +331,6 @@ namespace Opm
const UnstructuredGrid& grid)
: w_(0), is_parallel_run_(false)
{
std::vector<double> dummy_well_potentials;
// TODO: not sure about the usage of this WellsManager constructor
// TODO: not sure whether this is the correct thing to do here.
DynamicListEconLimited dummy_list_econ_limited;
@ -339,7 +338,7 @@ namespace Opm
UgGridHelpers::globalCell(grid), UgGridHelpers::cartDims(grid),
UgGridHelpers::dimensions(grid),
UgGridHelpers::cell2Faces(grid), UgGridHelpers::beginFaceCentroids(grid),
dummy_list_econ_limited, dummy_well_potentials,
dummy_list_econ_limited,
std::unordered_set<std::string>());
}

2
opm/core/wells/WellsManager.hpp
View File

@ -94,7 +94,6 @@ namespace Opm
FC begin_face_centroids,
const DynamicListEconLimited& list_econ_limited,
bool is_parallel_run=false,
const std::vector<double>& well_potentials=std::vector<double>(),
const std::unordered_set<std::string>& deactivated_wells = std::unordered_set<std::string> ());
WellsManager(const Opm::EclipseState& eclipseState,
@ -163,7 +162,6 @@ namespace Opm
const C2F& cell_to_faces,
FC begin_face_centroids,
const DynamicListEconLimited& list_econ_limited,
const std::vector<double>& well_potentials,
const std::unordered_set<std::string>& deactivated_wells);
// Disable copying and assignment.
WellsManager(const WellsManager& other);

4
opm/core/wells/WellsManager_impl.hpp
View File

@ -318,13 +318,12 @@ WellsManager(const Opm::EclipseState& eclipseState,
FC begin_face_centroids,
const DynamicListEconLimited& list_econ_limited,
bool is_parallel_run,
const std::vector<double>& well_potentials,
const std::unordered_set<std::string>& deactivated_wells)
: w_(0), is_parallel_run_(is_parallel_run)
{
init(eclipseState, timeStep, number_of_cells, global_cell,
cart_dims, dimensions,
cell_to_faces, begin_face_centroids, list_econ_limited, well_potentials, deactivated_wells);
cell_to_faces, begin_face_centroids, list_econ_limited, deactivated_wells);
}
/// Construct wells from deck.
@ -339,7 +338,6 @@ WellsManager::init(const Opm::EclipseState& eclipseState,
const C2F& cell_to_faces,
FC begin_face_centroids,
const DynamicListEconLimited& list_econ_limited,
const std::vector<double>& /* well_potentials */,
const std::unordered_set<std::string>& deactivated_wells)
{
if (dimensions != 3) {