From 01e8a8011ae407fe81df47cdf57d4747496b2381 Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <Thorsten.Liebig@gmx.de>
Date: Wed, 13 Apr 2011 13:03:41 +0200
Subject: [PATCH] fixed argument parsing & always redirect MPI output

---
 FDTD/openems_fdtd_mpi.cpp |  4 ++--
 FDTD/openems_fdtd_mpi.h   |  2 +-
 main.cpp                  | 11 ++---------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/FDTD/openems_fdtd_mpi.cpp b/FDTD/openems_fdtd_mpi.cpp
index 14bd299..bf97c45 100644
--- a/FDTD/openems_fdtd_mpi.cpp
+++ b/FDTD/openems_fdtd_mpi.cpp
@@ -35,7 +35,7 @@
 #include "tools/useful.h"
 #include "tinyxml.h"
 
-openEMS_FDTD_MPI::openEMS_FDTD_MPI() : openEMS()
+openEMS_FDTD_MPI::openEMS_FDTD_MPI(bool m_MPI_Debug) : openEMS()
 {
 	m_MyID = MPI::COMM_WORLD.Get_rank();
 	m_NumProc = MPI::COMM_WORLD.Get_size();
@@ -63,7 +63,7 @@ openEMS_FDTD_MPI::openEMS_FDTD_MPI() : openEMS()
 	m_Original_Grid = NULL;
 
 	//redirect output to file for all ranks > 0
-	if ((m_MyID>0) && (g_settings.GetVerboseLevel()==0))
+	if ((m_MyID>0) && (m_MPI_Debug==false))
 	{
 		stringstream out_name;
 		out_name << "ID" << m_MyID << "_" << "output.txt";
diff --git a/FDTD/openems_fdtd_mpi.h b/FDTD/openems_fdtd_mpi.h
index 236a345..4894968 100644
--- a/FDTD/openems_fdtd_mpi.h
+++ b/FDTD/openems_fdtd_mpi.h
@@ -27,7 +27,7 @@ class CSRectGrid;
 class openEMS_FDTD_MPI : public openEMS
 {
 public:
-    openEMS_FDTD_MPI();
+	openEMS_FDTD_MPI(bool m_MPI_Debug=false);
 	virtual ~openEMS_FDTD_MPI();
 
 	virtual void RunFDTD();
diff --git a/main.cpp b/main.cpp
index 2d6b11f..9d6e196 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,17 +38,10 @@ using namespace std;
 
 int main(int argc, char *argv[])
 {
-	//read global command line arguments first
-	for (int n=2; n<argc; ++n)
-	{
-		if (g_settings.parseCommandLineArgument(argv[n]))
-			continue;
-	}
-
 #ifdef MPI_SUPPORT
 	//init MPI
 	MPI::Init(argc,argv);
-	openEMS_FDTD_MPI FDTD;
+	openEMS_FDTD_MPI FDTD(false);
 #else
 	openEMS FDTD;
 #endif
@@ -102,7 +95,7 @@ int main(int argc, char *argv[])
 	{
 		for (int n=2; n<argc; ++n)
 		{
-			if (!FDTD.parseCommandLineArgument(argv[n]))
+			if ( (!FDTD.parseCommandLineArgument(argv[n])) && (!g_settings.parseCommandLineArgument(argv[n])))
 				cout << "openEMS - unknown argument: " << argv[n] << endl;
 		}
 	}