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

cricital bug fix for mode matching probes 

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
pull/22/head
Thorsten Liebig 2016-11-13 22:09:36 +01:00
parent 9f3d5f0da2
commit 765490d7a3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Common/processmodematch.cpp
View File

@ -135,22 +135,23 @@ void ProcessModeMatch::InitProcess()
m_ModeDist[n] = Create2DArray<double>(m_numLines); m_ModeDist[n] = Create2DArray<double>(m_numLines);
} }
bool dualMesh = m_ModeFieldType==1;
unsigned int pos[3] = {0,0,0}; unsigned int pos[3] = {0,0,0};
double discLine[3] = {0,0,0}; double discLine[3] = {0,0,0};
double gridDelta = 1; // 1 -> mode-matching function is definied in drawing units... double gridDelta = 1; // 1 -> mode-matching function is definied in drawing units...
double var[7]; double var[7];
pos[m_ny] = start[m_ny]; pos[m_ny] = start[m_ny];
discLine[m_ny] = Op->GetDiscLine(m_ny,pos[m_ny],m_dualMesh); discLine[m_ny] = Op->GetDiscLine(m_ny,pos[m_ny],dualMesh);
double norm = 0; double norm = 0;
double area = 0; double area = 0;
for (unsigned int posP = 0; posP<m_numLines[0]; ++posP) for (unsigned int posP = 0; posP<m_numLines[0]; ++posP)
{ {
pos[nP] = start[nP] + posP; pos[nP] = start[nP] + posP;
discLine[nP] = Op->GetDiscLine(nP,pos[nP],m_dualMesh); discLine[nP] = Op->GetDiscLine(nP,pos[nP],dualMesh);
for (unsigned int posPP = 0; posPP<m_numLines[1]; ++posPP) for (unsigned int posPP = 0; posPP<m_numLines[1]; ++posPP)
{ {
pos[nPP] = start[nPP] + posPP; pos[nPP] = start[nPP] + posPP;
discLine[nPP] = Op->GetDiscLine(nPP,pos[nPP],m_dualMesh); discLine[nPP] = Op->GetDiscLine(nPP,pos[nPP],dualMesh);
var[0] = discLine[0] * gridDelta; // x var[0] = discLine[0] * gridDelta; // x
var[1] = discLine[1] * gridDelta; // y var[1] = discLine[1] * gridDelta; // y
@ -169,7 +170,7 @@ void ProcessModeMatch::InitProcess()
var[5] = sqrt(pow(discLine[0],2)+pow(discLine[2],2)) * gridDelta; // r var[5] = sqrt(pow(discLine[0],2)+pow(discLine[2],2)) * gridDelta; // r
var[6] = asin(1)-atan(var[2]/var[3]); //theta (t) var[6] = asin(1)-atan(var[2]/var[3]); //theta (t)
} }
area = Op->GetNodeArea(m_ny,pos,m_dualMesh); area = Op->GetNodeArea(m_ny,pos,dualMesh);
for (int n=0; n<2; ++n) for (int n=0; n<2; ++n)
{ {
m_ModeDist[n][posP][posPP] = m_ModeParser[n]->Eval(var); //calc mode template m_ModeDist[n][posP][posPP] = m_ModeParser[n]->Eval(var); //calc mode template
@ -227,6 +228,7 @@ double* ProcessModeMatch::CalcMultipleIntegrals()
double field = 0; double field = 0;
double purity = 0; double purity = 0;
double area = 0; double area = 0;
bool dualMesh = m_ModeFieldType==1;
int nP = (m_ny+1)%3; int nP = (m_ny+1)%3;
int nPP = (m_ny+2)%3; int nPP = (m_ny+2)%3;
@ -242,7 +244,7 @@ double* ProcessModeMatch::CalcMultipleIntegrals()
for (unsigned int posPP = 0; posPP<m_numLines[1]; ++posPP) for (unsigned int posPP = 0; posPP<m_numLines[1]; ++posPP)
{ {
pos[nPP] = start[nPP] + posPP; pos[nPP] = start[nPP] + posPP;
area = Op->GetNodeArea(m_ny,pos,m_dualMesh); area = Op->GetNodeArea(m_ny,pos,dualMesh);
if (m_ModeFieldType==0) if (m_ModeFieldType==0)
m_Eng_Interface->GetEField(pos,out); m_Eng_Interface->GetEField(pos,out);
if (m_ModeFieldType==1) if (m_ModeFieldType==1)

4
openems.cpp
View File

@ -418,11 +418,13 @@ bool openEMS::SetupProcessing()
} }
if (CylinderCoords) if (CylinderCoords)
proc->SetMeshType(Processing::CYLINDRICAL_MESH); proc->SetMeshType(Processing::CYLINDRICAL_MESH);
if ((pb->GetProbeType()==1) || (pb->GetProbeType()==3) || (pb->GetProbeType()==11)) if ((pb->GetProbeType()==1) || (pb->GetProbeType()==3))
{ {
proc->SetDualTime(true); proc->SetDualTime(true);
proc->SetDualMesh(true); proc->SetDualMesh(true);
} }
if (pb->GetProbeType()==11)
proc->SetDualTime(true);
proc->SetProcessInterval(Nyquist/m_OverSampling); proc->SetProcessInterval(Nyquist/m_OverSampling);
if (pb->GetStartTime()>0 || pb->GetStopTime()>0) if (pb->GetStartTime()>0 || pb->GetStopTime()>0)
proc->SetProcessStartStopTime(pb->GetStartTime(), pb->GetStopTime()); proc->SetProcessStartStopTime(pb->GetStartTime(), pb->GetStopTime());