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 #907 from andlaus/frankenstein_fix_no_mpi

Browse Source 
fix the build if MPI is not available
This commit is contained in:
Andreas Lauser 2016-11-11 14:31:02 +01:00 committed by GitHub
commit 1853379ccb
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -60,8 +60,11 @@
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/autodiff/ISTLSolver.hpp> #include <opm/autodiff/ISTLSolver.hpp>
#include <opm/common/data/SimulationDataContainer.hpp> #include <opm/common/data/SimulationDataContainer.hpp>
#include <dune/istl/owneroverlapcopy.hh>
#include <dune/common/parallel/collectivecommunication.hh>
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
@ -439,7 +442,11 @@ namespace Opm {
typedef Y range_type; typedef Y range_type;
typedef typename X::field_type field_type; typedef typename X::field_type field_type;
#if HAVE_MPI
typedef Dune::OwnerOverlapCopyCommunication<int,int> communication_type; typedef Dune::OwnerOverlapCopyCommunication<int,int> communication_type;
#else
typedef Dune::CollectiveCommunication<int> communication_type;
#endif
enum { enum {
//! \brief The solver category. //! \brief The solver category.
@ -465,8 +472,10 @@ namespace Opm {
A_.mv( x, y ); A_.mv( x, y );
wellMod_.applyWellModel(x, y ); wellMod_.applyWellModel(x, y );
#if HAVE_MPI
if( comm_ ) if( comm_ )
comm_->project( y ); comm_->project( y );
#endif
} }
virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const
@ -474,8 +483,10 @@ namespace Opm {
A_.usmv(alpha,x,y); A_.usmv(alpha,x,y);
wellMod_.applyWellModel(x, y ); wellMod_.applyWellModel(x, y );
#if HAVE_MPI
if( comm_ ) if( comm_ )
comm_->project( y ); comm_->project( y );
#endif
} }
virtual const matrix_type& getmat() const { return A_; } virtual const matrix_type& getmat() const { return A_; }