Commit 4deb2a0a authored by Andreas Nüßing's avatar Andreas Nüßing

fix rebasing errors

parent b1773b75
......@@ -17,7 +17,8 @@ namespace duneuro
createDense(
const Solver& solver, std::shared_ptr<ST> subTriangulation,
std::shared_ptr<KDTreeElementSearch<typename Solver::Traits::FundamentalGridView>> search,
std::size_t dipoleCompartment, const Dune::ParameterTree& config)
std::size_t dipoleCompartment, const Dune::ParameterTree& config,
const Dune::ParameterTree& solverConfig)
{
const auto type = config.get<std::string>("type");
if (type == "partial_integration") {
......@@ -36,7 +37,8 @@ namespace duneuro
createSparse(
const Solver& solver, std::shared_ptr<ST> subTriangulation,
std::shared_ptr<KDTreeElementSearch<typename Solver::Traits::FundamentalGridView>> search,
std::size_t dipoleCompartment, const Dune::ParameterTree& config)
std::size_t dipoleCompartment, const Dune::ParameterTree& config,
const Dune::ParameterTree& solverConfig)
{
const auto type = config.get<std::string>("type");
if (type == "partial_integration") {
......
......@@ -7,6 +7,7 @@
#include <dune/pdelab/boilerplate/pdelab.hh>
#include <duneuro/common/edge_norm_provider.hh>
#include <duneuro/common/penalty_flux_weighting.hh>
#include <duneuro/eeg/source_model_interface.hh>
#include <duneuro/eeg/subtraction_dg_operator.hh>
#include <duneuro/eeg/subtraction_udg_default_parameter.hh>
......@@ -26,7 +27,9 @@ namespace duneuro
enum { dim = GV::dimension };
using Problem = SubtractionUDGDefaultParameter<GV, RF>;
using EdgeNormProvider = MultiEdgeNormProvider;
using LOP = SubtractionDG<Problem, EdgeNormProvider, SubtractionContinuityType::discontinuous>;
using PenaltyFluxWeighting = UnfittedDynamicPenaltyFluxWeights;
using LOP = SubtractionDG<Problem, EdgeNormProvider, PenaltyFluxWeighting,
SubtractionContinuityType::discontinuous>;
using WLOP = Dune::UDG::MultiPhaseLocalOperatorWrapper<LOP>;
using DOF = typename FS::DOF;
using UnfittedSubTriangulation = Dune::PDELab::UnfittedSubTriangulation<GV>;
......@@ -48,10 +51,9 @@ namespace duneuro
, problem_(subTriangulation->gridView(),
solverConfig.get<std::vector<double>>("conductivities"), dipolePhase)
, edgeNormProvider_(solverConfig.get<std::string>("edge_norm_type", "houston"), 1.0)
, lop_(problem_,
solverConfig.get<bool>("weights", true) ? ConvectionDiffusion_DG_Weights::weightsOn :
ConvectionDiffusion_DG_Weights::weightsOff,
config.get<unsigned int>("intorderadd"), config.get<unsigned int>("intorderadd_lb"))
, weighting_(solverConfig.get<std::string>("weights", "tensorOnly"))
, lop_(problem_, weighting_, config.get<unsigned int>("intorderadd"),
config.get<unsigned int>("intorderadd_lb"))
, wlop_(lop_)
, ust_(subTriangulation->gridView(), *subTriangulation_)
, gridOperator_(fs.getGFS(), fs.getGFS(), ust_, wlop_, MatrixBackend(2 * dim + 1))
......@@ -96,6 +98,7 @@ namespace duneuro
std::shared_ptr<ST> subTriangulation_;
Problem problem_;
EdgeNormProvider edgeNormProvider_;
PenaltyFluxWeighting weighting_;
LOP lop_;
WLOP wlop_;
UnfittedSubTriangulation ust_;
......
......@@ -371,9 +371,8 @@ namespace duneuro
}
}
UDGMEEGDriverData<dim> data_;
UnfittedMEEGDriverData<dim> data_;
Dune::ParameterTree config_;
std::size_t numberOfThreads_;
std::unique_ptr<typename Traits::Grid> grid_;
typename Traits::GridView fundamentalGridView_;
typename Traits::GridView levelSetGridView_;
......
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