Skip to content
Snippets Groups Projects
Commit 057e6a41 authored by Dr. Felix Tobias Schindler's avatar Dr. Felix Tobias Schindler
Browse files

[aperators.advection-fv] update to new API

parent efd77e11
No related branches found
No related tags found
3 merge requests!10Draft: consolidate refactoring work,!5Work on refactor operators bindings,!1Refactor operators
Hide whitespace changes
Inline Side-by-side
dune/gdt/operators/advection-fv.hh
+ 109
− 41
View file @ 057e6a41
......@@ -23,7 +23,7 @@
#include <dune/gdt/local/operators/advection-fv.hh>
#include "interfaces.hh"
#include "localizable-operator.hh"
#include "operator.hh"
namespace Dune {
namespace GDT {
......@@ -38,25 +38,30 @@ namespace GDT {
*
* \sa OperatorInterface
*/
template <class M, class AGV, size_t m = 1, class RGV = AGV, class SGV = AGV>
class AdvectionFvOperator : public LocalizableOperator<M, AGV, m, 1, m, 1, RGV, SGV>
template <class AGV,
size_t m = 1,
class F = double,
class M = XT::LA::IstlRowMajorSparseMatrix<F>,
class RGV = AGV,
class SGV = AGV>
class AdvectionFvOperator : public Operator<AGV, m, 1, m, 1, F, M, RGV, SGV>
{
public:
using ThisType = AdvectionFvOperator;
using BaseType = LocalizableOperator<M, AGV, m, 1, m, 1, RGV, SGV>;
using BaseType = Operator<AGV, m, 1, m, 1, F, M, RGV, SGV>;
public:
using BaseType::s_r;
using BaseType::s_rC;
using typename BaseType::F;
using typename BaseType::V;
using I = XT::Grid::extract_intersection_t<SGV>;
using E = XT::Grid::extract_entity_t<SGV>;
using NumericalFluxType = NumericalFluxInterface<I, SGV::dimension, m, F>;
using I = XT::Grid::extract_intersection_t<AGV>;
using E = XT::Grid::extract_entity_t<AGV>;
using NumericalFluxType = NumericalFluxInterface<I, AGV::dimension, m, F>;
using BoundaryTreatmentByCustomNumericalFluxOperatorType =
LocalAdvectionFvBoundaryTreatmentByCustomNumericalFluxOperator<I, V, SGV, m, F, F, RGV, V>;
LocalAdvectionFvBoundaryTreatmentByCustomNumericalFluxOperator<I, V, AGV, m, F, F, RGV, V>;
using BoundaryTreatmentByCustomExtrapolationOperatorType =
LocalAdvectionFvBoundaryTreatmentByCustomExtrapolationOperator<I, V, SGV, m, F, F, RGV, V>;
LocalAdvectionFvBoundaryTreatmentByCustomExtrapolationOperator<I, V, AGV, m, F, F, RGV, V>;
using typename BaseType::MatrixOperatorType;
using typename BaseType::RangeSpaceType;
......@@ -64,22 +69,28 @@ public:
using typename BaseType::VectorType;
AdvectionFvOperator(
const SGV& assembly_grid_view,
const AGV& assembly_grid_view,
const NumericalFluxType& numerical_flux,
const SourceSpaceType& source_space,
const RangeSpaceType& range_space,
const bool use_tbb = false,
const XT::Grid::IntersectionFilter<SGV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<SGV>())
: BaseType(assembly_grid_view, source_space, range_space, use_tbb)
const XT::Grid::IntersectionFilter<AGV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<AGV>(),
const std::string& logging_prefix = "",
const std::array<bool, 3>& logging_state = XT::Common::default_logger_state())
: BaseType(assembly_grid_view,
source_space,
range_space,
/*requires_assembly_=*/false,
logging_prefix.empty() ? "AdvectionFvOperator" : logging_prefix,
logging_state)
, numerical_flux_(numerical_flux.copy())
, periodicity_exception_(periodicity_exception.copy())
{
// contributions from inner intersections
this->append(LocalAdvectionFvCouplingOperator<I, V, SGV, m, F, F, RGV, V>(*numerical_flux_),
XT::Grid::ApplyOn::InnerIntersectionsOnce<SGV>());
*this += {LocalAdvectionFvCouplingOperator<I, V, AGV, m, F, F, RGV, V>(*numerical_flux_),
XT::Grid::ApplyOn::InnerIntersectionsOnce<AGV>()};
// contributions from periodic boundaries
this->append(LocalAdvectionFvCouplingOperator<I, V, SGV, m, F, F, RGV, V>(*numerical_flux_),
*(XT::Grid::ApplyOn::PeriodicBoundaryIntersectionsOnce<SGV>() && !(*periodicity_exception_)));
*this += {LocalAdvectionFvCouplingOperator<I, V, AGV, m, F, F, RGV, V>(*numerical_flux_),
*(XT::Grid::ApplyOn::PeriodicBoundaryIntersectionsOnce<AGV>() && !(*periodicity_exception_))};
}
AdvectionFvOperator(ThisType&& source)
......@@ -88,29 +99,28 @@ public:
, periodicity_exception_(std::move(source.periodicity_exception_))
{}
using BaseType::append;
/// \name Non-periodic boundary treatment
/// \name These methods can be used to define non-periodic boundary treatment
/// \{
ThisType&
append(typename BoundaryTreatmentByCustomNumericalFluxOperatorType::LambdaType numerical_boundary_treatment_flux,
const XT::Common::ParameterType& boundary_treatment_parameter_type = {},
const XT::Grid::IntersectionFilter<SGV>& filter = XT::Grid::ApplyOn::BoundaryIntersections<SGV>())
ThisType& boundary_treatment(
typename BoundaryTreatmentByCustomNumericalFluxOperatorType::LambdaType numerical_boundary_treatment_flux,
const XT::Common::ParameterType& boundary_treatment_parameter_type = {},
const XT::Grid::IntersectionFilter<AGV>& filter = XT::Grid::ApplyOn::BoundaryIntersections<AGV>())
{
this->append(BoundaryTreatmentByCustomNumericalFluxOperatorType(numerical_boundary_treatment_flux,
boundary_treatment_parameter_type),
filter);
*this += {BoundaryTreatmentByCustomNumericalFluxOperatorType(numerical_boundary_treatment_flux,
boundary_treatment_parameter_type),
filter};
return *this;
}
ThisType& append(typename BoundaryTreatmentByCustomExtrapolationOperatorType::LambdaType extrapolation,
const XT::Common::ParameterType& extrapolation_parameter_type = {},
const XT::Grid::IntersectionFilter<SGV>& filter = XT::Grid::ApplyOn::BoundaryIntersections<SGV>())
ThisType&
boundary_treatment(typename BoundaryTreatmentByCustomExtrapolationOperatorType::LambdaType extrapolation,
const XT::Common::ParameterType& extrapolation_parameter_type = {},
const XT::Grid::IntersectionFilter<AGV>& filter = XT::Grid::ApplyOn::BoundaryIntersections<AGV>())
{
this->append(BoundaryTreatmentByCustomExtrapolationOperatorType(
*numerical_flux_, extrapolation, extrapolation_parameter_type),
filter);
*this += {BoundaryTreatmentByCustomExtrapolationOperatorType(
*numerical_flux_, extrapolation, extrapolation_parameter_type),
filter};
return *this;
}
......@@ -118,21 +128,79 @@ public:
private:
std::unique_ptr<const NumericalFluxType> numerical_flux_;
std::unique_ptr<XT::Grid::IntersectionFilter<SGV>> periodicity_exception_;
std::unique_ptr<XT::Grid::IntersectionFilter<AGV>> periodicity_exception_;
}; // class AdvectionFvOperator
template <class MatrixType, class AGV, size_t m, class F, class RGV, class SGV>
std::enable_if_t<XT::LA::is_matrix<MatrixType>::value, AdvectionFvOperator<MatrixType, AGV, m, RGV, SGV>>
make_advection_fv_operator(
template <class MatrixType, // <- has to be specified manually
class AGV,
size_t m,
class F,
class RGV,
class SGV>
auto make_advection_fv_operator(
const AGV& assembly_grid_view,
const NumericalFluxInterface<XT::Grid::extract_intersection_t<AGV>, AGV::dimension, m, F>& numerical_flux,
const SpaceInterface<SGV, m, 1, F>& source_space,
const SpaceInterface<RGV, m, 1, F>& range_space,
const XT::Grid::IntersectionFilter<AGV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<AGV>())
const XT::Grid::IntersectionFilter<AGV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<AGV>(),
const std::string& logging_prefix = "",
const std::array<bool, 3>& logging_state = XT::Common::default_logger_state())
{
return AdvectionFvOperator<AGV, m, F, MatrixType, RGV, SGV>(assembly_grid_view,
numerical_flux,
source_space,
range_space,
periodicity_exception,
logging_prefix,
logging_state);
}
template <class AGV, size_t m, class F, class RGV, class SGV>
auto make_advection_fv_operator(
const AGV& assembly_grid_view,
const NumericalFluxInterface<XT::Grid::extract_intersection_t<AGV>, AGV::dimension, m, F>& numerical_flux,
const SpaceInterface<SGV, m, 1, F>& source_space,
const SpaceInterface<RGV, m, 1, F>& range_space,
const XT::Grid::IntersectionFilter<AGV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<AGV>(),
const std::string& logging_prefix = "",
const std::array<bool, 3>& logging_state = XT::Common::default_logger_state())
{
return make_advection_fv_operator<XT::LA::IstlRowMajorSparseMatrix<F>>(assembly_grid_view,
numerical_flux,
source_space,
range_space,
periodicity_exception,
logging_prefix,
logging_state);
}
template <class MatrixType, // <- has to be specified manually
class GV,
size_t m,
class F>
auto make_advection_fv_operator(
const SpaceInterface<GV, m, 1, F>& space,
const NumericalFluxInterface<XT::Grid::extract_intersection_t<GV>, GV::dimension, m, F>& numerical_flux,
const XT::Grid::IntersectionFilter<GV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<GV>(),
const std::string& logging_prefix = "",
const std::array<bool, 3>& logging_state = XT::Common::default_logger_state())
{
return AdvectionFvOperator<GV, m, F, MatrixType, GV, GV>(
space.grid_view(), numerical_flux, space, space, periodicity_exception, logging_prefix, logging_state);
}
template <class GV, size_t m, class F>
auto make_advection_fv_operator(
const SpaceInterface<GV, m, 1, F>& space,
const NumericalFluxInterface<XT::Grid::extract_intersection_t<GV>, GV::dimension, m, F>& numerical_flux,
const XT::Grid::IntersectionFilter<GV>& periodicity_exception = XT::Grid::ApplyOn::NoIntersections<GV>(),
const std::string& logging_prefix = "",
const std::array<bool, 3>& logging_state = XT::Common::default_logger_state())
{
return AdvectionFvOperator<MatrixType, AGV, m, RGV, SGV>(
assembly_grid_view, numerical_flux, source_space, range_space, periodicity_exception);
return make_advection_fv_operator<XT::LA::IstlRowMajorSparseMatrix<F>>(
space, numerical_flux, periodicity_exception, logging_prefix, logging_state);
}
......
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