From d37e906f21b755243078b27df1cd88a4cdeffe1d Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 6 Nov 2012 19:12:30 +0000
Subject: [PATCH] Grid are loaded in two places -- allow gmsh grids for both of
them
[[Imported from SVN: r8973]]
---
harmonicmaps-eoc.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/harmonicmaps-eoc.cc b/harmonicmaps-eoc.cc
index b1ed190c..ccbaad30 100644
--- a/harmonicmaps-eoc.cc
+++ b/harmonicmaps-eoc.cc
@@ -267,7 +267,10 @@ int main (int argc, char *argv[]) try
upperRight,
elements);
} else {
- grid = shared_ptr<GridType>(AmiraMeshReader<GridType>::read(parameterSet.get<std::string>("gridFile")));
+ if (gridFileName.rfind(".msh")!=std::string::npos)
+ grid = shared_ptr<GridType>(GmshReader<GridType>::read(gridFileName));
+ else
+ grid = shared_ptr<GridType>(AmiraMeshReader<GridType>::read(gridFileName));
}
grid->globalRefine(i-1);
--
GitLab