units: substitute "FlowVolume" by "LiquidVolume" and "GasVolume"

because the units for them are different in the "Field" unit system.
This commit is contained in:
Andreas Lauser
2014-02-07 17:28:28 +01:00
parent e4c60e6aa1
commit 44f310bfbf
10 changed files with 29 additions and 25 deletions

View File

@@ -52,7 +52,8 @@ namespace Opm {
const double Mass = 1.0;
const double Permeability = 9.869233e-16;
const double DissolvedGasRatio = 1.0;
const double FlowVolume = 1.0;
const double LiquidVolume = 1.0;
const double GasVolume = 1.0;
const double Density = 1.0;
const double Viscosity = 0.001; // cP -> Pa s
const double Timestep = 24*60*60; // days -> s
@@ -66,7 +67,8 @@ namespace Opm {
const double Mass = 0.45359237;
const double Permeability = 9.869233e-16;
const double DissolvedGasRatio = 178.1076; // Mscf / stb -> m^3/m^3
const double FlowVolume = 0.158987294; // STB -> 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
const double Viscosity = 0.001; // cP -> Pa s
const double Timestep = 24*60*60; // days -> s

View File

@@ -142,7 +142,8 @@ namespace Opm {
system->addDimension("m" , Metric::Mass );
system->addDimension("K" , Metric::Permeability );
system->addDimension("Rs" , Metric::DissolvedGasRatio);
system->addDimension("FlowVolume", Metric::FlowVolume );
system->addDimension("LiquidVolume", Metric::LiquidVolume );
system->addDimension("GasVolume", Metric::GasVolume );
system->addDimension("Rho" , Metric::Density );
system->addDimension("mu" , Metric::Viscosity);
system->addDimension("Timestep" , Metric::Timestep);
@@ -161,7 +162,8 @@ namespace Opm {
system->addDimension("m" , Field::Mass);
system->addDimension("K" , Field::Permeability );
system->addDimension("Rs" , Field::DissolvedGasRatio );
system->addDimension("FlowVolume" , Field::FlowVolume );
system->addDimension("LiquidVolume", Field::LiquidVolume );
system->addDimension("GasVolume", Field::GasVolume );
system->addDimension("Rho" , Field::Density );
system->addDimension("mu" , Field::Viscosity);
system->addDimension("Timestep", Field::Timestep);

View File

@@ -6,7 +6,7 @@
{"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*FlowVolume/t*P"},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/t*P"},
{"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "L"},
{"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "K" , "default" : -1},
{"name" : "SKIN" , "value_type" : "FLOAT", "dimension" : "1" , "default" : 0},

View File

@@ -2,8 +2,8 @@
{"name" : "GROUP" , "value_type" : "STRING" },
{"name" : "PHASE" , "value_type" : "STRING"},
{"name" : "CONTROL_MODE" , "value_type" : "STRING" , "default" : "NONE"},
{"name" : "SURFACE_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "FlowVolume/t"},
{"name" : "RESV_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "FlowVolume/t"},
{"name" : "SURFACE_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/t"},
{"name" : "RESV_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/t"},
{"name" : "REINJ_TARGET" , "value_type" : "FLOAT" , "default" : 0, "dimension":"1"},
{"name" : "VOIDAGE_TARGET" , "value_type" : "FLOAT" , "default" : 0, "dimension":"1"},
{"name" : "FREE" , "value_type" : "STRING" , "default" : "YES"},
@@ -11,5 +11,5 @@
{"name" : "GUIDE_DEF" , "value_type" : "STRING"},
{"name" : "REINJECT_GROUP" , "value_type" : "STRING"},
{"name" : "VOIDAGE_GROUP" , "value_type" : "STRING"},
{"name" : "WETGAS_TARGET", "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"}
{"name" : "WETGAS_TARGET", "value_type" : "FLOAT" , "dimension" : "GasVolume/t"}
]}

View File

@@ -1,10 +1,10 @@
{"name" : "GCONPROD" , "items" : [
{"name" : "GROUP" , "value_type" : "STRING" },
{"name" : "CONTROL_MODE" , "value_type" : "STRING" , "default" : "NONE"},
{"name" : "OIL_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "WATER_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "GAS_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "LIQUID_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "OIL_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "WATER_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "GAS_TARGET" , "value_type" : "FLOAT" , "dimension" : "GasVolume/t"},
{"name" : "LIQUID_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "EXCEED_PROC" , "value_type" : "STRING" , "default" : "NONE"},
{"name" : "RESPOND_TO_PARENT" , "value_type" : "STRING" , "default" : "YES"},
{"name" : "GUIDE_RATE" , "value_type" : "FLOAT"},

View File

@@ -1,2 +1,2 @@
{"name" : "TVDP*" , "size" : {"keyword":"EQLDIMS" , "item":"NTTRVD"}, "items" :
[ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["L" , "1/FlowVolume"]}]}
[ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["L" , "1/LiquidVolume"]}]}

View File

@@ -2,11 +2,11 @@
[{"name" : "WELL" , "value_type" : "STRING"},
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "CMODE" , "value_type" : "STRING"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0, "dimension" : "FlowVolume/t"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "FlowVolume/t"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "FlowVolume/t"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0, "dimension" : "LiquidVolume/t"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "LiquidVolume/t"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "GasVolume/t"},
{"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" : "NGLRAT" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "FlowVolume/t"}]}
{"name" : "NGLRAT" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "LiquidVolume/t"}]}

View File

@@ -3,8 +3,8 @@
{"name" : "TYPE" , "value_type" : "STRING" },
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "CMODE" , "value_type" : "STRING" },
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "P" , "default" : 6891},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},

View File

@@ -2,7 +2,7 @@
{"name" : "WELL" , "value_type" : "STRING" },
{"name" : "TYPE" , "value_type" : "STRING" },
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},

View File

@@ -2,11 +2,11 @@
[{"name" : "WELL" , "value_type" : "STRING"},
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "CMODE" , "value_type" : "STRING"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0 , "dimension" : "FlowVolume/t"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
{"name" : "LRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
{"name" : "RESV" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "GasVolume/t"},
{"name" : "LRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "RESV" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "VFPTable" , "value_type" : "INT" , "default" : 0.0 , "comment":"The default is a state variable"},