mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #915 from andlaus/frankenstein_fix_build_with_MPI
flow_ebos: fix the build
This commit is contained in:
commit
f012e07d89
@ -205,14 +205,14 @@ namespace Opm {
|
|||||||
isParallel() const
|
isParallel() const
|
||||||
{
|
{
|
||||||
#if HAVE_MPI
|
#if HAVE_MPI
|
||||||
if ( linsolver_.parallelInformation().type() !=
|
if ( istlSolver().parallelInformation().type() !=
|
||||||
typeid(ParallelISTLInformation) )
|
typeid(ParallelISTLInformation) )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const auto& comm =boost::any_cast<const ParallelISTLInformation&>(linsolver_.parallelInformation()).communicator();
|
const auto& comm =boost::any_cast<const ParallelISTLInformation&>(istlSolver().parallelInformation()).communicator();
|
||||||
return comm.size() > 1;
|
return comm.size() > 1;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
@ -1069,7 +1069,7 @@ namespace Opm {
|
|||||||
#if HAVE_MPI
|
#if HAVE_MPI
|
||||||
// mask[c] is 1 if we need to compute something in parallel
|
// mask[c] is 1 if we need to compute something in parallel
|
||||||
const auto & pinfo =
|
const auto & pinfo =
|
||||||
boost::any_cast<const ParallelISTLInformation&>(linsolver_.parallelInformation());
|
boost::any_cast<const ParallelISTLInformation&>(istlSolver().parallelInformation());
|
||||||
const auto& mask = pinfo.getOwnerMask();
|
const auto& mask = pinfo.getOwnerMask();
|
||||||
auto comm = pinfo.communicator();
|
auto comm = pinfo.communicator();
|
||||||
// Compute the global dims value and resize values accordingly.
|
// Compute the global dims value and resize values accordingly.
|
||||||
@ -1097,8 +1097,8 @@ namespace Opm {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hcpv = V::Zero(dims);
|
hcpv = std::vector<double>(dims, 0.0);
|
||||||
pres = V::Zero(dims);
|
pres = std::vector<double>(dims, 0.0);
|
||||||
|
|
||||||
for (int c = 0; c < nc; ++c) {
|
for (int c = 0; c < nc; ++c) {
|
||||||
const int region = fipnum[c] - 1;
|
const int region = fipnum[c] - 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user