OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix the WReorder Warning

Browse Source
This commit is contained in:
WesselDeZeeuw 2019-01-31 15:26:09 +01:00
parent a72d61cb50
commit fd4bdd6492
4 changed files with 9 additions and 9 deletions

6
opm/autodiff/AquiferCarterTracy.hpp
View File

@ -44,10 +44,10 @@ namespace Opm
using Base::waterCompIdx;
using Base::waterPhaseIdx;
AquiferCarterTracy( const AquiferCT::AQUCT_data& aquct_data,
const Aquancon::AquanconOutput& connection,
AquiferCarterTracy( const Aquancon::AquanconOutput& connection,
const std::unordered_map<int, int>& cartesian_to_compressed,
const Simulator& ebosSimulator)
const Simulator& ebosSimulator,
const AquiferCT::AQUCT_data& aquct_data)
: Base(connection, cartesian_to_compressed, ebosSimulator)
, aquct_data_(aquct_data)
{}

6
opm/autodiff/AquiferFetkovich.hpp
View File

@ -46,10 +46,10 @@ namespace Opm
using Base::waterCompIdx;
using Base::waterPhaseIdx;
AquiferFetkovich( const Aquifetp::AQUFETP_data& aqufetp_data,
const Aquancon::AquanconOutput& connection,
AquiferFetkovich( const Aquancon::AquanconOutput& connection,
const std::unordered_map<int, int>& cartesian_to_compressed,
const Simulator& ebosSimulator)
const Simulator& ebosSimulator,
const Aquifetp::AQUFETP_data& aqufetp_data)
: Base(connection, cartesian_to_compressed, ebosSimulator)
, aqufetp_data_(aqufetp_data)
{}

2
opm/autodiff/AquiferInterface.hpp
View File

@ -187,8 +187,8 @@ namespace Opm
virtual void endTimeStep() = 0;
protected:
const Simulator& ebos_simulator_;
const Aquancon::AquanconOutput connection_;
const Simulator& ebos_simulator_;
const std::unordered_map<int, int> cartesian_to_compressed_;
// Grid variables

4
opm/autodiff/BlackoilAquiferModel_impl.hpp
View File

@ -134,7 +134,7 @@ namespace Opm {
for (size_t i = 0; i < aquifersData.size(); ++i)
{
aquifers_CarterTracy.push_back(
AquiferCarterTracy<TypeTag> (aquifersData.at(i), aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_)
AquiferCarterTracy<TypeTag> (aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_ , aquifersData.at(i))
);
}
}
@ -161,7 +161,7 @@ namespace Opm {
for (size_t i = 0; i < aquifersData.size(); ++i)
{
aquifers_Fetkovich.push_back(
AquiferFetkovich<TypeTag> (aquifersData.at(i), aquifer_connection.at(i),cartesian_to_compressed_, this->simulator_)
AquiferFetkovich<TypeTag> (aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_ , aquifersData.at(i))
);
}
}