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

Grid properties: get rid of the dimension string for integer properties

Browse Source 
this uses a small amount of template magic, to automatically change
the API of the GridProperty class depending on wheter it is
instantiated for double or for int.
This commit is contained in:
Andreas Lauser
2014-06-04 14:03:29 +02:00
parent ac5dc9e6aa
commit 6f290a750d
5 changed files with 102 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@@ -138,10 +138,10 @@ namespace Opm {
BoxManager boxManager(m_eclipseGrid->getNX( ) , m_eclipseGrid->getNY() , m_eclipseGrid->getNZ());
typedef GridProperties<int>::SupportedKeywordInfo SupportedIntKeywordInfo;
static std::vector<SupportedIntKeywordInfo> supportedIntKeywords =
{SupportedIntKeywordInfo( "SATNUM" , 0.0, "1" ),
SupportedIntKeywordInfo( "PVTNUM" , 0.0, "1" ),
SupportedIntKeywordInfo( "EQLNUM" , 0.0, "1" ),
SupportedIntKeywordInfo( "FIPNUM" , 0.0, "1" )};
{SupportedIntKeywordInfo( "SATNUM" , 0.0 ),
SupportedIntKeywordInfo( "PVTNUM" , 0.0 ),
SupportedIntKeywordInfo( "EQLNUM" , 0.0 ),
SupportedIntKeywordInfo( "FIPNUM" , 0.0 )};
typedef GridProperties<double>::SupportedKeywordInfo SupportedDoubleKeywordInfo;
static std::vector<SupportedDoubleKeywordInfo> supportedDoubleKeywords =
@@ -283,7 +283,7 @@ namespace Opm {
} else if (m_doubleGridProperties->hasKeyword( field )) {
std::shared_ptr<GridProperty<double> > property = m_doubleGridProperties->getKeyword( field );
double siShiftValue = shiftValue * getSIScaling(property->getDimensionString());
double siShiftValue = shiftValue * getSIScaling(property->getKeywordInfo().getDimensionString());
property->add(siShiftValue , boxManager.getActiveBox() );
} else
throw std::invalid_argument("Fatal error processing ADD keyword. Tried to shift not defined keyword " + field);
@@ -308,7 +308,7 @@ namespace Opm {
} else if (m_doubleGridProperties->supportsKeyword( field )) {
std::shared_ptr<GridProperty<double> > property = m_doubleGridProperties->getKeyword( field );
double siValue = value * getSIScaling(property->getDimensionString());
double siValue = value * getSIScaling(property->getKeywordInfo().getDimensionString());
property->setScalar( siValue , boxManager.getActiveBox() );
} else
throw std::invalid_argument("Fatal error processing EQUALS keyword. Tried to set not defined keyword " + field);