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

Add unit support for FoamSurfactantConcentration.

Browse Source 
Note that FoamDensity and FoamSurfactantConcentration differ in field units,
as one is then poind/barrel and the other is pound/(1000 cubic feet)!
This commit is contained in:
Atgeirr Flø Rasmussen
2019-07-01 14:21:23 +02:00
parent 57cc97af47
commit c314464ef3
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/Units/Units.hpp
View File

@@ -270,6 +270,7 @@ namespace Opm {
constexpr const double Density = kilogram/cubic(meter);
constexpr const double PolymerDensity = kilogram/cubic(meter);
constexpr const double FoamDensity = kilogram/cubic(meter);
constexpr const double FoamSurfactantConcentration = kilogram/cubic(meter);
constexpr const double Salinity = kilogram/cubic(meter);
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = day;
@@ -298,6 +299,7 @@ namespace Opm {
constexpr const double Density = pound/cubic(feet);
constexpr const double PolymerDensity = pound/stb;
constexpr const double FoamDensity = pound/GasSurfaceVolume;
constexpr const double FoamSurfactantConcentration = pound/stb;
constexpr const double Salinity = pound/stb;
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = day;
@@ -326,6 +328,7 @@ namespace Opm {
constexpr const double Density = gram/cubic(centi*meter);
constexpr const double PolymerDensity = gram/cubic(centi*meter);
constexpr const double FoamDensity = gram/cubic(centi*meter);
constexpr const double FoamSurfactantConcentration = gram/cubic(centi*meter);
constexpr const double Salinity = gram/cubic(centi*meter);
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = hour;
@@ -354,6 +357,7 @@ namespace Opm {
constexpr const double Density = kilogram/cubic(meter);
constexpr const double PolymerDensity = kilogram/cubic(meter);
constexpr const double FoamDensity = kilogram/cubic(meter);
constexpr const double FoamSurfactantConcentration = kilogram/cubic(meter);
constexpr const double Salinity = kilogram/cubic(meter);
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = day;

5
src/opm/parser/eclipse/Units/UnitSystem.cpp
View File

@@ -984,6 +984,7 @@ namespace {
system.addDimension("Density" , Metric::Density );
system.addDimension("PolymerDensity", Metric::PolymerDensity);
system.addDimension("FoamDensity", Metric::FoamDensity);
system.addDimension("FoamSurfactantConcentration", Metric::FoamSurfactantConcentration);
system.addDimension("Salinity", Metric::Salinity);
system.addDimension("Viscosity" , Metric::Viscosity);
system.addDimension("Timestep" , Metric::Timestep);
@@ -1015,6 +1016,7 @@ namespace {
system.addDimension("Density", Field::Density );
system.addDimension("PolymerDensity", Field::PolymerDensity);
system.addDimension("FoamDensity", Field::FoamDensity);
system.addDimension("FoamSurfactantConcentration", Field::FoamSurfactantConcentration);
system.addDimension("Salinity", Field::Salinity);
system.addDimension("Viscosity", Field::Viscosity);
system.addDimension("Timestep", Field::Timestep);
@@ -1046,6 +1048,7 @@ namespace {
system.addDimension("Density", Lab::Density );
system.addDimension("PolymerDensity", Lab::PolymerDensity);
system.addDimension("FoamDensity", Lab::FoamDensity);
system.addDimension("FoamSurfactantConcentration", Lab::FoamSurfactantConcentration);
system.addDimension("Salinity", Lab::Salinity);
system.addDimension("Viscosity", Lab::Viscosity);
system.addDimension("Timestep", Lab::Timestep);
@@ -1076,6 +1079,7 @@ namespace {
system.addDimension("Density" , PVT_M::Density );
system.addDimension("PolymerDensity", PVT_M::PolymerDensity);
system.addDimension("FoamDensity", PVT_M::FoamDensity);
system.addDimension("FoamSurfactantConcentration", PVT_M::FoamSurfactantConcentration);
system.addDimension("Salinity", PVT_M::Salinity);
system.addDimension("Viscosity" , PVT_M::Viscosity);
system.addDimension("Timestep" , PVT_M::Timestep);
@@ -1105,6 +1109,7 @@ namespace {
system.addDimension("Density" , 1.0);
system.addDimension("PolymerDensity", 1.0);
system.addDimension("FoamDensity", 1.0);
system.addDimension("FoamSurfactantConcentration", 1.0);
system.addDimension("Salinity", 1.0);
system.addDimension("Viscosity" , 1.0);
system.addDimension("Timestep" , 1.0);