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

Merge pull request #519 from blattms/fix-parallel-equation-scaling-factor

Browse Source 
Correctly compute the scaling factor for the equations in parallel.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-10-28 16:35:47 +01:00
commit 38bd6b1484
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelBase.hpp
View File

@ -280,6 +280,8 @@ namespace Opm {
/// \brief Whether we print something to std::cout
bool terminal_output_;
/// \brief The number of cells of the global grid.
int global_nc_;
std::vector<int> primalVariable_;
V pvdt_;

24
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -194,13 +194,16 @@ namespace detail {
int local_number_of_wells = wells_ ? wells_->number_of_wells : 0;
int global_number_of_wells = info.communicator().sum(local_number_of_wells);
wells_active_ = ( wells_ && global_number_of_wells > 0 );
// Compute the global number of cells
std::vector<int> v( Opm::AutoDiffGrid::numCells(grid_), 1);
global_nc_ = 0;
info.computeReduction(v, Opm::Reduction::makeGlobalSumFunctor<int>(), global_nc_);
}else
#endif
{
wells_active_ = ( wells_ && wells_->number_of_wells > 0 );
global_nc_ = Opm::AutoDiffGrid::numCells(grid_);
}
#else
wells_active_ = ( wells_ && wells_->number_of_wells > 0 );
#endif
}
@ -969,7 +972,20 @@ namespace detail {
const int pos = pu.phase_pos[idx];
const ADB& temp_b = rq_[pos].b;
B = 1. / temp_b.value();
residual_.matbalscale[idx] = B.mean();
#if HAVE_MPI
if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) )
{
const ParallelISTLInformation& real_info =
boost::any_cast<const ParallelISTLInformation&>(linsolver_.parallelInformation());
double B_global_sum = 0;
real_info.computeReduction(B, Reduction::makeGlobalSumFunctor<double>(), B_global_sum);
residual_.matbalscale[idx] = B_global_sum / global_nc_;
}
else
#endif
{
residual_.matbalscale[idx] = B.mean();
}
}
}
}

15
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -237,7 +237,20 @@ namespace Opm {
if (has_solvent_) {
const ADB& temp_b = rq_[solvent_pos_].b;
ADB::V B = 1. / temp_b.value();
residual_.matbalscale[solvent_pos_] = B.mean();
#if HAVE_MPI
if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) )
{
const ParallelISTLInformation& real_info =
boost::any_cast<const ParallelISTLInformation&>(linsolver_.parallelInformation());
double B_global_sum = 0;
real_info.computeReduction(B, Reduction::makeGlobalSumFunctor<double>(), B_global_sum);
residual_.matbalscale[solvent_pos_] = B_global_sum / Base::global_nc_;
}
else
#endif
{
residual_.matbalscale[solvent_pos_] = B.mean();
}
}
}