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

units: Replace "P" by "Pressure"

Browse Source
This commit is contained in:
Andreas Lauser
2014-02-07 16:38:33 +01:00
parent 0129a382a8
commit 19d89d44cd
17 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ namespace Opm {
system->addDimension("Length" , 1);
system->addDimension("Time" , 86400 );
system->addDimension("m" , 1 );
system->addDimension("P" , 100000 );
system->addDimension("Pressure" , 100000 );
system->addDimension("K" , 9.869233e-10 );
system->addDimension("mu" , 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
@@ -128,7 +128,7 @@ namespace Opm {
system->addDimension("Length" , 0.3048);
system->addDimension("Time" , 86400 );
system->addDimension("m" , 0.45359237 );
system->addDimension("P" , 6894.76 );
system->addDimension("Pressure" , 6894.76 );
system->addDimension("K" , 9.869233e-10 );
system->addDimension("mu" , 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

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

@@ -136,7 +136,7 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Metric");
system->addDimension("1" , 1.0);
system->addDimension("P" , Metric::Pressure );
system->addDimension("Pressure" , Metric::Pressure );
system->addDimension("Length" , Metric::Length);
system->addDimension("Time" , Metric::Time );
system->addDimension("m" , Metric::Mass );
@@ -156,7 +156,7 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Field");
system->addDimension("1" , 1.0);
system->addDimension("P" , Field::Pressure );
system->addDimension("Pressure" , Field::Pressure );
system->addDimension("Length" , Field::Length);
system->addDimension("Time" , Field::Time);
system->addDimension("m" , Field::Mass);

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

@@ -122,7 +122,7 @@ void checkSystemHasRequiredDimensions(std::shared_ptr<const UnitSystem> system)
BOOST_CHECK( system->hasDimension("m"));
BOOST_CHECK( system->hasDimension("Time"));
BOOST_CHECK( system->hasDimension("K"));
BOOST_CHECK( system->hasDimension("P"));
BOOST_CHECK( system->hasDimension("Pressure"));
}
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(CreateMetricSystem) {
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::Pressure , system->getDimension("P")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Pressure , system->getDimension("Pressure")->getSIScaling() );
}
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
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::Pressure , system->getDimension("P")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Pressure , system->getDimension("Pressure")->getSIScaling() );
}

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

@@ -6,10 +6,10 @@
{"name" : "K2" , "value_type" : "INT" },
{"name" : "STATE" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "SAT_TABLE" , "value_type" : "INT" , "default" : 0},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/Time*P"},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/Time*Pressure"},
{"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "Length"},
{"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "K" , "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"},
{"name" : "PR" , "value_type" : "FLOAT", "dimension" : "P" }]}
{"name" : "PR" , "value_type" : "FLOAT", "dimension" : "Pressure" }]}

6
opm/parser/share/keywords/E/EQUIL
View File

@@ -2,12 +2,12 @@
"description": "The EQUIL item is used when equilibrationg the model. The item should consist of one record for each PVT region",
"items" :
[{"name" : "DATUM_DEPTH" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Length"},
{"name" : "DATUM_PRESSURE" , "value_type" : "FLOAT" , "dimension" : "P"} ,
{"name" : "DATUM_PRESSURE" , "value_type" : "FLOAT" , "dimension" : "Pressure"} ,
{"name" : "OWC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Length",
"description" : "The OWC item is depth of the OIL Water contact. This should ..."} ,
{"name" : "PC_OWC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"} ,
{"name" : "PC_OWC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Pressure"} ,
{"name" : "GOC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Length"} ,
{"name" : "PC_GOC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"} ,
{"name" : "PC_GOC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Pressure"} ,
{"name" : "BLACK_OIL_INIT" , "value_type" : "INT" , "default" : 0} ,
{"name" : "BLACK_OIL_INIT_WG" , "value_type" : "INT" , "default" : 0} ,
{"name" : "OIP_INIT" , "value_type" : "INT" , "default" : -5 , "comment":"The default is a state variable"}]}

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

@@ -1 +1 @@
{"name" : "PRESSURE" , "data" : {"value_type" : "FLOAT", "dimension" : "P"}}
{"name" : "PRESSURE" , "data" : {"value_type" : "FLOAT", "dimension" : "Pressure"}}

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" : ["P","1/Rs","mu"]}]}
{"name" : "data" , "size_type" : "ALL" , "value_type" : "FLOAT" , "dimension" : ["Pressure","1/Rs","mu"]}]}

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":"P" },
{"name":"GAS_PRESSURE", "value_type" : "FLOAT", "dimension":"Pressure" },
{"name":"DATA", "size_type" : "ALL" , "value_type":"FLOAT" , "dimension" : ["1/Rs","1","mu"]}
]
}

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":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["P","1","mu"]}
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["Pressure","1","mu"]}
]
}

6
opm/parser/share/keywords/P/PVTW
View File

@@ -1,8 +1,8 @@
{"name" : "PVTW" , "size" : {"keyword":"TABDIMS" , "item":"NTPVT"}, "items":
[ {"name":"P_REF", "value_type" : "FLOAT", "dimension":"P" },
[ {"name":"P_REF", "value_type" : "FLOAT", "dimension":"Pressure" },
{"name":"WATER_VOL_FACTOR", "value_type" : "FLOAT", "default" : 1.0,"dimension":"1"},
{"name":"WATER_COMPRESSIBILITY", "value_type" : "FLOAT", "default" : 0.00004, "dimension":"1/P"},
{"name":"WATER_COMPRESSIBILITY", "value_type" : "FLOAT", "default" : 0.00004, "dimension":"1/Pressure"},
{"name":"WATER_VISCOSITY", "value_type" : "FLOAT", "default" : 0.5, "dimension":"mu", "comment" : "Default is 0.3 in Eclipse300"},
{"name":"WATER_VISCOSIBILITY", "value_type" : "FLOAT", "default" : 0.0, "dimension":"1/P"}
{"name":"WATER_VISCOSIBILITY", "value_type" : "FLOAT", "default" : 0.0, "dimension":"1/Pressure"}
]}

4
opm/parser/share/keywords/R/ROCK
View File

@@ -1,3 +1,3 @@
{"name" : "ROCK" , "size" : {"keyword":"TABDIMS" , "item":"NTPVT"}, "items" : [
{"name" : "PREF" , "value_type" : "FLOAT" , "default" : 1.0132 , "dimension" : "P"},
{"name" : "COMPRESSIBILITY" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "1/P"}]}
{"name" : "PREF" , "value_type" : "FLOAT" , "default" : 1.0132 , "dimension" : "Pressure"},
{"name" : "COMPRESSIBILITY" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "1/Pressure"}]}

2
opm/parser/share/keywords/S/SGOF
View File

@@ -1,5 +1,5 @@
{"name" : "SGOF" , "size" : {"keyword" : "TABDIMS" , "item" : "NTSFUN"},
"items" : [
{"name":"table", "value_type":"FLOAT", "size_type" : "ALL", "dimension" : ["1","1","1","P"]}
{"name":"table", "value_type":"FLOAT", "size_type" : "ALL", "dimension" : ["1","1","1","Pressure"]}
]
}

2
opm/parser/share/keywords/S/SWOF
View File

@@ -1,5 +1,5 @@
{"name" : "SWOF" , "size" : {"keyword" : "TABDIMS" , "item" : "NTSFUN"},
"items" : [
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["1","1","1","P"]}
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["1","1","1","Pressure"]}
]
}

4
opm/parser/share/keywords/W/WCONHIST
View File

@@ -7,6 +7,6 @@
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "GasVolume/Time"},
{"name" : "VFPTable" , "value_type" : "INT" , "default" : 0.0 , "comment":"The default is a state variable"},
{"name" : "Lift" , "value_type" : "FLOAT" , "default" : 0.0 , "comment":"The default is a state variable"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Pressure"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "Pressure"},
{"name" : "NGLRAT" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "LiquidVolume/Time"}]}

4
opm/parser/share/keywords/W/WCONINJE
View File

@@ -5,8 +5,8 @@
{"name" : "CMODE" , "value_type" : "STRING" },
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "P" , "default" : 6891},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "Pressure" , "default" : 6891},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "Pressure"},
{"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},
{"name" : "VAPOIL_C" , "value_type" : "FLOAT" , "default" : 0},
{"name" : "GAS_STEAM_RATIO" , "value_type" : "FLOAT" , "default" : 0},

4
opm/parser/share/keywords/W/WCONINJH
View File

@@ -3,8 +3,8 @@
{"name" : "TYPE" , "value_type" : "STRING" },
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "Pressure"},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "Pressure"},
{"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},
{"name" : "VAPOIL_C" , "value_type" : "FLOAT" , "default" : 0},
{"name" : "SURFACE_OIL_FRACTION" , "value_type" : "FLOAT" , "default" : 0},

4
opm/parser/share/keywords/W/WCONPROD
View File

@@ -7,8 +7,8 @@
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "GasVolume/Time"},
{"name" : "LRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/Time"},
{"name" : "RESV" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/Time"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Pressure"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Pressure"},
{"name" : "VFPTable" , "value_type" : "INT" , "default" : 0.0 , "comment":"The default is a state variable"},
{"name" : "ALQ" , "value_type" : "FLOAT" , "default" : 0.0 , "comment":"The default is a state variable"},
{"name" : "E300_ITEM13" , "value_type" : "FLOAT"},