From b0dac54d609da89b89865febfd6e145a5b438bc2 Mon Sep 17 00:00:00 2001
From: Julian Heinze <julian.heinze@ufz.de>
Date: Wed, 24 May 2023 15:07:39 +0200
Subject: [PATCH] adjustemnts due to merge conflicts
meshgenerators moved to meshtoolslib
---
Applications/Utils/MeshEdit/Vtu2Grid.cpp | 2 +-
MeshToolsLib/MeshGenerators/VoxelGridFromMesh.cpp | 4 ++--
MeshToolsLib/MeshGenerators/VoxelGridFromMesh.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Applications/Utils/MeshEdit/Vtu2Grid.cpp b/Applications/Utils/MeshEdit/Vtu2Grid.cpp
index 15ef9f3ce36..191360653ba 100644
--- a/Applications/Utils/MeshEdit/Vtu2Grid.cpp
+++ b/Applications/Utils/MeshEdit/Vtu2Grid.cpp
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
#endif
return -1;
}
- using namespace MeshLib::MeshGenerator;
+ using namespace MeshToolsLib::MeshGenerator;
double const x_size = x_arg.getValue();
double const y_size = (y_arg.isSet()) ? y_arg.getValue() : x_arg.getValue();
diff --git a/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.cpp b/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.cpp
index 1c5911d578e..90ee6191bef 100644
--- a/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.cpp
+++ b/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.cpp
@@ -9,7 +9,7 @@
#include "VoxelGridFromMesh.h"
-namespace MeshLib::MeshGenerator::VoxelGridFromMesh
+namespace MeshToolsLib::MeshGenerator::VoxelGridFromMesh
{
std::array<std::size_t, 3> getDimensions(MathLib::Point3d const& min,
@@ -69,7 +69,7 @@ bool removeUnusedGridCells(vtkSmartPointer<vtkUnstructuredGrid> const& mesh,
if (n_elems_marked)
{
- grid.reset(MeshLib::removeElements(
+ grid.reset(MeshToolsLib::removeElements(
*grid, search.getSearchedElementIDs(), "trimmed_grid"));
}
return true;
diff --git a/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.h b/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.h
index f62acdc37f1..fd7f0043b04 100644
--- a/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.h
+++ b/MeshToolsLib/MeshGenerators/VoxelGridFromMesh.h
@@ -22,14 +22,14 @@
#include "InfoLib/GitInfo.h"
#include "MeshLib/Mesh.h"
-#include "MeshLib/MeshEditing/RemoveMeshComponents.h"
-#include "MeshLib/MeshGenerators/MeshGenerator.h"
+#include "MeshToolsLib/MeshEditing/RemoveMeshComponents.h"
+#include "MeshToolsLib/MeshGenerators/MeshGenerator.h"
#include "MeshLib/MeshSearch/ElementSearch.h"
#include "MeshLib/MeshSearch/MeshElementGrid.h"
static constexpr std::string const cell_id_name = "CellIds";
-namespace MeshLib::MeshGenerator::VoxelGridFromMesh
+namespace MeshToolsLib::MeshGenerator::VoxelGridFromMesh
{
std::array<std::size_t, 3> getDimensions(
--
GitLab