From 19d89d44cd7fc1040dcbc36bdbdeb4779b8af268 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Fri, 7 Feb 2014 16:38:33 +0100 Subject: [PATCH] units: Replace "P" by "Pressure" --- opm/parser/eclipse/Parser/UnitSystem.cpp | 4 ++-- opm/parser/eclipse/Units/UnitSystem.cpp | 4 ++-- opm/parser/eclipse/Units/tests/UnitTests.cpp | 6 +++--- opm/parser/share/keywords/C/COMPDAT | 4 ++-- opm/parser/share/keywords/E/EQUIL | 6 +++--- opm/parser/share/keywords/P/PRESSURE | 2 +- opm/parser/share/keywords/P/PVDG | 2 +- opm/parser/share/keywords/P/PVTG | 2 +- opm/parser/share/keywords/P/PVTO | 2 +- opm/parser/share/keywords/P/PVTW | 6 +++--- opm/parser/share/keywords/R/ROCK | 4 ++-- opm/parser/share/keywords/S/SGOF | 2 +- opm/parser/share/keywords/S/SWOF | 2 +- opm/parser/share/keywords/W/WCONHIST | 4 ++-- opm/parser/share/keywords/W/WCONINJE | 4 ++-- opm/parser/share/keywords/W/WCONINJH | 4 ++-- opm/parser/share/keywords/W/WCONPROD | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/opm/parser/eclipse/Parser/UnitSystem.cpp b/opm/parser/eclipse/Parser/UnitSystem.cpp index d11ba5398..38414d422 100644 --- a/opm/parser/eclipse/Parser/UnitSystem.cpp +++ b/opm/parser/eclipse/Parser/UnitSystem.cpp @@ -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 diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp index 65efa671d..6b004f1c7 100644 --- a/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/opm/parser/eclipse/Units/UnitSystem.cpp @@ -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); diff --git a/opm/parser/eclipse/Units/tests/UnitTests.cpp b/opm/parser/eclipse/Units/tests/UnitTests.cpp index d5330e94d..ae49fbfc7 100644 --- a/opm/parser/eclipse/Units/tests/UnitTests.cpp +++ b/opm/parser/eclipse/Units/tests/UnitTests.cpp @@ -122,7 +122,7 @@ void checkSystemHasRequiredDimensions(std::shared_ptr 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() ); } diff --git a/opm/parser/share/keywords/C/COMPDAT b/opm/parser/share/keywords/C/COMPDAT index a0efb0e53..119a7a956 100644 --- a/opm/parser/share/keywords/C/COMPDAT +++ b/opm/parser/share/keywords/C/COMPDAT @@ -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" }]} diff --git a/opm/parser/share/keywords/E/EQUIL b/opm/parser/share/keywords/E/EQUIL index d9a597b0f..695c51a7f 100644 --- a/opm/parser/share/keywords/E/EQUIL +++ b/opm/parser/share/keywords/E/EQUIL @@ -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"}]} diff --git a/opm/parser/share/keywords/P/PRESSURE b/opm/parser/share/keywords/P/PRESSURE index 838130e36..f2c9a70fb 100644 --- a/opm/parser/share/keywords/P/PRESSURE +++ b/opm/parser/share/keywords/P/PRESSURE @@ -1 +1 @@ -{"name" : "PRESSURE" , "data" : {"value_type" : "FLOAT", "dimension" : "P"}} +{"name" : "PRESSURE" , "data" : {"value_type" : "FLOAT", "dimension" : "Pressure"}} diff --git a/opm/parser/share/keywords/P/PVDG b/opm/parser/share/keywords/P/PVDG index e05d29086..abc5971dd 100644 --- a/opm/parser/share/keywords/P/PVDG +++ b/opm/parser/share/keywords/P/PVDG @@ -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"]}]} diff --git a/opm/parser/share/keywords/P/PVTG b/opm/parser/share/keywords/P/PVTG index 19eca26cc..50239e893 100644 --- a/opm/parser/share/keywords/P/PVTG +++ b/opm/parser/share/keywords/P/PVTG @@ -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"]} ] } diff --git a/opm/parser/share/keywords/P/PVTO b/opm/parser/share/keywords/P/PVTO index 29bf03729..febdc3b03 100644 --- a/opm/parser/share/keywords/P/PVTO +++ b/opm/parser/share/keywords/P/PVTO @@ -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"]} ] } diff --git a/opm/parser/share/keywords/P/PVTW b/opm/parser/share/keywords/P/PVTW index 955c36574..1029f3f05 100644 --- a/opm/parser/share/keywords/P/PVTW +++ b/opm/parser/share/keywords/P/PVTW @@ -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"} ]} diff --git a/opm/parser/share/keywords/R/ROCK b/opm/parser/share/keywords/R/ROCK index a3fcd54b9..6f3c43b60 100644 --- a/opm/parser/share/keywords/R/ROCK +++ b/opm/parser/share/keywords/R/ROCK @@ -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"}]} diff --git a/opm/parser/share/keywords/S/SGOF b/opm/parser/share/keywords/S/SGOF index 250179828..29fe1aebe 100644 --- a/opm/parser/share/keywords/S/SGOF +++ b/opm/parser/share/keywords/S/SGOF @@ -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"]} ] } diff --git a/opm/parser/share/keywords/S/SWOF b/opm/parser/share/keywords/S/SWOF index fdd1d8086..bad7dcf92 100644 --- a/opm/parser/share/keywords/S/SWOF +++ b/opm/parser/share/keywords/S/SWOF @@ -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"]} ] } diff --git a/opm/parser/share/keywords/W/WCONHIST b/opm/parser/share/keywords/W/WCONHIST index 3a349adb2..791ab15e5 100644 --- a/opm/parser/share/keywords/W/WCONHIST +++ b/opm/parser/share/keywords/W/WCONHIST @@ -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"}]} diff --git a/opm/parser/share/keywords/W/WCONINJE b/opm/parser/share/keywords/W/WCONINJE index 6c4a4fba7..0cfa6074a 100644 --- a/opm/parser/share/keywords/W/WCONINJE +++ b/opm/parser/share/keywords/W/WCONINJE @@ -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}, diff --git a/opm/parser/share/keywords/W/WCONINJH b/opm/parser/share/keywords/W/WCONINJH index 171880f09..bae55084c 100644 --- a/opm/parser/share/keywords/W/WCONINJH +++ b/opm/parser/share/keywords/W/WCONINJH @@ -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}, diff --git a/opm/parser/share/keywords/W/WCONPROD b/opm/parser/share/keywords/W/WCONPROD index 8ae035843..598b7332f 100644 --- a/opm/parser/share/keywords/W/WCONPROD +++ b/opm/parser/share/keywords/W/WCONPROD @@ -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"},