Skip to content
Snippets Groups Projects
Unverified Commit bc6d90da authored by René Fritze's avatar René Fritze
Browse files

fix headercheck

parent f1578179
No related branches found
No related tags found
1 merge request!10Draft: consolidate refactoring work
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define DUNE_GDT_ALGORITHMS_NEWTON_HH #define DUNE_GDT_ALGORITHMS_NEWTON_HH
#include <dune/xt/common/parameter.hh> #include <dune/xt/common/parameter.hh>
#include <dune/xt/common/print.hh>
#include <dune/xt/common/timedlogging.hh> #include <dune/xt/common/timedlogging.hh>
#include <dune/xt/la/container/vector-interface.hh> #include <dune/xt/la/container/vector-interface.hh>
#include <dune/xt/la/solver.hh> #include <dune/xt/la/solver.hh>
......
...@@ -76,7 +76,6 @@ protected: ...@@ -76,7 +76,6 @@ protected:
using D = typename AGV::ctype; using D = typename AGV::ctype;
public: public:
using typename BaseType::F;
using typename BaseType::V; using typename BaseType::V;
using I = XT::Grid::extract_intersection_t<AGV>; using I = XT::Grid::extract_intersection_t<AGV>;
......
...@@ -52,7 +52,6 @@ public: ...@@ -52,7 +52,6 @@ public:
using BaseType::s_r; using BaseType::s_r;
using BaseType::s_rC; using BaseType::s_rC;
using typename BaseType::F;
using typename BaseType::V; using typename BaseType::V;
using I = XT::Grid::extract_intersection_t<AGV>; using I = XT::Grid::extract_intersection_t<AGV>;
......
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
{ {
this->assert_matching_source(source_vector); this->assert_matching_source(source_vector);
this->assert_matching_range(range_vector); this->assert_matching_range(range_vector);
reconstruction_operator_.apply(source_function, reconstruction_, param); reconstruction_operator_.apply(source_vector, reconstruction_, param);
range_vector.set_all(0.); range_vector.set_all(0.);
advection_operator_.apply(reconstruction_.dofs().vector, range_vector); advection_operator_.apply(reconstruction_.dofs().vector, range_vector);
} }
......
...@@ -404,7 +404,7 @@ public: ...@@ -404,7 +404,7 @@ public:
return source_space_; return source_space_;
} }
const AssemblyGridViewType& assembly_grid_view() const override final const auto& assembly_grid_view() const override final
{ {
return source_space_.grid_view(); return source_space_.grid_view();
} }
......
...@@ -168,9 +168,9 @@ protected: ...@@ -168,9 +168,9 @@ protected:
}); });
if (boundary_treatment.empty()) { // The periodic case if (boundary_treatment.empty()) { // The periodic case
if (self.space_type_ == "fv") if (self.space_type_ == "fv")
return std::make_unique<AdvectionFvOperator<M, GV, m>>(space.grid_view(), numerical_flux, space, space); return std::make_unique<AdvectionFvOperator<GV, m>>(space.grid_view(), numerical_flux, space, space);
else else
return std::make_unique<AdvectionDgOperator<M, GV, m>>( return std::make_unique<AdvectionDgOperator<GV, m>>(
space.grid_view(), space.grid_view(),
numerical_flux, numerical_flux,
space, space,
...@@ -192,12 +192,12 @@ protected: ...@@ -192,12 +192,12 @@ protected:
boundary_info->register_new_normal({1}, new XT::Grid::ImpermeableBoundary()); boundary_info->register_new_normal({1}, new XT::Grid::ImpermeableBoundary());
const XT::Grid::ApplyOn::CustomBoundaryIntersections<GV> impermeable_wall_filter( const XT::Grid::ApplyOn::CustomBoundaryIntersections<GV> impermeable_wall_filter(
*boundary_info, new XT::Grid::ImpermeableBoundary()); *boundary_info, new XT::Grid::ImpermeableBoundary());
auto op = std::make_unique<AdvectionFvOperator<M, GV, m>>(space.grid_view(), auto op = std::make_unique<AdvectionFvOperator<GV, m>>(space.grid_view(),
numerical_flux, numerical_flux,
space, space,
space, space,
/*use_tbb=*/false, /*use_tbb=*/false,
/*periodicity_restriction=*/impermeable_wall_filter); /*periodicity_restriction=*/impermeable_wall_filter);
// the actual handling of impermeable walls // the actual handling of impermeable walls
op->append(/*numerical_boundary_flux=*/ op->append(/*numerical_boundary_flux=*/
[&](const auto& intersection, const auto& x, const auto& u, auto& ret, const auto& /*param*/) { [&](const auto& intersection, const auto& x, const auto& u, auto& ret, const auto& /*param*/) {
...@@ -213,12 +213,12 @@ protected: ...@@ -213,12 +213,12 @@ protected:
boundary_info->register_new_normal({1}, new XT::Grid::ImpermeableBoundary()); boundary_info->register_new_normal({1}, new XT::Grid::ImpermeableBoundary());
const XT::Grid::ApplyOn::CustomBoundaryIntersections<GV> impermeable_wall_filter( const XT::Grid::ApplyOn::CustomBoundaryIntersections<GV> impermeable_wall_filter(
*boundary_info, new XT::Grid::ImpermeableBoundary()); *boundary_info, new XT::Grid::ImpermeableBoundary());
auto op = std::make_unique<AdvectionFvOperator<M, GV, m>>(space.grid_view(), auto op = std::make_unique<AdvectionFvOperator<GV, m>>(space.grid_view(),
numerical_flux, numerical_flux,
space, space,
space, space,
/*use_tbb=*/false, /*use_tbb=*/false,
/*periodicity_restriction=*/impermeable_wall_filter); /*periodicity_restriction=*/impermeable_wall_filter);
// the actual handling of impermeable walls, see [DF2015, p. 415, (8.66 - 8.67)] // the actual handling of impermeable walls, see [DF2015, p. 415, (8.66 - 8.67)]
op->append( op->append(
/*boundary_extrapolation=*/ /*boundary_extrapolation=*/
...@@ -261,7 +261,7 @@ protected: ...@@ -261,7 +261,7 @@ protected:
*boundary_info, new XT::Grid::ImpermeableBoundary()); *boundary_info, new XT::Grid::ImpermeableBoundary());
const XT::Grid::ApplyOn::CustomBoundaryIntersections<GV> inflow_outflow_filter( const XT::Grid::ApplyOn::CustomBoundaryIntersections<GV> inflow_outflow_filter(
*boundary_info, new XT::Grid::InflowOutflowBoundary()); *boundary_info, new XT::Grid::InflowOutflowBoundary());
auto op = std::make_unique<AdvectionFvOperator<M, GV, m>>( auto op = std::make_unique<AdvectionFvOperator<GV, m>>(
space.grid_view(), space.grid_view(),
numerical_flux, numerical_flux,
space, space,
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <dune/gdt/local/integrands/abs.hh> #include <dune/gdt/local/integrands/abs.hh>
#include <dune/gdt/local/integrands/laplace.hh> #include <dune/gdt/local/integrands/laplace.hh>
#include <dune/gdt/local/integrands/product.hh> #include <dune/gdt/local/integrands/product.hh>
#include <dune/gdt/operators/localizable-operator.hh>
#include <dune/gdt/operators/oswald-interpolation.hh> #include <dune/gdt/operators/oswald-interpolation.hh>
#include <dune/gdt/spaces/l2/finite-volume.hh> #include <dune/gdt/spaces/l2/finite-volume.hh>
#include <dune/gdt/spaces/l2/discontinuous-lagrange.hh> #include <dune/gdt/spaces/l2/discontinuous-lagrange.hh>
...@@ -105,7 +104,7 @@ struct OswaldInterpolationOperatorOnLeafViewTest : public ::testing::Test ...@@ -105,7 +104,7 @@ struct OswaldInterpolationOperatorOnLeafViewTest : public ::testing::Test
void fulfills_l2_interpolation_estimate() void fulfills_l2_interpolation_estimate()
{ {
auto& self = *this; auto& self = *this;
OswaldInterpolationOperator<M, GV> oswald_interpolation( OswaldInterpolationOperator<GV> oswald_interpolation(
self.grid_provider->leaf_view(), *self.space, *self.space, *self.boundary_info); self.grid_provider->leaf_view(), *self.space, *self.space, *self.boundary_info);
oswald_interpolation.assemble(); oswald_interpolation.assemble();
auto range = make_discrete_function<V>(*self.space); auto range = make_discrete_function<V>(*self.space);
...@@ -227,7 +226,7 @@ struct OswaldInterpolationOperatorOnLeafViewTest : public ::testing::Test ...@@ -227,7 +226,7 @@ struct OswaldInterpolationOperatorOnLeafViewTest : public ::testing::Test
void fulfills_h1_interpolation_estimate() void fulfills_h1_interpolation_estimate()
{ {
auto& self = *this; auto& self = *this;
OswaldInterpolationOperator<M, GV> oswald_interpolation( OswaldInterpolationOperator<GV> oswald_interpolation(
self.grid_provider->leaf_view(), *self.space, *self.space, *self.boundary_info); self.grid_provider->leaf_view(), *self.space, *self.space, *self.boundary_info);
oswald_interpolation.assemble(); oswald_interpolation.assemble();
auto range = make_discrete_function<V>(*self.space); auto range = make_discrete_function<V>(*self.space);
...@@ -403,7 +402,7 @@ struct OswaldInterpolationOperatorOnCubicLeafViewTest : public OswaldInterpolati ...@@ -403,7 +402,7 @@ struct OswaldInterpolationOperatorOnCubicLeafViewTest : public OswaldInterpolati
void applies_correctly_on_cubic_grids() void applies_correctly_on_cubic_grids()
{ {
auto& self = *this; auto& self = *this;
OswaldInterpolationOperator<M, GV> oswald_interpolation( OswaldInterpolationOperator<GV> oswald_interpolation(
self.grid_provider->leaf_view(), *self.space, *self.space, *self.boundary_info); self.grid_provider->leaf_view(), *self.space, *self.space, *self.boundary_info);
oswald_interpolation.assemble(); oswald_interpolation.assemble();
auto range = make_discrete_function<V>(*self.space); auto range = make_discrete_function<V>(*self.space);
......
...@@ -217,8 +217,8 @@ public: ...@@ -217,8 +217,8 @@ public:
auto pattern_C = make_element_sparsity_pattern(pressure_space, pressure_space, grid_view); auto pattern_C = make_element_sparsity_pattern(pressure_space, pressure_space, grid_view);
Matrix A(m, m, pattern_A); Matrix A(m, m, pattern_A);
Matrix B(m, n, pattern_B); Matrix B(m, n, pattern_B);
MatrixOperator<Matrix, GV, d> A_operator(grid_view, velocity_space, velocity_space, A); MatrixOperator<GV, d> A_operator(grid_view, velocity_space, velocity_space, A);
MatrixOperator<Matrix, GV, 1, 1, d> B_operator(grid_view, pressure_space, velocity_space, B); MatrixOperator<GV, 1, 1, d> B_operator(grid_view, pressure_space, velocity_space, B);
// calculate A_{ij} as \int \nabla v_i \nabla v_j // calculate A_{ij} as \int \nabla v_i \nabla v_j
A_operator.append(LocalElementIntegralBilinearForm<E, d>(LocalLaplaceIntegrand<E, d>(problem_.diffusion()))); A_operator.append(LocalElementIntegralBilinearForm<E, d>(LocalLaplaceIntegrand<E, d>(problem_.diffusion())));
// calculate B_{ij} as \int -\nabla p_i div(v_j) // calculate B_{ij} as \int -\nabla p_i div(v_j)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment