OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-30 11:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Trying to get the test back running, by looking at the sim_fib_ad main method. Please advice if the string casting on line 335 is bad stuff, not my strongest side

Browse Source
This commit is contained in:
Kristian Flikka 2014-02-05 18:22:16 +01:00
parent 3318f506b3
commit 8d7e7cc731
1 changed files with 71 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
tests/integration_tests/sim_fibo_ad_test.cpp
View File

@ -26,7 +26,6 @@
#define BOOST_TEST_MODULE SimFiboADTest
#include <boost/test/unit_test.hpp>
#include <opm/core/pressure/FlowBCManager.hpp>
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
@ -68,7 +67,15 @@
using namespace Opm;
std::vector<BlackoilState> runWithOldParser(parameter::ParameterGroup param) {
std::vector<BlackoilState> runWithOldParser(int argc, char** argv) {
parameter::ParameterGroup param(argc, argv, false);
// If we have a "deck_filename", grid and props will be read from that.
bool use_deck = param.has("deck_filename");
if (!use_deck) {
OPM_THROW(std::runtime_error, "This program must be run with an input deck. "
"Specify the deck with deck_filename=deckname.data (for example).");
}
boost::scoped_ptr<EclipseGridParser> deck;
boost::scoped_ptr<GridManager> grid;
boost::scoped_ptr<BlackoilPropertiesInterface> props;
@ -77,24 +84,13 @@ std::vector<BlackoilState> runWithOldParser(parameter::ParameterGroup param) {
BlackoilState state;
std::vector<BlackoilState> state_collection;
double gravity[3] = {0.0};
boost::filesystem::path test_data("non_public/SPE1_opm.DATA");
std::string deck_filename = test_data.string();
std::string deck_filename = param.get<std::string>("deck_filename");
deck.reset(new EclipseGridParser(deck_filename));
// Grid init
grid.reset(new GridManager(*deck));
// use the capitalized part of the deck's filename between the
// last '/' and the last '.' character as base name.
std::string baseName = deck_filename;
auto charPos = baseName.rfind('/');
if (charPos != std::string::npos)
baseName = baseName.substr(charPos + 1);
charPos = baseName.rfind('.');
if (charPos != std::string::npos)
baseName = baseName.substr(0, charPos);
baseName = boost::to_upper_copy(baseName);
Opm::EclipseWriter outputWriter(param, share_obj(*deck), share_obj(*grid->c_grid()));
// Rock and fluid init
@ -102,16 +98,31 @@ std::vector<BlackoilState> runWithOldParser(parameter::ParameterGroup param) {
new_props.reset(new BlackoilPropsAdFromDeck(*deck, *grid->c_grid()));
rock_comp.reset(new RockCompressibility(*deck));
double gravity[3] = {0.0};
gravity[2] = deck->hasField("NOGRAV") ? 0.0 : unit::gravity;
initBlackoilStateFromDeck(*grid->c_grid(), *props, *deck, gravity[2], state);
// Init state variables (saturation and pressure).
if (param.has("init_saturation")) {
initStateBasic(*grid->c_grid(), *props, param, gravity[2], state);
initBlackoilSurfvol(*grid->c_grid(), *props, state);
enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour };
const PhaseUsage pu = props->phaseUsage();
if (pu.phase_used[Oil] && pu.phase_used[Gas]) {
const int np = props->numPhases();
const int nc = grid->c_grid()->number_of_cells;
for (int c = 0; c < nc; ++c) {
state.gasoilratio()[c] = state.surfacevol()[c*np + pu.phase_pos[Gas]]
/ state.surfacevol()[c*np + pu.phase_pos[Oil]];
}
}
} else {
initBlackoilStateFromDeck(*grid->c_grid(), *props, *deck, gravity[2], state);
}
bool use_gravity = (gravity[0] != 0.0 || gravity[1] != 0.0 || gravity[2] != 0.0);
const double *grav = use_gravity ? &gravity[0] : 0;
// Boundary conditions.
FlowBCManager bcs;
// Linear solver.
LinearSolverFactory linsolver(param);
@ -185,14 +196,15 @@ std::vector<BlackoilState> runWithOldParser(parameter::ParameterGroup param) {
}
std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
boost::filesystem::path test_data("non_public/SPE1_opm.DATA");
std::string deck_filename = test_data.string();
ParserPtr parser(new Parser());
DeckConstPtr deck = parser->parseFile(deck_filename);
ScheduleConstPtr schedule_deck(new Schedule(deck));
std::vector<BlackoilState> runWithNewParser(int argc, char** argv) {
parameter::ParameterGroup param(argc, argv, false);
// If we have a "deck_filename", grid and props will be read from that.
bool use_deck = param.has("deck_filename");
if (!use_deck) {
OPM_THROW(std::runtime_error, "This program must be run with an input deck. "
"Specify the deck with deck_filename=deckname.data (for example).");
}
boost::scoped_ptr<EclipseGridParser> old_deck;
boost::scoped_ptr<GridManager> grid;
boost::scoped_ptr<BlackoilPropertiesInterface> props;
@ -200,24 +212,13 @@ std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
boost::scoped_ptr<RockCompressibility> rock_comp;
BlackoilState state;
std::vector<BlackoilState> state_collection;
double gravity[3] = {0.0};
std::string deck_filename = param.get<std::string>("deck_filename");
old_deck.reset(new EclipseGridParser(deck_filename));
// Grid init
grid.reset(new GridManager(*old_deck));
// use the capitalized part of the deck's filename between the
// last '/' and the last '.' character as base name.
std::string baseName = deck_filename;
auto charPos = baseName.rfind('/');
if (charPos != std::string::npos)
baseName = baseName.substr(charPos + 1);
charPos = baseName.rfind('.');
if (charPos != std::string::npos)
baseName = baseName.substr(0, charPos);
baseName = boost::to_upper_copy(baseName);
Opm::EclipseWriter outputWriter(param, share_obj(*old_deck), share_obj(*grid->c_grid()));
// Rock and fluid init
@ -225,16 +226,31 @@ std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
new_props.reset(new BlackoilPropsAdFromDeck(*old_deck, *grid->c_grid()));
rock_comp.reset(new RockCompressibility(*old_deck));
double gravity[3] = {0.0};
gravity[2] = old_deck->hasField("NOGRAV") ? 0.0 : unit::gravity;
initBlackoilStateFromDeck(*grid->c_grid(), *props, *old_deck, gravity[2], state);
// Init state variables (saturation and pressure).
if (param.has("init_saturation")) {
initStateBasic(*grid->c_grid(), *props, param, gravity[2], state);
initBlackoilSurfvol(*grid->c_grid(), *props, state);
enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour };
const PhaseUsage pu = props->phaseUsage();
if (pu.phase_used[Oil] && pu.phase_used[Gas]) {
const int np = props->numPhases();
const int nc = grid->c_grid()->number_of_cells;
for (int c = 0; c < nc; ++c) {
state.gasoilratio()[c] = state.surfacevol()[c*np + pu.phase_pos[Gas]]
/ state.surfacevol()[c*np + pu.phase_pos[Oil]];
}
}
} else {
initBlackoilStateFromDeck(*grid->c_grid(), *props, *old_deck, gravity[2], state);
}
bool use_gravity = (gravity[0] != 0.0 || gravity[1] != 0.0 || gravity[2] != 0.0);
const double *grav = use_gravity ? &gravity[0] : 0;
// Boundary conditions.
FlowBCManager bcs;
// Linear solver.
LinearSolverFactory linsolver(param);
@ -253,6 +269,11 @@ std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
simtimer.init(*old_deck);
const double total_time = simtimer.totalTime();
ParserPtr parser(new Parser());
DeckConstPtr deck = parser->parseFile(deck_filename);
ScheduleConstPtr schedule_deck(new Schedule(deck));
//In the Schedule Deck, we have the start data as the 0th element.
for (size_t epoch = 0; epoch < schedule_deck->getTimeMap()->size() - 1; ++epoch) {
// Set epoch index.
@ -311,14 +332,12 @@ std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
BOOST_AUTO_TEST_CASE(SPE1_runWithOldAndNewParser_BlackOilStateEqual) {
boost::filesystem::path test_data("non_public/spe1.xml");
std::string deck_filename = test_data.string();
const char * argv[] = { "", deck_filename.c_str(), static_cast<const char*>(0)};
parameter::ParameterGroup param(2, argv, false);
char * argv[] = {const_cast<char*>(""),const_cast<char *>("deck_filename=non_public/SPE1_opm.DATA")};
std::vector<BlackoilState> runWithOldParserStates = runWithOldParser(param);
std::vector<BlackoilState> runWithNewParserStates = runWithNewParser(param);
std::vector<BlackoilState> runWithOldParserStates = runWithOldParser(2, argv);
std::vector<BlackoilState> runWithNewParserStates = runWithNewParser(2, argv);
std::cout << "======== Checking old parser vs new parser BlackoilState ==========\n\n";
for(size_t i=0; i<runWithOldParserStates.size(); i++) {
BOOST_CHECK(runWithOldParserStates[i].equals(runWithNewParserStates[i]));
}