From e880fa3ee80b5f5d7254d815f818943c6e836d0a Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <Thorsten.Liebig@gmx.de>
Date: Mon, 28 Jun 2010 18:27:41 +0200
Subject: [PATCH] Processing: some code cleanups & consistencies

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
---
 FDTD/processcurrent.cpp   |  4 +++-
 FDTD/processcurrent.h     |  2 +-
 FDTD/processfields.cpp    |  4 ++--
 FDTD/processfields.h      |  3 +--
 FDTD/processfields_td.cpp |  6 +++---
 FDTD/processing.h         | 10 +++++++---
 FDTD/processvoltage.cpp   |  4 +++-
 FDTD/processvoltage.h     |  2 +-
 openems.cpp               |  5 ++---
 9 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/FDTD/processcurrent.cpp b/FDTD/processcurrent.cpp
index e0efb07..f7517f2 100644
--- a/FDTD/processcurrent.cpp
+++ b/FDTD/processcurrent.cpp
@@ -46,8 +46,10 @@ void ProcessCurrent::DefineStartStopCoord(double* dstart, double* dstop)
 	}
 }
 
-void ProcessCurrent::Init()
+void ProcessCurrent::InitProcess()
 {
+	m_filename = m_Name;
+	OpenFile(m_filename);
 	FD_currents.clear();
 	for (size_t n=0;n<m_FD_Samples.size();++n)
 		FD_currents.push_back(0);
diff --git a/FDTD/processcurrent.h b/FDTD/processcurrent.h
index 571cf3c..2c30cec 100644
--- a/FDTD/processcurrent.h
+++ b/FDTD/processcurrent.h
@@ -28,7 +28,7 @@ public:
 
 	virtual void DefineStartStopCoord(double* dstart, double* dstop);
 
-	virtual void Init();
+	virtual void InitProcess();
 	virtual void FlushData();
 	virtual int Process();
 
diff --git a/FDTD/processfields.cpp b/FDTD/processfields.cpp
index 3115fe5..b6c99b7 100644
--- a/FDTD/processfields.cpp
+++ b/FDTD/processfields.cpp
@@ -77,8 +77,8 @@ void ProcessFields::InitProcess()
 		else
 			return;
 
-		m_fileName+= ".h5";
-		H5::H5File* file = new H5::H5File( m_fileName , H5F_ACC_TRUNC );
+		m_filename+= ".h5";
+		H5::H5File* file = new H5::H5File( m_filename , H5F_ACC_TRUNC );
 
 		H5::Group* group = new H5::Group( file->createGroup( "/Mesh" ));
 		for (int n=0;n<3;++n)
diff --git a/FDTD/processfields.h b/FDTD/processfields.h
index a282d9b..083dddc 100644
--- a/FDTD/processfields.h
+++ b/FDTD/processfields.h
@@ -43,7 +43,7 @@ public:
 	void SetFilePattern(string fp) {m_filename=filePattern=fp;}
 
 	//! Set the filename for a hdf5 data group file (HDF5 FileType only) \sa SetFileType
-	void SetFileName(string fn) {m_filename=m_fileName=fn;}
+	void SetFileName(string fn) {m_filename=fn;}
 
 	//! Define the Dump-Mode
 	void SetDumpMode(DumpMode mode) {m_DumpMode=mode;}
@@ -87,7 +87,6 @@ protected:
 	DumpType m_DumpType;
 	MeshType m_Mesh_Type;
 	string filePattern;
-	string m_fileName;
 	FileType m_fileType;
 
 	//! field dump sub-sampling
diff --git a/FDTD/processfields_td.cpp b/FDTD/processfields_td.cpp
index 10cb3dc..705e306 100644
--- a/FDTD/processfields_td.cpp
+++ b/FDTD/processfields_td.cpp
@@ -387,11 +387,11 @@ int ProcessFieldsTD::Process()
 	else if (m_fileType==HDF5_FILETYPE)
 	{
 		if (m_DumpMode==NO_INTERPOLATION)
-			DumpNoInterpol(m_fileName);
+			DumpNoInterpol(m_filename);
 		if (m_DumpMode==NODE_INTERPOLATE)
-			DumpNodeInterpol(m_fileName);
+			DumpNodeInterpol(m_filename);
 		if (m_DumpMode==CELL_INTERPOLATE)
-			DumpCellInterpol(m_fileName);
+			DumpCellInterpol(m_filename);
 	}
 	return GetNextInterval();
 }
diff --git a/FDTD/processing.h b/FDTD/processing.h
index ce74068..2e00e84 100644
--- a/FDTD/processing.h
+++ b/FDTD/processing.h
@@ -31,7 +31,9 @@ public:
 	Processing(Operator* op, Engine* eng);
 	virtual ~Processing();
 
-	virtual void Init() {};
+	virtual void SetName(string val) {m_Name=val;}
+
+	virtual void InitProcess() {};
 	virtual void Reset();
 
 	virtual void DefineStartStopCoord(double* dstart, double* dstop);
@@ -62,8 +64,6 @@ public:
 	//! Set the dump precision
 	void SetPrecision(unsigned int val) {m_precision = val;}
 
-	virtual void OpenFile( string outfile );
-
 	virtual void DumpBox2File( string vtkfilenameprefix, bool dualMesh = false ) const; //!< dump geometry to file
 
 protected:
@@ -71,6 +71,8 @@ protected:
 	Engine* Eng;
 	unsigned int m_precision;
 
+	string m_Name;
+
 	bool m_Flush;
 
 	double m_weight;
@@ -103,6 +105,8 @@ protected:
 	ofstream file;
 	string m_filename;
 
+	virtual void OpenFile(string outfile);
+
 	double CalcLineIntegral(unsigned int* start, unsigned int* stop, int field) const;
 	double CalcLineIntegral_I(unsigned int* start, unsigned int* stop) const;
 	double CalcLineIntegral_V(unsigned int* start, unsigned int* stop) const;
diff --git a/FDTD/processvoltage.cpp b/FDTD/processvoltage.cpp
index a847f85..20e1805 100644
--- a/FDTD/processvoltage.cpp
+++ b/FDTD/processvoltage.cpp
@@ -28,8 +28,10 @@ ProcessVoltage::~ProcessVoltage()
 	ProcessVoltage::FlushData();
 }
 
-void ProcessVoltage::Init()
+void ProcessVoltage::InitProcess()
 {
+	m_filename = m_Name;
+	OpenFile(m_filename);
 	FD_voltages.clear();
 	for (size_t n=0;n<m_FD_Samples.size();++n)
 		FD_voltages.push_back(0);
diff --git a/FDTD/processvoltage.h b/FDTD/processvoltage.h
index 7a719dc..b6cb344 100644
--- a/FDTD/processvoltage.h
+++ b/FDTD/processvoltage.h
@@ -27,7 +27,7 @@ public:
 	ProcessVoltage(Operator* op, Engine* eng);
 	virtual ~ProcessVoltage();
 
-	virtual void Init();
+	virtual void InitProcess();
 	virtual void FlushData();
 
 	virtual int Process();
diff --git a/openems.cpp b/openems.cpp
index 1f0293c..cc4fcc5 100644
--- a/openems.cpp
+++ b/openems.cpp
@@ -315,13 +315,11 @@ int openEMS::SetupFDTD(const char* file)
 				if (pb->GetProbeType()==0)
 				{
 					ProcessVoltage* procVolt = new ProcessVoltage(FDTD_Op,FDTD_Eng);
-					procVolt->OpenFile(pb->GetName());
 					proc=procVolt;
 				}
 				else if (pb->GetProbeType()==1)
 				{
 					ProcessCurrent* procCurr = new ProcessCurrent(FDTD_Op,FDTD_Eng);
-					procCurr->OpenFile(pb->GetName());
 					proc=procCurr;
 				}
 				else
@@ -333,7 +331,8 @@ int openEMS::SetupFDTD(const char* file)
 				proc->AddFrequency(pb->GetFDSamples());
 				proc->DefineStartStopCoord(start,stop);
 				proc->SetWeight(pb->GetWeighting());
-				proc->Init();
+				proc->SetName(pb->GetName());
+				proc->InitProcess();
 				PA->AddProcessing(proc);
 				prim->SetPrimitiveUsed(true);
 			}