Commit 59a6f718 authored by Timo Koch's avatar Timo Koch
Browse files

[md][embedded] Remove deprecated tags and integration point source interfaces

parent 66ec4304
......@@ -35,18 +35,6 @@ namespace Dumux {
template<class MDTraits, class CouplingMode>
class Embedded1d3dCouplingManager;
/*!
* \ingroup EmbeddedCoupling
* \brief The coupling mode
* \deprecated Will be removed after 3.3
*/
enum class EmbeddedCouplingMode
{ line, average, cylindersources, kernel };
// deprecated and will be removed after 3.3
template<class MDTraits, EmbeddedCouplingMode mode>
struct EmbeddedCouplingManager1d3d;
} // end namespace Dumux
#include <dumux/multidomain/embedded/couplingmanager1d3d_line.hh>
......@@ -54,37 +42,4 @@ struct EmbeddedCouplingManager1d3d;
#include <dumux/multidomain/embedded/couplingmanager1d3d_surface.hh>
#include <dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh>
// TODO: remove this part after the release 3.3
namespace Dumux {
template<class MDTraits>
struct [[deprecated("Removed after 3.3. Use Embedded1d3dCouplingManager.")]] EmbeddedCouplingManager1d3d<MDTraits, EmbeddedCouplingMode::line>
: public Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Line> {
using ParentType = Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Line>;
using ParentType::ParentType;
};
template<class MDTraits>
struct [[deprecated("Removed after 3.3. Use Embedded1d3dCouplingManager.")]] EmbeddedCouplingManager1d3d<MDTraits, EmbeddedCouplingMode::average>
: public Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Average> {
using ParentType = Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Average>;
using ParentType::ParentType;
};
template<class MDTraits>
struct [[deprecated("Removed after 3.3. Use Embedded1d3dCouplingManager.")]] EmbeddedCouplingManager1d3d<MDTraits, EmbeddedCouplingMode::cylindersources>
: public Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Surface> {
using ParentType = Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Surface>;
using ParentType::ParentType;
};
template<class MDTraits>
struct [[deprecated("Removed after 3.3. Use Embedded1d3dCouplingManager.")]] EmbeddedCouplingManager1d3d<MDTraits, EmbeddedCouplingMode::kernel>
: public Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Kernel> {
using ParentType = Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Kernel>;
using ParentType::ParentType;
};
} // end namespace Dumux
#endif
......@@ -279,9 +279,9 @@ public:
const auto id = idCounter_++;
const auto qpweight = qp.weight();
const auto ie = intersectionGeometry.integrationElement(qp.position());
pointSources(bulkIdx).emplace_back(globalPos, id, qpweight, ie, std::vector<std::size_t>({bulkElementIdx}));
pointSources(bulkIdx).emplace_back(globalPos, id, qpweight, ie, bulkElementIdx);
pointSources(bulkIdx).back().setEmbeddings(is.numDomainNeighbors());
pointSources(lowDimIdx).emplace_back(globalPos, id, qpweight, ie, std::vector<std::size_t>({lowDimElementIdx}));
pointSources(lowDimIdx).emplace_back(globalPos, id, qpweight, ie, lowDimElementIdx);
pointSources(lowDimIdx).back().setEmbeddings(is.numDomainNeighbors());
// pre compute additional data used for the evaluation of
......
......@@ -47,25 +47,6 @@ class IntegrationPointSource : public IdPointSource<GlobalPosition, SourceValues
using Scalar = std::decay_t<decltype(std::declval<SourceValues>()[0])>;
public:
//! Constructor for integration point sources
[[deprecated("Call constructor with a single element index instead! Will be removed after 3.3")]]
IntegrationPointSource(GlobalPosition pos, SourceValues values, IdType id,
Scalar qpweight, Scalar integrationElement,
const std::vector<std::size_t>& elementIndices)
: ParentType(pos, values, id),
qpweight_(qpweight), integrationElement_(integrationElement),
elementIndex_(elementIndices[0]) {}
//! Constructor for integration point sources, when there is no
// value known at the time of initialization
[[deprecated("Call constructor with a single element index instead! Will be removed after 3.3")]]
IntegrationPointSource(GlobalPosition pos, IdType id,
Scalar qpweight, Scalar integrationElement,
const std::vector<std::size_t>& elementIndices)
: ParentType(pos, id),
qpweight_(qpweight), integrationElement_(integrationElement),
elementIndex_(elementIndices[0]) {}
//! Constructor for integration point sources
IntegrationPointSource(GlobalPosition pos, SourceValues values, IdType id,
Scalar qpweight, Scalar integrationElement,
......@@ -99,10 +80,6 @@ public:
void setIntegrationElement(const Scalar ie)
{ integrationElement_ = ie; }
[[deprecated("Use elementIndex() instead. Will be removed after 3.3")]]
std::vector<std::size_t> elementIndices() const
{ return std::vector<std::size_t>({elementIndex_}); }
//! The index of the element this intergration point source is associated with
std::size_t elementIndex() const
{ return elementIndex_; }
......
Supports Markdown
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