From d48255d198c91200d02fee1085de9abc76c7cfdc Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Mon, 14 Nov 2016 18:09:20 +0100 Subject: [PATCH] warning fixed related to petsc --- opm/core/linalg/LinearSolverPetsc.cpp | 6 ++++-- tests/DuneIstlTestHelpers.hpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/opm/core/linalg/LinearSolverPetsc.cpp b/opm/core/linalg/LinearSolverPetsc.cpp index 3536e0d27..c7a374642 100644 --- a/opm/core/linalg/LinearSolverPetsc.cpp +++ b/opm/core/linalg/LinearSolverPetsc.cpp @@ -23,7 +23,9 @@ #include #include #define PETSC_CLANGUAGE_CXX 1 //enable CHKERRXX macro. +#include #include +#include #include namespace Opm @@ -180,11 +182,11 @@ namespace{ VecRestoreArray( v, &vec ); } - Mat to_petsc_mat( const int size, const int nonzeros, + Mat to_petsc_mat( const int size, const int /* nonzeros */, const int* ia, const int* ja, const double* sa ) { Mat A; - auto err = MatCreateSeqAIJWithArrays( PETSC_COMM_WORLD, size, size, (int*)ia, (int*)ja, (double*)sa, &A ); + auto err = MatCreateSeqAIJWithArrays( PETSC_COMM_WORLD, size, size, const_cast(ia), const_cast(ja), (double*)sa, &A ); CHKERRXX( err ); return A; } diff --git a/tests/DuneIstlTestHelpers.hpp b/tests/DuneIstlTestHelpers.hpp index b6838b9d1..2d09c0489 100644 --- a/tests/DuneIstlTestHelpers.hpp +++ b/tests/DuneIstlTestHelpers.hpp @@ -61,7 +61,7 @@ struct MPIFixture { }; -BOOST_GLOBAL_FIXTURE(MPIFixture); +BOOST_GLOBAL_FIXTURE(MPIFixture) struct MyMatrix {