diff --git a/src/mesh/DiamondDualConnectivityBuilder.cpp b/src/mesh/DiamondDualConnectivityBuilder.cpp
index bb9c9b3b643c87c4a71de31cf6a2a5c60e53b0e2..ec1620fabbca10161d5cc6696e57eb9b63ba3467 100644
--- a/src/mesh/DiamondDualConnectivityBuilder.cpp
+++ b/src/mesh/DiamondDualConnectivityBuilder.cpp
@@ -3,9 +3,9 @@
#include <mesh/Connectivity.hpp>
#include <mesh/ConnectivityDescriptor.hpp>
#include <mesh/ConnectivityDispatcher.hpp>
-#include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp>
#include <mesh/ItemValueUtils.hpp>
#include <mesh/Mesh.hpp>
+#include <mesh/PrimalToDiamondDualConnectivityDataMapper.hpp>
#include <mesh/RefId.hpp>
#include <utils/Array.hpp>
#include <utils/Messenger.hpp>
@@ -550,12 +550,12 @@ DiamondDualConnectivityBuilder::_buildDiamondConnectivityFrom(const IConnectivit
}
m_mapper =
- std::make_shared<ConnectivityToDiamondDualConnectivityDataMapper<Dimension>>(primal_connectivity,
- dynamic_cast<const ConnectivityType&>(
- *m_connectivity),
- m_primal_node_to_dual_node_map,
- m_primal_cell_to_dual_node_map,
- m_primal_face_to_dual_cell_map);
+ std::make_shared<PrimalToDiamondDualConnectivityDataMapper<Dimension>>(primal_connectivity,
+ dynamic_cast<const ConnectivityType&>(
+ *m_connectivity),
+ m_primal_node_to_dual_node_map,
+ m_primal_cell_to_dual_node_map,
+ m_primal_face_to_dual_cell_map);
}
DiamondDualConnectivityBuilder::DiamondDualConnectivityBuilder(const IConnectivity& connectivity)
diff --git a/src/mesh/DiamondDualConnectivityBuilder.hpp b/src/mesh/DiamondDualConnectivityBuilder.hpp
index 1ce888e24d9aaff77a60ad68cfafe4f74fe0b678..da8b6c3d5a2e08895fe518bfd56a4f178a33ad46 100644
--- a/src/mesh/DiamondDualConnectivityBuilder.hpp
+++ b/src/mesh/DiamondDualConnectivityBuilder.hpp
@@ -2,7 +2,7 @@
#define DIAMOND_DUAL_CONNECTIVITY_BUILDER_HPP
#include <mesh/ConnectivityBuilderBase.hpp>
-#include <mesh/IConnectivityToDualConnectivityDataMapper.hpp>
+#include <mesh/IPrimalToDualConnectivityDataMapper.hpp>
#include <mesh/ItemIdToItemIdMap.hpp>
#include <memory>
@@ -18,7 +18,7 @@ class DiamondDualConnectivityBuilder : public ConnectivityBuilderBase
CellIdToNodeIdMap m_primal_cell_to_dual_node_map;
FaceIdToCellIdMap m_primal_face_to_dual_cell_map;
- std::shared_ptr<IConnectivityToDualConnectivityDataMapper> m_mapper;
+ std::shared_ptr<IPrimalToDualConnectivityDataMapper> m_mapper;
template <size_t Dimension>
void _buildDiamondConnectivityDescriptor(const Connectivity<Dimension>&, ConnectivityDescriptor&);
@@ -30,7 +30,7 @@ class DiamondDualConnectivityBuilder : public ConnectivityBuilderBase
DiamondDualConnectivityBuilder(const IConnectivity&);
public:
- std::shared_ptr<IConnectivityToDualConnectivityDataMapper>
+ std::shared_ptr<IPrimalToDualConnectivityDataMapper>
mapper() const
{
return m_mapper;
diff --git a/src/mesh/DiamondDualMeshBuilder.cpp b/src/mesh/DiamondDualMeshBuilder.cpp
index 6276012f66faf8101a073fcf22e698a6d70fb3ba..48a4646bef234964de28065c2bf6824b05af7247 100644
--- a/src/mesh/DiamondDualMeshBuilder.cpp
+++ b/src/mesh/DiamondDualMeshBuilder.cpp
@@ -1,12 +1,12 @@
#include <mesh/DiamondDualMeshBuilder.hpp>
#include <mesh/Connectivity.hpp>
-#include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp>
#include <mesh/DualConnectivityManager.hpp>
#include <mesh/ItemValueUtils.hpp>
#include <mesh/Mesh.hpp>
#include <mesh/MeshData.hpp>
#include <mesh/MeshDataManager.hpp>
+#include <mesh/PrimalToDiamondDualConnectivityDataMapper.hpp>
template <size_t Dimension>
void
@@ -30,11 +30,11 @@ DiamondDualMeshBuilder::_buildDualDiamondMeshFrom(const std::shared_ptr<const IM
MeshData<Dimension>& primal_mesh_data = MeshDataManager::instance().getMeshData(primal_mesh);
const CellValue<const TinyVector<Dimension>> primal_xj = primal_mesh_data.xj();
- std::shared_ptr connectivity_to_diamond_dual_connectivity_data_mapper =
- manager.getConnectivityToDiamondDualConnectivityDataMapper(primal_mesh.connectivity());
+ std::shared_ptr primal_to_diamond_dual_connectivity_data_mapper =
+ manager.getPrimalToDiamondDualConnectivityDataMapper(primal_mesh.connectivity());
NodeValue<TinyVector<Dimension>> diamond_xr{diamond_connectivity};
- connectivity_to_diamond_dual_connectivity_data_mapper->toDualNode(primal_xr, primal_xj, diamond_xr);
+ primal_to_diamond_dual_connectivity_data_mapper->toDualNode(primal_xr, primal_xj, diamond_xr);
m_mesh = std::make_shared<MeshType>(p_diamond_connectivity, diamond_xr);
}
diff --git a/src/mesh/DualConnectivityManager.cpp b/src/mesh/DualConnectivityManager.cpp
index 87c154dc93c48d81ad6e05a49f65fe295e69e316..5a09a8214044b198ef7ce4592e708f4987b270a4 100644
--- a/src/mesh/DualConnectivityManager.cpp
+++ b/src/mesh/DualConnectivityManager.cpp
@@ -1,11 +1,11 @@
#include <utils/PugsAssert.hpp>
#include <mesh/Connectivity.hpp>
-#include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp>
-#include <mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp>
#include <mesh/DiamondDualConnectivityBuilder.hpp>
#include <mesh/DualConnectivityManager.hpp>
#include <mesh/MedianDualConnectivityBuilder.hpp>
+#include <mesh/PrimalToDiamondDualConnectivityDataMapper.hpp>
+#include <mesh/PrimalToMedianDualConnectivityDataMapper.hpp>
#include <utils/Exceptions.hpp>
#include <sstream>
@@ -25,10 +25,10 @@ DualConnectivityManager::destroy()
Assert(m_instance != nullptr, "DualConnectivityManager was not created!");
// LCOV_EXCL_START
- if (m_instance->m_connectivity_to_dual_connectivity_info_map.size() > 0) {
+ if (m_instance->m_primal_to_dual_connectivity_info_map.size() > 0) {
std::stringstream error;
error << ": some connectivities are still registered\n";
- for (const auto& [key, diamond_dual_connectivity_info] : m_instance->m_connectivity_to_dual_connectivity_info_map) {
+ for (const auto& [key, diamond_dual_connectivity_info] : m_instance->m_primal_to_dual_connectivity_info_map) {
error << " - connectivity " << rang::fgB::magenta << key.second << rang::style::reset << ": " << name(key.first)
<< " dual connectivity of " << rang::fgB::yellow << diamond_dual_connectivity_info.dualConnectivity().get()
<< rang::style::reset << '\n';
@@ -46,10 +46,10 @@ DualConnectivityManager::deleteConnectivity(const IConnectivity* p_connectivity)
bool has_removed = false;
do {
has_removed = false;
- for (const auto& [key, dual_connectivity] : m_connectivity_to_dual_connectivity_info_map) {
+ for (const auto& [key, dual_connectivity] : m_primal_to_dual_connectivity_info_map) {
const auto& [type, p_parent_connectivity] = key;
if (p_connectivity == p_parent_connectivity) {
- m_connectivity_to_dual_connectivity_info_map.erase(key);
+ m_primal_to_dual_connectivity_info_map.erase(key);
has_removed = true;
break;
}
@@ -63,7 +63,7 @@ DualConnectivityManager::_buildDualConnectivity(const Key& key, const IConnectiv
{
DualConnectivityBuilderType builder{connectivity};
DualConnectivityInfo connectivity_info{builder.connectivity(), builder.mapper()};
- m_connectivity_to_dual_connectivity_info_map[key] = connectivity_info;
+ m_primal_to_dual_connectivity_info_map[key] = connectivity_info;
return connectivity_info;
}
@@ -73,8 +73,8 @@ DualConnectivityManager::_getDualConnectivityInfo(const DualMeshType& type, cons
const IConnectivity* p_connectivity = &connectivity;
auto key = std::make_pair(type, p_connectivity);
- if (auto i_connectivity = m_connectivity_to_dual_connectivity_info_map.find(key);
- i_connectivity != m_connectivity_to_dual_connectivity_info_map.end()) {
+ if (auto i_connectivity = m_primal_to_dual_connectivity_info_map.find(key);
+ i_connectivity != m_primal_to_dual_connectivity_info_map.end()) {
return i_connectivity->second;
} else {
switch (type) {
@@ -102,13 +102,13 @@ DualConnectivityManager::getDiamondDualConnectivity(const Connectivity<Dimension
}
template <size_t Dimension>
-std::shared_ptr<const ConnectivityToDiamondDualConnectivityDataMapper<Dimension>>
-DualConnectivityManager::getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>& connectivity)
+std::shared_ptr<const PrimalToDiamondDualConnectivityDataMapper<Dimension>>
+DualConnectivityManager::getPrimalToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>& connectivity)
{
auto i_data_mapper =
this->_getDualConnectivityInfo(DualMeshType::Diamond, connectivity).connectivityToDualConnectivityDataMapper();
auto diamond_data_mapper =
- std::dynamic_pointer_cast<const ConnectivityToDiamondDualConnectivityDataMapper<Dimension>>(i_data_mapper);
+ std::dynamic_pointer_cast<const PrimalToDiamondDualConnectivityDataMapper<Dimension>>(i_data_mapper);
if (diamond_data_mapper.use_count() > 0) {
return diamond_data_mapper;
@@ -128,13 +128,13 @@ DualConnectivityManager::getMedianDualConnectivity(const Connectivity<Dimension>
}
template <size_t Dimension>
-std::shared_ptr<const ConnectivityToMedianDualConnectivityDataMapper<Dimension>>
-DualConnectivityManager::getConnectivityToMedianDualConnectivityDataMapper(const Connectivity<Dimension>& connectivity)
+std::shared_ptr<const PrimalToMedianDualConnectivityDataMapper<Dimension>>
+DualConnectivityManager::getPrimalToMedianDualConnectivityDataMapper(const Connectivity<Dimension>& connectivity)
{
auto i_data_mapper =
this->_getDualConnectivityInfo(DualMeshType::Median, connectivity).connectivityToDualConnectivityDataMapper();
auto data_mapper =
- std::dynamic_pointer_cast<const ConnectivityToMedianDualConnectivityDataMapper<Dimension>>(i_data_mapper);
+ std::dynamic_pointer_cast<const PrimalToMedianDualConnectivityDataMapper<Dimension>>(i_data_mapper);
if (data_mapper.use_count() > 0) {
return data_mapper;
@@ -154,14 +154,14 @@ template std::shared_ptr<const Connectivity<2>> DualConnectivityManager::getDiam
template std::shared_ptr<const Connectivity<3>> DualConnectivityManager::getDiamondDualConnectivity(
const Connectivity<3>& connectivity);
-template std::shared_ptr<const ConnectivityToDiamondDualConnectivityDataMapper<1>>
-DualConnectivityManager::getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<1>&);
+template std::shared_ptr<const PrimalToDiamondDualConnectivityDataMapper<1>>
+DualConnectivityManager::getPrimalToDiamondDualConnectivityDataMapper(const Connectivity<1>&);
-template std::shared_ptr<const ConnectivityToDiamondDualConnectivityDataMapper<2>>
-DualConnectivityManager::getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<2>&);
+template std::shared_ptr<const PrimalToDiamondDualConnectivityDataMapper<2>>
+DualConnectivityManager::getPrimalToDiamondDualConnectivityDataMapper(const Connectivity<2>&);
-template std::shared_ptr<const ConnectivityToDiamondDualConnectivityDataMapper<3>>
-DualConnectivityManager::getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<3>&);
+template std::shared_ptr<const PrimalToDiamondDualConnectivityDataMapper<3>>
+DualConnectivityManager::getPrimalToDiamondDualConnectivityDataMapper(const Connectivity<3>&);
template std::shared_ptr<const Connectivity<1>> DualConnectivityManager::getMedianDualConnectivity(
const Connectivity<1>& connectivity);
@@ -172,11 +172,11 @@ template std::shared_ptr<const Connectivity<2>> DualConnectivityManager::getMedi
template std::shared_ptr<const Connectivity<3>> DualConnectivityManager::getMedianDualConnectivity(
const Connectivity<3>& connectivity);
-template std::shared_ptr<const ConnectivityToMedianDualConnectivityDataMapper<1>>
-DualConnectivityManager::getConnectivityToMedianDualConnectivityDataMapper(const Connectivity<1>&);
+template std::shared_ptr<const PrimalToMedianDualConnectivityDataMapper<1>>
+DualConnectivityManager::getPrimalToMedianDualConnectivityDataMapper(const Connectivity<1>&);
-template std::shared_ptr<const ConnectivityToMedianDualConnectivityDataMapper<2>>
-DualConnectivityManager::getConnectivityToMedianDualConnectivityDataMapper(const Connectivity<2>&);
+template std::shared_ptr<const PrimalToMedianDualConnectivityDataMapper<2>>
+DualConnectivityManager::getPrimalToMedianDualConnectivityDataMapper(const Connectivity<2>&);
-template std::shared_ptr<const ConnectivityToMedianDualConnectivityDataMapper<3>>
-DualConnectivityManager::getConnectivityToMedianDualConnectivityDataMapper(const Connectivity<3>&);
+template std::shared_ptr<const PrimalToMedianDualConnectivityDataMapper<3>>
+DualConnectivityManager::getPrimalToMedianDualConnectivityDataMapper(const Connectivity<3>&);
diff --git a/src/mesh/DualConnectivityManager.hpp b/src/mesh/DualConnectivityManager.hpp
index 07acd018aa561c61b4b4c63cff3bc3464c2ee9c5..a45e2226dc428f397389ed2445e435e6b9edbc2f 100644
--- a/src/mesh/DualConnectivityManager.hpp
+++ b/src/mesh/DualConnectivityManager.hpp
@@ -3,7 +3,7 @@
#include <mesh/DualMeshType.hpp>
#include <mesh/IConnectivity.hpp>
-#include <mesh/IConnectivityToDualConnectivityDataMapper.hpp>
+#include <mesh/IPrimalToDualConnectivityDataMapper.hpp>
#include <memory>
#include <unordered_map>
@@ -12,10 +12,10 @@ template <size_t Dimension>
class Connectivity;
template <size_t Dimension>
-class ConnectivityToDiamondDualConnectivityDataMapper;
+class PrimalToDiamondDualConnectivityDataMapper;
template <size_t Dimension>
-class ConnectivityToMedianDualConnectivityDataMapper;
+class PrimalToMedianDualConnectivityDataMapper;
class DualConnectivityManager
{
@@ -24,7 +24,7 @@ class DualConnectivityManager
{
private:
std::shared_ptr<const IConnectivity> m_dual_connectivity;
- std::shared_ptr<const IConnectivityToDualConnectivityDataMapper> m_connectivity_to_dual_connectivity_data_mapper;
+ std::shared_ptr<const IPrimalToDualConnectivityDataMapper> m_primal_to_dual_connectivity_data_mapper;
public:
PUGS_INLINE
@@ -35,10 +35,10 @@ class DualConnectivityManager
}
PUGS_INLINE
- std::shared_ptr<const IConnectivityToDualConnectivityDataMapper>
+ std::shared_ptr<const IPrimalToDualConnectivityDataMapper>
connectivityToDualConnectivityDataMapper()
{
- return m_connectivity_to_dual_connectivity_data_mapper;
+ return m_primal_to_dual_connectivity_data_mapper;
}
DualConnectivityInfo& operator=(const DualConnectivityInfo&) = default;
@@ -48,11 +48,11 @@ class DualConnectivityManager
DualConnectivityInfo(const DualConnectivityInfo&) = default;
DualConnectivityInfo(DualConnectivityInfo&&) = default;
- DualConnectivityInfo(const std::shared_ptr<const IConnectivity>& dual_connectivity,
- const std::shared_ptr<const IConnectivityToDualConnectivityDataMapper>&
- connectivity_to_dual_connectivity_data_mapper)
+ DualConnectivityInfo(
+ const std::shared_ptr<const IConnectivity>& dual_connectivity,
+ const std::shared_ptr<const IPrimalToDualConnectivityDataMapper>& primal_to_dual_connectivity_data_mapper)
: m_dual_connectivity{dual_connectivity},
- m_connectivity_to_dual_connectivity_data_mapper{connectivity_to_dual_connectivity_data_mapper}
+ m_primal_to_dual_connectivity_data_mapper{primal_to_dual_connectivity_data_mapper}
{}
~DualConnectivityInfo() = default;
@@ -73,7 +73,7 @@ class DualConnectivityManager
DualConnectivityInfo _getDualConnectivityInfo(const DualMeshType& type, const IConnectivity& connectivity);
- std::unordered_map<Key, DualConnectivityInfo, HashKey> m_connectivity_to_dual_connectivity_info_map;
+ std::unordered_map<Key, DualConnectivityInfo, HashKey> m_primal_to_dual_connectivity_info_map;
static DualConnectivityManager* m_instance;
@@ -101,15 +101,15 @@ class DualConnectivityManager
std::shared_ptr<const Connectivity<Dimension>> getMedianDualConnectivity(const Connectivity<Dimension>&);
template <size_t Dimension>
- std::shared_ptr<const ConnectivityToMedianDualConnectivityDataMapper<Dimension>>
- getConnectivityToMedianDualConnectivityDataMapper(const Connectivity<Dimension>&);
+ std::shared_ptr<const PrimalToMedianDualConnectivityDataMapper<Dimension>>
+ getPrimalToMedianDualConnectivityDataMapper(const Connectivity<Dimension>&);
template <size_t Dimension>
std::shared_ptr<const Connectivity<Dimension>> getDiamondDualConnectivity(const Connectivity<Dimension>&);
template <size_t Dimension>
- std::shared_ptr<const ConnectivityToDiamondDualConnectivityDataMapper<Dimension>>
- getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>&);
+ std::shared_ptr<const PrimalToDiamondDualConnectivityDataMapper<Dimension>>
+ getPrimalToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>&);
};
#endif // DUAL_CONNECTIVITY_MANAGER_HPP
diff --git a/src/mesh/IConnectivityToDualConnectivityDataMapper.hpp b/src/mesh/IConnectivityToDualConnectivityDataMapper.hpp
deleted file mode 100644
index 4248a15665d2e3acd6dafc4f2081f8bec7f03dfd..0000000000000000000000000000000000000000
--- a/src/mesh/IConnectivityToDualConnectivityDataMapper.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef I_CONNECTIVITY_TO_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
-#define I_CONNECTIVITY_TO_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
-
-class IConnectivityToDualConnectivityDataMapper
-{
- public:
- IConnectivityToDualConnectivityDataMapper(const IConnectivityToDualConnectivityDataMapper&) = delete;
- IConnectivityToDualConnectivityDataMapper(IConnectivityToDualConnectivityDataMapper&&) = delete;
-
- IConnectivityToDualConnectivityDataMapper() = default;
- virtual ~IConnectivityToDualConnectivityDataMapper() = default;
-};
-
-#endif // I_CONNECTIVITY_TO_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
diff --git a/src/mesh/IPrimalToDualConnectivityDataMapper.hpp b/src/mesh/IPrimalToDualConnectivityDataMapper.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..56bf51733c0105694c01a24ffb25fa01ccf973c6
--- /dev/null
+++ b/src/mesh/IPrimalToDualConnectivityDataMapper.hpp
@@ -0,0 +1,14 @@
+#ifndef I_PRIMAL_TO_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#define I_PRIMAL_TO_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+
+class IPrimalToDualConnectivityDataMapper
+{
+ public:
+ IPrimalToDualConnectivityDataMapper(const IPrimalToDualConnectivityDataMapper&) = delete;
+ IPrimalToDualConnectivityDataMapper(IPrimalToDualConnectivityDataMapper&&) = delete;
+
+ IPrimalToDualConnectivityDataMapper() = default;
+ virtual ~IPrimalToDualConnectivityDataMapper() = default;
+};
+
+#endif // I_PRIMAL_TO_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
diff --git a/src/mesh/MedianDualConnectivityBuilder.cpp b/src/mesh/MedianDualConnectivityBuilder.cpp
index cd8f1c62459846c1645330ada2f90811ec71b456..ee345aa72646f705cae371ca0bc3d605051298b9 100644
--- a/src/mesh/MedianDualConnectivityBuilder.cpp
+++ b/src/mesh/MedianDualConnectivityBuilder.cpp
@@ -3,9 +3,9 @@
#include <mesh/Connectivity.hpp>
#include <mesh/ConnectivityDescriptor.hpp>
#include <mesh/ConnectivityDispatcher.hpp>
-#include <mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp>
#include <mesh/ItemValueUtils.hpp>
#include <mesh/Mesh.hpp>
+#include <mesh/PrimalToMedianDualConnectivityDataMapper.hpp>
#include <mesh/RefId.hpp>
#include <utils/Array.hpp>
#include <utils/Messenger.hpp>
@@ -380,14 +380,13 @@ MedianDualConnectivityBuilder::_buildConnectivityFrom<2>(const IConnectivity& i_
m_connectivity = ConnectivityType::build(dual_descriptor);
- m_mapper =
- std::make_shared<ConnectivityToMedianDualConnectivityDataMapper<2>>(primal_connectivity,
- dynamic_cast<const ConnectivityType&>(
- *m_connectivity),
- m_primal_boundary_node_to_dual_node_map,
- m_primal_face_to_dual_node_map,
- m_primal_cell_to_dual_node_map,
- m_primal_node_to_dual_cell_map);
+ m_mapper = std::make_shared<PrimalToMedianDualConnectivityDataMapper<2>>(primal_connectivity,
+ dynamic_cast<const ConnectivityType&>(
+ *m_connectivity),
+ m_primal_boundary_node_to_dual_node_map,
+ m_primal_face_to_dual_node_map,
+ m_primal_cell_to_dual_node_map,
+ m_primal_node_to_dual_cell_map);
}
MedianDualConnectivityBuilder::MedianDualConnectivityBuilder(const IConnectivity& connectivity)
diff --git a/src/mesh/MedianDualConnectivityBuilder.hpp b/src/mesh/MedianDualConnectivityBuilder.hpp
index 6ab278b29e27ee6d7dd25b2ef6819e9c025c87d3..71efff92a83a86b143afd61ca86610a8396dab09 100644
--- a/src/mesh/MedianDualConnectivityBuilder.hpp
+++ b/src/mesh/MedianDualConnectivityBuilder.hpp
@@ -2,7 +2,7 @@
#define MEDIAN_DUAL_CONNECTIVITY_BUILDER_HPP
#include <mesh/ConnectivityBuilderBase.hpp>
-#include <mesh/IConnectivityToDualConnectivityDataMapper.hpp>
+#include <mesh/IPrimalToDualConnectivityDataMapper.hpp>
#include <mesh/ItemIdToItemIdMap.hpp>
#include <memory>
@@ -19,7 +19,7 @@ class MedianDualConnectivityBuilder : public ConnectivityBuilderBase
NodeIdToNodeIdMap m_primal_boundary_node_to_dual_node_map;
NodeIdToCellIdMap m_primal_node_to_dual_cell_map;
- std::shared_ptr<IConnectivityToDualConnectivityDataMapper> m_mapper;
+ std::shared_ptr<IPrimalToDualConnectivityDataMapper> m_mapper;
template <size_t Dimension>
void _buildConnectivityDescriptor(const Connectivity<Dimension>&, ConnectivityDescriptor&);
@@ -31,7 +31,7 @@ class MedianDualConnectivityBuilder : public ConnectivityBuilderBase
MedianDualConnectivityBuilder(const IConnectivity&);
public:
- std::shared_ptr<IConnectivityToDualConnectivityDataMapper>
+ std::shared_ptr<IPrimalToDualConnectivityDataMapper>
mapper() const
{
return m_mapper;
diff --git a/src/mesh/MedianDualMeshBuilder.cpp b/src/mesh/MedianDualMeshBuilder.cpp
index 9e3a756956bed665f52c1e05725733ca28eb5f86..87af0be245da317c6f6b87f000b42af0b1166ae7 100644
--- a/src/mesh/MedianDualMeshBuilder.cpp
+++ b/src/mesh/MedianDualMeshBuilder.cpp
@@ -1,12 +1,12 @@
#include <mesh/MedianDualMeshBuilder.hpp>
#include <mesh/Connectivity.hpp>
-#include <mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp>
#include <mesh/DualConnectivityManager.hpp>
#include <mesh/ItemValueUtils.hpp>
#include <mesh/Mesh.hpp>
#include <mesh/MeshData.hpp>
#include <mesh/MeshDataManager.hpp>
+#include <mesh/PrimalToMedianDualConnectivityDataMapper.hpp>
template <size_t Dimension>
void
@@ -33,11 +33,11 @@ MedianDualMeshBuilder::_buildMedianDualMeshFrom(const std::shared_ptr<const IMes
const CellValue<const TinyVector<Dimension>> primal_xj = primal_mesh_data.xj();
const FaceValue<const TinyVector<Dimension>> primal_xl = primal_mesh_data.xl();
- std::shared_ptr connectivity_to_dual_connectivity_data_mapper =
- manager.getConnectivityToMedianDualConnectivityDataMapper(primal_mesh.connectivity());
+ std::shared_ptr primal_to_dual_connectivity_data_mapper =
+ manager.getPrimalToMedianDualConnectivityDataMapper(primal_mesh.connectivity());
NodeValue<TinyVector<Dimension>> dual_xr{dual_connectivity};
- connectivity_to_dual_connectivity_data_mapper->toDualNode(primal_xr, primal_xl, primal_xj, dual_xr);
+ primal_to_dual_connectivity_data_mapper->toDualNode(primal_xr, primal_xl, primal_xj, dual_xr);
m_mesh = std::make_shared<MeshType>(p_dual_connectivity, dual_xr);
}
diff --git a/src/mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp b/src/mesh/PrimalToDiamondDualConnectivityDataMapper.hpp
similarity index 87%
rename from src/mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp
rename to src/mesh/PrimalToDiamondDualConnectivityDataMapper.hpp
index be6833eb51ec7108ecd265843d9686d480f37147..a8e7d0e1afe630aa9ebb363ca7c5b907e04f303e 100644
--- a/src/mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp
+++ b/src/mesh/PrimalToDiamondDualConnectivityDataMapper.hpp
@@ -1,15 +1,15 @@
-#ifndef CONNECTIVITY_TO_DIAMOND_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
-#define CONNECTIVITY_TO_DIAMOND_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#ifndef PRIMAL_TO_DIAMOND_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#define PRIMAL_TO_DIAMOND_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
#include <mesh/Connectivity.hpp>
-#include <mesh/IConnectivityToDualConnectivityDataMapper.hpp>
+#include <mesh/IPrimalToDualConnectivityDataMapper.hpp>
#include <mesh/ItemIdToItemIdMap.hpp>
#include <mesh/ItemValue.hpp>
#include <utils/Array.hpp>
#include <utils/PugsAssert.hpp>
template <size_t Dimension>
-class ConnectivityToDiamondDualConnectivityDataMapper : public IConnectivityToDualConnectivityDataMapper
+class PrimalToDiamondDualConnectivityDataMapper : public IPrimalToDualConnectivityDataMapper
{
private:
const IConnectivity* m_primal_connectivity;
@@ -125,11 +125,11 @@ class ConnectivityToDiamondDualConnectivityDataMapper : public IConnectivityToDu
});
}
- ConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>& primal_connectivity,
- const Connectivity<Dimension>& dual_connectivity,
- const ConstNodeIdToNodeIdMap& primal_node_to_dual_node_map,
- const ConstCellIdToNodeIdMap& primal_cell_to_dual_node_map,
- const ConstFaceIdToCellIdMap& primal_face_to_dual_cell_map)
+ PrimalToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>& primal_connectivity,
+ const Connectivity<Dimension>& dual_connectivity,
+ const ConstNodeIdToNodeIdMap& primal_node_to_dual_node_map,
+ const ConstCellIdToNodeIdMap& primal_cell_to_dual_node_map,
+ const ConstFaceIdToCellIdMap& primal_face_to_dual_cell_map)
: m_primal_connectivity{&primal_connectivity},
m_dual_connectivity{&dual_connectivity},
m_primal_node_to_dual_node_map{primal_node_to_dual_node_map},
@@ -138,4 +138,4 @@ class ConnectivityToDiamondDualConnectivityDataMapper : public IConnectivityToDu
{}
};
-#endif // CONNECTIVITY_TO_DIAMOND_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#endif // PRIMAL_TO_DIAMOND_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
diff --git a/src/mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp b/src/mesh/PrimalToMedianDualConnectivityDataMapper.hpp
similarity index 88%
rename from src/mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp
rename to src/mesh/PrimalToMedianDualConnectivityDataMapper.hpp
index 822e813e1edbe0addb313737417d7d8d315e167c..c511930ebc5909c27683bc382c4246cfede412de 100644
--- a/src/mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp
+++ b/src/mesh/PrimalToMedianDualConnectivityDataMapper.hpp
@@ -1,15 +1,15 @@
-#ifndef CONNECTIVITY_TO_MEDIAN_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
-#define CONNECTIVITY_TO_MEDIAN_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#ifndef PRIMAL_TO_MEDIAN_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#define PRIMAL_TO_MEDIAN_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
#include <mesh/Connectivity.hpp>
-#include <mesh/IConnectivityToDualConnectivityDataMapper.hpp>
+#include <mesh/IPrimalToDualConnectivityDataMapper.hpp>
#include <mesh/ItemIdToItemIdMap.hpp>
#include <mesh/ItemValue.hpp>
#include <utils/Array.hpp>
#include <utils/PugsAssert.hpp>
template <size_t Dimension>
-class ConnectivityToMedianDualConnectivityDataMapper : public IConnectivityToDualConnectivityDataMapper
+class PrimalToMedianDualConnectivityDataMapper : public IPrimalToDualConnectivityDataMapper
{
private:
const IConnectivity* m_primal_connectivity;
@@ -154,12 +154,12 @@ class ConnectivityToMedianDualConnectivityDataMapper : public IConnectivityToDua
});
}
- ConnectivityToMedianDualConnectivityDataMapper(const Connectivity<Dimension>& primal_connectivity,
- const Connectivity<Dimension>& dual_connectivity,
- const ConstNodeIdToNodeIdMap& primal_boundary_to_dual_node_map,
- const ConstFaceIdToNodeIdMap& primal_face_to_dual_node_map,
- const ConstCellIdToNodeIdMap& primal_cell_to_dual_node_map,
- const ConstNodeIdToCellIdMap& primal_node_to_dual_cell_map)
+ PrimalToMedianDualConnectivityDataMapper(const Connectivity<Dimension>& primal_connectivity,
+ const Connectivity<Dimension>& dual_connectivity,
+ const ConstNodeIdToNodeIdMap& primal_boundary_to_dual_node_map,
+ const ConstFaceIdToNodeIdMap& primal_face_to_dual_node_map,
+ const ConstCellIdToNodeIdMap& primal_cell_to_dual_node_map,
+ const ConstNodeIdToCellIdMap& primal_node_to_dual_cell_map)
: m_primal_connectivity{&primal_connectivity},
m_dual_connectivity{&dual_connectivity},
m_primal_boundary_node_to_dual_node_map{primal_boundary_to_dual_node_map},
@@ -169,4 +169,4 @@ class ConnectivityToMedianDualConnectivityDataMapper : public IConnectivityToDua
{}
};
-#endif // CONNECTIVITY_TO_MEDIAN_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
+#endif // PRIMAL_TO_MEDIAN_DUAL_CONNECTIVITY_DATA_MAPPER_HPP
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3b8ee67b3607e01c4c49488daac9262f3937ba20..6edfaeb58b24d9f2d1c4986b632861ecc1f77a5e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -56,8 +56,6 @@ add_executable (unit_tests
test_CellIntegrator.cpp
test_ConsoleManager.cpp
test_CG.cpp
- test_ConnectivityToDiamondDualConnectivityDataMapper.cpp
- test_ConnectivityToMedianDualConnectivityDataMapper.cpp
test_ContinueProcessor.cpp
test_ConcatExpressionProcessor.cpp
test_CRSGraph.cpp
@@ -104,6 +102,8 @@ add_executable (unit_tests
test_OStream.cpp
test_ParseError.cpp
test_PETScUtils.cpp
+ test_PrimalToDiamondDualConnectivityDataMapper.cpp
+ test_PrimalToMedianDualConnectivityDataMapper.cpp
test_PrismGaussQuadrature.cpp
test_PrismTransformation.cpp
test_PugsAssert.cpp
diff --git a/tests/test_DualConnectivityManager.cpp b/tests/test_DualConnectivityManager.cpp
index 1c5b26cd4330731392ba46757dcad3bc2566e5e7..00e42e44fa592b4f1c1cbede7fb37b4b5ad64dfc 100644
--- a/tests/test_DualConnectivityManager.cpp
+++ b/tests/test_DualConnectivityManager.cpp
@@ -23,7 +23,7 @@ TEST_CASE("DualConnectivityManager", "[mesh]")
DualConnectivityManager::instance().getDiamondDualConnectivity(connectivity);
std::shared_ptr p_diamond_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToDiamondDualConnectivityDataMapper(connectivity);
+ DualConnectivityManager::instance().getPrimalToDiamondDualConnectivityDataMapper(connectivity);
const auto ref_counter = p_diamond_dual_connectivity.use_count();
const auto ref_counter_mapper = p_diamond_dual_connectivity_mapper.use_count();
@@ -32,7 +32,7 @@ TEST_CASE("DualConnectivityManager", "[mesh]")
std::shared_ptr p_diamond_dual_connectivity2 =
DualConnectivityManager::instance().getDiamondDualConnectivity(connectivity);
std::shared_ptr p_diamond_dual_connectivity_mapper2 =
- DualConnectivityManager::instance().getConnectivityToDiamondDualConnectivityDataMapper(connectivity);
+ DualConnectivityManager::instance().getPrimalToDiamondDualConnectivityDataMapper(connectivity);
REQUIRE(p_diamond_dual_connectivity == p_diamond_dual_connectivity2);
REQUIRE(p_diamond_dual_connectivity.use_count() == ref_counter + 1);
@@ -67,7 +67,7 @@ TEST_CASE("DualConnectivityManager", "[mesh]")
DualConnectivityManager::instance().getMedianDualConnectivity(connectivity);
std::shared_ptr p_median_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToMedianDualConnectivityDataMapper(connectivity);
+ DualConnectivityManager::instance().getPrimalToMedianDualConnectivityDataMapper(connectivity);
const auto ref_counter = p_median_dual_connectivity.use_count();
const auto ref_counter_mapper = p_median_dual_connectivity_mapper.use_count();
@@ -77,7 +77,7 @@ TEST_CASE("DualConnectivityManager", "[mesh]")
DualConnectivityManager::instance().getMedianDualConnectivity(connectivity);
std::shared_ptr p_median_dual_connectivity_mapper2 =
- DualConnectivityManager::instance().getConnectivityToMedianDualConnectivityDataMapper(connectivity);
+ DualConnectivityManager::instance().getPrimalToMedianDualConnectivityDataMapper(connectivity);
REQUIRE(p_median_dual_connectivity == p_median_dual_connectivity2);
REQUIRE(p_median_dual_connectivity.use_count() == ref_counter + 1);
@@ -114,9 +114,9 @@ TEST_CASE("DualConnectivityManager", "[mesh]")
DualConnectivityManager::instance().getDiamondDualConnectivity(connectivity);
std::shared_ptr p_median_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToMedianDualConnectivityDataMapper(connectivity);
+ DualConnectivityManager::instance().getPrimalToMedianDualConnectivityDataMapper(connectivity);
std::shared_ptr p_diamond_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToDiamondDualConnectivityDataMapper(connectivity);
+ DualConnectivityManager::instance().getPrimalToDiamondDualConnectivityDataMapper(connectivity);
const auto median_ref_counter = p_median_dual_connectivity.use_count();
const auto diamond_ref_counter = p_diamond_dual_connectivity.use_count();
diff --git a/tests/test_ConnectivityToDiamondDualConnectivityDataMapper.cpp b/tests/test_PrimalToDiamondDualConnectivityDataMapper.cpp
similarity index 67%
rename from tests/test_ConnectivityToDiamondDualConnectivityDataMapper.cpp
rename to tests/test_PrimalToDiamondDualConnectivityDataMapper.cpp
index b51fbc6fe3546aea6be3c726415909458cd747ec..ec628b753f6df89dde29634cd325ed2d72169d03 100644
--- a/tests/test_ConnectivityToDiamondDualConnectivityDataMapper.cpp
+++ b/tests/test_PrimalToDiamondDualConnectivityDataMapper.cpp
@@ -2,15 +2,15 @@
#include <catch2/matchers/catch_matchers_all.hpp>
#include <MeshDataBaseForTests.hpp>
-#include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp>
#include <mesh/DualConnectivityManager.hpp>
+#include <mesh/PrimalToDiamondDualConnectivityDataMapper.hpp>
#include <mesh/Connectivity.hpp>
#include <mesh/Mesh.hpp>
// clazy:excludeall=non-pod-global-static
-TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
+TEST_CASE("PrimalToDiamondDualConnectivityDataMapper", "[mesh]")
{
SECTION("1D")
{
@@ -26,9 +26,9 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
DualConnectivityManager::instance().getDiamondDualConnectivity(primal_connectivity);
const ConnectivityType& dual_connectivity = *p_diamond_dual_connectivity;
- std::shared_ptr p_connectivity_to_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToDiamondDualConnectivityDataMapper(primal_connectivity);
- const auto& connectivity_to_dual_connectivity_mapper = *p_connectivity_to_dual_connectivity_mapper;
+ std::shared_ptr p_primal_to_dual_connectivity_mapper =
+ DualConnectivityManager::instance().getPrimalToDiamondDualConnectivityDataMapper(primal_connectivity);
+ const auto& primal_to_dual_connectivity_mapper = *p_primal_to_dual_connectivity_mapper;
SECTION("check data transfer between primal faces to dual cells")
{
@@ -38,7 +38,7 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
CellValue<size_t> dual_from_primal_face_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualCell(primal_face_value, dual_from_primal_face_value);
+ primal_to_dual_connectivity_mapper.toDualCell(primal_face_value, dual_from_primal_face_value);
{
bool correct_value = true;
@@ -51,7 +51,7 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
{
bool is_same = true;
FaceValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value, primal_from_dual_cell_value);
for (FaceId face_id = 0; face_id < primal_connectivity.numberOfFaces(); ++face_id) {
is_same &= (primal_from_dual_cell_value[face_id] == primal_face_value[face_id]);
}
@@ -59,18 +59,18 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(FaceValue<size_t>{dual_connectivity},
- dual_from_primal_face_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(FaceValue<size_t>{dual_connectivity},
+ dual_from_primal_face_value),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(primal_face_value,
- CellValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(primal_face_value,
+ CellValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value,
- FaceValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value,
+ FaceValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
- primal_face_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
+ primal_face_value),
"unexpected connectivity for dual CellValue");
#endif // NDEBUG
@@ -98,8 +98,8 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
NodeValue<size_t> dual_from_primal_cell_and_node_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
- dual_from_primal_cell_and_node_value);
+ primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
+ dual_from_primal_cell_and_node_value);
{
const auto& dual_node_to_cell_matrix = dual_connectivity.nodeToCellMatrix();
@@ -117,8 +117,8 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
bool is_same = true;
NodeValue<size_t> primal_from_dual_node_value{primal_connectivity};
CellValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- primal_from_dual_node_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ primal_from_dual_node_value, primal_from_dual_cell_value);
for (CellId cell_id = 0; cell_id < primal_connectivity.numberOfCells(); ++cell_id) {
is_same &= (primal_cell_value[cell_id] == primal_from_dual_cell_value[cell_id]);
}
@@ -133,28 +133,28 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
- primal_cell_value,
- dual_from_primal_cell_and_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
+ primal_cell_value,
+ dual_from_primal_cell_and_node_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value,
- CellValue<size_t>{dual_connectivity},
- dual_from_primal_cell_and_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value,
+ CellValue<size_t>{dual_connectivity},
+ dual_from_primal_cell_and_node_value),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
- NodeValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
+ NodeValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- NodeValue<size_t>{dual_connectivity},
- primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ NodeValue<size_t>{dual_connectivity},
+ primal_cell_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- primal_node_value,
- CellValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ primal_node_value,
+ CellValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
- primal_node_value, primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
+ primal_node_value, primal_cell_value),
"unexpected connectivity for dual NodeValue");
#endif // NDEBUG
@@ -175,9 +175,9 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
DualConnectivityManager::instance().getDiamondDualConnectivity(primal_connectivity);
const ConnectivityType& dual_connectivity = *p_diamond_dual_connectivity;
- std::shared_ptr p_connectivity_to_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToDiamondDualConnectivityDataMapper(primal_connectivity);
- const auto& connectivity_to_dual_connectivity_mapper = *p_connectivity_to_dual_connectivity_mapper;
+ std::shared_ptr p_primal_to_dual_connectivity_mapper =
+ DualConnectivityManager::instance().getPrimalToDiamondDualConnectivityDataMapper(primal_connectivity);
+ const auto& primal_to_dual_connectivity_mapper = *p_primal_to_dual_connectivity_mapper;
SECTION("check data transfer between primal faces to dual cells")
{
@@ -191,7 +191,7 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
CellValue<size_t> dual_from_primal_face_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualCell(primal_face_value, dual_from_primal_face_value);
+ primal_to_dual_connectivity_mapper.toDualCell(primal_face_value, dual_from_primal_face_value);
{
const auto& dual_cell_to_node_matrix = dual_connectivity.cellToNodeMatrix();
@@ -206,7 +206,7 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
{
bool is_same = true;
FaceValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value, primal_from_dual_cell_value);
for (FaceId face_id = 0; face_id < primal_connectivity.numberOfFaces(); ++face_id) {
is_same &= (primal_from_dual_cell_value[face_id] == primal_face_value[face_id]);
}
@@ -214,18 +214,18 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(FaceValue<size_t>{dual_connectivity},
- dual_from_primal_face_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(FaceValue<size_t>{dual_connectivity},
+ dual_from_primal_face_value),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(primal_face_value,
- CellValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(primal_face_value,
+ CellValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value,
- FaceValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value,
+ FaceValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
- primal_face_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
+ primal_face_value),
"unexpected connectivity for dual CellValue");
#endif // NDEBUG
@@ -250,8 +250,8 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
NodeValue<size_t> dual_from_primal_cell_and_node_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
- dual_from_primal_cell_and_node_value);
+ primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
+ dual_from_primal_cell_and_node_value);
{
const auto& dual_node_to_cell_matrix = dual_connectivity.nodeToCellMatrix();
@@ -267,8 +267,8 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
bool is_same = true;
NodeValue<size_t> primal_from_dual_node_value{primal_connectivity};
CellValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- primal_from_dual_node_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ primal_from_dual_node_value, primal_from_dual_cell_value);
for (CellId cell_id = 0; cell_id < primal_connectivity.numberOfCells(); ++cell_id) {
is_same &= (primal_cell_value[cell_id] == primal_from_dual_cell_value[cell_id]);
}
@@ -280,28 +280,28 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
- primal_cell_value,
- dual_from_primal_cell_and_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
+ primal_cell_value,
+ dual_from_primal_cell_and_node_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value,
- CellValue<size_t>{dual_connectivity},
- dual_from_primal_cell_and_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value,
+ CellValue<size_t>{dual_connectivity},
+ dual_from_primal_cell_and_node_value),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
- NodeValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
+ NodeValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- NodeValue<size_t>{dual_connectivity},
- primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ NodeValue<size_t>{dual_connectivity},
+ primal_cell_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- primal_node_value,
- CellValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ primal_node_value,
+ CellValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
- primal_node_value, primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
+ primal_node_value, primal_cell_value),
"unexpected connectivity for dual NodeValue");
#endif // NDEBUG
@@ -322,9 +322,9 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
DualConnectivityManager::instance().getDiamondDualConnectivity(primal_connectivity);
const ConnectivityType& dual_connectivity = *p_diamond_dual_connectivity;
- std::shared_ptr p_connectivity_to_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToDiamondDualConnectivityDataMapper(primal_connectivity);
- const auto& connectivity_to_dual_connectivity_mapper = *p_connectivity_to_dual_connectivity_mapper;
+ std::shared_ptr p_primal_to_dual_connectivity_mapper =
+ DualConnectivityManager::instance().getPrimalToDiamondDualConnectivityDataMapper(primal_connectivity);
+ const auto& primal_to_dual_connectivity_mapper = *p_primal_to_dual_connectivity_mapper;
SECTION("check data transfer between primal faces to dual cells")
{
@@ -340,7 +340,7 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
CellValue<size_t> dual_from_primal_face_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualCell(primal_face_value, dual_from_primal_face_value);
+ primal_to_dual_connectivity_mapper.toDualCell(primal_face_value, dual_from_primal_face_value);
{
const auto& dual_cell_to_node_matrix = dual_connectivity.cellToNodeMatrix();
@@ -354,7 +354,7 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
{
bool is_same = true;
FaceValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value, primal_from_dual_cell_value);
for (FaceId face_id = 0; face_id < primal_connectivity.numberOfFaces(); ++face_id) {
is_same &= (primal_from_dual_cell_value[face_id] == primal_face_value[face_id]);
}
@@ -362,18 +362,18 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(FaceValue<size_t>{dual_connectivity},
- dual_from_primal_face_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(FaceValue<size_t>{dual_connectivity},
+ dual_from_primal_face_value),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(primal_face_value,
- CellValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(primal_face_value,
+ CellValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value,
- FaceValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_face_value,
+ FaceValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
- primal_face_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
+ primal_face_value),
"unexpected connectivity for dual CellValue");
#endif // NDEBUG
@@ -398,8 +398,8 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
NodeValue<size_t> dual_from_primal_cell_and_node_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
- dual_from_primal_cell_and_node_value);
+ primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
+ dual_from_primal_cell_and_node_value);
{
const auto& dual_node_to_cell_matrix = dual_connectivity.nodeToCellMatrix();
@@ -415,8 +415,8 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
bool is_same = true;
NodeValue<size_t> primal_from_dual_node_value{primal_connectivity};
CellValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- primal_from_dual_node_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ primal_from_dual_node_value, primal_from_dual_cell_value);
for (CellId cell_id = 0; cell_id < primal_connectivity.numberOfCells(); ++cell_id) {
is_same &= (primal_cell_value[cell_id] == primal_from_dual_cell_value[cell_id]);
}
@@ -428,28 +428,28 @@ TEST_CASE("ConnectivityToDiamondDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
- primal_cell_value,
- dual_from_primal_cell_and_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
+ primal_cell_value,
+ dual_from_primal_cell_and_node_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value,
- CellValue<size_t>{dual_connectivity},
- dual_from_primal_cell_and_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value,
+ CellValue<size_t>{dual_connectivity},
+ dual_from_primal_cell_and_node_value),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
- NodeValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_cell_value,
+ NodeValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- NodeValue<size_t>{dual_connectivity},
- primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ NodeValue<size_t>{dual_connectivity},
+ primal_cell_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
- primal_node_value,
- CellValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_cell_and_node_value,
+ primal_node_value,
+ CellValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
- primal_node_value, primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
+ primal_node_value, primal_cell_value),
"unexpected connectivity for dual NodeValue");
#endif // NDEBUG
diff --git a/tests/test_ConnectivityToMedianDualConnectivityDataMapper.cpp b/tests/test_PrimalToMedianDualConnectivityDataMapper.cpp
similarity index 65%
rename from tests/test_ConnectivityToMedianDualConnectivityDataMapper.cpp
rename to tests/test_PrimalToMedianDualConnectivityDataMapper.cpp
index 96ea229403c27ddc1243ebc68f27147b845c8fbc..2b75b88409d1f42773a68ee8297951442e1f30c3 100644
--- a/tests/test_ConnectivityToMedianDualConnectivityDataMapper.cpp
+++ b/tests/test_PrimalToMedianDualConnectivityDataMapper.cpp
@@ -2,15 +2,15 @@
#include <catch2/matchers/catch_matchers_all.hpp>
#include <MeshDataBaseForTests.hpp>
-#include <mesh/ConnectivityToMedianDualConnectivityDataMapper.hpp>
#include <mesh/DualConnectivityManager.hpp>
+#include <mesh/PrimalToMedianDualConnectivityDataMapper.hpp>
#include <mesh/Connectivity.hpp>
#include <mesh/Mesh.hpp>
// clazy:excludeall=non-pod-global-static
-TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
+TEST_CASE("PrimalToMedianDualConnectivityDataMapper", "[mesh]")
{
SECTION("2D")
{
@@ -26,9 +26,9 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
DualConnectivityManager::instance().getMedianDualConnectivity(primal_connectivity);
const ConnectivityType& dual_connectivity = *p_median_dual_connectivity;
- std::shared_ptr p_connectivity_to_dual_connectivity_mapper =
- DualConnectivityManager::instance().getConnectivityToMedianDualConnectivityDataMapper(primal_connectivity);
- const auto& connectivity_to_dual_connectivity_mapper = *p_connectivity_to_dual_connectivity_mapper;
+ std::shared_ptr p_primal_to_dual_connectivity_mapper =
+ DualConnectivityManager::instance().getPrimalToMedianDualConnectivityDataMapper(primal_connectivity);
+ const auto& primal_to_dual_connectivity_mapper = *p_primal_to_dual_connectivity_mapper;
SECTION("check data transfer between primal nodes to dual cells")
{
@@ -42,7 +42,7 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
CellValue<size_t> dual_from_primal_node_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualCell(primal_node_value, dual_from_primal_node_value);
+ primal_to_dual_connectivity_mapper.toDualCell(primal_node_value, dual_from_primal_node_value);
{
const auto& dual_cell_to_node_matrix = dual_connectivity.cellToNodeMatrix();
@@ -56,7 +56,7 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
{
bool is_same = true;
NodeValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_node_value, primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_node_value, primal_from_dual_cell_value);
for (NodeId node_id = 0; node_id < primal_connectivity.numberOfNodes(); ++node_id) {
is_same &= (primal_from_dual_cell_value[node_id] == primal_node_value[node_id]);
}
@@ -64,18 +64,18 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(NodeValue<size_t>{dual_connectivity},
- dual_from_primal_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(NodeValue<size_t>{dual_connectivity},
+ dual_from_primal_node_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualCell(primal_node_value,
- CellValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualCell(primal_node_value,
+ CellValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_node_value,
- NodeValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(dual_from_primal_node_value,
+ NodeValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
- primal_node_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualCell(CellValue<size_t>{primal_connectivity},
+ primal_node_value),
"unexpected connectivity for dual CellValue");
#endif // NDEBUG
@@ -100,8 +100,8 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
primal_node_value.fill(2);
NodeValue<size_t> dual_from_primal_value{dual_connectivity};
- connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_face_value, primal_cell_value,
- dual_from_primal_value);
+ primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, primal_face_value, primal_cell_value,
+ dual_from_primal_value);
{
const auto& dual_node_to_face_matrix = dual_connectivity.nodeToFaceMatrix();
@@ -118,10 +118,10 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
NodeValue<size_t> primal_from_dual_node_value{primal_connectivity};
FaceValue<size_t> primal_from_dual_face_value{primal_connectivity};
CellValue<size_t> primal_from_dual_cell_value{primal_connectivity};
- connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value, //
- primal_from_dual_node_value, //
- primal_from_dual_face_value, //
- primal_from_dual_cell_value);
+ primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value, //
+ primal_from_dual_node_value, //
+ primal_from_dual_face_value, //
+ primal_from_dual_cell_value);
for (CellId cell_id = 0; cell_id < primal_connectivity.numberOfCells(); ++cell_id) {
is_same &= (primal_cell_value[cell_id] == primal_from_dual_cell_value[cell_id]);
@@ -143,46 +143,43 @@ TEST_CASE("ConnectivityToMedianDualConnectivityDataMapper", "[mesh]")
}
#ifndef NDEBUG
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
- primal_face_value, //
- primal_cell_value,
- dual_from_primal_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(NodeValue<size_t>{dual_connectivity},
+ primal_face_value, //
+ primal_cell_value, dual_from_primal_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value,
- FaceValue<size_t>{dual_connectivity},
- primal_cell_value,
- dual_from_primal_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value,
+ FaceValue<size_t>{dual_connectivity},
+ primal_cell_value, dual_from_primal_value),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, //
- primal_face_value, //
- CellValue<size_t>{dual_connectivity},
- dual_from_primal_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, //
+ primal_face_value, //
+ CellValue<size_t>{dual_connectivity},
+ dual_from_primal_value),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.toDualNode(primal_node_value, //
- primal_face_value, //
- primal_cell_value,
- NodeValue<size_t>{primal_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.toDualNode(primal_node_value, //
+ primal_face_value, //
+ primal_cell_value,
+ NodeValue<size_t>{primal_connectivity}),
"unexpected connectivity for dual NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value,
- NodeValue<size_t>{dual_connectivity},
- primal_face_value, //
- primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value,
+ NodeValue<size_t>{dual_connectivity},
+ primal_face_value, //
+ primal_cell_value),
"unexpected connectivity for primal NodeValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value,
- primal_node_value,
- FaceValue<size_t>{dual_connectivity},
- primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value, primal_node_value,
+ FaceValue<size_t>{dual_connectivity},
+ primal_cell_value),
"unexpected connectivity for primal FaceValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value,
- primal_node_value, //
- primal_face_value, //
- CellValue<size_t>{dual_connectivity}),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(dual_from_primal_value,
+ primal_node_value, //
+ primal_face_value, //
+ CellValue<size_t>{dual_connectivity}),
"unexpected connectivity for primal CellValue");
- REQUIRE_THROWS_WITH(connectivity_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
- primal_node_value, //
- primal_face_value, //
- primal_cell_value),
+ REQUIRE_THROWS_WITH(primal_to_dual_connectivity_mapper.fromDualNode(NodeValue<size_t>{primal_connectivity},
+ primal_node_value, //
+ primal_face_value, //
+ primal_cell_value),
"unexpected connectivity for dual NodeValue");
#endif // NDEBUG