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

units: rename "K" to "Permeability"

Browse Source
This commit is contained in:
Andreas Lauser
2014-02-07 17:00:15 +01:00
parent ac60eed7d6
commit ae73345763
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -140,7 +140,7 @@ namespace Opm {
system->addDimension("Length" , Metric::Length);
system->addDimension("Time" , Metric::Time );
system->addDimension("m" , Metric::Mass );
system->addDimension("K" , Metric::Permeability );
system->addDimension("Permeability", Metric::Permeability );
system->addDimension("GasDissolutionFactor", Metric::GasDissolutionFactor);
system->addDimension("OilDissolutionFactor", Metric::OilDissolutionFactor);
system->addDimension("LiquidVolume", Metric::LiquidVolume );
@@ -161,13 +161,13 @@ namespace Opm {
system->addDimension("Length", Field::Length);
system->addDimension("Time" , Field::Time);
system->addDimension("m" , Field::Mass);
system->addDimension("K" , Field::Permeability );
system->addDimension("Permeability", Field::Permeability );
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 );
system->addDimension("Viscosity" , Field::Viscosity);
system->addDimension("Rho", Field::Density );
system->addDimension("Viscosity", Field::Viscosity);
system->addDimension("Timestep", Field::Timestep);
return system;
}

6
opm/parser/eclipse/Units/tests/UnitTests.cpp
View File

@@ -121,7 +121,7 @@ void checkSystemHasRequiredDimensions(std::shared_ptr<const UnitSystem> system)
BOOST_CHECK( system->hasDimension("Length"));
BOOST_CHECK( system->hasDimension("m"));
BOOST_CHECK( system->hasDimension("Time"));
BOOST_CHECK( system->hasDimension("K"));
BOOST_CHECK( system->hasDimension("Permeability"));
BOOST_CHECK( system->hasDimension("Pressure"));
}
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE(CreateMetricSystem) {
BOOST_CHECK_EQUAL( Metric::Length , system->getDimension("Length")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Mass , system->getDimension("m")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Time , system->getDimension("Time")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Permeability , system->getDimension("K")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Permeability , system->getDimension("Permeability")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Pressure , system->getDimension("Pressure")->getSIScaling() );
}
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
BOOST_CHECK_EQUAL( Field::Length , system->getDimension("Length")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Mass , system->getDimension("m")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Time , system->getDimension("Time")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Permeability , system->getDimension("K")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Permeability , system->getDimension("Permeability")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Pressure , system->getDimension("Pressure")->getSIScaling() );
}

2
opm/parser/share/keywords/C/COMPDAT
View File

@@ -8,7 +8,7 @@
{"name" : "SAT_TABLE" , "value_type" : "INT" , "default" : 0},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "Viscosity*LiquidVolume/Time*Pressure"},
{"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "Length"},
{"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "K" , "default" : -1},
{"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "Permeability" , "default" : -1},
{"name" : "SKIN" , "value_type" : "FLOAT", "dimension" : "1" , "default" : 0},
{"name" : "D_FACTOR" , "value_type" : "FLOAT", "dimension" : "1" },
{"name" : "DIR" , "value_type" : "STRING" , "default" : "Z"},

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

@@ -1 +1 @@
{"name" : "PERMX" , "data" : {"value_type" : "FLOAT" , "dimension" : "K"}}
{"name" : "PERMX" , "data" : {"value_type" : "FLOAT" , "dimension" : "Permeability"}}

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

@@ -1 +1 @@
{"name" : "PERMXY" , "data" : {"value_type" : "FLOAT" , "dimension" : "K"}}
{"name" : "PERMXY" , "data" : {"value_type" : "FLOAT" , "dimension" : "Permeability"}}

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

@@ -1 +1 @@
{"name" : "PERMY" , "data" : {"value_type" : "FLOAT" , "default" : 0 , "dimension" : "K"}}
{"name" : "PERMY" , "data" : {"value_type" : "FLOAT" , "default" : 0 , "dimension" : "Permeability"}}

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

@@ -1 +1 @@
{"name" : "PERMYX" , "data" : {"value_type" : "FLOAT" , "dimension" : "K"}}
{"name" : "PERMYX" , "data" : {"value_type" : "FLOAT" , "dimension" : "Permeability"}}

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

@@ -1 +1 @@
{"name" : "PERMYZ" , "data" : {"value_type" : "FLOAT" , "dimension" : "K"}}
{"name" : "PERMYZ" , "data" : {"value_type" : "FLOAT" , "dimension" : "Permeability"}}

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

@@ -1 +1 @@
{"name" : "PERMZ" , "data" : {"value_type" : "FLOAT" , "default" : 0 , "dimension" : "K"}}
{"name" : "PERMZ" , "data" : {"value_type" : "FLOAT" , "default" : 0 , "dimension" : "Permeability"}}

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

@@ -1 +1 @@
{"name" : "PERMZX" , "data" : {"value_type" : "FLOAT" , "dimension" : "K"}}
{"name" : "PERMZX" , "data" : {"value_type" : "FLOAT" , "dimension" : "Permeability"}}