From 8212f039ed1d1ed7ac0b28da2cfd91692196aa1c Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <thorsten.liebig@gmx.de>
Date: Wed, 19 May 2010 21:25:15 +0200
Subject: [PATCH] more console output regarding operator & engine usage

---
 FDTD/engine.cpp                  | 1 +
 FDTD/engine_multithread.cpp      | 3 ++-
 FDTD/engine_sse.cpp              | 1 +
 FDTD/engine_sse_compressed.cpp   | 1 +
 FDTD/operator.cpp                | 1 +
 FDTD/operator_cylinder.cpp       | 1 +
 FDTD/operator_sse.cpp            | 1 +
 FDTD/operator_sse_compressed.cpp | 1 +
 openems.cpp                      | 3 +--
 9 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/FDTD/engine.cpp b/FDTD/engine.cpp
index dc8b10a..3371e2f 100644
--- a/FDTD/engine.cpp
+++ b/FDTD/engine.cpp
@@ -24,6 +24,7 @@
 //! it's the responsibility of the caller to free the returned pointer
 Engine* Engine::New(const Operator* op)
 {
+	cout << "Create FDTD engine" << endl;
 	Engine* e = new Engine(op);
 	e->Init();
 	return e;
diff --git a/FDTD/engine_multithread.cpp b/FDTD/engine_multithread.cpp
index 041bcc4..1f93d67 100644
--- a/FDTD/engine_multithread.cpp
+++ b/FDTD/engine_multithread.cpp
@@ -37,6 +37,7 @@
 //! it's the responsibility of the caller to free the returned pointer
 Engine_Multithread* Engine_Multithread::New(const Operator* op, unsigned int numThreads)
 {
+	cout << "Create FDTD engine multithreading environment" << endl;
 	Engine_Multithread* e = new Engine_Multithread(op);
 	e->setNumThreads( numThreads );
 	e->Init();
@@ -84,7 +85,7 @@ void Engine_Multithread::Init()
 	m_stopThreads = false;
 	if (m_numThreads == 0)
 		m_numThreads = boost::thread::hardware_concurrency();
-	cout << "using " << m_numThreads << " threads" << std::endl;
+	cout << "Multithreading engine using " << m_numThreads << " threads." << std::endl;
 	m_barrier_VoltUpdate = new boost::barrier(m_numThreads); // numThread workers
 	m_barrier_VoltExcite = new boost::barrier(m_numThreads+1); // numThread workers + 1 excitation thread
 	m_barrier_CurrUpdate = new boost::barrier(m_numThreads); // numThread workers
diff --git a/FDTD/engine_sse.cpp b/FDTD/engine_sse.cpp
index eb5e2bb..afe4d32 100644
--- a/FDTD/engine_sse.cpp
+++ b/FDTD/engine_sse.cpp
@@ -21,6 +21,7 @@
 //! it's the responsibility of the caller to free the returned pointer
 Engine_sse* Engine_sse::New(const Operator_sse* op)
 {
+	cout << "Create FDTD engine (SSE)" << endl;
 	Engine_sse* e = new Engine_sse(op);
 	e->Init();
 	return e;
diff --git a/FDTD/engine_sse_compressed.cpp b/FDTD/engine_sse_compressed.cpp
index d0b08c6..781a1be 100644
--- a/FDTD/engine_sse_compressed.cpp
+++ b/FDTD/engine_sse_compressed.cpp
@@ -20,6 +20,7 @@
 
 Engine_SSE_Compressed* Engine_SSE_Compressed::New(const Operator_SSE_Compressed* op)
 {
+	cout << "Create FDTD engine (compressed SSE)" << endl;
 	Engine_SSE_Compressed* e = new Engine_SSE_Compressed(op);
 	e->Init();
 	return e;
diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp
index cdc6f4a..0894c86 100644
--- a/FDTD/operator.cpp
+++ b/FDTD/operator.cpp
@@ -26,6 +26,7 @@
 
 Operator* Operator::New()
 {
+	cout << "Create FDTD operator" << endl;
 	Operator* op = new Operator();
 	op->Init();
 	return op;
diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp
index d36e2cd..52e09ae 100644
--- a/FDTD/operator_cylinder.cpp
+++ b/FDTD/operator_cylinder.cpp
@@ -22,6 +22,7 @@
 
 Operator_Cylinder* Operator_Cylinder::New()
 {
+	cout << "Create cylindrical FDTD operator" << endl;
 	Operator_Cylinder* op = new Operator_Cylinder();
 	op->Init();
 	return op;
diff --git a/FDTD/operator_sse.cpp b/FDTD/operator_sse.cpp
index 0903f9c..3d3c366 100644
--- a/FDTD/operator_sse.cpp
+++ b/FDTD/operator_sse.cpp
@@ -21,6 +21,7 @@
 
 Operator_sse* Operator_sse::New()
 {
+	cout << "Create FDTD operator (SSE)" << endl;
 	Operator_sse* op = new Operator_sse();
 	op->Init();
 	return op;
diff --git a/FDTD/operator_sse_compressed.cpp b/FDTD/operator_sse_compressed.cpp
index ae624df..fdb7a57 100644
--- a/FDTD/operator_sse_compressed.cpp
+++ b/FDTD/operator_sse_compressed.cpp
@@ -24,6 +24,7 @@
 
 Operator_SSE_Compressed* Operator_SSE_Compressed::New()
 {
+	cout << "Create FDTD operator (compressed SSE)" << endl;
 	Operator_SSE_Compressed* op = new Operator_SSE_Compressed();
 	op->Init();
 	return op;
diff --git a/openems.cpp b/openems.cpp
index ef4e147..00b6f35 100644
--- a/openems.cpp
+++ b/openems.cpp
@@ -173,7 +173,7 @@ int openEMS::SetupFDTD(const char* file)
 	FDTD_Opts->QueryIntAttribute("CylinderCoords",&help);
 	if (help==1)
 	{
-		cout << "Using a cylinder coordinate FDTD..." << endl;
+//		cout << "Using a cylinder coordinate FDTD..." << endl;
 		CylinderCoords = true;
 	}
 
@@ -208,7 +208,6 @@ int openEMS::SetupFDTD(const char* file)
 	}
 
 	//*************** setup operator ************//
-	cout << "Create Operator..." << endl;
 	if (CylinderCoords)
 	{
 		FDTD_Op = Operator_Cylinder::New();