Update to deal.II 9.1: MultipointFluxMixedFiniteElementMethods

diff --git a/MultipointFluxMixedFiniteElementMethods/CMakeLists.txt b/MultipointFluxMixedFiniteElementMethods/CMakeLists.txt
index 36be8163ddf2be8aa5442d216c0e823868b5794a..055911fd62664d7def7e5e3df26aed4b2c4a3902 100644 (file)
--- a/MultipointFluxMixedFiniteElementMethods/CMakeLists.txt
+++ b/MultipointFluxMixedFiniteElementMethods/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(TARGET_SRC
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 
-FIND_PACKAGE(deal.II 9.0.0 QUIET
+FIND_PACKAGE(deal.II 9.1 QUIET
   HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
   )
 IF(NOT ${deal.II_FOUND})

diff --git a/MultipointFluxMixedFiniteElementMethods/mfmfe.cc b/MultipointFluxMixedFiniteElementMethods/mfmfe.cc
index 9fdca37ec81257628a9585b3d816e6cc18da7e24..a551288f47787710a56788b5983df108084b1a08 100644 (file)
--- a/MultipointFluxMixedFiniteElementMethods/mfmfe.cc
+++ b/MultipointFluxMixedFiniteElementMethods/mfmfe.cc
@@ -17,6 +17,7 @@
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/timer.h>
+#include <deal.II/base/utilities.h>
 #include <deal.II/base/work_stream.h>
 
 #include <deal.II/lac/full_matrix.h>
@@ -417,7 +418,7 @@ namespace MFMFE
     const FEValuesExtractors::Vector velocity (0);
     const FEValuesExtractors::Scalar pressure (dim);
 
-    const unsigned int n_vel = dim*pow(degree+1,dim);
+    const unsigned int n_vel = dim*Utilities::pow(degree+1,dim);
     std::unordered_map<unsigned int, std::unordered_map<unsigned int, double>> div_map;
 
     // One, we need to be able to assemble the communication between velocity and
@@ -818,7 +819,7 @@ namespace MFMFE
 
     pres_solution.reinit(n_p);
 
-    SolverControl solver_control (2.0*n_p, 1e-10);
+    SolverControl solver_control (static_cast<int>(2.0*n_p), 1e-10);
     SolverCG<> solver (solver_control);
 
     PreconditionIdentity identity;