From 1a7706250693eb084b4b2d89c199d15a5bc1d502 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Fri, 27 May 2016 12:28:54 +0200
Subject: [PATCH] mv PVDFile to MeshLib/IO/VtkIO
---
{NumLib => MeshLib}/IO/VtkIO/PVDFile.cpp | 4 ++--
{NumLib => MeshLib}/IO/VtkIO/PVDFile.h | 10 +++++-----
NumLib/CMakeLists.txt | 2 --
ProcessLib/Output.h | 4 ++--
4 files changed, 9 insertions(+), 11 deletions(-)
rename {NumLib => MeshLib}/IO/VtkIO/PVDFile.cpp (97%)
rename {NumLib => MeshLib}/IO/VtkIO/PVDFile.h (85%)
diff --git a/NumLib/IO/VtkIO/PVDFile.cpp b/MeshLib/IO/VtkIO/PVDFile.cpp
similarity index 97%
rename from NumLib/IO/VtkIO/PVDFile.cpp
rename to MeshLib/IO/VtkIO/PVDFile.cpp
index cd52ea5b076..0dbc8167981 100644
--- a/NumLib/IO/VtkIO/PVDFile.cpp
+++ b/MeshLib/IO/VtkIO/PVDFile.cpp
@@ -14,7 +14,7 @@
#include <limits>
#include <logog/include/logog.hpp>
-namespace NumLib
+namespace MeshLib
{
namespace IO
{
@@ -43,4 +43,4 @@ void PVDFile::addVTUFile(const std::string &vtu_fname, double timestep)
}
} // IO
-} // NumLib
+} // MeshLib
diff --git a/NumLib/IO/VtkIO/PVDFile.h b/MeshLib/IO/VtkIO/PVDFile.h
similarity index 85%
rename from NumLib/IO/VtkIO/PVDFile.h
rename to MeshLib/IO/VtkIO/PVDFile.h
index cb832cd56fc..61c2de3cd68 100644
--- a/NumLib/IO/VtkIO/PVDFile.h
+++ b/MeshLib/IO/VtkIO/PVDFile.h
@@ -7,13 +7,13 @@
*
*/
-#ifndef FILEIO_VTK_PVDFILE_H
-#define FILEIO_VTK_PVDFILE_H
+#ifndef MESHLIB_VTKIO_PVDFILE_H
+#define MESHLIB_VTKIO_PVDFILE_H
#include <string>
#include <vector>
-namespace NumLib
+namespace MeshLib
{
namespace IO
{
@@ -36,6 +36,6 @@ private:
};
} // namespace IO
-} // namespace NumLib
+} // namespace MeshLib
-#endif // FILEIO_VTK_PVDFILE_H
+#endif // MESHLIB_VTKIO_PVDFILE_H
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index 1e4b086bac1..7d5a00bb7cf 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -28,8 +28,6 @@ set(SOURCES ${SOURCES} ${SOURCES_ODESOLVER})
GET_SOURCE_FILES(SOURCES_EXTRAPOLATION Extrapolation)
set(SOURCES ${SOURCES} ${SOURCES_EXTRAPOLATION})
-GET_SOURCE_FILES(SOURCES_IO_VTK IO/VtkIO)
-set(SOURCES ${SOURCES} ${SOURCES_IO_VTK})
# Create the library
add_library(NumLib ${SOURCES})
diff --git a/ProcessLib/Output.h b/ProcessLib/Output.h
index 6ccc77dcb99..b9b18ebb87f 100644
--- a/ProcessLib/Output.h
+++ b/ProcessLib/Output.h
@@ -11,7 +11,7 @@
#define PROCESSLIB_OUTPUT_H
#include "BaseLib/ConfigTree.h"
-#include "NumLib/IO/VtkIO/PVDFile.h"
+#include "MeshLib/IO/VtkIO/PVDFile.h"
#include "Process.h"
namespace ProcessLib
@@ -78,7 +78,7 @@ private:
{}
const unsigned process_index;
- NumLib::IO::PVDFile pvd_file;
+ MeshLib::IO::PVDFile pvd_file;
};
Output(std::string const& prefix)
--
GitLab