From: Jean-Paul Pelteret Date: Sat, 23 May 2020 16:19:53 +0000 (+0200) Subject: Update to deal.II 9.1: MultipointFluxMixedFiniteElementMethods X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15abe1962a1d3433ec319f0767893ea2815302b9;p=code-gallery.git Update to deal.II 9.1: MultipointFluxMixedFiniteElementMethods --- diff --git a/MultipointFluxMixedFiniteElementMethods/CMakeLists.txt b/MultipointFluxMixedFiniteElementMethods/CMakeLists.txt index 36be816..055911f 100644 --- 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 9fdca37..a551288 100644 --- a/MultipointFluxMixedFiniteElementMethods/mfmfe.cc +++ b/MultipointFluxMixedFiniteElementMethods/mfmfe.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -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> 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(2.0*n_p), 1e-10); SolverCG<> solver (solver_control); PreconditionIdentity identity;