OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-23 22:32:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

flow_ebos: fix the build

Browse Source 
mainly, the "linsolver_" attribute is called "istlSolver_" in the
BlackoilModelEbos class. Also, this problem possibly only occured if
MPI was enabled...
This commit is contained in:
Andreas Lauser 2016-11-14 13:29:42 +01:00
parent f07ef850e3
commit 4271da8d84
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -195,7 +195,7 @@ namespace Opm {
// compute global sum of number of cells // compute global sum of number of cells
global_nc_ = grid_.comm().sum( global_nc_ ); global_nc_ = grid_.comm().sum( global_nc_ );
if( ! istlSolver_ ) if (!istlSolver_)
{ {
OPM_THROW(std::logic_error,"solver down cast to ISTLSolver failed"); OPM_THROW(std::logic_error,"solver down cast to ISTLSolver failed");
} }
@ -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;