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

Merge remote-tracking branch 'hnil/master'

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-12-07 16:02:24 +01:00
commit 86130c187e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dune/upscaling/SteadyStateUpscaler.hpp
View File

@ -106,6 +106,7 @@ namespace Dune
// ------- Data members ------- // ------- Data members -------
std::vector<double> last_saturation_state_; std::vector<double> last_saturation_state_;
bool use_gravity_;
bool output_vtk_; bool output_vtk_;
bool print_inoutflows_; bool print_inoutflows_;
int simulation_steps_; int simulation_steps_;

9
dune/upscaling/SteadyStateUpscalerImplicit_impl.hpp
View File

@ -55,6 +55,7 @@ namespace Dune
template <class Traits> template <class Traits>
inline SteadyStateUpscalerImplicit<Traits>::SteadyStateUpscalerImplicit() inline SteadyStateUpscalerImplicit<Traits>::SteadyStateUpscalerImplicit()
: Super(), : Super(),
use_gravity_(false),
output_vtk_(false), output_vtk_(false),
output_ecl_(false), output_ecl_(false),
print_inoutflows_(false), print_inoutflows_(false),
@ -76,6 +77,7 @@ namespace Dune
inline void SteadyStateUpscalerImplicit<Traits>::initImpl(const Opm::parameter::ParameterGroup& param) inline void SteadyStateUpscalerImplicit<Traits>::initImpl(const Opm::parameter::ParameterGroup& param)
{ {
Super::initImpl(param); Super::initImpl(param);
use_gravity_ = param.getDefault("output_vtk", use_gravity_);
output_vtk_ = param.getDefault("output_vtk", output_vtk_); output_vtk_ = param.getDefault("output_vtk", output_vtk_);
output_ecl_ = param.getDefault("output_ecl", output_ecl_); output_ecl_ = param.getDefault("output_ecl", output_ecl_);
if (output_ecl_) { if (output_ecl_) {
@ -155,9 +157,12 @@ namespace Dune
Opm::SparseVector<double> injection(num_cells); Opm::SparseVector<double> injection(num_cells);
// Gravity. // Gravity.
FieldVector<double, 3> gravity(0.0); FieldVector<double, 3> gravity(0.0);
// gravity[2] = -Opm::unit::gravity; if(use_gravity_){
gravity[2] = -Opm::unit::gravity;
}
if (gravity.two_norm() > 0.0) { if (gravity.two_norm() > 0.0) {
MESSAGE("Warning: Gravity not yet handled by flow solver."); MESSAGE("Warning: Gravity is experimental for flow solver.");
} }
// Set up initial saturation profile. // Set up initial saturation profile.

10
dune/upscaling/SteadyStateUpscaler_impl.hpp
View File

@ -41,7 +41,7 @@
#include <dune/porsol/common/MatrixInverse.hpp> #include <dune/porsol/common/MatrixInverse.hpp>
#include <dune/porsol/common/SimulatorUtilities.hpp> #include <dune/porsol/common/SimulatorUtilities.hpp>
#include <dune/porsol/common/ReservoirPropertyFixedMobility.hpp> #include <dune/porsol/common/ReservoirPropertyFixedMobility.hpp>
#include <opm/core/utility/Units.hpp>
#include <algorithm> #include <algorithm>
namespace Dune namespace Dune
@ -52,6 +52,7 @@ namespace Dune
template <class Traits> template <class Traits>
inline SteadyStateUpscaler<Traits>::SteadyStateUpscaler() inline SteadyStateUpscaler<Traits>::SteadyStateUpscaler()
: Super(), : Super(),
use_gravity_(false),
output_vtk_(false), output_vtk_(false),
print_inoutflows_(false), print_inoutflows_(false),
simulation_steps_(10), simulation_steps_(10),
@ -69,6 +70,7 @@ namespace Dune
inline void SteadyStateUpscaler<Traits>::initImpl(const Opm::parameter::ParameterGroup& param) inline void SteadyStateUpscaler<Traits>::initImpl(const Opm::parameter::ParameterGroup& param)
{ {
Super::initImpl(param); Super::initImpl(param);
use_gravity_ = param.getDefault("use_gravity", use_gravity_);
output_vtk_ = param.getDefault("output_vtk", output_vtk_); output_vtk_ = param.getDefault("output_vtk", output_vtk_);
print_inoutflows_ = param.getDefault("print_inoutflows", print_inoutflows_); print_inoutflows_ = param.getDefault("print_inoutflows", print_inoutflows_);
simulation_steps_ = param.getDefault("simulation_steps", simulation_steps_); simulation_steps_ = param.getDefault("simulation_steps", simulation_steps_);
@ -141,9 +143,11 @@ namespace Dune
Opm::SparseVector<double> injection(num_cells); Opm::SparseVector<double> injection(num_cells);
// Gravity. // Gravity.
FieldVector<double, 3> gravity(0.0); FieldVector<double, 3> gravity(0.0);
// gravity[2] = -Opm::unit::gravity; if(use_gravity_){
gravity[2] = -Opm::unit::gravity;
}
if (gravity.two_norm() > 0.0) { if (gravity.two_norm() > 0.0) {
MESSAGE("Warning: Gravity not yet handled by flow solver."); MESSAGE("Warning: Gravity is experimental for flow solver.");
} }
// Set up initial saturation profile. // Set up initial saturation profile.