mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#8416 VFP Plot : Support import of all units (Field, PVT, ..)
This commit is contained in:
parent
fef0a2b70c
commit
aeb0bf0677
@ -22,6 +22,7 @@
|
|||||||
#include "cafUtils.h"
|
#include "cafUtils.h"
|
||||||
|
|
||||||
#include "opm/parser/eclipse/Parser/Parser.hpp"
|
#include "opm/parser/eclipse/Parser/Parser.hpp"
|
||||||
|
#include "opm/parser/eclipse/Parser/ParserKeywords/V.hpp"
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
@ -38,12 +39,22 @@ std::vector<Opm::VFPInjTable> RimVfpTableExtractor::extractVfpInjectionTables( c
|
|||||||
std::string myKeyword = "VFPINJ";
|
std::string myKeyword = "VFPINJ";
|
||||||
auto keywordList = deck.getKeywordList( myKeyword );
|
auto keywordList = deck.getKeywordList( myKeyword );
|
||||||
|
|
||||||
Opm::UnitSystem unitSystem;
|
|
||||||
|
|
||||||
for ( auto kw : keywordList )
|
for ( auto kw : keywordList )
|
||||||
{
|
{
|
||||||
auto name = kw->name();
|
auto name = kw->name();
|
||||||
|
|
||||||
|
Opm::UnitSystem unitSystem;
|
||||||
|
{
|
||||||
|
const auto& header = kw->getRecord( 0 );
|
||||||
|
|
||||||
|
if ( header.getItem<Opm::ParserKeywords::VFPINJ::UNITS>().hasValue( 0 ) )
|
||||||
|
{
|
||||||
|
std::string units_string;
|
||||||
|
units_string = header.getItem<Opm::ParserKeywords::VFPINJ::UNITS>().get<std::string>( 0 );
|
||||||
|
unitSystem = Opm::UnitSystem( units_string );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Opm::VFPInjTable table( *kw, unitSystem );
|
Opm::VFPInjTable table( *kw, unitSystem );
|
||||||
tables.push_back( table );
|
tables.push_back( table );
|
||||||
}
|
}
|
||||||
@ -70,12 +81,22 @@ std::vector<Opm::VFPProdTable> RimVfpTableExtractor::extractVfpProductionTables(
|
|||||||
std::string myKeyword = "VFPPROD";
|
std::string myKeyword = "VFPPROD";
|
||||||
auto keywordList = deck.getKeywordList( myKeyword );
|
auto keywordList = deck.getKeywordList( myKeyword );
|
||||||
|
|
||||||
Opm::UnitSystem unitSystem;
|
|
||||||
|
|
||||||
for ( auto kw : keywordList )
|
for ( auto kw : keywordList )
|
||||||
{
|
{
|
||||||
auto name = kw->name();
|
auto name = kw->name();
|
||||||
|
|
||||||
|
Opm::UnitSystem unitSystem;
|
||||||
|
{
|
||||||
|
const auto& header = kw->getRecord( 0 );
|
||||||
|
|
||||||
|
if ( header.getItem<Opm::ParserKeywords::VFPPROD::UNITS>().hasValue( 0 ) )
|
||||||
|
{
|
||||||
|
std::string units_string;
|
||||||
|
units_string = header.getItem<Opm::ParserKeywords::VFPPROD::UNITS>().get<std::string>( 0 );
|
||||||
|
unitSystem = Opm::UnitSystem( units_string );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Opm::VFPProdTable table( *kw, unitSystem );
|
Opm::VFPProdTable table( *kw, unitSystem );
|
||||||
tables.push_back( table );
|
tables.push_back( table );
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user