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

Moved output parameters to the end of the list in extractParallelGridInformationToISTL

Browse Source
This commit is contained in:
Markus Blatt 2015-02-11 11:22:27 +01:00
parent 11848acf0c
commit be7221aa9b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/sim_fibo_ad_cp.cpp
View File

@ -213,7 +213,7 @@ try
std::unique_ptr<NewtonIterationBlackoilInterface> fis_solver;
boost::any parallel_information;
Opm::extractParallelGridInformationToISTL(parallel_information, *grid);
Opm::extractParallelGridInformationToISTL(*grid, parallel_information);
if (param.getDefault("use_cpr", true)) {
fis_solver.reset(new NewtonIterationBlackoilCPR(param, parallel_information));
} else {

4
opm/autodiff/ExtractParallelGridInformationToISTL.cpp
View File

@ -27,7 +27,7 @@
#if defined(HAVE_DUNE_CORNERPOINT)
#if defined(HAVE_MPI) && defined(HAVE_DUNE_ISTL) && DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
// Extracts the information about the data decomposition from the grid for dune-istl
void extractParallelGridInformationToISTL(boost::any& anyComm, const Dune::CpGrid& grid)
void extractParallelGridInformationToISTL(const Dune::CpGrid& grid, boost::any& anyComm)
{
if(grid.comm().size()>1)
{
@ -42,7 +42,7 @@ void extractParallelGridInformationToISTL(boost::any& anyComm, const Dune::CpGri
}
#else
// Missing support for MPI or dune-istl -> do nothing.
void extractParallelGridInformationToISTL(boost::any&, const Dune::CpGrid&)
void extractParallelGridInformationToISTL(const Dune::CpGrid&, boost::any&)
{}
#endif //defined(HAVE_MPI) && defined(HAVE_DUNE_ISTL) && DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
#endif //defined(HAVE_DUNE_CORNERPOINT)

6
opm/autodiff/ExtractParallelGridInformationToISTL.hpp
View File

@ -33,11 +33,11 @@ namespace Opm
/// about the data decompoisition and convert it to the format expected by the linear algebra
/// of dune-istl.
/// \warn if there is no support for dune-istl and MPI then this functio does not do anything.
/// \param anyComm The handle to to store the information in. If grid is a parallel grid
/// \param[in] grid The grid to inspect.
/// \param[out] anyComm The handle to to store the information in. If grid is a parallel grid
/// then this will ecapsulate an instance of ParallelISTLInformation.
/// \param grid The grid to inspect.
void extractParallelGridInformationToISTL(boost::any& anyComm, const Dune::CpGrid& grid);
void extractParallelGridInformationToISTL(const Dune::CpGrid& grid, boost::any& anyComm);
} // end namespace Opm
#endif //defined(HAVE_DUNE_CORNERPOINT)