Commit 30895bf4 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

changed integral_constants in template parameters to constant values

parent 6019643a
......@@ -118,7 +118,7 @@ namespace AMDiS
return makeFunctorGridFunction(partial(lf.fct(), _i), lgfs...);
}, lf.localFcts());
auto const& lgfs_i = std::get<_i>(lf.localFcts());
auto const& lgfs_i = std::get<decltype(_i)::value>(lf.localFcts());
return makeFunctorGridFunction(Operation::Multiplies{}, di_f, derivative(lgfs_i));
};
......
#pragma once
#include "config.h"
#include <dune/geometry/quadraturerules.hh>
#include <amdis/GridFunctions.hpp>
......@@ -45,9 +45,9 @@ namespace AMDiS
using QuadratureRules = Dune::QuadratureRules<typename GridView::ctype, GridView::dimension>;
auto makeQuad = [](auto&& type, auto&& localFct) { return QuadratureRules::rule(type, order(localFct)); };
#ifdef AMDIS_HAS_CXX_CONSTEXPR_IF
#if AMDIS_HAS_CXX_CONSTEXPR_IF
if constexpr(expr_has_order)
return Impl::integrateImpl(std::forward<decltype(gridFct)>(gridFct), gridView, makeQuad);
return Impl::integrateImpl(gridFct, gridView, makeQuad);
else
return 0.0;
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment