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

Added derived iniitializer classes SWL and ISWL

Browse Source
This commit is contained in:
Joakim Hove
2015-03-31 12:18:13 +02:00
parent 2d08d78257
commit 2947336982
2 changed files with 113 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -724,8 +724,12 @@ namespace Opm {
double nan = std::numeric_limits<double>::quiet_NaN();
const auto eptLookup = std::make_shared<EndpointInitializer<>>(*deck, *this);
const auto SGLLookup = std::make_shared<SGLEndpointInitializer<>>(*deck, *this);
const auto ISGLLookup = std::make_shared<ISGLEndpointInitializer<>>(*deck, *this);
const auto SWLLookup = std::make_shared<SWLEndpointInitializer<>>(*deck, *this);
const auto ISWLLookup = std::make_shared<ISWLEndpointInitializer<>>(*deck, *this);
const auto tempLookup = std::make_shared<GridPropertyTemperatureLookupInitializer<>>(*deck, *this);
const auto distributeTopLayer = std::make_shared<const GridPropertyPostProcessor::DistributeTopLayer>(*this);
const auto initPORV = std::make_shared<GridPropertyPostProcessor::InitPORV>(*this);
@@ -753,20 +757,20 @@ namespace Opm {
SupportedDoubleKeywordInfo( "ISGLZ-" , ISGLLookup, "1" ),
// keywords to specify the connate water saturation.
SupportedDoubleKeywordInfo( "SWL" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWL" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLX" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLX-" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLX" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLX-" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLY" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLY-" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLY" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLY-" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLZ" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLZ-" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLZ" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLZ-" , eptLookup, "1" ),
SupportedDoubleKeywordInfo( "SWL" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLX" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLX-" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLY" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLY-" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLZ" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "SWLZ-" , SWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWL" , ISWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLX" , ISWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLX-" , ISWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLY" , ISWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLY-" , ISWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLZ" , ISWLLookup, "1" ),
SupportedDoubleKeywordInfo( "ISWLZ-" , ISWLLookup, "1" ),
// keywords to specify the maximum gas saturation.
SupportedDoubleKeywordInfo( "SGU" , eptLookup, "1" ),

109
opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp
View File

@@ -98,22 +98,9 @@ public:
assert(0 <= satTableIdx && satTableIdx < numSatTables);
assert(0 <= imbTableIdx && imbTableIdx < numSatTables);
// the SWL keyword family
if (propertyName.find("SWL") == 0)
values[cellIdx] = selectValue(enptvdTables,
(useEnptvd && endNum >= 0) ? endNum : -1,
"SWCO",
cellDepth,
m_minWaterSat[satTableIdx]);
else if (propertyName.find("ISWL") == 0)
values[cellIdx] = selectValue(imptvdTables,
(useImptvd && endNum >= 0) ? endNum : -1,
"SWCO",
cellDepth,
m_minWaterSat[imbTableIdx]);
// the SGU keyword family
else if (propertyName.find("SGU") == 0)
if (propertyName.find("SGU") == 0)
values[cellIdx] = selectValue(enptvdTables,
(useEnptvd && endNum >= 0) ? endNum : -1,
"SGMAX",
@@ -440,6 +427,100 @@ public:
}
}
};
template <class EclipseState=Opm::EclipseState,
class Deck=Opm::Deck>
class SWLEndpointInitializer
: public EndpointInitializer<EclipseState,Deck>
{
public:
SWLEndpointInitializer(const Deck& deck, const EclipseState& eclipseState)
: EndpointInitializer<EclipseState,Deck>( deck , eclipseState )
{ }
void apply(std::vector<double>& values,
const std::string& /* propertyname */ ) const
{
auto eclipseGrid = this->m_eclipseState.getEclipseGrid();
auto tabdims = this->m_eclipseState.getTabdims();
auto satnum = this->m_eclipseState.getIntGridProperty("SATNUM");
auto endnum = this->m_eclipseState.getIntGridProperty("ENDNUM");
int numSatTables = tabdims->getNumSatTables();
satnum->checkLimits(1 , numSatTables);
this->findSaturationEndpoints( );
// acctually assign the defaults. if the ENPVD keyword was specified in the deck,
// this currently cannot be done because we would need the Z-coordinate of the
// cell and we would need to know how the simulator wants to interpolate between
// sampling points. Both of these are outside the scope of opm-parser, so we just
// assign a NaN in this case...
bool useEnptvd = this->m_deck.hasKeyword("ENPTVD");
const auto& enptvdTables = this->m_eclipseState.getEnptvdTables();
for (size_t cellIdx = 0; cellIdx < eclipseGrid->getCartesianSize(); cellIdx++) {
int satTableIdx = satnum->iget( cellIdx ) - 1;
int endNum = endnum->iget( cellIdx ) - 1;
double cellDepth = std::get<2>(eclipseGrid->getCellCenter(cellIdx));
values[cellIdx] = selectValue(enptvdTables,
(useEnptvd && endNum >= 0) ? endNum : -1,
"SWCO",
cellDepth,
this->m_minWaterSat[satTableIdx]);
}
}
};
template <class EclipseState=Opm::EclipseState,
class Deck=Opm::Deck>
class ISWLEndpointInitializer
: public EndpointInitializer<EclipseState,Deck>
{
public:
ISWLEndpointInitializer(const Deck& deck, const EclipseState& eclipseState)
: EndpointInitializer<EclipseState,Deck>( deck , eclipseState )
{ }
void apply(std::vector<double>& values,
const std::string& /* propertyname */ ) const
{
auto eclipseGrid = this->m_eclipseState.getEclipseGrid();
auto tabdims = this->m_eclipseState.getTabdims();
auto imbnum = this->m_eclipseState.getIntGridProperty("IMBNUM");
auto endnum = this->m_eclipseState.getIntGridProperty("ENDNUM");
int numSatTables = tabdims->getNumSatTables();
imbnum->checkLimits(1 , numSatTables);
this->findSaturationEndpoints( );
// acctually assign the defaults. if the ENPVD keyword was specified in the deck,
// this currently cannot be done because we would need the Z-coordinate of the
// cell and we would need to know how the simulator wants to interpolate between
// sampling points. Both of these are outside the scope of opm-parser, so we just
// assign a NaN in this case...
bool useImptvd = this->m_deck.hasKeyword("IMPTVD");
const auto& imptvdTables = this->m_eclipseState.getImptvdTables();
for (size_t cellIdx = 0; cellIdx < eclipseGrid->getCartesianSize(); cellIdx++) {
int imbTableIdx = imbnum->iget( cellIdx ) - 1;
int endNum = endnum->iget( cellIdx ) - 1;
double cellDepth = std::get<2>(eclipseGrid->getCellCenter(cellIdx));
values[cellIdx] = selectValue(imptvdTables,
(useImptvd && endNum >= 0) ? endNum : -1,
"SWCO",
cellDepth,
this->m_minWaterSat[imbTableIdx]);
}
}
};
}
#endif