From c491984cc0a3713bb4a1d07c95f987b4aef10ab7 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 9 Jan 2013 15:17:28 +0100
Subject: [PATCH] Using logog logging in file readMeshFromFile.cpp.
---
FileIO/readMeshFromFile.cpp | 35 ++++++++++++++++++-----------------
FileIO/readMeshFromFile.h | 18 +++++++++++-------
2 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/FileIO/readMeshFromFile.cpp b/FileIO/readMeshFromFile.cpp
index 777862c1ab9..7c7f3e774c3 100644
--- a/FileIO/readMeshFromFile.cpp
+++ b/FileIO/readMeshFromFile.cpp
@@ -1,27 +1,32 @@
/**
+ * @copyright
* Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*
- *
- * \file readMeshFromFile.cpp
- *
- * Created on 2012-09-27 by Karsten Rink
+ * @file readMeshFromFile.cpp
+ * @date 2012-09-27
+ * @author Karsten Rink
*/
-#include "readMeshFromFile.h"
-#include "Mesh.h"
-#include "RapidXmlIO/RapidVtuInterface.h"
-#include "RapidXmlIO/BoostVtuInterface.h"
-#include "Legacy/MeshIO.h"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
// BaseLib
-#include "StringTools.h"
#include "FileTools.h"
+#include "StringTools.h"
+
+// MeshLib
+#include "Mesh.h"
-namespace FileIO {
+// FileIO
+#include "Legacy/MeshIO.h"
+#include "RapidXmlIO/BoostVtuInterface.h"
+#include "readMeshFromFile.h"
+namespace FileIO
+{
MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
{
if (BaseLib::hasFileExtension("msh", file_name))
@@ -31,13 +36,9 @@ MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
}
if (BaseLib::hasFileExtension("vtu", file_name))
- {
- //return FileIO::RapidVtuInterface::readVTUFile(file_name);
return FileIO::BoostVtuInterface::readVTUFile(file_name);
- }
- std::cout << "Unknown mesh file format" << std::endl;
+ ERR("readMeshFromFile(): Unknown mesh file format in file %s.", file_name.c_str());
return 0;
}
-
-}
+} // end namespace FileIO
diff --git a/FileIO/readMeshFromFile.h b/FileIO/readMeshFromFile.h
index c44c4038daa..dc35c001d28 100644
--- a/FileIO/readMeshFromFile.h
+++ b/FileIO/readMeshFromFile.h
@@ -5,9 +5,9 @@
* http://www.opengeosys.org/project/license
*
*
- * \file readMeshFromFile.h
- *
- * Created on 2012-09-27 by Karsten Rink
+ * @file readMeshFromFile.h
+ * @date 2012-09-27
+ * @author Karsten Rink
*/
#ifndef READMESHFROMFILE_H
@@ -15,10 +15,14 @@
#include <string>
-namespace MeshLib { class Mesh; }
+namespace MeshLib
+{
+class Mesh;
+}
-namespace FileIO {
- MeshLib::Mesh* readMeshFromFile(const std::string &file_name);
+namespace FileIO
+{
+MeshLib::Mesh* readMeshFromFile(const std::string &file_name);
}
-#endif // READMESHFROMFILE_H
\ No newline at end of file
+#endif // READMESHFROMFILE_H
--
GitLab