From 147a1d4a0fd27357d566057abce23f08749b6183 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 26 Sep 2014 15:55:09 +0200
Subject: [PATCH] Added a mesh conversion round trip test.
It takes an OGS mesh, converts it via VtkMappedMeshSource to VTK, then
the VTK mesh gets converted back to OGS mesh.
---
CMakeLists.txt | 5 ---
FileIO/CMakeLists.txt | 4 +-
InSituLib/CMakeLists.txt | 2 +-
MeshLib/CMakeLists.txt | 3 ++
Tests/InSituLib/TestVtkMappedMeshSource.cpp | 43 +++++++++++++++++++--
scripts/cmake/ExternalProjectCatalyst.cmake | 4 +-
6 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77a483d9386..8847edee831 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,6 @@ IF(OGS_USE_EIGEN)
INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
ENDIF()
-IF(OGS_BUILD_GUI)
- ADD_DEFINITIONS(-DOGS_BUILD_GUI)
- ADD_SUBDIRECTORY(Gui)
-ENDIF() # OGS_BUILD_GUI
-
IF(OGS_BUILD_VIS)
ADD_SUBDIRECTORY(InSituLib)
ENDIF()
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 9b5ea377b5d..662ff066008 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -56,8 +56,8 @@ TARGET_LINK_LIBRARIES (FileIO
shp
)
-IF(TARGET CatalystRescan)
- ADD_DEPENDENCIES(FileIO CatalystRescan)
+IF(TARGET VtkRescan)
+ ADD_DEPENDENCIES(FileIO VtkRescan)
ENDIF()
FILE(GLOB XSD_FILES . *.xsd)
diff --git a/InSituLib/CMakeLists.txt b/InSituLib/CMakeLists.txt
index c41382c62ca..f7603344bba 100644
--- a/InSituLib/CMakeLists.txt
+++ b/InSituLib/CMakeLists.txt
@@ -13,5 +13,5 @@ ADD_LIBRARY(InSituLib
)
IF(TARGET VtkRescan)
- ADD_DEPENDENCIES(InSituLib STATIC VtkRescan)
+ ADD_DEPENDENCIES(InSituLib VtkRescan)
ENDIF()
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 0c4f19ccae4..ea4430e4f58 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -16,3 +16,6 @@ target_link_libraries (MeshLib
logog
)
+IF(TARGET VtkRescan)
+ ADD_DEPENDENCIES(MeshLib VtkRescan)
+ENDIF()
diff --git a/Tests/InSituLib/TestVtkMappedMeshSource.cpp b/Tests/InSituLib/TestVtkMappedMeshSource.cpp
index b94868719f1..98fce5b606a 100644
--- a/Tests/InSituLib/TestVtkMappedMeshSource.cpp
+++ b/Tests/InSituLib/TestVtkMappedMeshSource.cpp
@@ -11,17 +11,22 @@
* http://www.opengeosys.org/project/license
*
*/
-#include <vtkNew.h>
-#include <vtkUnstructuredGrid.h>
-
#include "gtest/gtest.h"
+#include "BaseLib/BuildInfo.h"
#include "Mesh.h"
#include "MeshGenerators/MeshGenerator.h"
+#include "MeshGenerators/VtkMeshConverter.h"
#include "VtkMappedMesh.h"
#include "VtkMappedMeshSource.h"
+#include <vtkNew.h>
+#include <vtkUnstructuredGrid.h>
+#include <vtkSmartPointer.h>
+#include <vtkXMLUnstructuredGridWriter.h>
+#include <vtkXMLUnstructuredGridReader.h>
+
class InSituMesh : public ::testing::Test
{
public:
@@ -67,10 +72,14 @@ TEST_F(InSituMesh, MappedMesh)
ASSERT_EQ(0, vtkMesh->GetNumberOfPoints()); // No points are defined
}
-TEST_F(InSituMesh, MappedMeshSource)
+TEST_F(InSituMesh, MappedMeshSourceRoundtrip)
{
+ // TODO Add more comparison criteria
+
ASSERT_TRUE(mesh != nullptr);
+ std::string test_data_file(BaseLib::BuildInfo::tests_tmp_path + "/MappedMeshSourceRoundtrip.vtu");
+ // Test VtkMappedMeshSource, i.e. OGS mesh to VTK mesh
vtkNew<InSituLib::VtkMappedMeshSource> vtkSource;
vtkSource->SetMesh(mesh);
vtkSource->Update();
@@ -78,4 +87,30 @@ TEST_F(InSituMesh, MappedMeshSource)
ASSERT_EQ((subdivisions+1)*(subdivisions+1), output->GetNumberOfPoints());
ASSERT_EQ(subdivisions*subdivisions, output->GetNumberOfCells());
+
+ // Write VTK mesh to file
+ vtkSmartPointer<vtkXMLUnstructuredGridWriter> vtuWriter =
+ vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
+ // Setting binary file mode, otherwise corrupted output due to VTK bug
+ // See http://www.paraview.org/Bug/view.php?id=13382
+ vtuWriter->SetDataModeToBinary();
+ vtuWriter->SetFileName(test_data_file.c_str());
+ vtuWriter->SetInputConnection(vtkSource->GetOutputPort());
+ vtuWriter->Write();
+
+ // Read back VTK mesh
+ vtkSmartPointer<vtkXMLUnstructuredGridReader> reader =
+ vtkSmartPointer<vtkXMLUnstructuredGridReader>::New();
+ reader->SetFileName(test_data_file.c_str());
+ reader->Update();
+ vtkUnstructuredGrid* vtkMesh = reader->GetOutput();
+
+ // Both VTK meshes should be identical
+ ASSERT_EQ(vtkMesh->GetNumberOfPoints(), output->GetNumberOfPoints());
+ ASSERT_EQ(vtkMesh->GetNumberOfCells(), output->GetNumberOfCells());
+
+ // Both OGS meshes should be identical
+ MeshLib::Mesh* newMesh = MeshLib::VtkMeshConverter::convertUnstructuredGrid(vtkMesh);
+ ASSERT_EQ(mesh->getNNodes(), newMesh->getNNodes());
+ ASSERT_EQ(mesh->getNElements(), newMesh->getNElements());
}
diff --git a/scripts/cmake/ExternalProjectCatalyst.cmake b/scripts/cmake/ExternalProjectCatalyst.cmake
index 8b6912c6c98..99c904a1c98 100644
--- a/scripts/cmake/ExternalProjectCatalyst.cmake
+++ b/scripts/cmake/ExternalProjectCatalyst.cmake
@@ -40,7 +40,7 @@ ExternalProject_Add(Catalyst
IF(NOT ${ParaView_FOUND})
# Rerun cmake in initial build
- ADD_CUSTOM_TARGET(CatalystRescan ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} DEPENDS Catalyst)
+ ADD_CUSTOM_TARGET(VtkRescan ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} DEPENDS Catalyst)
ELSE()
- ADD_CUSTOM_TARGET(CatalystRescan) # dummy target for caching
+ ADD_CUSTOM_TARGET(VtkRescan) # dummy target for caching
ENDIF()
--
GitLab