Processing/ ProcessIntegral: fixed FD & multiple results handling

Common/processing.cpp

@@ -185,6 +185,11 @@ void Processing::OpenFile( string outfile )
 	m_filename = outfile;
 }
 
+void Processing::PostProcess()
+{
+	FlushData();
+}
+
 void Processing::DumpBox2File( string vtkfilenameprefix, bool dualMesh ) const
 {
 	string vtkfilename = vtkfilenameprefix + m_filename + ".vtk";
@@ -252,30 +257,6 @@ void Processing::DumpBox2File( string vtkfilenameprefix, bool dualMesh ) const
 	file.close();
 }
 
-void Processing::Dump_FD_Data(vector<double_complex> value, double factor, string filename)
-{
-	if (value.size()==0)
-		return;
-	if (value.size()!=m_FD_Samples.size())
-	{
-		cerr << "Processing::Dump_FD_Data: Error: Complex value and frequency vector have different size! This should never happend!!!" << endl;
-		return;
-	}
-	ofstream file;
-	file.open( filename.c_str() );
-	if (!file.is_open())
-		cerr << "Can't open file: " << filename << endl;
-
-	time_t rawTime;
-	time(&rawTime);
-	file << "%dump by openEMS @" << ctime(&rawTime) << "%frequency\treal\timag\n";
-	for (size_t n=0; n<value.size(); ++n)
-	{
-		file << m_FD_Samples.at(n) << "\t" << 2.0 * std::real(value.at(n))*factor << "\t" << 2.0 * std::imag(value.at(n))*factor << "\n";
-	}
-	file.close();
-}
-
 void ProcessingArray::AddProcessing(Processing* proc)
 {
 	ProcessArray.push_back(proc);

Common/processing.h

@@ -72,7 +72,7 @@ public:
 	virtual int Process() {return GetNextInterval();}
 
 	//! Process data after simulation has finished.
-	virtual void PostProcess() {};
+	virtual void PostProcess();
 
 	//! If disabled, Process() will do nothing...
 	virtual void SetEnable(bool val) {Enabled=val;}
@@ -128,8 +128,6 @@ protected:
 	//! Sampling interval needed for the FD_Samples
 	unsigned int m_FD_Interval;
 
-	void Dump_FD_Data(vector<double_complex> value, double factor, string filename);
-
 	//! define if given coords are on main or dualMesh (default is false)
 	bool m_dualMesh;
 

Common/processintegral.cpp

@@ -21,29 +21,68 @@
 ProcessIntegral::ProcessIntegral(Engine_Interface_Base* eng_if)  : Processing(eng_if)
 {
 	m_Results=NULL;
+	m_FD_Results=NULL;
 }
 
 ProcessIntegral::~ProcessIntegral()
 {
 	delete[] m_Results;
+	delete[] m_FD_Results;
 	m_Results = NULL;
-	ProcessIntegral::FlushData();
+	m_FD_Results = NULL;
 }
 
 
 void ProcessIntegral::InitProcess()
 {
+	delete[] m_Results;
+	delete[] m_FD_Results;
+	m_Results = new double[GetNumberOfIntegrals()];
+	m_FD_Results = new vector<double_complex>[GetNumberOfIntegrals()];
+
 	m_filename = m_Name;
 	OpenFile(m_filename);
-	FD_Values.clear();
-	for (size_t n=0; n<m_FD_Samples.size(); ++n)
-		FD_Values.push_back(0);
+
+	for (int i=0;i<GetNumberOfIntegrals();++i)
+	{
+		for (size_t n=0; n<m_FD_Samples.size(); ++n)
+		{
+			m_FD_Results[i].push_back(0);
+		}
+	}
 }
 
 void ProcessIntegral::FlushData()
 {
 	if (m_FD_Samples.size())
-		Dump_FD_Data(FD_Values,1.0/(double)m_FD_SampleCount,m_filename + "_FD");
+		Dump_FD_Data(1.0/(double)m_FD_SampleCount,m_filename + "_FD");
+}
+
+
+void ProcessIntegral::Dump_FD_Data(double factor, string filename)
+{
+	if (m_FD_Samples.size()==0)
+		return;
+	ofstream file;
+	file.open( filename.c_str() );
+	if (!file.is_open())
+		cerr << "ProcessIntegral::Dump_FD_Data: Error: Can't open file: " << filename << endl;
+	time_t rawTime;
+	time(&rawTime);
+	file << "%dump by openEMS @" << ctime(&rawTime) << "%frequency";
+	for (int i = 0; i < GetNumberOfIntegrals();++i)
+		file << "\treal\timag";
+	file << "\n";
+
+	for (size_t n=0; n<m_FD_Samples.size(); ++n)
+	{
+		file << m_FD_Samples.at(n) ;
+		for (int i = 0; i < GetNumberOfIntegrals();++i)
+			file << "\t" << std::real(m_FD_Results[i].at(n))*factor << "\t" << std::imag(m_FD_Results[i].at(n))*factor;
+		file << "\n";
+	}
+
+	file.close();
 }
 
 int ProcessIntegral::Process()
@@ -53,15 +92,12 @@ int ProcessIntegral::Process()
 
 	CalcMultipleIntegrals();
 	int NrInt = GetNumberOfIntegrals();
-	double integral = m_Results[0] * m_weight;
-
 	double time = m_Eng_Interface->GetTime(m_dualTime);
 
 	if (ProcessInterval)
 	{
 		if (m_Eng_Interface->GetNumberOfTimesteps()%ProcessInterval==0)
 		{
-			TD_Values.push_back(integral);
 			file << setprecision(m_precision) << time;
 			for (int n=0; n<NrInt; ++n)
 				file << "\t" << m_Results[n] * m_weight;
@@ -73,10 +109,10 @@ int ProcessIntegral::Process()
 	{
 		if (m_Eng_Interface->GetNumberOfTimesteps()%m_FD_Interval==0)
 		{
-			double T = time;
 			for (size_t n=0; n<m_FD_Samples.size(); ++n)
 			{
-				FD_Values.at(n) += (double)integral * std::exp( -2.0 * _I * M_PI * m_FD_Samples.at(n) * T );
+				for (int i=0; i<NrInt; ++i)
+					m_FD_Results[i].at(n) += (double)m_Results[i] * m_weight * std::exp( -2.0 * _I * M_PI * m_FD_Samples.at(n) * time );
 			}
 			++m_FD_SampleCount;
 			if (m_Flush)
@@ -90,8 +126,6 @@ int ProcessIntegral::Process()
 
 double* ProcessIntegral::CalcMultipleIntegrals()
 {
-	if (m_Results==NULL)
-		m_Results = new double[1];
 	m_Results[0] = CalcIntegral();
 	return m_Results;
 }

Common/processintegral.h

@@ -53,9 +53,9 @@ public:
 protected:
 	ProcessIntegral(Engine_Interface_Base* eng_if);
 
-	vector<double> TD_Values;
-	vector<double_complex> FD_Values;
+	void Dump_FD_Data(double factor, string filename);
 
+	vector<double_complex> *m_FD_Results;
 	double *m_Results;
 };