caiyu/openEMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nf2ff: fixes and improved memory cleanup

Browse Source
This commit is contained in:
Thorsten Liebig 2012-07-30 11:14:09 +02:00
parent cb78878604
commit a96ae7ca58
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nf2ff/nf2ff.cpp
View File

@ -230,6 +230,8 @@ bool nf2ff::AnalyseFile(string E_Field_file, string H_Field_file)
if (H_file.ReadMesh(H_lines, H_numLines, H_meshType) == false) if (H_file.ReadMesh(H_lines, H_numLines, H_meshType) == false)
{ {
cerr << "nf2ff::AnalyseFile: Error reading H-Field mesh..." << endl; cerr << "nf2ff::AnalyseFile: Error reading H-Field mesh..." << endl;
for (int n=0;n<3;++n)
delete[] E_lines[n];
return false; return false;
} }
@ -237,11 +239,21 @@ bool nf2ff::AnalyseFile(string E_Field_file, string H_Field_file)
if (E_meshType!=H_meshType) if (E_meshType!=H_meshType)
{ {
cerr << "nf2ff::AnalyseFile: Error mesh types don't agree" << endl; cerr << "nf2ff::AnalyseFile: Error mesh types don't agree" << endl;
for (int n=0;n<3;++n)
{
delete[] H_lines[n];
delete[] E_lines[n];
}
return false; return false;
} }
if ((E_numLines[0]!=H_numLines[0]) || (E_numLines[1]!=H_numLines[1]) || (E_numLines[2]!=H_numLines[2])) if ((E_numLines[0]!=H_numLines[0]) || (E_numLines[1]!=H_numLines[1]) || (E_numLines[2]!=H_numLines[2]))
{ {
cerr << "nf2ff::AnalyseFile: Error mesh dimensions don't agree" << endl; cerr << "nf2ff::AnalyseFile: Error mesh dimensions don't agree" << endl;
for (int n=0;n<3;++n)
{
delete[] H_lines[n];
delete[] E_lines[n];
}
return false; return false;
} }
for (int n=0;n<3;++n) for (int n=0;n<3;++n)
@ -249,6 +261,11 @@ bool nf2ff::AnalyseFile(string E_Field_file, string H_Field_file)
if (E_lines[n][m]!=H_lines[n][m]) if (E_lines[n][m]!=H_lines[n][m])
{ {
cerr << "nf2ff::AnalyseFile: Error mesh lines don't agree" << endl; cerr << "nf2ff::AnalyseFile: Error mesh lines don't agree" << endl;
for (int n=0;n<3;++n)
{
delete[] H_lines[n];
delete[] E_lines[n];
}
return false; return false;
} }
@ -259,10 +276,26 @@ bool nf2ff::AnalyseFile(string E_Field_file, string H_Field_file)
unsigned int data_size[4]; unsigned int data_size[4];
vector<complex<float>****> E_fd_data; vector<complex<float>****> E_fd_data;
E_file.CalcFDVectorData(m_freq,E_fd_data,data_size); if (E_file.CalcFDVectorData(m_freq,E_fd_data,data_size)==false)
{
for (int n=0;n<3;++n)
{
delete[] H_lines[n];
delete[] E_lines[n];
}
return false;
}
vector<complex<float>****> H_fd_data; vector<complex<float>****> H_fd_data;
H_file.CalcFDVectorData(m_freq,H_fd_data,data_size); if (H_file.CalcFDVectorData(m_freq,H_fd_data,data_size)==false)
{
for (int n=0;n<3;++n)
{
delete[] H_lines[n];
delete[] E_lines[n];
}
return false;
}
if (m_Verbose>0) if (m_Verbose>0)
cerr << "nf2ff: Analysing far-field for " << m_nf2ff.size() << " frequencies. " << endl; cerr << "nf2ff: Analysing far-field for " << m_nf2ff.size() << " frequencies. " << endl;