From 291c4fcf0062d798ceffdfb041efb295a33d4155 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 5 Jun 2012 08:41:35 +0200
Subject: [PATCH] - added logog library to MeshRead program
---
SimpleTests/MeshTests/CMakeLists.txt | 1 +
SimpleTests/MeshTests/MeshRead.cpp | 15 +++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index a094ce66234..1da4fad3911 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -22,5 +22,6 @@ TARGET_LINK_LIBRARIES ( MeshRead
MathLib
BaseLib
GeoLib
+ logog
)
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
index 83c8060cbd3..2e0da48402e 100644
--- a/SimpleTests/MeshTests/MeshRead.cpp
+++ b/SimpleTests/MeshTests/MeshRead.cpp
@@ -10,6 +10,10 @@
#include "RunTime.h"
#include "tclap/CmdLine.h"
+// BaseLib/logog
+#include "logog.hpp"
+
+
// MeshLib
#include "Node.h"
#include "Elements/Element.h"
@@ -18,6 +22,9 @@
int main(int argc, char *argv[])
{
+ LOGOG_INITIALIZE();
+ logog::Cout* logogCout = new logog::Cout;
+
TCLAP::CmdLine cmd("Simple mesh loading test", ' ', "0.1");
// Define a value argument and add it to the command line.
@@ -43,10 +50,14 @@ int main(int argc, char *argv[])
MeshLib::Mesh* mesh = mesh_io.loadMeshFromFile(fname);
#ifndef WIN32
unsigned long mem_with_mesh (mem_watch.getVirtMemUsage());
- std::cout << "mem for mesh: " << (mem_with_mesh - mem_without_mesh)/(1024*1024) << " MB" << std::endl;
+// std::cout << "mem for mesh: " << (mem_with_mesh - mem_without_mesh)/(1024*1024) << " MB" << std::endl;
+ INFO ("mem for mesh: %i MB", (mem_with_mesh - mem_without_mesh)/(1024*1024));
run_time.stop();
- std::cout << "time for reading: " << run_time.elapsed() << " s" << std::endl;
+// std::cout << "time for reading: " << run_time.elapsed() << " s" << std::endl;
+ INFO ("time for reading: %f s", run_time.elapsed());
#endif
delete mesh;
+ delete logogCout;
+ LOGOG_SHUTDOWN();
}
--
GitLab