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

added: Ymodule dimension in UnitSystem

Browse Source
This commit is contained in:
hnil
2023-08-16 15:29:47 +02:00
committed by Arne Morten Kvarving
parent e22b0944dd
commit 3a66f7c9b6
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/input/eclipse/Units/UnitSystem.hpp
View File

@@ -84,6 +84,7 @@ namespace Opm {
gas_oil_ratio_rate,
moles,
ppm,
ymodule,
_count // New entries must be added *before* this
};

6
opm/input/eclipse/Units/Units.hpp
View File

@@ -282,6 +282,7 @@ namespace Opm {
constexpr const double Energy = kilo*joule;
constexpr const double Moles = kilo*mol;
constexpr const double PPM = 1./mega;
constexpr const double Ymodule = giga*Pascal;
}
@@ -315,7 +316,7 @@ namespace Opm {
constexpr const double Energy = btu;
constexpr const double Moles = kilo*pound*mol;
constexpr const double PPM = 1./mega;
constexpr const double Ymodule = giga*Pascal;
}
@@ -349,7 +350,7 @@ namespace Opm {
constexpr const double Energy = joule;
constexpr const double Moles = mol;
constexpr const double PPM = 1./mega;
constexpr const double Ymodule = giga*Pascal;
}
@@ -383,6 +384,7 @@ namespace Opm {
constexpr const double Energy = kilo*joule;
constexpr const double Moles = kilo*mol;
constexpr const double PPM = 1./mega;
constexpr const double Ymodule = giga*Pascal;
}
}

26
src/opm/input/eclipse/Units/UnitSystem.cpp
View File

@@ -93,6 +93,7 @@ namespace {
0.0,
0.0,
0.0,
0.0,
};
static const double to_metric[] = {
@@ -139,6 +140,7 @@ namespace {
1 / (1 / Metric::Time),
1 / Metric::Moles,
1 / Metric::PPM,
1 / Metric::Ymodule,
};
static const double from_metric[] = {
@@ -185,6 +187,7 @@ namespace {
1 / Metric::Time,
Metric::Moles,
Metric::PPM,
Metric::Ymodule,
};
static constexpr const char* metric_names[static_cast<int>(UnitSystem::measure::_count)] = {
@@ -231,6 +234,7 @@ namespace {
"SM3/SM3/DAY",
"KG-M",
"PPM", /*Parts per million */
"GPa",
};
static_assert(numElems(from_metric_offset) == static_cast<std::size_t>(UnitSystem::measure::_count),
@@ -297,6 +301,7 @@ namespace {
0.0,
0.0,
0.0,
0.0,
};
static const double to_field[] = {
@@ -343,6 +348,7 @@ namespace {
1 / (Field::GasSurfaceVolume / Field::LiquidSurfaceVolume / Field::Time),
1 / Field::Moles,
1 / Field::PPM,
1 / Field::Ymodule,
};
static const double from_field[] = {
@@ -389,6 +395,7 @@ namespace {
Field::GasSurfaceVolume / Field::LiquidSurfaceVolume / Field::Time,
Field::Moles,
Field::PPM,
Field::Ymodule,
};
static constexpr const char* field_names[static_cast<int>(UnitSystem::measure::_count)] = {
@@ -435,6 +442,7 @@ namespace {
"MSCF/STB/DAY",
"LB-M",
"PPM",
"GPa",
};
static_assert(numElems(from_field_offset) == static_cast<std::size_t>(UnitSystem::measure::_count),
@@ -501,6 +509,7 @@ namespace {
0.0,
0.0,
0.0,
0.0,
};
static const double to_lab[] = {
@@ -547,6 +556,7 @@ namespace {
1 / (Lab::GasDissolutionFactor / Lab::Time),
1 / Lab::Moles,
1 / Lab::PPM,
1 / Lab::Ymodule,
};
static const double from_lab[] = {
@@ -593,6 +603,7 @@ namespace {
Lab::GasDissolutionFactor / Lab::Time,
Lab::Moles,
Lab::PPM,
Lab::Ymodule,
};
static constexpr const char* lab_names[static_cast<int>(UnitSystem::measure::_count)] = {
@@ -639,6 +650,7 @@ namespace {
"SCC/SCC/HR",
"g-M",
"PPM",
"GPa",
};
static_assert(numElems(from_lab_offset) == static_cast<std::size_t>(UnitSystem::measure::_count),
@@ -705,6 +717,7 @@ namespace {
0.0,
0.0,
0.0,
0.0,
};
static const double to_pvt_m[] = {
@@ -751,6 +764,7 @@ namespace {
1 / (PVT_M::GasSurfaceVolume / PVT_M::LiquidSurfaceVolume /PVT_M::Time),
1 / PVT_M::Moles,
1 / PVT_M::PPM,
1 / PVT_M::Ymodule,
};
static const double from_pvt_m[] = {
@@ -797,6 +811,7 @@ namespace {
PVT_M::GasSurfaceVolume / PVT_M::LiquidSurfaceVolume /PVT_M::Time,
PVT_M::Moles,
PVT_M::PPM,
PVT_M::Ymodule,
};
static constexpr const char* pvt_m_names[static_cast<int>(UnitSystem::measure::_count)] = {
@@ -843,6 +858,7 @@ namespace {
"SM3/SM3/DAY",
"KG-M",
"PPM",
"GPa"
};
static_assert(numElems(from_pvt_m_offset) == static_cast<std::size_t>(UnitSystem::measure::_count),
@@ -909,6 +925,7 @@ namespace {
0.0,
0.0,
0.0,
0.0,
};
static const double to_input[] = {
@@ -955,6 +972,7 @@ namespace {
1,
1,
1,
1,
};
static const double from_input[] = {
@@ -1001,6 +1019,7 @@ namespace {
1,
1,
1,
1,
};
static constexpr const char* input_names[static_cast<int>(UnitSystem::measure::_count)] = {
@@ -1046,7 +1065,8 @@ namespace {
"KG/SM3", /*salinity */
"SM3/SM3/DAY",
"g-M",
"PPM"
"PPM",
"GPa",
};
static_assert(numElems(from_input_offset) == static_cast<std::size_t>(UnitSystem::measure::_count),
@@ -1152,6 +1172,7 @@ namespace {
this->addDimension("Energy", PVT_M::Energy);
this->addDimension("PPM", PVT_M::PPM);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", PVT_M::Ymodule);
}
@@ -1190,6 +1211,7 @@ namespace {
this->addDimension("Energy", Lab::Energy);
this->addDimension("PPM", Lab::PPM);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", Lab::Ymodule);
}
@@ -1229,6 +1251,7 @@ namespace {
this->addDimension("Energy", Metric::Energy);
this->addDimension("PPM", Metric::PPM);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", Metric::Ymodule);
}
void UnitSystem::initFIELD() {
@@ -1266,6 +1289,7 @@ namespace {
this->addDimension("Energy", Field::Energy);
this->addDimension("PPM", Field::PPM);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", Field::Ymodule);
}