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 #653 from dr-robertk/PR/cleanup-backuprestore

Browse Source 
BackupRestore: remove all specializations for BlackoilState.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-15 13:15:35 +02:00
commit fbe7a2242b
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
opm/autodiff/BackupRestore.hpp
View File

@ -157,18 +157,16 @@ namespace Opm {
enum { SimulatorStateId = 0,
WellStateId = 1,
BlackoilStateId = 2,
WellStateFullyImplicitBackoilId = 3 };
inline int objectId( const SimulationDataContainer& /* state */) {
return SimulatorStateId;
}
inline int objectId( const WellState& /* state */) {
return WellStateId;
}
inline int objectId( const BlackoilState& /* state */) {
return BlackoilStateId;
}
inline int objectId( const WellStateFullyImplicitBlackoil& /* state */) {
return WellStateFullyImplicitBackoilId;
}
@ -227,43 +225,6 @@ namespace Opm {
return in;
}
// BlackoilState
inline
std::ostream& operator << (std::ostream& out, const BlackoilState& state )
{
// write id of object to stream
writeValue( out, objectId( state ) );
// backup simulator state
const SimulationDataContainer& simstate = static_cast< const SimulationDataContainer& > (state);
out << simstate;
// backup additional blackoil state variables
writeContainer( out, state.surfacevol() );
writeContainer( out, state.gasoilratio() );
writeContainer( out, state.rv() );
return out;
}
inline
std::istream& operator >> (std::istream& in, BlackoilState& state )
{
// check id of stored object
checkObjectId( in, state );
// restore simulator state
SimulationDataContainer& simstate = static_cast< SimulationDataContainer& > (state);
in >> simstate;
// restore additional blackoil state variables
readContainer( in, state.surfacevol() );
readContainer( in, state.gasoilratio() );
readContainer( in, state.rv() );
return in;
}
// WellState
inline
std::ostream& operator << (std::ostream& out, const WellState& state )