Merge branch 'DataExplorerIntegration' of github.com:ufz/ogs into DataExplorerIntegration

FileIO/XmlIO/XmlGspInterface.cpp

@@ -16,7 +16,7 @@
 #include "XmlStnInterface.h"
 #include "XmlCndInterface.h"
 
-#include "MeshIO.h"
+#include "Legacy/MeshIO.h"
 #include "Mesh.h"
 
 #include <QFileInfo>

OGS/ProjectData.cpp

@@ -47,7 +47,7 @@ const MeshLib::Mesh* ProjectData::getMesh(const std::string &name) const
 
 bool ProjectData::removeMesh(const std::string &name)
 {
-	for (std::vector<MeshLib::Mesh*>::const_iterator it = _msh_vec.begin(); it != _msh_vec.end(); ++it)
+	for (std::vector<MeshLib::Mesh*>::iterator it = _msh_vec.begin(); it != _msh_vec.end(); ++it)
 		if (name.compare((*it)->getName()) == 0)
 		{
 			delete *it;

SimpleTests/MeshTests/CollapseMeshNodes.cpp

@@ -21,7 +21,7 @@
 #include "Node.h"
 #include "Elements/Element.h"
 #include "Mesh.h"
-#include "MeshIO.h"
+#include "Legacy/MeshIO.h"
 #include "MeshCoarsener.h"
 
 int main(int argc, char *argv[])

SimpleTests/MeshTests/MeshRead.cpp

@@ -17,7 +17,7 @@
 #include "Node.h"
 #include "Elements/Element.h"
 #include "Mesh.h"
-#include "MeshIO.h"
+#include "Legacy/MeshIO.h"
 
 int main(int argc, char *argv[])
 {

scripts/cmake/Find.cmake

@@ -85,7 +85,7 @@ ENDIF()
 
 IF(VTK_NETCDF_FOUND)
 	ADD_DEFINITIONS(-DVTK_NETCDF_FOUND)
-	INCLUDE_DIRECTORIES(${VTK_NETCDF_FOUND} ${VTK_DIR}/Utilities)
+	INCLUDE_DIRECTORIES(${VTK_NETCDF_FOUND} ${VTK_DIR}/Utilities ${VTK_NETCDF_FOUND}/../..)
 ELSE()
 	SET(NETCDF_CXX TRUE)
 	FIND_PACKAGE(NetCDF)