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

Merge pull request #1138 from atgeirr/silence-warnings

Browse Source 
Silence warnings
This commit is contained in:
Atgeirr Flø Rasmussen 2017-04-12 13:01:26 +02:00 committed by GitHub
commit f88e527a0c
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -883,7 +883,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
const std::vector<double>& krnswdc, const std::vector<double>& krnswdc,
const std::vector<int>& cells) const std::vector<int>& cells)
{ {
const int n = cells.size(); const size_t n = cells.size();
assert(pcswmdc.size() == n); assert(pcswmdc.size() == n);
assert(krnswdc.size() == n); assert(krnswdc.size() == n);
satprops_->setGasOilHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data()); satprops_->setGasOilHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data());
@ -896,7 +896,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
std::vector<double>& krnswdc, std::vector<double>& krnswdc,
const std::vector<int>& cells) const const std::vector<int>& cells) const
{ {
const int n = cells.size(); const size_t n = cells.size();
pcswmdc.resize(n); pcswmdc.resize(n);
krnswdc.resize(n); krnswdc.resize(n);
satprops_->getGasOilHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data()); satprops_->getGasOilHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data());
@ -909,7 +909,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
const std::vector<double>& krnswdc, const std::vector<double>& krnswdc,
const std::vector<int>& cells) const std::vector<int>& cells)
{ {
const int n = cells.size(); const size_t n = cells.size();
assert(pcswmdc.size() == n); assert(pcswmdc.size() == n);
assert(krnswdc.size() == n); assert(krnswdc.size() == n);
satprops_->setOilWaterHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data()); satprops_->setOilWaterHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data());
@ -922,7 +922,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
std::vector<double>& krnswdc, std::vector<double>& krnswdc,
const std::vector<int>& cells) const const std::vector<int>& cells) const
{ {
const int n = cells.size(); const size_t n = cells.size();
pcswmdc.resize(n); pcswmdc.resize(n);
krnswdc.resize(n); krnswdc.resize(n);
satprops_->getOilWaterHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data()); satprops_->getOilWaterHystParams(n, cells.data(), pcswmdc.data(), krnswdc.data());

2
opm/autodiff/Compat.cpp
View File

@ -123,7 +123,7 @@ data::Solution simToSolution( const SimulationDataContainer& reservoir,
void solutionToSim( const data::Solution& sol, void solutionToSim( const data::Solution& sol,
const std::map<std::string,std::vector<double> >& extra, const std::map<std::string,std::vector<double> >& /* extra */,
PhaseUsage phases, PhaseUsage phases,
SimulationDataContainer& state ) { SimulationDataContainer& state ) {

1
opm/autodiff/RedistributeDataHandles.hpp
View File

@ -93,6 +93,7 @@ public:
void scatter(Buffer& buffer, std::size_t i, std::size_t s) void scatter(Buffer& buffer, std::size_t i, std::size_t s)
{ {
assert(s==size(i)); assert(s==size(i));
static_cast<void>(s);
for(auto index = i*size(i), end = (i+1)*size(i); for(auto index = i*size(i), end = (i+1)*size(i);
index < end; ++index) index < end; ++index)

4
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -815,10 +815,6 @@ namespace Opm {
} }
if (active_[Oil] && active_[Gas]) { if (active_[Oil] && active_[Gas]) {
EvalWell well_temperature = extendEval(fs.temperature(FluidSystem::oilPhaseIdx));
EvalWell rsSatEval = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), well_temperature, well_pressure);
EvalWell rvSatEval = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), well_temperature, well_pressure);
const int oilpos = pu.phase_pos[Oil]; const int oilpos = pu.phase_pos[Oil];
const int gaspos = pu.phase_pos[Gas]; const int gaspos = pu.phase_pos[Gas];