From 91c65b8ea26975b3b435455a5a7f7ce451064449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com> Date: Thu, 9 Dec 2021 17:43:45 +0100 Subject: [PATCH] Rename files according to the class names --- src/language/modules/MeshModule.cpp | 2 +- src/main.cpp | 4 ++-- src/mesh/CMakeLists.txt | 4 ++-- src/mesh/DiamondDualMeshBuilder.cpp | 2 +- ...lConnectivityManager.cpp => DualConnectivityManager.cpp} | 2 +- ...lConnectivityManager.hpp => DualConnectivityManager.hpp} | 6 +++--- .../{DiamondDualMeshManager.cpp => DualMeshManager.cpp} | 2 +- .../{DiamondDualMeshManager.hpp => DualMeshManager.hpp} | 6 +++--- src/mesh/IConnectivity.cpp | 2 +- src/mesh/IMesh.cpp | 2 +- tests/mpi_test_main.cpp | 4 ++-- tests/test_CellIntegrator.cpp | 2 +- tests/test_EdgeIntegrator.cpp | 2 +- tests/test_FaceIntegrator.cpp | 2 +- tests/test_main.cpp | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) rename src/mesh/{DiamondDualConnectivityManager.cpp => DualConnectivityManager.cpp} (98%) rename src/mesh/{DiamondDualConnectivityManager.hpp => DualConnectivityManager.hpp} (95%) rename src/mesh/{DiamondDualMeshManager.cpp => DualMeshManager.cpp} (97%) rename src/mesh/{DiamondDualMeshManager.hpp => DualMeshManager.hpp} (89%) diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp index 30505ad73..da8eb6a69 100644 --- a/src/language/modules/MeshModule.cpp +++ b/src/language/modules/MeshModule.cpp @@ -8,7 +8,7 @@ #include <language/utils/TypeDescriptor.hpp> #include <mesh/CartesianMeshBuilder.hpp> #include <mesh/Connectivity.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/GmshReader.hpp> #include <mesh/Mesh.hpp> #include <mesh/MeshRelaxer.hpp> diff --git a/src/main.cpp b/src/main.cpp index af8fd9129..7e03cdc80 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include <analysis/QuadratureManager.hpp> #include <language/PugsParser.hpp> -#include <mesh/DiamondDualConnectivityManager.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualConnectivityManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/MeshDataManager.hpp> #include <mesh/SynchronizerManager.hpp> #include <utils/PugsUtils.hpp> diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt index 309e3323a..8f75c57d6 100644 --- a/src/mesh/CMakeLists.txt +++ b/src/mesh/CMakeLists.txt @@ -8,9 +8,9 @@ add_library( ConnectivityComputer.cpp ConnectivityDispatcher.cpp DiamondDualConnectivityBuilder.cpp - DiamondDualConnectivityManager.cpp DiamondDualMeshBuilder.cpp - DiamondDualMeshManager.cpp + DualConnectivityManager.cpp + DualMeshManager.cpp GmshReader.cpp IConnectivity.cpp IMesh.cpp diff --git a/src/mesh/DiamondDualMeshBuilder.cpp b/src/mesh/DiamondDualMeshBuilder.cpp index a9a7ad786..175aadfa4 100644 --- a/src/mesh/DiamondDualMeshBuilder.cpp +++ b/src/mesh/DiamondDualMeshBuilder.cpp @@ -3,7 +3,7 @@ #include <mesh/Connectivity.hpp> #include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp> #include <mesh/DiamondDualConnectivityBuilder.hpp> -#include <mesh/DiamondDualConnectivityManager.hpp> +#include <mesh/DualConnectivityManager.hpp> #include <mesh/ItemValueUtils.hpp> #include <mesh/Mesh.hpp> #include <mesh/MeshData.hpp> diff --git a/src/mesh/DiamondDualConnectivityManager.cpp b/src/mesh/DualConnectivityManager.cpp similarity index 98% rename from src/mesh/DiamondDualConnectivityManager.cpp rename to src/mesh/DualConnectivityManager.cpp index 1041b183e..c3a2011d8 100644 --- a/src/mesh/DiamondDualConnectivityManager.cpp +++ b/src/mesh/DualConnectivityManager.cpp @@ -3,7 +3,7 @@ #include <mesh/Connectivity.hpp> #include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp> #include <mesh/DiamondDualConnectivityBuilder.hpp> -#include <mesh/DiamondDualConnectivityManager.hpp> +#include <mesh/DualConnectivityManager.hpp> #include <utils/Exceptions.hpp> #include <sstream> diff --git a/src/mesh/DiamondDualConnectivityManager.hpp b/src/mesh/DualConnectivityManager.hpp similarity index 95% rename from src/mesh/DiamondDualConnectivityManager.hpp rename to src/mesh/DualConnectivityManager.hpp index 09608a568..ef2812ea7 100644 --- a/src/mesh/DiamondDualConnectivityManager.hpp +++ b/src/mesh/DualConnectivityManager.hpp @@ -1,5 +1,5 @@ -#ifndef DIAMOND_DUAL_CONNECTIVITY_MANAGER_HPP -#define DIAMOND_DUAL_CONNECTIVITY_MANAGER_HPP +#ifndef DUAL_CONNECTIVITY_MANAGER_HPP +#define DUAL_CONNECTIVITY_MANAGER_HPP #include <mesh/IConnectivity.hpp> @@ -91,4 +91,4 @@ class DualConnectivityManager getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>&); }; -#endif // DIAMOND_DUAL_CONNECTIVITY_MANAGER_HPP +#endif // DUAL_CONNECTIVITY_MANAGER_HPP diff --git a/src/mesh/DiamondDualMeshManager.cpp b/src/mesh/DualMeshManager.cpp similarity index 97% rename from src/mesh/DiamondDualMeshManager.cpp rename to src/mesh/DualMeshManager.cpp index c14ae45f1..683cfbfb9 100644 --- a/src/mesh/DiamondDualMeshManager.cpp +++ b/src/mesh/DualMeshManager.cpp @@ -1,4 +1,4 @@ -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/Connectivity.hpp> #include <mesh/DiamondDualMeshBuilder.hpp> diff --git a/src/mesh/DiamondDualMeshManager.hpp b/src/mesh/DualMeshManager.hpp similarity index 89% rename from src/mesh/DiamondDualMeshManager.hpp rename to src/mesh/DualMeshManager.hpp index 7106e3ae2..5ae476ff3 100644 --- a/src/mesh/DiamondDualMeshManager.hpp +++ b/src/mesh/DualMeshManager.hpp @@ -1,5 +1,5 @@ -#ifndef DIAMOND_DUAL_MESH_MANAGER_HPP -#define DIAMOND_DUAL_MESH_MANAGER_HPP +#ifndef DUAL_MESH_MANAGER_HPP +#define DUAL_MESH_MANAGER_HPP #include <mesh/IMesh.hpp> #include <utils/PugsAssert.hpp> @@ -52,4 +52,4 @@ class DualMeshManager std::shared_ptr<const Mesh<Connectivity<Dimension>>>); }; -#endif // DIAMOND_DUAL_MESH_MANAGER_HPP +#endif // DUAL_MESH_MANAGER_HPP diff --git a/src/mesh/IConnectivity.cpp b/src/mesh/IConnectivity.cpp index f95214955..bc83c0298 100644 --- a/src/mesh/IConnectivity.cpp +++ b/src/mesh/IConnectivity.cpp @@ -1,6 +1,6 @@ #include <mesh/IConnectivity.hpp> -#include <mesh/DiamondDualConnectivityManager.hpp> +#include <mesh/DualConnectivityManager.hpp> #include <mesh/SynchronizerManager.hpp> IConnectivity::~IConnectivity() diff --git a/src/mesh/IMesh.cpp b/src/mesh/IMesh.cpp index cea6b1e4f..e2a1739a8 100644 --- a/src/mesh/IMesh.cpp +++ b/src/mesh/IMesh.cpp @@ -1,6 +1,6 @@ #include <mesh/IMesh.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/MeshDataManager.hpp> IMesh::~IMesh() diff --git a/tests/mpi_test_main.cpp b/tests/mpi_test_main.cpp index 860ec3560..93f3c7d90 100644 --- a/tests/mpi_test_main.cpp +++ b/tests/mpi_test_main.cpp @@ -4,8 +4,8 @@ #include <analysis/QuadratureManager.hpp> #include <language/utils/OperatorRepository.hpp> -#include <mesh/DiamondDualConnectivityManager.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualConnectivityManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/MeshDataManager.hpp> #include <mesh/SynchronizerManager.hpp> #include <utils/Messenger.hpp> diff --git a/tests/test_CellIntegrator.cpp b/tests/test_CellIntegrator.cpp index 7559cb2c2..a0f19555c 100644 --- a/tests/test_CellIntegrator.cpp +++ b/tests/test_CellIntegrator.cpp @@ -4,7 +4,7 @@ #include <analysis/GaussLegendreQuadratureDescriptor.hpp> #include <analysis/GaussLobattoQuadratureDescriptor.hpp> #include <analysis/GaussQuadratureDescriptor.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/ItemValue.hpp> #include <mesh/Mesh.hpp> #include <scheme/CellIntegrator.hpp> diff --git a/tests/test_EdgeIntegrator.cpp b/tests/test_EdgeIntegrator.cpp index 0dc29d27d..dbfc74d49 100644 --- a/tests/test_EdgeIntegrator.cpp +++ b/tests/test_EdgeIntegrator.cpp @@ -4,7 +4,7 @@ #include <analysis/GaussLegendreQuadratureDescriptor.hpp> #include <analysis/GaussLobattoQuadratureDescriptor.hpp> #include <analysis/GaussQuadratureDescriptor.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/ItemValue.hpp> #include <mesh/Mesh.hpp> #include <scheme/EdgeIntegrator.hpp> diff --git a/tests/test_FaceIntegrator.cpp b/tests/test_FaceIntegrator.cpp index 6d54d7f17..4afe3f9dc 100644 --- a/tests/test_FaceIntegrator.cpp +++ b/tests/test_FaceIntegrator.cpp @@ -4,7 +4,7 @@ #include <analysis/GaussLegendreQuadratureDescriptor.hpp> #include <analysis/GaussLobattoQuadratureDescriptor.hpp> #include <analysis/GaussQuadratureDescriptor.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/ItemValue.hpp> #include <mesh/Mesh.hpp> #include <scheme/FaceIntegrator.hpp> diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 5557e1ce4..91d9a080a 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -4,8 +4,8 @@ #include <analysis/QuadratureManager.hpp> #include <language/utils/OperatorRepository.hpp> -#include <mesh/DiamondDualConnectivityManager.hpp> -#include <mesh/DiamondDualMeshManager.hpp> +#include <mesh/DualConnectivityManager.hpp> +#include <mesh/DualMeshManager.hpp> #include <mesh/MeshDataManager.hpp> #include <mesh/SynchronizerManager.hpp> #include <utils/Messenger.hpp> -- GitLab