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

units: rename "1/Rs to "OilDissolutionFactor" and "Rs to "GasDissolutionFactor"

Browse Source
This commit is contained in:
Andreas Lauser
2014-02-07 16:51:21 +01:00
parent bc4d467322
commit ac60eed7d6
8 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/Parser/UnitSystem.cpp
View File

@@ -114,7 +114,7 @@ namespace Opm {
system->addDimension("Pressure" , 100000 );
system->addDimension("K" , 9.869233e-10 );
system->addDimension("Viscosity" , 0.001); // viscosity. ECLiPSE uses cP for metric units
system->addDimension("Rs" , 1); // Gas dissolution factor. ECLiPSE uses m^3/m^3 for metric units
system->addDimension("GasDissolutionFactor" , 1); // Gas dissolution factor. ECLiPSE uses m^3/m^3 for metric units
return system;
}
@@ -131,7 +131,7 @@ namespace Opm {
system->addDimension("Pressure" , 6894.76 );
system->addDimension("K" , 9.869233e-10 );
system->addDimension("Viscosity" , 0.001); // viscosity. ECLiPSE uses cP for field units
system->addDimension("Rs" , 28.316847/0.15898729); // Gas dissolution factor. ECLiPSE uses Mscft/stb for field units
system->addDimension("GasDissolutionFactor" , 28.316847/0.15898729); // Gas dissolution factor. ECLiPSE uses Mscft/stb for field units
return system;
}

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

@@ -51,7 +51,8 @@ namespace Opm {
const double Time = 86400;
const double Mass = 1.0;
const double Permeability = 9.869233e-16;
const double DissolvedGasRatio = 1.0;
const double GasDissolutionFactor = 1.0;
const double OilDissolutionFactor = 1.0;
const double LiquidVolume = 1.0;
const double GasVolume = 1.0;
const double Density = 1.0;
@@ -66,7 +67,8 @@ namespace Opm {
const double Time = 86400;
const double Mass = 0.45359237;
const double Permeability = 9.869233e-16;
const double DissolvedGasRatio = 178.1076; // Mscf / stb -> m^3/m^3
const double GasDissolutionFactor = 178.1076; // Mscf / stb -> m^3/m^3
const double OilDissolutionFactor = 1.0/178.1076; // stb / Mscf -> m^3/m^3
const double LiquidVolume = 0.158987294; // STB -> m^3
const double GasVolume = 28.316847; // MCFT -> m^3
const double Density = 16.01846; // lb/ft^3 -> kg / m^3

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

@@ -136,16 +136,17 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Metric");
system->addDimension("1" , 1.0);
system->addDimension("Pressure" , Metric::Pressure );
system->addDimension("Length" , Metric::Length);
system->addDimension("Time" , Metric::Time );
system->addDimension("Pressure" , Metric::Pressure );
system->addDimension("Length" , Metric::Length);
system->addDimension("Time" , Metric::Time );
system->addDimension("m" , Metric::Mass );
system->addDimension("K" , Metric::Permeability );
system->addDimension("Rs" , Metric::DissolvedGasRatio);
system->addDimension("GasDissolutionFactor", Metric::GasDissolutionFactor);
system->addDimension("OilDissolutionFactor", Metric::OilDissolutionFactor);
system->addDimension("LiquidVolume", Metric::LiquidVolume );
system->addDimension("GasVolume", Metric::GasVolume );
system->addDimension("GasVolume" , Metric::GasVolume );
system->addDimension("Rho" , Metric::Density );
system->addDimension("Viscosity" , Metric::Viscosity);
system->addDimension("Viscosity" , Metric::Viscosity);
system->addDimension("Timestep" , Metric::Timestep);
return system;
}
@@ -156,12 +157,13 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Field");
system->addDimension("1" , 1.0);
system->addDimension("Pressure" , Field::Pressure );
system->addDimension("Length" , Field::Length);
system->addDimension("Time" , Field::Time);
system->addDimension("Pressure", Field::Pressure );
system->addDimension("Length", Field::Length);
system->addDimension("Time" , Field::Time);
system->addDimension("m" , Field::Mass);
system->addDimension("K" , Field::Permeability );
system->addDimension("Rs" , Field::DissolvedGasRatio );
system->addDimension("GasDissolutionFactor" , Field::GasDissolutionFactor);
system->addDimension("OilDissolutionFactor", Field::OilDissolutionFactor);
system->addDimension("LiquidVolume", Field::LiquidVolume );
system->addDimension("GasVolume", Field::GasVolume );
system->addDimension("Rho" , Field::Density );

2
opm/parser/share/keywords/P/PVDG
View File

@@ -1,4 +1,4 @@
{"name" : "PVDG" , "size" : {"keyword" : "TABDIMS" , "item" : "NTPVT"} , "items" : [
{"name" : "data" , "size_type" : "ALL" , "value_type" : "FLOAT" , "dimension" : ["Pressure","1/Rs","Viscosity"]}]}
{"name" : "data" , "size_type" : "ALL" , "value_type" : "FLOAT" , "dimension" : ["Pressure","OilDissolutionFactor","Viscosity"]}]}

2
opm/parser/share/keywords/P/PVTG
View File

@@ -1,6 +1,6 @@
{"name" : "PVTG" , "num_tables" : {"keyword":"TABDIMS" , "item":"NTPVT"},
"items" : [
{"name":"GAS_PRESSURE", "value_type" : "FLOAT", "dimension":"Pressure" },
{"name":"DATA", "size_type" : "ALL" , "value_type":"FLOAT" , "dimension" : ["1/Rs","1","Viscosity"]}
{"name":"DATA", "size_type" : "ALL" , "value_type":"FLOAT" , "dimension" : ["OilDissolutionFactor","1","Viscosity"]}
]
}

2
opm/parser/share/keywords/P/PVTO
View File

@@ -1,6 +1,6 @@
{"name" : "PVTO" , "num_tables" : {"keyword" : "TABDIMS" , "item" : "NTPVT"},
"items" : [
{"name":"RS", "value_type" : "FLOAT", "dimension":"Rs" },
{"name":"RS", "value_type" : "FLOAT", "dimension":"GasDissolutionFactor" },
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["Pressure","1","Viscosity"]}
]
}

2
opm/parser/share/keywords/R/RS
View File

@@ -1 +1 @@
{"name" : "RS" , "data" : {"value_type" : "FLOAT", "dimension" : "Rs"}}
{"name" : "RS" , "data" : {"value_type" : "FLOAT", "dimension" : "GasDissolutionFactor"}}

2
opm/parser/share/keywords/R/RSVD
View File

@@ -2,6 +2,6 @@
"items" : [{"name" : "table" ,
"value_type" : "FLOAT" ,
"size_type" : "ALL",
"dimension" : ["Length" , "Rs"]}]}
"dimension" : ["Length" , "GasDissolutionFactor"]}]}