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

Cleans up the BlackoilModelEbos.hpp file to address the final comments.

Browse Source
This commit is contained in:
kel85uk 2018-05-30 14:26:07 +02:00
parent 963d42aab3
commit 1237724c9a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -369,9 +369,6 @@ namespace Opm {
ebosSimulator_.problem().beginIteration(); ebosSimulator_.problem().beginIteration();
ebosSimulator_.model().linearizer().linearize(); ebosSimulator_.model().linearizer().linearize();
ebosSimulator_.problem().endIteration(); ebosSimulator_.problem().endIteration();
// -------- Current time step length ----------
const double dt = timer.currentStepLength();
// -------- Aquifer models ---------- // -------- Aquifer models ----------
try try
@ -384,6 +381,9 @@ namespace Opm {
OPM_THROW(Opm::NumericalIssue,"Error when assembling aquifer models"); OPM_THROW(Opm::NumericalIssue,"Error when assembling aquifer models");
} }
// -------- Current time step length ----------
const double dt = timer.currentStepLength();
// -------- Well equations ---------- // -------- Well equations ----------
try try
@ -596,6 +596,7 @@ namespace Opm {
virtual void apply( const X& x, Y& y ) const virtual void apply( const X& x, Y& y ) const
{ {
A_.mv( x, y ); A_.mv( x, y );
// add well model modification to y // add well model modification to y
wellMod_.apply(x, y ); wellMod_.apply(x, y );
@ -609,6 +610,7 @@ namespace Opm {
virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const
{ {
A_.usmv(alpha,x,y); A_.usmv(alpha,x,y);
// add scaled well model modification to y // add scaled well model modification to y
wellMod_.applyScaleAdd( alpha, x, y ); wellMod_.applyScaleAdd( alpha, x, y );
@ -1121,9 +1123,6 @@ namespace Opm {
BlackoilAquiferModel<TypeTag>& BlackoilAquiferModel<TypeTag>&
aquiferModel() { return aquifer_model_; } aquiferModel() { return aquifer_model_; }
const BlackoilAquiferModel<TypeTag>&
aquiferModel() const { return aquifer_model_; }
void beginReportStep() void beginReportStep()
{ {
ebosSimulator_.problem().beginEpisode(); ebosSimulator_.problem().beginEpisode();