handling both HO and H0 for mutliphase model input

to fix a failed test.
This commit is contained in:
Kai Bao
2015-11-11 09:33:30 +01:00
parent 192f7f698c
commit 9a5cb7e9dd
2 changed files with 5 additions and 5 deletions

View File

@@ -653,8 +653,8 @@ namespace Opm {
const std::string MultiPhaseModelEnumToString(MultiPhaseModelEnum enumValue) {
switch (enumValue) {
case H0:
return "H0";
case HO:
return "HO";
case DF:
return "DF";
default:
@@ -667,8 +667,8 @@ namespace Opm {
std::string trimmedString(stringValue);
boost::algorithm::trim(trimmedString);
if (trimmedString == "H0") {
return H0;
if ((trimmedString == "HO") || (trimmedString == "H0")) {
return HO;
} else if (trimmedString == "DF") {
return DF;
} else {

View File

@@ -264,7 +264,7 @@ namespace Opm {
CompPressureDropEnum CompPressureDropEnumFromString(const std::string& stringValue);
enum MultiPhaseModelEnum {
H0 = 0,
HO = 0,
DF = 1
};
const std::string MultiPhaseModelEnumToString(MultiPhaseModelEnum enumValue);