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

add the infrastructure needed to deal with surface tension

Browse Source 
this is required for the JFUNC keyword...
This commit is contained in:
Andreas Lauser
2016-10-06 15:31:37 +02:00
parent 1fc4fa633b
commit eb9dd487c6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,6 +133,7 @@ namespace Opm {
/// \name Force
/// @{
constexpr const double Newton = kilogram*meter / square(second); // == 1
constexpr const double dyne = 1e-5*Newton;
constexpr const double lbf = pound * gravity; // Pound-force
/// @}
@@ -211,6 +212,7 @@ namespace Opm {
constexpr const double Salinity = kilogram/cubic(meter);
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = day;
constexpr const double SurfaceTension = dyne/(centi*meter);
}
@@ -236,6 +238,7 @@ namespace Opm {
constexpr const double Salinity = pound/stb;
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = day;
constexpr const double SurfaceTension = dyne/(centi*meter);
}
@@ -261,6 +264,7 @@ namespace Opm {
constexpr const double Salinity = gram/cubic(centi*meter);
constexpr const double Viscosity = centi*Poise;
constexpr const double Timestep = hour;
constexpr const double SurfaceTension = dyne/(centi*meter);
}
}

3
opm/parser/eclipse/Units/UnitSystem.cpp
View File

@@ -488,6 +488,7 @@ namespace {
system->addDimension("Salinity", Metric::Salinity);
system->addDimension("Viscosity" , Metric::Viscosity);
system->addDimension("Timestep" , Metric::Timestep);
system->addDimension("SurfaceTension" , Metric::SurfaceTension);
system->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
return system;
}
@@ -516,6 +517,7 @@ namespace {
system->addDimension("Salinity", Field::Salinity);
system->addDimension("Viscosity", Field::Viscosity);
system->addDimension("Timestep", Field::Timestep);
system->addDimension("SurfaceTension" , Field::SurfaceTension);
system->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
return system;
}
@@ -544,6 +546,7 @@ namespace {
system->addDimension("Salinity", Lab::Salinity);
system->addDimension("Viscosity", Lab::Viscosity);
system->addDimension("Timestep", Lab::Timestep);
system->addDimension("SurfaceTension" , Lab::SurfaceTension);
system->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
return system;
}