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

Removed unused perm and ntg arguments to Well construction

Browse Source
This commit is contained in:
Joakim Hove 2019-11-19 20:16:44 +01:00
parent 3d9a0341b2
commit c80d72e27c
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,6 @@
#include <opm/core/wells/WellCollection.hpp>
#include <opm/core/wells/WellsGroup.hpp>
#include <opm/grid/utility/CompressedPropertyAccess.hpp>
struct Wells;
struct UnstructuredGrid;
@ -173,7 +171,7 @@ namespace Opm
std::vector<std::string>& well_names, const PhaseUsage& phaseUsage,
const std::vector<int>& wells_on_proc);
template<class C2F, class FC, class NTG>
template<class C2F, class FC>
void createWellsFromSpecs( const std::vector<Well>& wells, size_t timeStep,
const C2F& cell_to_faces,
const int* cart_dims,
@ -185,8 +183,6 @@ namespace Opm
std::map<std::string, int> & well_names_to_index,
const PhaseUsage& phaseUsage,
const std::map<int,int>& cartesian_to_compressed,
const double* permeability,
const NTG& ntg,
std::vector<int>& wells_on_proc,
const std::unordered_set<std::string>& deactivated_wells);

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

@ -4,7 +4,6 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/grid/utility/compressedToCartesian.hpp>
#include <opm/core/props/rock/RockFromDeck.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
@ -101,7 +100,7 @@ getCubeDim(const C2F& c2f,
namespace Opm
{
template<class C2F, class FC, class NTG>
template<class C2F, class FC>
void WellsManager::createWellsFromSpecs(const std::vector<Well>& wells, size_t timeStep,
const C2F& /* c2f */,
const int* cart_dims,
@ -113,8 +112,6 @@ void WellsManager::createWellsFromSpecs(const std::vector<Well>& wells, size_t t
std::map<std::string, int>& well_names_to_index,
const PhaseUsage& phaseUsage,
const std::map<int,int>& cartesian_to_compressed,
const double* /* permeability */,
const NTG& /* ntg */,
std::vector<int>& wells_on_proc,
const std::unordered_set<std::string>& ignored_wells)
{
@ -333,12 +330,6 @@ WellsManager::init(const Opm::EclipseState& eclipseState,
well_names.reserve(wells.size());
well_data.reserve(wells.size());
typedef GridPropertyAccess::ArrayPolicy::ExtractFromDeck<double> DoubleArray;
typedef GridPropertyAccess::Compressed<DoubleArray, GridPropertyAccess::Tag::NTG> NTGArray;
DoubleArray ntg_glob(eclipseState, "NTG", 1.0);
NTGArray ntg(ntg_glob, global_cell);
const auto& eclGrid = eclipseState.getInputGrid();
// use cell thickness (dz) from eclGrid
@ -351,21 +342,13 @@ WellsManager::init(const Opm::EclipseState& eclipseState,
}
}
std::vector<double> interleavedPerm;
RockFromDeck::extractInterleavedPermeability(eclipseState,
number_of_cells,
global_cell,
cart_dims,
0.0,
interleavedPerm);
createWellsFromSpecs(wells, timeStep, cell_to_faces,
cart_dims,
begin_face_centroids,
dimensions,
dz,
well_names, well_data, well_names_to_index,
pu, cartesian_to_compressed, interleavedPerm.data(), ntg,
pu, cartesian_to_compressed,
wells_on_proc, deactivated_wells);
setupWellControls(wells, summaryState, well_names, pu, wells_on_proc);