From dc0b54c63b80bc7a26359363ad3a001ce30d8459 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 31 May 2016 09:06:00 +0200
Subject: [PATCH] Move GMSHInterface from FileIO to GeoLib/IO.
---
Applications/DataExplorer/VtkAct/CMakeLists.txt | 2 +-
Applications/DataExplorer/mainwindow.cpp | 2 +-
Applications/Utils/MeshEdit/CMakeLists.txt | 2 +-
FileIO/CMakeLists.txt | 2 --
GeoLib/CMakeLists.txt | 3 +++
{FileIO => GeoLib/IO}/GMSHInterface.cpp | 12 ++++++------
{FileIO => GeoLib/IO}/GMSHInterface.h | 0
.../IO/Gmsh}/GMSHAdaptiveMeshDensity.cpp | 4 ----
.../IO/Gmsh}/GMSHAdaptiveMeshDensity.h | 4 ----
.../IO/Gmsh}/GMSHFixedMeshDensity.cpp | 6 +-----
.../GmshIO => GeoLib/IO/Gmsh}/GMSHFixedMeshDensity.h | 4 ----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLine.cpp | 4 ----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLine.h | 4 ----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLineLoop.cpp | 4 ----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLineLoop.h | 4 ----
.../IO/Gmsh}/GMSHMeshDensityStrategy.h | 4 ----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPoint.cpp | 6 +-----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPoint.h | 4 ----
.../GmshIO => GeoLib/IO/Gmsh}/GMSHPolygonTree.cpp | 4 ----
{FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPolygonTree.h | 4 ----
20 files changed, 14 insertions(+), 65 deletions(-)
rename {FileIO => GeoLib/IO}/GMSHInterface.cpp (96%)
rename {FileIO => GeoLib/IO}/GMSHInterface.h (100%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHAdaptiveMeshDensity.cpp (97%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHAdaptiveMeshDensity.h (93%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHFixedMeshDensity.cpp (83%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHFixedMeshDensity.h (88%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLine.cpp (88%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLine.h (87%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLineLoop.cpp (92%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHLineLoop.h (88%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHMeshDensityStrategy.h (88%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPoint.cpp (87%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPoint.h (88%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPolygonTree.cpp (99%)
rename {FileIO/GmshIO => GeoLib/IO/Gmsh}/GMSHPolygonTree.h (97%)
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 4c5d2a0433b..222f9f36ff5 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
- ${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/GmshIO
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/Gmsh
${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index db380c501d9..c639b24f648 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -65,10 +65,10 @@
#include "MeshLib/IO/Legacy/MeshIO.h"
#include "MeshLib/IO/readMeshFromFile.h"
#include "MeshLib/IO/GmshReader.h"
-#include "FileIO/GMSHInterface.h"
#include "FileIO/TetGenInterface.h"
#include "PetrelInterface.h"
#include "XmlIO/Qt/XmlGspInterface.h"
+#include "GeoLib/IO/GMSHInterface.h"
#include "GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
#include "GeoLib/IO/XmlIO/Qt/XmlStnInterface.h"
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 498254606b6..0d90cbe2f2f 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/BaseLib
${CMAKE_SOURCE_DIR}/GeoLib
${CMAKE_SOURCE_DIR}/FileIO
- ${CMAKE_SOURCE_DIR}/FileIO/GmshIO
+ ${CMAKE_SOURCE_DIR}/FileIO/Gmsh
${CMAKE_SOURCE_DIR}/MathLib
${CMAKE_SOURCE_DIR}/MeshLib
)
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 6a611754234..7f536a63310 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -1,7 +1,5 @@
GET_SOURCE_FILES(SOURCES_FileIO)
set(SOURCES ${SOURCES_FileIO})
-GET_SOURCE_FILES(SOURCES_GMSHIO GmshIO)
-set(SOURCES ${SOURCES} ${SOURCES_GMSHIO})
# Create the library
add_library(FileIO ${SOURCES})
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 8b6cc058675..64bb2474198 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -18,6 +18,9 @@ if(QT4_FOUND)
SET(SOURCES ${SOURCES} ${SOURCES_IO_FEFLOW})
endif()
+GET_SOURCE_FILES(SOURCES_IO_GMSHIO IO/Gmsh)
+set(SOURCES ${SOURCES} ${SOURCES_IO_GMSHIO})
+
# Create the library
add_library(GeoLib STATIC ${SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/tetgen/predicates.cxx
diff --git a/FileIO/GMSHInterface.cpp b/GeoLib/IO/GMSHInterface.cpp
similarity index 96%
rename from FileIO/GMSHInterface.cpp
rename to GeoLib/IO/GMSHInterface.cpp
index e059eab4e6d..65a9b502068 100644
--- a/FileIO/GMSHInterface.cpp
+++ b/GeoLib/IO/GMSHInterface.cpp
@@ -16,12 +16,12 @@
#include "BaseLib/BuildInfo.h"
#include "BaseLib/FileTools.h"
-#include "FileIO/GMSHInterface.h"
-#include "FileIO/GmshIO/GMSHAdaptiveMeshDensity.h"
-#include "FileIO/GmshIO/GMSHFixedMeshDensity.h"
-#include "FileIO/GmshIO/GMSHPoint.h"
-#include "FileIO/GmshIO/GMSHPolygonTree.h"
-#include "FileIO/GmshIO/GMSHMeshDensityStrategy.h"
+#include "GeoLib/IO/GMSHInterface.h"
+#include "GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h"
+#include "GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h"
+#include "GeoLib/IO/Gmsh/GMSHPoint.h"
+#include "GeoLib/IO/Gmsh/GMSHPolygonTree.h"
+#include "GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h"
#include "GeoLib/AnalyticalGeometry.h"
#include "GeoLib/GEOObjects.h"
diff --git a/FileIO/GMSHInterface.h b/GeoLib/IO/GMSHInterface.h
similarity index 100%
rename from FileIO/GMSHInterface.h
rename to GeoLib/IO/GMSHInterface.h
diff --git a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
similarity index 97%
rename from FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
rename to GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
index 21cdc00dde2..f7a61eebfc5 100644
--- a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
+++ b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2012-03-05
- * \brief Implementation of the GMSHAdaptiveMeshDensity class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.h b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
similarity index 93%
rename from FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
rename to GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
index d2d878a0061..831a7e9ea8e 100644
--- a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
+++ b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2012-03-05
- * \brief Definition of the GMSHAdaptiveMeshDensity class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHFixedMeshDensity.cpp b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
similarity index 83%
rename from FileIO/GmshIO/GMSHFixedMeshDensity.cpp
rename to GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
index 59d6fbc682a..707486ae809 100644
--- a/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
+++ b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2012-03-05
- * \brief Implementation of the GMSHFixedMeshDensity class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
@@ -12,7 +8,7 @@
*
*/
-#include "GmshIO/GMSHFixedMeshDensity.h"
+#include "GMSHFixedMeshDensity.h"
namespace FileIO
{
diff --git a/FileIO/GmshIO/GMSHFixedMeshDensity.h b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
similarity index 88%
rename from FileIO/GmshIO/GMSHFixedMeshDensity.h
rename to GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
index 8644b636fe1..3bef0bc0c02 100644
--- a/FileIO/GmshIO/GMSHFixedMeshDensity.h
+++ b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2012-03-05
- * \brief Definition of the GMSHFixedMeshDensity class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLine.cpp b/GeoLib/IO/Gmsh/GMSHLine.cpp
similarity index 88%
rename from FileIO/GmshIO/GMSHLine.cpp
rename to GeoLib/IO/Gmsh/GMSHLine.cpp
index 59b0e0bc46b..8bcb94c0709 100644
--- a/FileIO/GmshIO/GMSHLine.cpp
+++ b/GeoLib/IO/Gmsh/GMSHLine.cpp
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date Mar 22, 2012
- * \brief Implementation of the GMSHLine class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLine.h b/GeoLib/IO/Gmsh/GMSHLine.h
similarity index 87%
rename from FileIO/GmshIO/GMSHLine.h
rename to GeoLib/IO/Gmsh/GMSHLine.h
index 939ea4b9352..0c7748fdbe8 100644
--- a/FileIO/GmshIO/GMSHLine.h
+++ b/GeoLib/IO/Gmsh/GMSHLine.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date Mar 22, 2012
- * \brief Definition of the GMSHLine class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLineLoop.cpp b/GeoLib/IO/Gmsh/GMSHLineLoop.cpp
similarity index 92%
rename from FileIO/GmshIO/GMSHLineLoop.cpp
rename to GeoLib/IO/Gmsh/GMSHLineLoop.cpp
index 5a5d803c477..d448c96b26e 100644
--- a/FileIO/GmshIO/GMSHLineLoop.cpp
+++ b/GeoLib/IO/Gmsh/GMSHLineLoop.cpp
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date Mar 22, 2012
- * \brief Implementation of the GMSHLineLoop class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLineLoop.h b/GeoLib/IO/Gmsh/GMSHLineLoop.h
similarity index 88%
rename from FileIO/GmshIO/GMSHLineLoop.h
rename to GeoLib/IO/Gmsh/GMSHLineLoop.h
index b1cad96d579..480ec802523 100644
--- a/FileIO/GmshIO/GMSHLineLoop.h
+++ b/GeoLib/IO/Gmsh/GMSHLineLoop.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date Mar 22, 2012
- * \brief Definition of the GMSHLineLoop class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHMeshDensityStrategy.h b/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
similarity index 88%
rename from FileIO/GmshIO/GMSHMeshDensityStrategy.h
rename to GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
index ff908199926..21675e2bb61 100644
--- a/FileIO/GmshIO/GMSHMeshDensityStrategy.h
+++ b/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2010-03-05
- * \brief Definition of the GMSHMeshDensityStrategy class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHPoint.cpp b/GeoLib/IO/Gmsh/GMSHPoint.cpp
similarity index 87%
rename from FileIO/GmshIO/GMSHPoint.cpp
rename to GeoLib/IO/Gmsh/GMSHPoint.cpp
index 1e0d13d6c47..f936a45bc03 100644
--- a/FileIO/GmshIO/GMSHPoint.cpp
+++ b/GeoLib/IO/Gmsh/GMSHPoint.cpp
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2012-03-21
- * \brief Implementation of the GMSHPoint class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
@@ -15,7 +11,7 @@
#include <cmath>
#include <limits>
-#include "GmshIO/GMSHPoint.h"
+#include "GMSHPoint.h"
namespace FileIO
{
diff --git a/FileIO/GmshIO/GMSHPoint.h b/GeoLib/IO/Gmsh/GMSHPoint.h
similarity index 88%
rename from FileIO/GmshIO/GMSHPoint.h
rename to GeoLib/IO/Gmsh/GMSHPoint.h
index b2788802e86..792b4ab46cb 100644
--- a/FileIO/GmshIO/GMSHPoint.h
+++ b/GeoLib/IO/Gmsh/GMSHPoint.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date 2012-03-21
- * \brief Definition of the GMSHPoint class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHPolygonTree.cpp b/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
similarity index 99%
rename from FileIO/GmshIO/GMSHPolygonTree.cpp
rename to GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
index be35d891e14..afed2c4aec6 100644
--- a/FileIO/GmshIO/GMSHPolygonTree.cpp
+++ b/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date Mar 27, 2012
- * \brief Implementation of the GMSHPolygonTree class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHPolygonTree.h b/GeoLib/IO/Gmsh/GMSHPolygonTree.h
similarity index 97%
rename from FileIO/GmshIO/GMSHPolygonTree.h
rename to GeoLib/IO/Gmsh/GMSHPolygonTree.h
index b234fbb64e5..8fdc5b4abb1 100644
--- a/FileIO/GmshIO/GMSHPolygonTree.h
+++ b/GeoLib/IO/Gmsh/GMSHPolygonTree.h
@@ -1,8 +1,4 @@
/**
- * \file
- * \author Thomas Fischer
- * \date Mar 27 2012
- * \brief Definition of the GMSHPolygonTree class.
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
--
GitLab