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

fixed: pass the fipnum data into the adaptive timer stepper

Browse Source 
summary substep reports requires FIP data
This commit is contained in:
Arne Morten Kvarving 2017-02-06 16:51:22 +01:00
parent b5b42faba4
commit a14f5392ee
7 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -1005,6 +1005,14 @@ namespace Opm {
return fluid_.numPhases();
}
/// Wrapper required due to not following generic API
template<class T>
std::vector<std::vector<double> >
computeFluidInPlace(const T&, const std::vector<int>& fipnum) const
{
return computeFluidInPlace(fipnum);
}
std::vector<std::vector<double> >
computeFluidInPlace(const std::vector<int>& fipnum) const
{

3
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -232,7 +232,8 @@ namespace Opm
// \Note: The report steps are met in any case
// \Note: The sub stepping will require a copy of the state variables
if( adaptiveTimeStepping ) {
report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_ );
report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_,
output_writer_.requireFIPNUM() ? &fipnum : nullptr );
}
else {
// solve for complete report step

3
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -282,7 +282,8 @@ public:
// \Note: The report steps are met in any case
// \Note: The sub stepping will require a copy of the state variables
if( adaptiveTimeStepping ) {
report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_ );
report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_,
output_writer_.requireFIPNUM() ? &fipnum : nullptr );
}
else {
// solve for complete report step

5
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
View File

@ -459,4 +459,9 @@ namespace Opm
const auto& initconfig = eclipseState_.getInitConfig();
return initconfig.restartRequested();
}
bool BlackoilOutputWriter::requireFIPNUM() const {
return eclipseState_.getSummaryConfig().requireFIPNUM();
}
}

2
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -288,6 +288,8 @@ namespace Opm
bool isRestart() const;
bool requireFIPNUM() const;
protected:
const bool output_;
std::unique_ptr< ParallelDebugOutputInterface > parallelOutput_;

5
opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp
View File

@ -299,4 +299,9 @@ namespace Opm
const auto& initconfig = eclipseState_.getInitConfig();
return initconfig.restartRequested();
}
bool BlackoilOutputWriterEbos::requireFIPNUM() const {
return eclipseState_.getSummaryConfig().requireFIPNUM();
}
}

2
opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp
View File

@ -147,6 +147,8 @@ namespace Opm
bool isRestart() const;
bool requireFIPNUM() const;
protected:
const bool output_;
std::unique_ptr< ParallelDebugOutputInterface > parallelOutput_;