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

OPM-211: Added new InitConfig class, and corresponding test

Browse Source
This commit is contained in:
Edvin Brudevoll
2015-06-11 12:40:09 +02:00
parent 3c5ed85bc0
commit 90c023f1f0
5 changed files with 238 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/parser/eclipse/CMakeLists.txt
+3
View File
@@ -13,6 +13,7 @@ add_subdirectory(EclipseState/Tables/tests)
add_subdirectory(EclipseState/Grid/tests)
add_subdirectory(EclipseState/Util/tests)
add_subdirectory(EclipseState/IOConfig/tests)
add_subdirectory(EclipseState/InitConfig/tests)
add_subdirectory( Applications )
@@ -110,6 +111,7 @@ EclipseState/Grid/Fault.cpp
EclipseState/Grid/FaultCollection.cpp
EclipseState/Grid/NNC.cpp
#
EclipseState/InitConfig/InitConfig.cpp
EclipseState/SimulationConfig/SimulationConfig.cpp
EclipseState/SimulationConfig/ThresholdPressure.cpp
#
@@ -198,6 +200,7 @@ EclipseState/Grid/Fault.hpp
EclipseState/Grid/FaultCollection.hpp
EclipseState/Grid/NNC.hpp
#
EclipseState/InitConfig/InitConfig.hpp
EclipseState/SimulationConfig/SimulationConfig.hpp
EclipseState/SimulationConfig/ThresholdPressure.hpp
#
opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp
+69
View File
@@ -0,0 +1,69 @@
/*
Copyright 2015 Statoil ASA.
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <iostream>
namespace Opm {
InitConfig::InitConfig(DeckConstPtr deck) {
m_restartInitiated = false;
m_restartStep = 0;
m_restartRootName = "";
initRestartKW(deck);
}
void InitConfig::initRestartKW(DeckConstPtr deck) {
if (deck->hasKeyword("RESTART") && deck->hasKeyword("SKIPREST")) {
DeckKeywordConstPtr restart_kw = deck->getKeyword("RESTART");
DeckRecordConstPtr restart_dataRecord = restart_kw->getRecord(0);
DeckItemPtr restart_rootname_item = restart_dataRecord->getItem(0);
const std::string restart_rootname_string = restart_rootname_item->getString(0);
DeckItemPtr restart_report_step_item = restart_dataRecord->getItem(1);
int restart_report_step_int = restart_report_step_item->getInt(0);
DeckItemPtr save_item = restart_dataRecord->getItem(2);
if (save_item->hasValue(0)) {
throw std::runtime_error("OPM does not support RESTART from a SAVE file, only from RESTART files");
}
m_restartInitiated = true;
m_restartStep = restart_report_step_int;
m_restartRootName = restart_rootname_string;
} else if (deck->hasKeyword("RESTART") || deck->hasKeyword("SKIPREST")){
throw std::runtime_error("Error in deck: Only one of the kewywords RESTART and SKIPREST are supplied. None or both of them should be supplied.");
}
}
bool InitConfig::getRestartInitiated() const {
return m_restartInitiated;
}
int InitConfig::getRestartStep() const {
return m_restartStep;
}
const std::string& InitConfig::getRestartRootName() const {
return m_restartRootName;
}
} //namespace Opm
opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp
+49
View File
@@ -0,0 +1,49 @@
/*
Copyright 2015 Statoil ASA.
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_INIT_CONFIG_HPP
#define OPM_INIT_CONFIG_HPP
#include <opm/parser/eclipse/Deck/Deck.hpp>
namespace Opm {
class InitConfig {
public:
InitConfig(DeckConstPtr deck);
bool getRestartInitiated() const;
int getRestartStep() const;
const std::string& getRestartRootName() const;
private:
void initRestartKW(DeckConstPtr deck);
bool m_restartInitiated;
int m_restartStep;
std::string m_restartRootName;
};
typedef std::shared_ptr<InitConfig> InitConfigPtr;
typedef std::shared_ptr<const InitConfig> InitConfigConstPtr;
} //namespace Opm
#endif
opm/parser/eclipse/EclipseState/InitConfig/tests/CMakeLists.txt
+2
View File
@@ -0,0 +1,2 @@
opm_add_test(runInitConfigTests SOURCES InitConfigTest.cpp
LIBRARIES opmparser ${Boost_LIBRARIES})
opm/parser/eclipse/EclipseState/InitConfig/tests/InitConfigTest.cpp
+115
View File
@@ -0,0 +1,115 @@
/*
Copyright 2015 Statoil ASA.
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#define BOOST_TEST_MODULE InitConfigTests
#include <boost/test/unit_test.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
using namespace Opm;
const std::string& deckStr =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
"SOLUTION\n"
"RESTART\n"
"BASE 5\n"
"/\n"
"GRID\n"
"START -- 0 \n"
"19 JUN 2007 / \n"
"SCHEDULE\n"
"SKIPREST \n"
"/\n";
const std::string& deckStr2 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
"SOLUTION\n"
"/\n"
"GRID\n"
"START -- 0 \n"
"19 JUN 2007 / \n"
"SCHEDULE\n"
"/\n";
const std::string& deckStr3 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
"SOLUTION\n"
"RESTART\n"
"BASE 5 SAVE UNFORMATTED\n"
"/\n"
"GRID\n"
"START -- 0 \n"
"19 JUN 2007 / \n"
"SCHEDULE\n"
"SKIPREST \n"
"/\n";
const std::string& deckStr4 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
"SOLUTION\n"
"RESTART\n"
"BASE 5\n"
"/\n"
"GRID\n"
"START -- 0 \n"
"19 JUN 2007 / \n"
"SCHEDULE\n"
"/\n";
static DeckPtr createDeck(const std::string& input) {
Opm::Parser parser;
return parser.parseString(input);
}
BOOST_AUTO_TEST_CASE(InitConfigTest) {
DeckPtr deck = createDeck(deckStr);
InitConfigPtr initConfigPtr;
BOOST_CHECK_NO_THROW(initConfigPtr = std::make_shared<InitConfig>(deck));
BOOST_CHECK_EQUAL(initConfigPtr->getRestartInitiated(), true);
BOOST_CHECK_EQUAL(initConfigPtr->getRestartStep(), 5);
BOOST_CHECK_EQUAL(initConfigPtr->getRestartRootName(), "BASE");
DeckPtr deck2 = createDeck(deckStr2);
InitConfigPtr initConfigPtr2;
BOOST_CHECK_NO_THROW(initConfigPtr2 = std::make_shared<InitConfig>(deck2));
BOOST_CHECK_EQUAL(initConfigPtr2->getRestartInitiated(), false);
BOOST_CHECK_EQUAL(initConfigPtr2->getRestartStep(), 0);
BOOST_CHECK_EQUAL(initConfigPtr2->getRestartRootName(), "");
DeckPtr deck3 = createDeck(deckStr3);
BOOST_CHECK_THROW(std::make_shared<InitConfig>(deck3), std::runtime_error);
DeckPtr deck4 = createDeck(deckStr4);
BOOST_CHECK_THROW(std::make_shared<InitConfig>(deck4), std::runtime_error);
}