From 7d49a74d0c2ae1ac71d7aefc1ccaaa39d6f4311b Mon Sep 17 00:00:00 2001
From: Dmitrij Naumov <dmitrij@naumov.de>
Date: Wed, 31 Oct 2012 15:58:13 +0100
Subject: [PATCH] Deduplicate readMeshFromFile() in MeshTests/MeshRead.
---
SimpleTests/MeshTests/MeshRead.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
index 0c47cc4b4ac..9576e9dc5eb 100644
--- a/SimpleTests/MeshTests/MeshRead.cpp
+++ b/SimpleTests/MeshTests/MeshRead.cpp
@@ -16,8 +16,7 @@
#include "logog.hpp"
// FileIO
-#include "RapidXmlIO/RapidVtuInterface.h"
-#include "Legacy/MeshIO.h"
+#include "readMeshFromFile.h"
// MeshLib
#include "Node.h"
@@ -47,19 +46,13 @@ int main(int argc, char *argv[])
std::string fname (mesh_arg.getValue());
- FileIO::MeshIO mesh_io;
#ifndef WIN32
BaseLib::MemWatch mem_watch;
unsigned long mem_without_mesh (mem_watch.getVirtMemUsage());
#endif
BaseLib::RunTime run_time;
run_time.start();
- MeshLib::Mesh* mesh(NULL);
- if (BaseLib::getFileExtension(fname).compare("msh") == 0) {
- mesh = mesh_io.loadMeshFromFile(fname);
- } else {
- mesh = FileIO::RapidVtuInterface::readVTUFile(fname);
- }
+ MeshLib::Mesh* mesh = FileIO::readMeshFromFile(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;
--
GitLab