From 3a285d68059f3cb48fedd3b1deef36c3a021c141 Mon Sep 17 00:00:00 2001 From: Felix Schindler <felix.schindler@wwu.de> Date: Wed, 18 Mar 2020 11:25:31 +0100 Subject: [PATCH] fix some typos --- dune/gdt/local/bilinear-forms/integrals.hh | 6 +++--- dune/gdt/local/functionals/integrals.hh | 5 +++-- dune/gdt/local/integrands/generic.hh | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dune/gdt/local/bilinear-forms/integrals.hh b/dune/gdt/local/bilinear-forms/integrals.hh index e8ca05f4d..f322d1554 100644 --- a/dune/gdt/local/bilinear-forms/integrals.hh +++ b/dune/gdt/local/bilinear-forms/integrals.hh @@ -55,7 +55,7 @@ public: {} LocalElementIntegralBilinearForm(typename GenericIntegrand::GenericOrderFunctionType order_function, - typename GenericIntegrand::GenericEvalauteFunctionType evaluate_function, + typename GenericIntegrand::GenericEvaluateFunctionType evaluate_function, const XT::Common::ParameterType& param_type = {}, const int over_integrate = 0) : BaseType(param_type) @@ -196,8 +196,8 @@ public: const size_t integrand_order = integrand_->order(test_basis_inside, ansatz_basis_inside, test_basis_outside, ansatz_basis_outside) + over_integrate_; - for (const auto& quadrature_point : QuadratureRules<D, d - 1>::rule( - intersection.type(), XT::Common::numeric_cast<int>(integrand_order))) { + for (const auto& quadrature_point : + QuadratureRules<D, d - 1>::rule(intersection.type(), XT::Common::numeric_cast<int>(integrand_order))) { const auto point_in_reference_intersection = quadrature_point.position(); // integration factors const auto integration_factor = intersection.geometry().integrationElement(point_in_reference_intersection); diff --git a/dune/gdt/local/functionals/integrals.hh b/dune/gdt/local/functionals/integrals.hh index dff5877ce..d8f24961f 100644 --- a/dune/gdt/local/functionals/integrals.hh +++ b/dune/gdt/local/functionals/integrals.hh @@ -49,7 +49,8 @@ public: const XT::Common::ParameterType& param_type = {}, const int over_integrate = 0) : BaseType(param_type) - , integrand_(GenericIntegrand(order_function, evaluate_function, post_bind_function).copy_as_unary_element_integrand()) + , integrand_( + GenericIntegrand(order_function, evaluate_function, post_bind_function).copy_as_unary_element_integrand()) , over_integrate_(over_integrate) {} @@ -124,7 +125,7 @@ public: {} // LocalIntersectionIntegralFunctional(typename GenericIntegrand::GenericOrderFunctionType order_function, - // typename GenericIntegrand::GenericEvalauteFunctionType evaluate_function, + // typename GenericIntegrand::GenericEvaluateFunctionType evaluate_function, // const XT::Common::ParameterType& param_type = {}, // const int over_integrate = 0) // : BaseType(param_type) diff --git a/dune/gdt/local/integrands/generic.hh b/dune/gdt/local/integrands/generic.hh index e501a20c6..6ceb696b8 100644 --- a/dune/gdt/local/integrands/generic.hh +++ b/dune/gdt/local/integrands/generic.hh @@ -212,8 +212,8 @@ public: using GenericOrderFunctionType = std::function<int(const LocalTestBasisType& /*test_basis*/, const LocalAnsatzBasisType& /*ansatz_basis*/, const XT::Common::Parameter& /*param*/)>; - using GenericEvaluateFunctionType = std::function<void(const LocalBasisType& /*inside_basis*/, - const LocalBasisType& /*outside_basis*/, + using GenericEvaluateFunctionType = std::function<void(const LocalTestBasisType& /*test_basis*/, + const LocalAnsatzBasisType& /*ansatz_basis*/, const DomainType& /*point_in_reference_intersection*/, DynamicMatrix<F>& /*result*/, const XT::Common::Parameter& /*param*/)>; -- GitLab