Commit 667f2eb2 authored by Andreas Nüßing's avatar Andreas Nüßing

[CutFEM] rename udg parts to unfitted

As many of the former udg components are now also used by cutfem, we rename
them to unfitted to better distinguish between those parts that are really
udg specific and those that are not.
parent 16846497
......@@ -6,7 +6,7 @@
#include <duneuro/common/exceptions.hh>
#include <duneuro/eeg/source_model_interface.hh>
#include <duneuro/eeg/udg_partial_integration_source_model.hh>
#include <duneuro/eeg/unfitted_partial_integration_source_model.hh>
namespace duneuro
{
......@@ -21,7 +21,7 @@ namespace duneuro
{
const auto type = config.get<std::string>("type");
if (type == "partial_integration") {
return Dune::Std::make_unique<UDGPartialIntegrationSourceModel<
return Dune::Std::make_unique<UnfittedPartialIntegrationSourceModel<
typename Solver::Traits::FunctionSpace::GFS, ST, Vector>>(
solver.functionSpace().getGFS(), subTriangulation, search, dipoleCompartment, false);
} else {
......@@ -40,7 +40,7 @@ namespace duneuro
{
const auto type = config.get<std::string>("type");
if (type == "partial_integration") {
return Dune::Std::make_unique<UDGPartialIntegrationSourceModel<
return Dune::Std::make_unique<UnfittedPartialIntegrationSourceModel<
typename Solver::Traits::FunctionSpace::GFS, ST, Vector>>(
solver.functionSpace().getGFS(), subTriangulation, search, dipoleCompartment, false);
} else {
......
......@@ -6,8 +6,8 @@
#include <duneuro/common/exceptions.hh>
#include <duneuro/eeg/source_model_interface.hh>
#include <duneuro/eeg/udg_partial_integration_source_model.hh>
#include <duneuro/eeg/udg_patch_based_venant_source_model.hh>
#include <duneuro/eeg/unfitted_partial_integration_source_model.hh>
#include <duneuro/eeg/unfitted_patch_based_venant_source_model.hh>
namespace duneuro
{
......@@ -22,11 +22,11 @@ namespace duneuro
{
const auto type = config.get<std::string>("type");
if (type == "partial_integration") {
return Dune::Std::make_unique<UDGPartialIntegrationSourceModel<
return Dune::Std::make_unique<UnfittedPartialIntegrationSourceModel<
typename Solver::Traits::FunctionSpace::GFS, ST, Vector>>(
solver.functionSpace().getGFS(), subTriangulation, search, dipoleCompartment, true);
} else if (type == "patch_based_venant") {
return Dune::Std::make_unique<UDGPatchBasedVenantSourceModel<
return Dune::Std::make_unique<UnfittedPatchBasedVenantSourceModel<
typename Solver::Traits::FunctionSpace::GFS, ST, Vector>>(
solver.functionSpace().getGFS(), subTriangulation, search, dipoleCompartment, config);
} else {
......@@ -45,11 +45,11 @@ namespace duneuro
{
const auto type = config.get<std::string>("type");
if (type == "partial_integration") {
return Dune::Std::make_unique<UDGPartialIntegrationSourceModel<
return Dune::Std::make_unique<UnfittedPartialIntegrationSourceModel<
typename Solver::Traits::FunctionSpace::GFS, ST, Vector>>(
solver.functionSpace().getGFS(), subTriangulation, search, dipoleCompartment, true);
} else if (type == "patch_based_venant") {
return Dune::Std::make_unique<UDGPatchBasedVenantSourceModel<
return Dune::Std::make_unique<UnfittedPatchBasedVenantSourceModel<
typename Solver::Traits::FunctionSpace::GFS, ST, Vector>>(
solver.functionSpace().getGFS(), subTriangulation, search, dipoleCompartment, config);
} else {
......
#ifndef DUNEURO_UDG_EEG_FORWARD_SOLVER_HH
#define DUNEURO_UDG_EEG_FORWARD_SOLVER_HH
#ifndef DUNEURO_UNFITTED_EEG_FORWARD_SOLVER_HH
#define DUNEURO_UNFITTED_EEG_FORWARD_SOLVER_HH
#include <dune/common/parametertree.hh>
#include <duneuro/common/dipole.hh>
#include <duneuro/common/flags.hh>
#include <duneuro/common/make_dof_vector.hh>
#include <duneuro/common/udg_solver.hh>
#include <duneuro/eeg/eeg_forward_solver_interface.hh>
#include <duneuro/eeg/source_model_interface.hh>
#include <duneuro/eeg/udg_source_model_factory.hh>
namespace duneuro
{
template <class S, class SMF>
struct UDGEEGFowardSolverTraits {
struct UnfittedEEGFowardSolverTraits {
using Solver = S;
using SubTriangulation = typename Solver::Traits::SubTriangulation;
static const unsigned int dimension = SubTriangulation::dim;
......@@ -27,16 +25,16 @@ namespace duneuro
};
template <class S, class SMF>
class UDGEEGFowardSolver
: public EEGForwardSolver<UDGEEGFowardSolver<S, SMF>, UDGEEGFowardSolverTraits<S, SMF>>
class UnfittedEEGFowardSolver : public EEGForwardSolver<UnfittedEEGFowardSolver<S, SMF>,
UnfittedEEGFowardSolverTraits<S, SMF>>
{
public:
using Traits = UDGEEGFowardSolverTraits<S, SMF>;
using Traits = UnfittedEEGFowardSolverTraits<S, SMF>;
UDGEEGFowardSolver(std::shared_ptr<typename Traits::SubTriangulation> subTriangulation,
std::shared_ptr<typename Traits::Solver> solver,
std::shared_ptr<typename Traits::ElementSearch> search,
const Dune::ParameterTree& config)
UnfittedEEGFowardSolver(std::shared_ptr<typename Traits::SubTriangulation> subTriangulation,
std::shared_ptr<typename Traits::Solver> solver,
std::shared_ptr<typename Traits::ElementSearch> search,
const Dune::ParameterTree& config)
: subTriangulation_(subTriangulation)
, solver_(solver)
, search_(search)
......@@ -105,4 +103,4 @@ namespace duneuro
};
}
#endif // DUNEURO_UDG_EEG_FORWARD_SOLVER_HH
#endif // DUNEURO_UNFITTED_EEG_FORWARD_SOLVER_HH
#ifndef DUNEURO_PARTIALINTEGRATIONUDGRESIDUAL_HH
#define DUNEURO_PARTIALINTEGRATIONUDGRESIDUAL_HH
#ifndef DUNEURO_UNFITTED_PARTIAL_INTEGRATION_SOURCE_MODEL_HH
#define DUNEURO_UNFITTED_PARTIAL_INTEGRATION_SOURCE_MODEL_HH
#include <dune/common/fvector.hh>
......@@ -17,7 +17,7 @@
namespace duneuro
{
template <class GFS, class ST, class V>
class UDGPartialIntegrationSourceModel
class UnfittedPartialIntegrationSourceModel
: public SourceModelBase<typename GFS::Traits::GridViewType, V>
{
public:
......@@ -33,9 +33,9 @@ namespace duneuro
using ULFS = Dune::PDELab::UnfittedLocalFunctionSpace<GFS>;
using UCache = Dune::PDELab::LFSIndexCache<ULFS>;
UDGPartialIntegrationSourceModel(const GFS& gfs, std::shared_ptr<ST> subTriangulation,
std::shared_ptr<typename BaseT::SearchType> search,
std::size_t child, bool scaleToBBox)
UnfittedPartialIntegrationSourceModel(const GFS& gfs, std::shared_ptr<ST> subTriangulation,
std::shared_ptr<typename BaseT::SearchType> search,
std::size_t child, bool scaleToBBox)
: BaseT(search)
, subTriangulation_(subTriangulation)
, child_(child)
......@@ -126,4 +126,4 @@ namespace duneuro
};
}
#endif // DUNEURO_PARTIALINTEGRATIONUDGRESIDUAL_HH
#endif // DUNEURO_UNFITTED_PARTIAL_INTEGRATION_SOURCE_MODEL_HH
#ifndef DUNEURO_UDG_PATCH_BASED_VENANT_SOURCE_MODEL_HH
#define DUNEURO_UDG_PATCH_BASED_VENANT_SOURCE_MODEL_HH
#ifndef DUNEURO_UNFITTED_PATCH_BASED_VENANT_SOURCE_MODEL_HH
#define DUNEURO_UNFITTED_PATCH_BASED_VENANT_SOURCE_MODEL_HH
#include <Eigen/Dense>
#include <array>
......@@ -22,7 +22,7 @@
namespace duneuro
{
template <class GFS, class ST, class V>
class UDGPatchBasedVenantSourceModel
class UnfittedPatchBasedVenantSourceModel
: public SourceModelBase<typename GFS::Traits::GridViewType, V>
{
public:
......@@ -37,9 +37,9 @@ namespace duneuro
using UST = Dune::PDELab::UnfittedSubTriangulation<GV>;
using SearchType = typename BaseT::SearchType;
UDGPatchBasedVenantSourceModel(const GFS& gfs, std::shared_ptr<ST> subTriangulation,
std::shared_ptr<typename BaseT::SearchType> search,
std::size_t child, const Dune::ParameterTree& params)
UnfittedPatchBasedVenantSourceModel(const GFS& gfs, std::shared_ptr<ST> subTriangulation,
std::shared_ptr<typename BaseT::SearchType> search,
std::size_t child, const Dune::ParameterTree& params)
: BaseT(search)
, subTriangulation_(subTriangulation)
, child_(child)
......@@ -133,4 +133,4 @@ namespace duneuro
};
}
#endif // DUNEURO_UDG_PATCH_BASED_VENANT_SOURCE_MODEL_HH
#endif // DUNEURO_UNFITTED_PATCH_BASED_VENANT_SOURCE_MODEL_HH
#ifndef DUNEURO_UDG_TRANSFER_MATRIX_RHS_HH
#define DUNEURO_UDG_TRANSFER_MATRIX_RHS_HH
#ifndef DUNEURO_UNFITTED_TRANSFER_MATRIX_RHS_HH
#define DUNEURO_UNFITTED_TRANSFER_MATRIX_RHS_HH
#include <dune/common/fvector.hh>
......@@ -14,7 +14,7 @@
namespace duneuro
{
template <class GFS, class ST>
class UDGTransferMatrixRHS
class UnfittedTransferMatrixRHS
{
public:
using GV = typename GFS::Traits::GridViewType;
......@@ -27,8 +27,8 @@ namespace duneuro
using ULFS = Dune::PDELab::UnfittedLocalFunctionSpace<GFS>;
using UCache = Dune::PDELab::LFSIndexCache<ULFS>;
UDGTransferMatrixRHS(const GFS& gfs, std::shared_ptr<ST> st, std::size_t child,
bool scaleToBBox)
UnfittedTransferMatrixRHS(const GFS& gfs, std::shared_ptr<ST> st, std::size_t child,
bool scaleToBBox)
: st_(st), gfs_(gfs), child_(child), scaleToBBox_(scaleToBBox)
{
}
......@@ -112,4 +112,4 @@ namespace duneuro
};
}
#endif // DUNEURO_UDG_TRANSFER_MATRIX_RHS_HH
#endif // DUNEURO_UNFITTED_TRANSFER_MATRIX_RHS_HH
#ifndef DUNEURO_UDG_TRANSFER_MATRIX_SOLVER_HH
#define DUNEURO_UDG_TRANSFER_MATRIX_SOLVER_HH
#ifndef DUNEURO_UNFITTED_TRANSFER_MATRIX_SOLVER_HH
#define DUNEURO_UNFITTED_TRANSFER_MATRIX_SOLVER_HH
#include <dune/common/parametertree.hh>
#include <duneuro/common/make_dof_vector.hh>
#include <duneuro/common/udg_solver.hh>
#include <duneuro/eeg/projection_utilities.hh>
#include <duneuro/eeg/udg_transfer_matrix_rhs.hh>
#include <duneuro/eeg/unfitted_transfer_matrix_rhs.hh>
#include <duneuro/io/data_tree.hh>
namespace duneuro
{
template <class S>
struct UDGTransferMatrixSolverTraits {
struct UnfittedTransferMatrixSolverTraits {
using Solver = S;
using SubTriangulation = typename Solver::Traits::SubTriangulation;
static const unsigned int dimension = SubTriangulation::dim;
......@@ -26,14 +25,15 @@ namespace duneuro
};
template <class S>
class UDGTransferMatrixSolver
class UnfittedTransferMatrixSolver
{
public:
using Traits = UDGTransferMatrixSolverTraits<S>;
using Traits = UnfittedTransferMatrixSolverTraits<S>;
UDGTransferMatrixSolver(std::shared_ptr<typename Traits::SubTriangulation> subTriangulation,
std::shared_ptr<typename Traits::Solver> solver, bool scaleToBBox,
const Dune::ParameterTree& config)
UnfittedTransferMatrixSolver(
std::shared_ptr<typename Traits::SubTriangulation> subTriangulation,
std::shared_ptr<typename Traits::Solver> solver, bool scaleToBBox,
const Dune::ParameterTree& config)
: subTriangulation_(subTriangulation)
, solver_(solver)
, scaleToBBox_(scaleToBBox)
......@@ -119,7 +119,8 @@ namespace duneuro
Dune::Timer timer;
rightHandSideVector = 0.0;
// assemble right hand side
UDGTransferMatrixRHS<typename Traits::FunctionSpace::GFS, typename Traits::SubTriangulation>
UnfittedTransferMatrixRHS<typename Traits::FunctionSpace::GFS,
typename Traits::SubTriangulation>
rhsAssembler(solver_->functionSpace().getGFS(), subTriangulation_,
config.get<std::size_t>("compartment"), scaleToBBox_);
rhsAssembler.assembleRightHandSide(reference.element, reference.localPosition,
......@@ -138,4 +139,4 @@ namespace duneuro
};
}
#endif // DUNEURO_UDG_TRANSFER_MATRIX_SOLVER_HH
#endif // DUNEURO_UNFITTED_TRANSFER_MATRIX_SOLVER_HH
#ifndef DUNEURO_UDG_TRANSFER_MATRIX_USER_HH
#define DUNEURO_UDG_TRANSFER_MATRIX_USER_HH
#ifndef DUNEURO_UNFITTED_TRANSFER_MATRIX_USER_HH
#define DUNEURO_UNFITTED_TRANSFER_MATRIX_USER_HH
#include <dune/common/parametertree.hh>
#include <dune/common/timer.hh>
......@@ -9,15 +9,13 @@
#include <duneuro/common/make_dof_vector.hh>
#include <duneuro/common/matrix_utilities.hh>
#include <duneuro/common/sparse_vector_container.hh>
#include <duneuro/common/udg_solver.hh>
#include <duneuro/common/vector_density.hh>
#include <duneuro/eeg/udg_source_model_factory.hh>
#include <duneuro/io/data_tree.hh>
namespace duneuro
{
template <class S, class SMF>
struct UDGTransferMatrixUserTraits {
struct UnfittedTransferMatrixUserTraits {
using Solver = S;
using SubTriangulation = typename Solver::Traits::SubTriangulation;
static const unsigned int dimension = SubTriangulation::dim;
......@@ -32,15 +30,15 @@ namespace duneuro
};
template <class S, class SMF>
class UDGTransferMatrixUser
class UnfittedTransferMatrixUser
{
public:
using Traits = UDGTransferMatrixUserTraits<S, SMF>;
using Traits = UnfittedTransferMatrixUserTraits<S, SMF>;
UDGTransferMatrixUser(std::shared_ptr<typename Traits::SubTriangulation> subTriangulation,
std::shared_ptr<typename Traits::Solver> solver,
std::shared_ptr<typename Traits::ElementSearch> search,
const Dune::ParameterTree& config)
UnfittedTransferMatrixUser(std::shared_ptr<typename Traits::SubTriangulation> subTriangulation,
std::shared_ptr<typename Traits::Solver> solver,
std::shared_ptr<typename Traits::ElementSearch> search,
const Dune::ParameterTree& config)
: subTriangulation_(subTriangulation), solver_(solver), search_(search)
{
}
......@@ -150,4 +148,4 @@ namespace duneuro
};
}
#endif // DUNEURO_UDG_TRANSFER_MATRIX_USER_HH
#endif // DUNEURO_UNFITTED_TRANSFER_MATRIX_USER_HH
......@@ -9,7 +9,7 @@
#include <duneuro/io/data_tree.hh>
#include <duneuro/meeg/meeg_driver_interface.hh>
#if HAVE_DUNE_UDG
#include <duneuro/meeg/udg_meeg_driver_data.hh>
#include <duneuro/meeg/unfitted_meeg_driver_data.hh>
#endif
namespace duneuro
......@@ -18,7 +18,7 @@ namespace duneuro
struct MEEGDriverData {
FittedDriverData<dim> fittedData;
#if HAVE_DUNE_UDG
UDGMEEGDriverData<dim> udgData;
UnfittedMEEGDriverData<dim> unfittedData;
#endif
};
......
This diff is collapsed.
#include <config.h>
#include <duneuro/meeg/udg_meeg_driver.hh>
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 1>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 2>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 3>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 4>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 5>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 6>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 1>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 2>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 3>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 4>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 5>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 6>;
#include <config.h>
#include <duneuro/meeg/udg_meeg_driver.hh>
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 1>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 2>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 3>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 4>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 5>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 6>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 1>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 2>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 3>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 4>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 5>;
template class duneuro::UDGMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 6>;
#ifndef DUNEURO_UDG_MEEG_DRIVER_HH
#define DUNEURO_UDG_MEEG_DRIVER_HH
#ifndef DUNEURO_UNFITTED_MEEG_DRIVER_HH
#define DUNEURO_UNFITTED_MEEG_DRIVER_HH
#if HAVE_TBB
#include <tbb/tbb.h>
......@@ -15,16 +15,18 @@
#include <duneuro/common/matrix_utilities.hh>
#include <duneuro/common/stl.hh>
#include <duneuro/common/structured_grid_utilities.hh>
#include <duneuro/common/udg_solver.hh>
#include <duneuro/common/udg_solver_backend.hh>
#include <duneuro/eeg/cutfem_source_model_factory.hh>
#include <duneuro/eeg/projected_electrodes.hh>
#include <duneuro/eeg/udg_eeg_forward_solver.hh>
#include <duneuro/eeg/udg_transfer_matrix_solver.hh>
#include <duneuro/eeg/udg_transfer_matrix_user.hh>
#include <duneuro/eeg/udg_source_model_factory.hh>
#include <duneuro/eeg/unfitted_eeg_forward_solver.hh>
#include <duneuro/eeg/unfitted_transfer_matrix_solver.hh>
#include <duneuro/eeg/unfitted_transfer_matrix_user.hh>
#include <duneuro/io/refined_vtk_writer.hh>
#include <duneuro/io/vtk_functors.hh>
#include <duneuro/meeg/meeg_driver_interface.hh>
#include <duneuro/meeg/udg_meeg_driver_data.hh>
#include <duneuro/meeg/unfitted_meeg_driver_data.hh>
namespace duneuro
{
......@@ -63,7 +65,7 @@ namespace duneuro
};
template <UnfittedSolverType solverType, int dim, int degree, int compartments>
struct UDGMEEGDriverTraits {
struct UnfittedMEEGDriverTraits {
using Grid = typename SubTriangulationTraits<dim>::Grid;
using GridView = typename SubTriangulationTraits<dim>::GridView;
using SubTriangulation = typename SubTriangulationTraits<dim>::SubTriangulation;
......@@ -71,9 +73,9 @@ namespace duneuro
using Solver = typename SelectUnfittedSolver<solverType, dim, degree, compartments>::SolverType;
using SourceModelFactory = typename SelectUnfittedSolver<solverType, dim, degree,
compartments>::SourceModelFactoryType;
using EEGForwardSolver = UDGEEGFowardSolver<Solver, SourceModelFactory>;
using EEGTransferMatrixSolver = UDGTransferMatrixSolver<Solver>;
using TransferMatrixUser = UDGTransferMatrixUser<Solver, SourceModelFactory>;
using EEGForwardSolver = UnfittedEEGFowardSolver<Solver, SourceModelFactory>;
using EEGTransferMatrixSolver = UnfittedTransferMatrixSolver<Solver>;
using TransferMatrixUser = UnfittedTransferMatrixUser<Solver, SourceModelFactory>;
using SolverBackend =
typename SelectUnfittedSolver<solverType, dim, degree, compartments>::SolverBackendType;
......@@ -85,17 +87,17 @@ namespace duneuro
};
template <UnfittedSolverType solverType, int dim, int degree, int compartments>
class UDGMEEGDriver : public MEEGDriverInterface<dim>
class UnfittedMEEGDriver : public MEEGDriverInterface<dim>
{
public:
using Traits = UDGMEEGDriverTraits<solverType, dim, degree, compartments>;
using Traits = UnfittedMEEGDriverTraits<solverType, dim, degree, compartments>;
explicit UDGMEEGDriver(const Dune::ParameterTree& config)
: UDGMEEGDriver(UDGMEEGDriverData<dim>{}, config)
explicit UnfittedMEEGDriver(const Dune::ParameterTree& config)
: UnfittedMEEGDriver(UnfittedMEEGDriverData<dim>{}, config)
{
}
explicit UDGMEEGDriver(UDGMEEGDriverData<dim> data, const Dune::ParameterTree& config)
explicit UnfittedMEEGDriver(UnfittedMEEGDriverData<dim> data, const Dune::ParameterTree& config)
: data_(data)
, numberOfThreads_(config.get<std::size_t>("numberOfThreads", 1))
, grid_(make_structured_grid<dim>(config.sub("volume_conductor.grid")))
......@@ -350,7 +352,7 @@ namespace duneuro
}
}
UDGMEEGDriverData<dim> data_;
UnfittedMEEGDriverData<dim> data_;
std::size_t numberOfThreads_;
std::unique_ptr<typename Traits::Grid> grid_;
typename Traits::GridView fundamentalGridView_;
......@@ -373,4 +375,4 @@ namespace duneuro
};
}
#endif // DUNEURO_UDG_MEEG_DRIVER_HH
#endif // DUNEURO_UNFITTED_MEEG_DRIVER_HH
#include <config.h>
#include <duneuro/meeg/unfitted_meeg_driver.hh>
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 1>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 2>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 3>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 4>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 5>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 2, 1, 6>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 1>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 2>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 3>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 4>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 5>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 2, 1, 6>;
#include <config.h>
#include <duneuro/meeg/unfitted_meeg_driver.hh>
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 1>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 2>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 3>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 4>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 5>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::udg, 3, 1, 6>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 1>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 2>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 3>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 4>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 5>;
template class duneuro::UnfittedMEEGDriver<duneuro::UnfittedSolverType::cutfem, 3, 1, 6>;
#ifndef DUNEURO_UDG_MEEG_DRIVER_DATA_HH
#define DUNEURO_UDG_MEEG_DRIVER_DATA_HH
#ifndef DUNEURO_UNFITTED_MEEG_DRIVER_DATA_HH
#define DUNEURO_UNFITTED_MEEG_DRIVER_DATA_HH
#include <duneuro/udg/simpletpmc_levelset_factory.hh>
namespace duneuro
{
template <int dim>
struct UDGMEEGDriverData {
struct UnfittedMEEGDriverData {
SimpleTPMCLevelSetData<double, dim> levelSetData;
};
}
#endif // DUNEURO_UDG_MEEG_DRIVER_DATA_HH
#endif // DUNEURO_UNFITTED_MEEG_DRIVER_DATA_HH
......@@ -10,7 +10,7 @@ namespace duneuro
struct TDCSDriverData {
FittedDriverData<dim> fittedData;
#if HAVE_DUNE_UDG
UDGMEEGDriverData<dim> udgData;
UnfittedMEEGDriverData<dim> udgData;
#endif
};
......
......@@ -10,7 +10,7 @@
#include <duneuro/common/udg_solver_backend.hh>
#include <duneuro/io/refined_vtk_writer.hh>
#include <duneuro/io/vtk_functors.hh>
#include <duneuro/meeg/udg_meeg_driver_data.hh>
#include <duneuro/meeg/unfitted_meeg_driver_data.hh>
#include <duneuro/tes/tdcs_driver_interface.hh>
#include <duneuro/tes/tdcs_patch_udg_parameter.hh>
#include <duneuro/tes/udg_tdcs_solver.hh>
......@@ -38,11 +38,11 @@ namespace duneuro
explicit UDGTDCSDriver(const PatchSet<double, dim>& patchSet, const Dune::ParameterTree& config,
DataTree dataTree = DataTree())
: UDGTDCSDriver(UDGMEEGDriverData<dim>{}, patchSet, config, dataTree)
: UDGTDCSDriver(UnfittedMEEGDriverData<dim>{}, patchSet, config, dataTree)
{
}
explicit UDGTDCSDriver(const UDGMEEGDriverData<dim>& data,
explicit UDGTDCSDriver(const UnfittedMEEGDriverData<dim>& data,
const PatchSet<double, dim>& patchSet, const Dune::ParameterTree& config,
DataTree dataTree = DataTree())
: config_(config)
......
......@@ -6,14 +6,14 @@
#include <dune/udg/simpletpmctriangulation.hh>
#include <duneuro/common/structured_grid_utilities.hh>
#include <duneuro/meeg/udg_meeg_driver_data.hh>
#include <duneuro/meeg/unfitted_meeg_driver_data.hh>
#include <duneuro/udg/simpletpmc_domain.hh>
namespace duneuro
{
template <class GV>
std::vector<std::size_t> hexahedralize(const GV& fundamentalGridView, const GV& levelSetGridView,
UDGMEEGDriverData<GV::dimension> data,
UnfittedMEEGDriverData<GV::dimension> data,
const Dune::ParameterTree& config)
{
SimpleTPMCDomain<GV, GV> domain(levelSetGridView, data.levelSetData, config.sub("domain"));
......@@ -40,7 +40,7 @@ namespace duneuro
}
template <int dim>
std::vector<std::size_t> hexahedralize(UDGMEEGDriverData<dim> data,
std::vector<std::size_t> hexahedralize(UnfittedMEEGDriverData<dim> data,
const Dune::ParameterTree& config)
{
auto grid = make_structured_grid<dim>(config.sub("volume_conductor.grid"));
......
......@@ -4,8 +4,8 @@ set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/meeg/fitted_m
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/tes/fitted_tdcs_driver_3d.cc)
if (dune-udg_FOUND)
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/meeg/udg_meeg_driver_2d.cc)
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/meeg/udg_meeg_driver_3d.cc)
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/meeg/unfitted_meeg_driver_2d.cc)
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/meeg/unfitted_meeg_driver_3d.cc)
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/tes/udg_tdcs_driver_2d.cc)
set(duneuro_SOURCES ${duneuro_SOURCES} ${CMAKE_SOURCE_DIR}/duneuro/tes/udg_tdcs_driver_3d.cc)
endif()
......
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