mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
completely remove the EclipseGridParser from the module
This commit is contained in:
@@ -30,23 +30,23 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
|
||||
#include <opm/core/grid/GridManager.hpp>
|
||||
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
|
||||
#include <opm/core/utility/Units.hpp>
|
||||
#include <opm/core/utility/parameters/ParameterGroup.hpp>
|
||||
|
||||
#include <opm/parser/eclipse/Parser/Parser.hpp>
|
||||
#include <opm/parser/eclipse/Deck/Deck.hpp>
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
|
||||
|
||||
struct SetupSimple {
|
||||
SetupSimple()
|
||||
: param()
|
||||
, deck()
|
||||
{
|
||||
std::ifstream str("fluid.data");
|
||||
deck.read(str);
|
||||
Opm::ParserPtr parser(new Opm::Parser());
|
||||
newParserDeck = parser->parseFile("fluid.data");
|
||||
|
||||
param.disableOutput();
|
||||
param.insertParameter("init_rock" , "false" );
|
||||
@@ -56,7 +56,7 @@ struct SetupSimple {
|
||||
}
|
||||
|
||||
Opm::parameter::ParameterGroup param;
|
||||
Opm::EclipseGridParser deck;
|
||||
Opm::DeckConstPtr newParserDeck;
|
||||
};
|
||||
|
||||
|
||||
@@ -65,14 +65,14 @@ struct TestFixture : public Setup
|
||||
{
|
||||
TestFixture()
|
||||
: Setup()
|
||||
, grid (deck)
|
||||
, props(deck, *grid.c_grid(), param,
|
||||
, grid (newParserDeck)
|
||||
, props(newParserDeck, *grid.c_grid(), param,
|
||||
param.getDefault("init_rock", false))
|
||||
{
|
||||
}
|
||||
|
||||
using Setup::param;
|
||||
using Setup::deck;
|
||||
using Setup::newParserDeck;
|
||||
|
||||
Opm::GridManager grid;
|
||||
Opm::BlackoilPropertiesFromDeck props;
|
||||
|
||||
Reference in New Issue
Block a user