OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1061 from babrodtk/warning_fixes

Browse Source 
Warning fixes
This commit is contained in:
Atgeirr Flø Rasmussen 2016-09-07 10:46:15 +02:00 committed by GitHub
commit 8efc75367b
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/core/grid/GridHelpers.hpp
View File

@ -190,10 +190,6 @@ const double* beginCellVolumes(const UnstructuredGrid& grid);
/// \brief Get an iterator over the cell volumes of a grid positioned after the last cell.
const double* endCellVolumes(const UnstructuredGrid& grid);
/// \brief Get the cell centroid of a face.
/// \param grid The grid whose cell centroid we query.
/// \param face_index The index of the corresponding face.
const double* faceCentroid(const UnstructuredGrid& grid, int face_index);
/// \brief Traits of the face centroids of a grid.
@ -220,7 +216,6 @@ beginFaceCentroids(const UnstructuredGrid& grid);
/// \brief Get a coordinate of a specific face centroid.
/// \param grid The grid.
/// \param face_index The index of the specific face.
/// \param coordinate The coordinate index.
FaceCentroidTraits<UnstructuredGrid>::ValueType
faceCentroid(const UnstructuredGrid& grid, int face_index);

6
opm/core/linalg/LinearSolverIstl.cpp
View File

@ -466,8 +466,8 @@ namespace Opm
double linsolver_prolongate_factor)
{
// Solve with AMG solver.
typedef Dune::MatrixAdapter<typename O::matrix_type, Vector, Vector> Operator;
Operator sOpA(opA.getmat());
typedef Dune::MatrixAdapter<typename O::matrix_type, Vector, Vector> AMGOperator;
AMGOperator sOpA(opA.getmat());
#if FIRST_DIAGONAL
typedef Dune::Amg::FirstDiagonal CouplingMetric;
@ -482,7 +482,7 @@ namespace Opm
#endif
typedef Dune::Amg::CoarsenCriterion<CriterionBase> Criterion;
typedef Dune::Amg::FastAMG<Operator,Vector> Precond;
typedef Dune::Amg::FastAMG<AMGOperator, Vector> Precond;
// Construct preconditioner.
Criterion criterion;

12
opm/core/utility/Units.hpp
View File

@ -35,6 +35,8 @@
#ifndef OPM_UNITS_HEADER
#define OPM_UNITS_HEADER
/**
* \file
* Constants and routines to assist in handling units of measurement. These are
@ -216,6 +218,16 @@ namespace Opm
return q / unit;
}
} // namespace convert
#ifndef HAS_ATTRIBUTE_UNUSED
namespace detail {
// Some units are sometimes unused, and generate a (potentially) large number of warnings
// Adding them here silences these warnings, and should have no side-effects
double __attribute__((unused)) unused_units = stb + liter + barsa + psia + darcy;
} // namespace detail
#endif
} // namespace unit
} // namespace Opm
#endif // OPM_UNITS_HEADER