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

Remove unused argument from several functions.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-02-17 10:28:11 +01:00
parent 4a1a14d1da
commit eb82269900
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,7 +327,7 @@ namespace Opm
{
init(eclipseState, timeStep, UgGridHelpers::numCells(grid),
UgGridHelpers::globalCell(grid), UgGridHelpers::cartDims(grid),
UgGridHelpers::dimensions(grid), UgGridHelpers::beginCellCentroids(grid),
UgGridHelpers::dimensions(grid),
UgGridHelpers::cell2Faces(grid), UgGridHelpers::beginFaceCentroids(grid),
permeability);

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

@@ -140,14 +140,13 @@ namespace Opm
private:
template<class CC, class C2F, class FC>
template<class C2F, class FC>
void init(const Opm::EclipseStateConstPtr eclipseState,
const size_t timeStep,
int num_cells,
const int* global_cell,
const int* cart_dims,
int dimensions,
CC begin_cell_centroids,
const C2F& cell_to_faces,
FC begin_face_centroids,
const double* permeability);
@@ -158,12 +157,11 @@ namespace Opm
void setupWellControls(std::vector<WellConstPtr>& wells, size_t timeStep,
std::vector<std::string>& well_names, const PhaseUsage& phaseUsage);
template<class C2F, class CC, class FC, class NTG>
template<class C2F, class FC, class NTG>
void createWellsFromSpecs( std::vector<WellConstPtr>& wells, size_t timeStep,
const C2F& cell_to_faces,
const int* cart_dims,
FC begin_face_centroids,
CC begin_cell_centroids,
int dimensions,
std::vector<std::string>& well_names,
std::vector<WellData>& well_data,

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

@@ -100,12 +100,11 @@ getCubeDim(const C2F& c2f,
namespace Opm
{
template<class C2F, class CC, class FC, class NTG>
template<class C2F, class FC, class NTG>
void WellsManager::createWellsFromSpecs(std::vector<WellConstPtr>& wells, size_t timeStep,
const C2F& c2f,
const int* cart_dims,
FC begin_face_centroids,
CC begin_cell_centroids,
int dimensions,
std::vector<std::string>& well_names,
std::vector<WellData>& well_data,
@@ -271,7 +270,7 @@ WellsManager(const Opm::EclipseStateConstPtr eclipseState,
}
/// Construct wells from deck.
template <class CC, class C2F, class FC>
template <class C2F, class FC>
void
WellsManager::init(const Opm::EclipseStateConstPtr eclipseState,
const size_t timeStep,
@@ -279,7 +278,6 @@ WellsManager::init(const Opm::EclipseStateConstPtr eclipseState,
const int* global_cell,
const int* cart_dims,
int dimensions,
CC begin_cell_centroids,
const C2F& cell_to_faces,
FC begin_face_centroids,
const double* permeability)
@@ -327,7 +325,6 @@ WellsManager::init(const Opm::EclipseStateConstPtr eclipseState,
createWellsFromSpecs(wells, timeStep, cell_to_faces,
cart_dims,
begin_face_centroids,
begin_cell_centroids,
dimensions,
well_names, well_data, well_names_to_index,
pu, cartesian_to_compressed, permeability, ntg);

2
tests/test_writenumwells.cpp
View File

@@ -79,7 +79,7 @@ void verifyWellState(const std::string& rst_filename,
BOOST_CHECK(well_conn_get_j(well_head) == well->getHeadJ());
for (int j = 0; j < well_ts_get_size(well_ts); ++j) {
well_state_type * well_state = well_ts_iget_state(well_ts, j);
well_state = well_ts_iget_state(well_ts, j);
//Verify welltype
int ert_well_type = well_state_get_type(well_state);