deleteSolidPhasefromPhases

This commit is contained in:
Cintia Goncalves Machado
2020-06-19 13:31:33 +02:00
parent 6ab09afb0c
commit 784abc7069
2 changed files with 7 additions and 12 deletions

View File

@@ -40,12 +40,11 @@ enum class Phase {
ENERGY = 5,
POLYMW = 6,
FOAM = 7,
BRINE = 8,
PRECSALT = 9
BRINE = 8
// If you add more entries to this enum, remember to update NUM_PHASES_IN_ENUM below.
};
constexpr int NUM_PHASES_IN_ENUM = static_cast<int>(Phase::PRECSALT) + 1; // Used to get correct size of the bitset in class Phases.
constexpr int NUM_PHASES_IN_ENUM = static_cast<int>(Phase::BRINE) + 1; // Used to get correct size of the bitset in class Phases.
Phase get_phase( const std::string& );
std::ostream& operator<<( std::ostream&, const Phase& );
@@ -54,7 +53,7 @@ class Phases {
public:
Phases() noexcept = default;
Phases( bool oil, bool gas, bool wat, bool solvent = false, bool polymer = false, bool energy = false,
bool polymw = false, bool foam = false, bool brine = false, bool precsalt = false ) noexcept;
bool polymw = false, bool foam = false, bool brine = false ) noexcept;
static Phases serializeObject();