OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-31 11:36:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix][WellModelMatrixAdapter] fix applyscaleadd method.

Browse Source
This commit is contained in:
Robert Kloefkorn 2016-11-17 13:43:39 +01:00
parent 439a084508
commit a0da20378c
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -308,7 +308,7 @@ namespace Opm {
// ebosSimulator_.model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
}
if( converged )
if( converged && (iteration >= nonlinear_solver.minIter()) )
{
// in case of convergence we do not need to reset intensive quantities
invalidateIntensiveQuantitiesCache_ = false ;
@ -423,9 +423,15 @@ namespace Opm {
}
template <class X, class Y>
void applyWellModel(const X& x, Y& y )
void applyWellModelAdd(const X& x, Y& y )
{
wellModel().apply(x, y);
wellModel().apply(x, y);
}
template <class X, class Y>
void applyWellModelScaleAdd(const Scalar alpha, const X& x, Y& y )
{
wellModel().applyScaleAdd(alpha, x, y);
}
@ -487,7 +493,7 @@ namespace Opm {
#if HAVE_MPI
typedef Dune::OwnerOverlapCopyCommunication<int,int> communication_type;
#else
typedef Dune::CollectiveCommunication<int> communication_type;
typedef Dune::CollectiveCommunication< Grid > communication_type;
#endif
enum {
@ -512,7 +518,8 @@ namespace Opm {
virtual void apply( const X& x, Y& y ) const
{
A_.mv( x, y );
wellMod_.applyWellModel(x, y );
// add well model modification to y
wellMod_.applyWellModelAdd(x, y );
#if HAVE_MPI
if( comm_ )
@ -524,7 +531,8 @@ namespace Opm {
virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const
{
A_.usmv(alpha,x,y);
//wellMod_.applyWellModel(x, y );
// add scaled well model modification to y
wellMod_.applyWellModelScaleAdd( alpha, x, y );
#if HAVE_MPI
if( comm_ )

17
opm/autodiff/StandardWellsDense.hpp
View File

@ -336,6 +336,22 @@ namespace Opm {
duneB_.mmtv(invDCx,Ax);
}
// apply well model with scaling of alpha
void applyScaleAdd(const Scalar alpha, const BVector& x, BVector& Ax)
{
if ( ! localWellsActive() ) {
return;
}
if( scaleAddRes_.size() != Ax.size() ) {
scaleAddRes_.resize( Ax.size() );
}
scaleAddRes_ = 0.0;
apply( x, scaleAddRes_ );
Ax.axpy( alpha, scaleAddRes_ );
}
// xw = inv(D)*(rw - C*x)
void recoverVariable(const BVector& x, BVector& xw) const {
if ( ! localWellsActive() ) {
@ -1418,6 +1434,7 @@ namespace Opm {
mutable BVector Cx_;
mutable BVector invDrw_;
mutable BVector scaleAddRes_;
// protected methods
EvalWell getBhp(const int wellIdx) const {