Fixed missing member, parameter name and changed gravity sign.

Assumes now that gravity should be positive in the z direction.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-12-07 16:26:49 +01:00
parent 86130c187e
commit 59197c6f58
3 changed files with 6 additions and 5 deletions

View File

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

View File

@ -77,7 +77,7 @@ namespace Dune
inline void SteadyStateUpscalerImplicit<Traits>::initImpl(const Opm::parameter::ParameterGroup& param)
{
Super::initImpl(param);
use_gravity_ = param.getDefault("output_vtk", use_gravity_);
use_gravity_ = param.getDefault("use_gravity", use_gravity_);
output_vtk_ = param.getDefault("output_vtk", output_vtk_);
output_ecl_ = param.getDefault("output_ecl", output_ecl_);
if (output_ecl_) {
@ -157,8 +157,8 @@ namespace Dune
Opm::SparseVector<double> injection(num_cells);
// Gravity.
FieldVector<double, 3> gravity(0.0);
if(use_gravity_){
gravity[2] = -Opm::unit::gravity;
if (use_gravity_) {
gravity[2] = Opm::unit::gravity;
}
if (gravity.two_norm() > 0.0) {

View File

@ -143,8 +143,8 @@ namespace Dune
Opm::SparseVector<double> injection(num_cells);
// Gravity.
FieldVector<double, 3> gravity(0.0);
if(use_gravity_){
gravity[2] = -Opm::unit::gravity;
if (use_gravity_) {
gravity[2] = Opm::unit::gravity;
}
if (gravity.two_norm() > 0.0) {
MESSAGE("Warning: Gravity is experimental for flow solver.");