OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #989 from jokva/read-rock-compressibility-from-eclipsestate

Browse Source 
RockCompressibility takes only EclipseState
This commit is contained in:
Atgeirr Flø Rasmussen 2017-01-09 09:33:41 +01:00 committed by GitHub
commit 86b71e7d48
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/sim_2p_comp_reorder.cpp
View File

@ -114,7 +114,7 @@ try
// check_well_controls = param.getDefault("check_well_controls", false); // check_well_controls = param.getDefault("check_well_controls", false);
// max_well_control_iterations = param.getDefault("max_well_control_iterations", 10); // max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);
// Rock compressibility. // Rock compressibility.
rock_comp.reset(new RockCompressibility(deck, *eclipseState)); rock_comp.reset(new RockCompressibility(*eclipseState));
// Gravity. // Gravity.
gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity; gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity;
// Init state variables (saturation and pressure). // Init state variables (saturation and pressure).

2
examples/sim_2p_incomp.cpp
View File

@ -126,7 +126,7 @@ try
state.reset( new TwophaseState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid ))); state.reset( new TwophaseState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid )));
// Rock compressibility. // Rock compressibility.
rock_comp.reset(new RockCompressibility(deck, *eclipseState)); rock_comp.reset(new RockCompressibility(*eclipseState));
// Gravity. // Gravity.
gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity; gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity;
// Init state variables (saturation and pressure). // Init state variables (saturation and pressure).

2
examples/sim_2p_incomp_ad.cpp
View File

@ -128,7 +128,7 @@ try
state.reset( new TwophaseState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid ))); state.reset( new TwophaseState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid )));
// Rock compressibility. // Rock compressibility.
rock_comp.reset(new RockCompressibility(deck, *eclipseState)); rock_comp.reset(new RockCompressibility(*eclipseState));
// Gravity. // Gravity.
gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity; gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity;
// Init state variables (saturation and pressure). // Init state variables (saturation and pressure).

2
examples/sim_poly2p_comp_reorder.cpp
View File

@ -116,7 +116,7 @@ try
state.reset( new PolymerBlackoilState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid ), 2)); state.reset( new PolymerBlackoilState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid ), 2));
// Rock compressibility. // Rock compressibility.
rock_comp.reset(new RockCompressibility(deck, *eclipseState)); rock_comp.reset(new RockCompressibility(*eclipseState));
// Gravity. // Gravity.
gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity; gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity;
// Init state variables (saturation and pressure). // Init state variables (saturation and pressure).

2
examples/sim_poly2p_incomp_reorder.cpp
View File

@ -116,7 +116,7 @@ try
state.reset( new PolymerState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid ), 2)); state.reset( new PolymerState( UgGridHelpers::numCells( ug_grid ) , UgGridHelpers::numFaces( ug_grid ), 2));
// Rock compressibility. // Rock compressibility.
rock_comp.reset(new RockCompressibility(deck, *eclipseState)); rock_comp.reset(new RockCompressibility(*eclipseState));
// Gravity. // Gravity.
gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity; gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity;
// Init state variables (saturation and pressure). // Init state variables (saturation and pressure).

2
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -196,7 +196,7 @@ try
PolymerPropsAd polymer_props_ad(polymer_props); PolymerPropsAd polymer_props_ad(polymer_props);
// Rock compressibility. // Rock compressibility.
rock_comp.reset(new RockCompressibility(deck, *eclipseState)); rock_comp.reset(new RockCompressibility(*eclipseState));
// Gravity. // Gravity.
gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity; gravity[2] = deck.hasKeyword("NOGRAV") ? 0.0 : unit::gravity;

2
opm/autodiff/FlowMain.hpp
View File

@ -562,7 +562,7 @@ namespace Opm
fluidprops_.reset(new BlackoilPropsAdFromDeck(*deck_, *eclipse_state_, material_law_manager_, grid)); fluidprops_.reset(new BlackoilPropsAdFromDeck(*deck_, *eclipse_state_, material_law_manager_, grid));
// Rock compressibility. // Rock compressibility.
rock_comp_.reset(new RockCompressibility(*deck_, *eclipse_state_, output_cout_)); rock_comp_.reset(new RockCompressibility(*eclipse_state_, output_cout_));
// Gravity. // Gravity.
assert(UgGridHelpers::dimensions(grid) == 3); assert(UgGridHelpers::dimensions(grid) == 3);