OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-26 11:10:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Calm warnings about excessive semi-colons, unused variables, and missing declarations.

Browse Source
This commit is contained in:
Markus Blatt 2015-01-23 16:36:48 +01:00
parent 4a80474782
commit d137b0c144
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/core/linalg/ParallelIstlInformation.hpp
View File

@ -158,7 +158,7 @@ public:
} }
} }
} }
}; }
/// \brief Compute one or more global reductions. /// \brief Compute one or more global reductions.
/// ///
/// This function can either be used with a container, an operator, and an initial value /// This function can either be used with a container, an operator, and an initial value
@ -223,7 +223,6 @@ private:
std::tuple<ReturnValues...> init=values; std::tuple<ReturnValues...> init=values;
updateOwnerMask(std::get<0>(containers)); updateOwnerMask(std::get<0>(containers));
computeLocalReduction(containers, operators, values); computeLocalReduction(containers, operators, values);
auto val=std::get<0>(values);
std::vector<std::tuple<ReturnValues...> > receivedValues(communicator_.size()); std::vector<std::tuple<ReturnValues...> > receivedValues(communicator_.size());
communicator_.allgather(&values, 1, &(receivedValues[0])); communicator_.allgather(&values, 1, &(receivedValues[0]));
values=init; values=init;
@ -468,7 +467,9 @@ namespace Opm
/// \param grid The grid to inspect. /// \param grid The grid to inspect.
inline void extractParallelGridInformationToISTL(boost::any& anyComm, const UnstructuredGrid& grid) inline void extractParallelGridInformationToISTL(boost::any& anyComm, const UnstructuredGrid& grid)
{} {
(void)anyComm; (void)grid;
}
} // end namespace Opm } // end namespace Opm
#endif #endif

4
tests/DuneIstlTestHelpers.hpp
View File

@ -56,7 +56,7 @@ struct MPIFixture {
}; };
BOOST_GLOBAL_FIXTURE(MPIFixture); BOOST_GLOBAL_FIXTURE(MPIFixture)
struct MyMatrix struct MyMatrix
{ {
@ -177,7 +177,7 @@ void createRandomVectors(O& pinfo, int NN, std::vector<double>& x, std::vector<d
pinfo.copyOwnerToAll(b,b); pinfo.copyOwnerToAll(b,b);
} }
std::tuple<int,int,int,int> computeRegions(int N=100) inline std::tuple<int,int,int,int> computeRegions(int N=100)
{ {
int procs, rank; int procs, rank;
MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_rank(MPI_COMM_WORLD, &rank);