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

Solvent support in Runspec.phases

Browse Source
This commit is contained in:
Jørgen Kvalsvik
2016-12-20 12:51:44 +01:00
parent 3c8b092dc5
commit 31b4c4a0fb
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
opm/parser/eclipse/EclipseState/Runspec.cpp
View File

@@ -28,16 +28,18 @@ Phase get_phase( const std::string& str ) {
if( str == "OIL" ) return Phase::OIL;
if( str == "GAS" ) return Phase::GAS;
if( str == "WAT" ) return Phase::WATER;
if( str == "WATER" ) return Phase::WATER;
if( str == "WATER" ) return Phase::WATER;
if( str == "SOLVENT" ) return Phase::SOLVENT;
throw std::invalid_argument( "Unknown phase '" + str + "'" );
}
std::ostream& operator<<( std::ostream& stream, const Phase& p ) {
switch( p ) {
case Phase::OIL: return stream << "OIL";
case Phase::GAS: return stream << "GAS";
case Phase::WATER: return stream << "WATER";
case Phase::OIL: return stream << "OIL";
case Phase::GAS: return stream << "GAS";
case Phase::WATER: return stream << "WATER";
case Phase::SOLVENT: return stream << "SOLVENT";
}
return stream;
@@ -45,10 +47,11 @@ std::ostream& operator<<( std::ostream& stream, const Phase& p ) {
using un = std::underlying_type< Phase >::type;
Phases::Phases( bool oil, bool gas, bool wat ) noexcept :
bits( (oil ? (1 << static_cast< un >( Phase::OIL ) ) : 0) |
(gas ? (1 << static_cast< un >( Phase::GAS ) ) : 0) |
(wat ? (1 << static_cast< un >( Phase::WATER ) ) : 0) )
Phases::Phases( bool oil, bool gas, bool wat, bool sol ) noexcept :
bits( (oil ? (1 << static_cast< un >( Phase::OIL ) ) : 0) |
(gas ? (1 << static_cast< un >( Phase::GAS ) ) : 0) |
(wat ? (1 << static_cast< un >( Phase::WATER ) ) : 0) |
(sol ? (1 << static_cast< un >( Phase::SOLVENT) ) : 0) )
{}
bool Phases::active( Phase p ) const noexcept {
@@ -63,7 +66,9 @@ size_t Phases::size() const noexcept {
Runspec::Runspec( const Deck& deck ) :
active_phases( Phases{ deck.hasKeyword( "OIL" ),
deck.hasKeyword( "GAS" ),
deck.hasKeyword( "WATER" ) } ),
deck.hasKeyword( "WATER" ),
deck.hasKeyword( "SOLVENT" ),
} ),
m_tabdims( deck )
{}

11
opm/parser/eclipse/EclipseState/Runspec.hpp
View File

@@ -30,9 +30,10 @@ namespace Opm {
class Deck;
enum class Phase {
OIL = 0,
GAS = 1,
WATER = 2,
OIL = 0,
GAS = 1,
WATER = 2,
SOLVENT = 3,
};
Phase get_phase( const std::string& );
@@ -41,13 +42,13 @@ std::ostream& operator<<( std::ostream&, const Phase& );
class Phases {
public:
Phases() noexcept = default;
Phases( bool oil, bool gas, bool wat ) noexcept;
Phases( bool oil, bool gas, bool wat, bool solvent = false ) noexcept;
bool active( Phase ) const noexcept;
size_t size() const noexcept;
private:
std::bitset< 3 > bits;
std::bitset< 4 > bits;
};
class Runspec {

2
opm/parser/eclipse/EclipseState/Schedule/Well.cpp
View File

@@ -97,6 +97,8 @@ namespace Opm {
case Phase::WATER: return p.WaterRate;
case Phase::OIL: return p.OilRate;
case Phase::GAS: return p.GasRate;
case Phase::SOLVENT:
throw std::logic_error( "Production of 'SOLVENT' requested." );
}
throw std::logic_error( "Unreachable state. Invalid Phase value. "