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

fixed nyquist handling

pull/1/head
Thorsten Liebig 2010-04-02 17:20:18 +02:00
parent 0274f4e253
commit f73d6f80f8
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
FDTD/operator.cpp
View File

@ -88,12 +88,11 @@ void Operator::Reset()
Operator::Init();
}
unsigned int Operator::GetNyquistNum(double fmax)
unsigned int Operator::CalcNyquistNum(double fmax)
{
if (dT==0) return 1;
double T0 = 1/fmax;
m_nyquistTS = floor(T0/2/dT);
return m_nyquistTS;
return floor(T0/2/dT);
}
bool Operator::SnapToMesh(double* dcoord, unsigned int* uicoord, bool lower)
@ -245,7 +244,7 @@ unsigned int Operator::CalcGaussianPulsExcitation(double f0, double fc)
ExciteSignal[n] = cos(2.0*PI*f0*(n*dT-9.0/(2.0*PI*fc)))*exp(-1*pow(2.0*PI*fc*n*dT/3.0-3,2));
// cerr << ExciteSignal[n] << endl;
}
return GetNyquistNum(f0+fc);
return CalcNyquistNum(f0+fc);
}
unsigned int Operator::CalcDiracPulsExcitation()
@ -259,10 +258,7 @@ unsigned int Operator::CalcDiracPulsExcitation()
ExciteSignal[0]=0.0;
ExciteSignal[1]=1.0;
// FIXME GetNyquistNum() has side-effects!
m_nyquistTS = 1;
return m_nyquistTS;
return 1;
}
unsigned int Operator::CalcStepExcitation()
@ -275,10 +271,7 @@ unsigned int Operator::CalcStepExcitation()
ExciteSignal[0]=1.0;
ExciteSignal[1]=1.0;
// FIXME GetNyquistNum() has side-effects!
m_nyquistTS = 1;
return m_nyquistTS;
return 1;
}
unsigned int Operator::CalcSinusExcitation(double f0, int nTS)
@ -296,7 +289,7 @@ unsigned int Operator::CalcSinusExcitation(double f0, int nTS)
ExciteSignal[n] = sin(2.0*PI*f0*n*dT);
// cerr << ExciteSignal[n] << endl;
}
return GetNyquistNum(f0);
return CalcNyquistNum(f0);
}
void Operator::DumpOperator2File(string filename)

5
FDTD/operator.h
View File

@ -48,9 +48,12 @@ public:
virtual void ApplyMagneticBC(bool* dirs);
double GetTimestep() const {return dT;};
unsigned int GetNyquistNum(double fmax);
double GetNumberCells() const;
void SetNyquistNum(unsigned int nyquist) {m_nyquistTS=nyquist;}
unsigned int GetNyquistNum() const {return m_nyquistTS;};
unsigned int CalcNyquistNum(double fmax);
void ShowStat() const;
void DumpOperator2File(string filename);

2
openems.cpp
View File

@ -247,6 +247,8 @@ int openEMS::SetupFDTD(const char* file)
exit(-1);
}
FDTD_Op->SetNyquistNum(Nyquist);
if (DebugMat)
{
FDTD_Op->DumpMaterial2File("material_dump.vtk");