Removes unused function parameter warnings.

This commit is contained in:
Markus Blatt
2019-04-25 10:00:59 +02:00
parent cda7d1906e
commit 48c3802bf3
11 changed files with 32 additions and 33 deletions
+2 -3
View File
@@ -390,7 +390,7 @@ public:
int cartElemIdx = vanguard_.cartesianIndexMapper().cartesianIndex(elemIdx); int cartElemIdx = vanguard_.cartesianIndexMapper().cartesianIndex(elemIdx);
globalToLocal[cartElemIdx] = elemIdx; globalToLocal[cartElemIdx] = elemIdx;
} }
applyEditNncToGridTrans_(elemMapper, globalToLocal); applyEditNncToGridTrans_(globalToLocal);
applyNncToGridTrans_(globalToLocal); applyNncToGridTrans_(globalToLocal);
//remove very small non-neighbouring transmissibilities //remove very small non-neighbouring transmissibilities
@@ -703,8 +703,7 @@ private:
} }
/// \brief Multiplies the grid transmissibilities according to EDITNNC. /// \brief Multiplies the grid transmissibilities according to EDITNNC.
void applyEditNncToGridTrans_(const ElementMapper& elementMapper, void applyEditNncToGridTrans_(const std::vector<int>& globalToLocal)
const std::vector<int>& globalToLocal)
{ {
const auto& editNnc = vanguard_.eclState().getInputEDITNNC(); const auto& editNnc = vanguard_.eclState().getInputEDITNNC();
if (editNnc.empty()) if (editNnc.empty())
+2 -2
View File
@@ -109,7 +109,7 @@ namespace Opm {
template <typename TypeTag> template <typename TypeTag>
template <class Restarter> template <class Restarter>
void void
BlackoilAquiferModel<TypeTag>::serialize(Restarter& res) BlackoilAquiferModel<TypeTag>::serialize(Restarter& /* res */)
{ {
// TODO (?) // TODO (?)
throw std::logic_error("BlackoilAquiferModel::serialize() is not yet implemented"); throw std::logic_error("BlackoilAquiferModel::serialize() is not yet implemented");
@@ -118,7 +118,7 @@ namespace Opm {
template<typename TypeTag> template<typename TypeTag>
template <class Restarter> template <class Restarter>
void void
BlackoilAquiferModel<TypeTag>::deserialize(Restarter& res) BlackoilAquiferModel<TypeTag>::deserialize(Restarter& /* res */)
{ {
// TODO (?) // TODO (?)
throw std::logic_error("BlackoilAquiferModel::deserialize() is not yet implemented"); throw std::logic_error("BlackoilAquiferModel::deserialize() is not yet implemented");
+2 -2
View File
@@ -360,7 +360,7 @@ namespace Opm {
/// Called once after each time step. /// Called once after each time step.
/// In this class, this function does nothing. /// In this class, this function does nothing.
/// \param[in] timer simulation timer /// \param[in] timer simulation timer
void afterStep(const SimulatorTimerInterface& OPM_UNUSED timer) void afterStep(const SimulatorTimerInterface& timer OPM_UNUSED)
{ {
ebosSimulator_.problem().endTimeStep(); ebosSimulator_.problem().endTimeStep();
} }
@@ -369,7 +369,7 @@ namespace Opm {
/// \param[in] reservoir_state reservoir state variables /// \param[in] reservoir_state reservoir state variables
/// \param[in, out] well_state well state variables /// \param[in, out] well_state well state variables
/// \param[in] initial_assembly pass true if this is the first call to assemble() in this timestep /// \param[in] initial_assembly pass true if this is the first call to assemble() in this timestep
SimulatorReport assembleReservoir(const SimulatorTimerInterface& timer, SimulatorReport assembleReservoir(const SimulatorTimerInterface& /* timer */,
const int iterationIdx) const int iterationIdx)
{ {
// -------- Mass balance equations -------- // -------- Mass balance equations --------
+4 -4
View File
@@ -138,7 +138,7 @@ namespace Opm {
///////////// /////////////
template <class Restarter> template <class Restarter>
void deserialize(Restarter& res) void deserialize(Restarter& /* res */)
{ {
// TODO (?) // TODO (?)
} }
@@ -148,13 +148,13 @@ namespace Opm {
* to the harddisk. * to the harddisk.
*/ */
template <class Restarter> template <class Restarter>
void serialize(Restarter& res) void serialize(Restarter& /* res*/)
{ {
// TODO (?) // TODO (?)
} }
void beginEpisode(const Opm::EclipseState& eclState, void beginEpisode(const Opm::EclipseState& /* eclState */,
const Opm::Schedule& schedule, const Opm::Schedule& /* schedule */,
bool isRestart) bool isRestart)
{ {
size_t episodeIdx = ebosSimulator_.episodeIndex(); size_t episodeIdx = ebosSimulator_.episodeIndex();
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Opm {
template<typename TypeTag> template<typename TypeTag>
void void
BlackoilWellModel<TypeTag>:: BlackoilWellModel<TypeTag>::
init(const Opm::EclipseState& eclState, const Opm::Schedule& schedule) init(const Opm::EclipseState& eclState, const Opm::Schedule& /* schedule */)
{ {
gravity_ = ebosSimulator_.problem().gravity()[2]; gravity_ = ebosSimulator_.problem().gravity()[2];
+1 -1
View File
@@ -490,7 +490,7 @@ protected:
template <class C, class LinearOperator, class MatrixOperator, class POrComm, class AMG > template <class C, class LinearOperator, class MatrixOperator, class POrComm, class AMG >
void void
constructAMGPrecond(LinearOperator& /* linearOperator */, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >& opA, const double relax, constructAMGPrecond(LinearOperator& /* linearOperator */, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >& opA, const double relax,
const MILU_VARIANT milu ) const const MILU_VARIANT /* milu */ ) const
{ {
ISTLUtility::template createAMGPreconditionerPointer<C>( *opA, relax, ISTLUtility::template createAMGPreconditionerPointer<C>( *opA, relax,
comm, amg, parameters_, weights_ ); comm, amg, parameters_, weights_ );
+6 -6
View File
@@ -259,9 +259,9 @@ namespace Opm
template <typename TypeTag> template <typename TypeTag>
void void
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
updateWellStateWithTarget(const Simulator& ebos_simulator, updateWellStateWithTarget(const Simulator& /* ebos_simulator */,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger) const Opm::DeferredLogger& /* deferred_logger */) const
{ {
// Updating well state bas on well control // Updating well state bas on well control
// Target values are used as initial conditions for BHP, THP, and SURFACE_RATE // Target values are used as initial conditions for BHP, THP, and SURFACE_RATE
@@ -768,7 +768,7 @@ namespace Opm
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
updateWellState(const BVectorWell& dwells, updateWellState(const BVectorWell& dwells,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger, Opm::DeferredLogger& /* deferred_logger */,
const double relaxation_factor) const const double relaxation_factor) const
{ {
const double dFLimit = param_.dwell_fraction_max_; const double dFLimit = param_.dwell_fraction_max_;
@@ -2017,9 +2017,9 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
void void
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
wellTestingPhysical(Simulator& simulator, const std::vector<double>& B_avg, wellTestingPhysical(Simulator& /* simulator */, const std::vector<double>& /* B_avg */,
const double simulation_time, const int report_step, const double /* simulation_time */, const int /* report_step */,
WellState& well_state, WellTestState& welltest_state, Opm::DeferredLogger& deferred_logger) WellState& /* well_state */, WellTestState& /* welltest_state */, Opm::DeferredLogger& deferred_logger)
{ {
const std::string msg = "Support of well testing for physical limits for multisegment wells is not " const std::string msg = "Support of well testing for physical limits for multisegment wells is not "
"implemented yet, wellTestingPhysical() for " + name() + " will do nothing"; "implemented yet, wellTestingPhysical() for " + name() + " will do nothing";
+4 -4
View File
@@ -922,7 +922,7 @@ namespace Opm
void void
StandardWellV<TypeTag>:: StandardWellV<TypeTag>::
updatePrimaryVariablesNewton(const BVectorWell& dwells, updatePrimaryVariablesNewton(const BVectorWell& dwells,
const WellState& well_state) const const WellState& /* well_state */) const
{ {
const double dFLimit = param_.dwell_fraction_max_; const double dFLimit = param_.dwell_fraction_max_;
@@ -1433,7 +1433,7 @@ namespace Opm
void void
StandardWellV<TypeTag>:: StandardWellV<TypeTag>::
updateWellOperability(const Simulator& ebos_simulator, updateWellOperability(const Simulator& ebos_simulator,
const WellState& well_state, const WellState& /* well_state */,
Opm::DeferredLogger& deferred_logger) Opm::DeferredLogger& deferred_logger)
{ {
this->operability_status_.reset(); this->operability_status_.reset();
@@ -1509,7 +1509,7 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
void void
StandardWellV<TypeTag>:: StandardWellV<TypeTag>::
checkOperabilityUnderTHPLimitProducer(const Simulator& ebos_simulator, Opm::DeferredLogger& deferred_logger) checkOperabilityUnderTHPLimitProducer(const Simulator& /* ebos_simulator */, Opm::DeferredLogger& deferred_logger)
{ {
const double obtain_bhp = calculateBHPWithTHPTargetIPR(deferred_logger); const double obtain_bhp = calculateBHPWithTHPTargetIPR(deferred_logger);
@@ -2892,7 +2892,7 @@ namespace Opm
void void
StandardWellV<TypeTag>:: StandardWellV<TypeTag>::
wellTestingPhysical(Simulator& ebos_simulator, const std::vector<double>& B_avg, wellTestingPhysical(Simulator& ebos_simulator, const std::vector<double>& B_avg,
const double simulation_time, const int report_step, const double /* simulation_time */ , const int /* report_step */,
WellState& well_state, WellTestState& welltest_state, Opm::DeferredLogger& deferred_logger) WellState& well_state, WellTestState& welltest_state, Opm::DeferredLogger& deferred_logger)
{ {
deferred_logger.debug(" well " + name() + " is being tested for physical limits"); deferred_logger.debug(" well " + name() + " is being tested for physical limits");
+4 -4
View File
@@ -867,7 +867,7 @@ namespace Opm
void void
StandardWell<TypeTag>:: StandardWell<TypeTag>::
updatePrimaryVariablesNewton(const BVectorWell& dwells, updatePrimaryVariablesNewton(const BVectorWell& dwells,
const WellState& well_state) const const WellState& /* well_state */) const
{ {
const double dFLimit = param_.dwell_fraction_max_; const double dFLimit = param_.dwell_fraction_max_;
@@ -1357,7 +1357,7 @@ namespace Opm
void void
StandardWell<TypeTag>:: StandardWell<TypeTag>::
updateWellOperability(const Simulator& ebos_simulator, updateWellOperability(const Simulator& ebos_simulator,
const WellState& well_state, const WellState& /* well_state */,
Opm::DeferredLogger& deferred_logger Opm::DeferredLogger& deferred_logger
) )
{ {
@@ -1434,7 +1434,7 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
void void
StandardWell<TypeTag>:: StandardWell<TypeTag>::
checkOperabilityUnderTHPLimitProducer(const Simulator& ebos_simulator, Opm::DeferredLogger& deferred_logger) checkOperabilityUnderTHPLimitProducer(const Simulator& /* ebos_simulator */, Opm::DeferredLogger& deferred_logger)
{ {
const double obtain_bhp = calculateBHPWithTHPTargetIPR(deferred_logger); const double obtain_bhp = calculateBHPWithTHPTargetIPR(deferred_logger);
@@ -2782,7 +2782,7 @@ namespace Opm
void void
StandardWell<TypeTag>:: StandardWell<TypeTag>::
wellTestingPhysical(Simulator& ebos_simulator, const std::vector<double>& B_avg, wellTestingPhysical(Simulator& ebos_simulator, const std::vector<double>& B_avg,
const double simulation_time, const int report_step, const double /* simulation_time */, const int /* report_step */,
WellState& well_state, WellTestState& welltest_state, WellState& well_state, WellTestState& welltest_state,
Opm::DeferredLogger& deferred_logger) Opm::DeferredLogger& deferred_logger)
{ {
+1 -1
View File
@@ -774,7 +774,7 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
void void
WellInterface<TypeTag>:: WellInterface<TypeTag>::
updateWellTestStatePhysical(const WellState& well_state, updateWellTestStatePhysical(const WellState& /* well_state */,
const double simulation_time, const double simulation_time,
const bool write_message_to_opmlog, const bool write_message_to_opmlog,
WellTestState& well_test_state, WellTestState& well_test_state,
+5 -5
View File
@@ -103,18 +103,18 @@ namespace Opm
{ {
template<class C2F, class FC, class NTG> template<class C2F, class FC, class NTG>
void WellsManager::createWellsFromSpecs(std::vector<const Well*>& wells, size_t timeStep, void WellsManager::createWellsFromSpecs(std::vector<const Well*>& wells, size_t timeStep,
const C2F& c2f, const C2F& /* c2f */,
const int* cart_dims, const int* cart_dims,
FC begin_face_centroids, FC /* begin_face_centroids */,
int dimensions, int dimensions,
std::vector<double>& dz, std::vector<double>& /* dz */,
std::vector<std::string>& well_names, std::vector<std::string>& well_names,
std::vector<WellData>& well_data, std::vector<WellData>& well_data,
std::map<std::string, int>& well_names_to_index, std::map<std::string, int>& well_names_to_index,
const PhaseUsage& phaseUsage, const PhaseUsage& phaseUsage,
const std::map<int,int>& cartesian_to_compressed, const std::map<int,int>& cartesian_to_compressed,
const double* permeability, const double* /* permeability */,
const NTG& ntg, const NTG& /* ntg */,
std::vector<int>& wells_on_proc, std::vector<int>& wells_on_proc,
const std::unordered_set<std::string>& ignored_wells) const std::unordered_set<std::string>& ignored_wells)
{ {