OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move implementation to cpp file

Browse Source
This commit is contained in:
Joakim Hove
2021-11-04 13:33:43 +01:00
parent 5e2dc1e30c
commit 3fcbac1e95
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp
View File

@@ -30,7 +30,6 @@
#include <opm/common/utility/TimeService.hpp>
#include <opm/io/eclipse/rst/state.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
namespace Opm {
@@ -93,30 +92,9 @@ namespace Opm {
ScheduleRestartInfo() = default;
ScheduleRestartInfo(const RestartIO::RstState * rst, const Deck& deck) {
if (rst) {
const auto& [t,r] = rst->header.restart_info();
this->time = t;
this->report_step = r;
this->skiprest = deck.hasKeyword<ParserKeywords::SKIPREST>();
}
}
bool operator==(const ScheduleRestartInfo& other) const {
return this->time == other.time &&
this->report_step == other.report_step &&
this->skiprest == other.skiprest;
}
static ScheduleRestartInfo serializeObject() {
ScheduleRestartInfo rst_info;
rst_info.report_step = 12345;
rst_info.skiprest = false;
return rst_info;
}
ScheduleRestartInfo(const RestartIO::RstState * rst, const Deck& deck);
bool operator==(const ScheduleRestartInfo& other) const;
static ScheduleRestartInfo serializeObject();
template<class Serializer>
void serializeOp(Serializer& serializer)

26
src/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.cpp
View File

@@ -29,9 +29,35 @@
#include <opm/common/utility/String.hpp>
#include <opm/common/utility/TimeService.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
namespace Opm {
ScheduleRestartInfo::ScheduleRestartInfo(const RestartIO::RstState * rst, const Deck& deck) {
if (rst) {
const auto& [t,r] = rst->header.restart_info();
this->time = t;
this->report_step = r;
this->skiprest = deck.hasKeyword<ParserKeywords::SKIPREST>();
}
}
bool ScheduleRestartInfo::operator==(const ScheduleRestartInfo& other) const {
return this->time == other.time &&
this->report_step == other.report_step &&
this->skiprest == other.skiprest;
}
ScheduleRestartInfo ScheduleRestartInfo::serializeObject() {
ScheduleRestartInfo rst_info;
rst_info.report_step = 12345;
rst_info.skiprest = false;
return rst_info;
}
ScheduleBlock::ScheduleBlock(const KeywordLocation& location, ScheduleTimeType time_type, const time_point& start_time) :