Merge pull request #88 from qilicun/fix_wellstate

Adapte to FIBO wellstate API changes in opm-autodiff.
This commit is contained in:
Atgeirr Flø Rasmussen committed 2015-01-19 10:25:56 +01:00
commit 8b859f2fcc
2 files changed
+4 -4

No files matched your search

@@ -357,7 +357,7 @@ namespace Opm
if (timer.currentStepNum() == 0) {
output_writer_.writeInit(timer);
}
output_writer_.writeTimeStep(timer, state.blackoilState(), well_state.basicWellState());
output_writer_.writeTimeStep(timer, state.blackoilState(), well_state);
}
// Max oil saturation (for VPPARS), hysteresis update.
@@ -399,7 +399,7 @@ namespace Opm
}
outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
outputWellStateMatlab(prev_well_state, timer.currentStepNum(), output_dir_);
output_writer_.writeTimeStep(timer, state.blackoilState(), prev_well_state.basicWellState());
output_writer_.writeTimeStep(timer, state.blackoilState(), prev_well_state);
}
// Stop timer and create timing report
@@ -306,7 +306,7 @@ namespace Opm
if (timer.currentStepNum() == 0) {
output_writer_.writeInit(timer);
}
output_writer_.writeTimeStep(timer, state.blackoilState(), well_state.basicWellState());
output_writer_.writeTimeStep(timer, state.blackoilState(), well_state);
}
// Run solver.
solver_timer.start();
@@ -371,7 +371,7 @@ namespace Opm
outputStateVtk(grid_, state, timer.currentStepNum(), output_dir_);
}
outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
output_writer_.writeTimeStep(timer, state.blackoilState(), prev_well_state.basicWellState());
output_writer_.writeTimeStep(timer, state.blackoilState(), prev_well_state);
}
total_timer.stop();