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

separate excitation signal for voltages and currents

Browse Source
This commit is contained in:
Thorsten Liebig 2010-04-30 11:28:53 +02:00
parent d16545c776
commit ab7a25d3ee
3 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FDTD/engine.cpp
View File

@ -118,14 +118,14 @@ void Engine::ApplyVoltageExcite()
exc_pos = (int)numTS - (int)Op->E_Exc_delay[n]; exc_pos = (int)numTS - (int)Op->E_Exc_delay[n];
exc_pos *= (exc_pos>0 && exc_pos<=(int)Op->ExciteLength); exc_pos *= (exc_pos>0 && exc_pos<=(int)Op->ExciteLength);
// if (n==0) cerr << numTS << " => " << Op->ExciteSignal[exc_pos] << endl; // if (n==0) cerr << numTS << " => " << Op->ExciteSignal[exc_pos] << endl;
volt[Op->E_Exc_dir[n]][Op->E_Exc_index[0][n]][Op->E_Exc_index[1][n]][Op->E_Exc_index[2][n]] += Op->E_Exc_amp[n]*Op->ExciteSignal[exc_pos]; volt[Op->E_Exc_dir[n]][Op->E_Exc_index[0][n]][Op->E_Exc_index[1][n]][Op->E_Exc_index[2][n]] += Op->E_Exc_amp[n]*Op->ExciteSignal_volt[exc_pos];
} }
// write the first excitation into the file "et1" // write the first excitation into the file "et1"
if (Op->E_Exc_Count >= 1) { if (Op->E_Exc_Count >= 1) {
exc_pos = (int)numTS - (int)Op->E_Exc_delay[0]; exc_pos = (int)numTS - (int)Op->E_Exc_delay[0];
exc_pos *= (exc_pos>0 && exc_pos<=(int)Op->ExciteLength); exc_pos *= (exc_pos>0 && exc_pos<=(int)Op->ExciteLength);
file_et1 << numTS * Op->GetTimestep() << "\t" << Op->E_Exc_amp[0]*Op->ExciteSignal[exc_pos] << "\n"; // do not use std::endl here, because it will do an implicit flush file_et1 << numTS * Op->GetTimestep() << "\t" << Op->E_Exc_amp[0]*Op->ExciteSignal_volt[exc_pos] << "\n"; // do not use std::endl here, because it will do an implicit flush
} }
} }
@ -164,7 +164,7 @@ void Engine::ApplyCurrentExcite()
exc_pos = (int)numTS - (int)Op->Curr_Exc_delay[n]; exc_pos = (int)numTS - (int)Op->Curr_Exc_delay[n];
exc_pos *= (exc_pos>0 && exc_pos<=(int)Op->ExciteLength); exc_pos *= (exc_pos>0 && exc_pos<=(int)Op->ExciteLength);
// if (n==0) cerr << numTS << " => " << Op->ExciteSignal[exc_pos] << endl; // if (n==0) cerr << numTS << " => " << Op->ExciteSignal[exc_pos] << endl;
curr[Op->Curr_Exc_dir[n]][Op->Curr_Exc_index[0][n]][Op->Curr_Exc_index[1][n]][Op->Curr_Exc_index[2][n]] += Op->Curr_Exc_amp[n]*Op->ExciteSignal[exc_pos]; curr[Op->Curr_Exc_dir[n]][Op->Curr_Exc_index[0][n]][Op->Curr_Exc_index[1][n]][Op->Curr_Exc_index[2][n]] += Op->Curr_Exc_amp[n]*Op->ExciteSignal_curr[exc_pos];
} }
} }

78
FDTD/operator.cpp
View File

@ -45,7 +45,8 @@ void Operator::Init()
{ {
CSX = NULL; CSX = NULL;
ExciteSignal = NULL; ExciteSignal_volt = NULL;
ExciteSignal_curr = NULL;
E_Exc_delay = NULL; E_Exc_delay = NULL;
E_Exc_amp=NULL; E_Exc_amp=NULL;
E_Exc_dir=NULL; E_Exc_dir=NULL;
@ -80,7 +81,8 @@ void Operator::Init()
void Operator::Reset() void Operator::Reset()
{ {
delete[] ExciteSignal; delete[] ExciteSignal_volt;
delete[] ExciteSignal_curr;
delete[] E_Exc_delay; delete[] E_Exc_delay;
delete[] E_Exc_dir; delete[] E_Exc_dir;
delete[] E_Exc_amp; delete[] E_Exc_amp;
@ -321,9 +323,9 @@ unsigned int Operator::GetMaxExcitationTimestep() const
unsigned int maxStep=0; unsigned int maxStep=0;
for (unsigned int n=1;n<ExciteLength+1;++n) for (unsigned int n=1;n<ExciteLength+1;++n)
{ {
if (fabs(ExciteSignal[n])>maxAmp) if (fabs(ExciteSignal_volt[n])>maxAmp)
{ {
maxAmp = fabs(ExciteSignal[n]); maxAmp = fabs(ExciteSignal_volt[n]);
maxStep = n; maxStep = n;
} }
} }
@ -336,13 +338,18 @@ unsigned int Operator::CalcGaussianPulsExcitation(double f0, double fc)
ExciteLength = (unsigned int)(2.0 * 9.0/(2.0*PI*fc) / dT); ExciteLength = (unsigned int)(2.0 * 9.0/(2.0*PI*fc) / dT);
// cerr << "Operator::CalcGaussianPulsExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl; // cerr << "Operator::CalcGaussianPulsExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl;
delete[] ExciteSignal; delete[] ExciteSignal_volt;
ExciteSignal = new FDTD_FLOAT[ExciteLength+1]; delete[] ExciteSignal_curr;
ExciteSignal[0]=0.0; ExciteSignal_volt = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_curr = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_volt[0]=0.0;
ExciteSignal_curr[0]=0.0;
for (unsigned int n=1;n<ExciteLength+1;++n) for (unsigned int n=1;n<ExciteLength+1;++n)
{ {
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)); double t = (n-1)*dT;
// cerr << ExciteSignal[n] << endl; ExciteSignal_volt[n] = cos(2.0*PI*f0*(t-9.0/(2.0*PI*fc)))*exp(-1*pow(2.0*PI*fc*t/3.0-3,2));
t += 0.5*dT;
ExciteSignal_curr[n] = cos(2.0*PI*f0*(t-9.0/(2.0*PI*fc)))*exp(-1*pow(2.0*PI*fc*t/3.0-3,2));
} }
return CalcNyquistNum(f0+fc); return CalcNyquistNum(f0+fc);
} }
@ -353,10 +360,14 @@ unsigned int Operator::CalcDiracPulsExcitation()
ExciteLength = 1; ExciteLength = 1;
// cerr << "Operator::CalcDiracPulsExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl; // cerr << "Operator::CalcDiracPulsExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl;
delete[] ExciteSignal; delete[] ExciteSignal_volt;
ExciteSignal = new FDTD_FLOAT[ExciteLength+1]; delete[] ExciteSignal_curr;
ExciteSignal[0]=0.0; ExciteSignal_volt = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal[1]=1.0; ExciteSignal_curr = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_volt[0]=0.0;
ExciteSignal_volt[1]=1.0;
ExciteSignal_curr[0]=0.0;
ExciteSignal_curr[1]=1.0;
return 1; return 1;
} }
@ -366,10 +377,14 @@ unsigned int Operator::CalcStepExcitation()
if (dT==0) return 0; if (dT==0) return 0;
ExciteLength = 1; ExciteLength = 1;
delete[] ExciteSignal; delete[] ExciteSignal_volt;
ExciteSignal = new FDTD_FLOAT[ExciteLength+1]; delete[] ExciteSignal_curr;
ExciteSignal[0]=1.0; ExciteSignal_volt = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal[1]=1.0; ExciteSignal_curr = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_volt[0]=1.0;
ExciteSignal_volt[1]=1.0;
ExciteSignal_curr[0]=0.0;
ExciteSignal_curr[1]=1.0;
return 1; return 1;
} }
@ -381,9 +396,12 @@ unsigned int Operator::CalcCustomExcitation(double f0, int nTS, string signal)
ExciteLength = (unsigned int)(nTS); ExciteLength = (unsigned int)(nTS);
// cerr << "Operator::CalcSinusExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl; // cerr << "Operator::CalcSinusExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl;
delete[] ExciteSignal; delete[] ExciteSignal_volt;
ExciteSignal = new FDTD_FLOAT[ExciteLength+1]; delete[] ExciteSignal_curr;
ExciteSignal[0]=0.0; ExciteSignal_volt = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_curr = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_volt[0]=0.0;
ExciteSignal_curr[0]=0.0;
FunctionParser fParse; FunctionParser fParse;
fParse.AddConstant("pi", 3.14159265358979323846); fParse.AddConstant("pi", 3.14159265358979323846);
fParse.AddConstant("e", 2.71828182845904523536); fParse.AddConstant("e", 2.71828182845904523536);
@ -397,8 +415,9 @@ unsigned int Operator::CalcCustomExcitation(double f0, int nTS, string signal)
for (unsigned int n=1;n<ExciteLength+1;++n) for (unsigned int n=1;n<ExciteLength+1;++n)
{ {
vars[0] = (n-1)*GetTimestep(); vars[0] = (n-1)*GetTimestep();
ExciteSignal[n] = fParse.Eval(vars); ExciteSignal_volt[n] = fParse.Eval(vars);
// cerr << ExciteSignal[n] << endl; vars[0] += 0.5*GetTimestep();
ExciteSignal_curr[n] = fParse.Eval(vars);
} }
return CalcNyquistNum(f0); return CalcNyquistNum(f0);
} }
@ -410,13 +429,18 @@ unsigned int Operator::CalcSinusExcitation(double f0, int nTS)
ExciteLength = (unsigned int)(nTS); ExciteLength = (unsigned int)(nTS);
// cerr << "Operator::CalcSinusExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl; // cerr << "Operator::CalcSinusExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl;
delete[] ExciteSignal; delete[] ExciteSignal_volt;
ExciteSignal = new FDTD_FLOAT[ExciteLength+1]; delete[] ExciteSignal_curr;
ExciteSignal[0]=0.0; ExciteSignal_volt = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_curr = new FDTD_FLOAT[ExciteLength+1];
ExciteSignal_volt[0]=0.0;
ExciteSignal_curr[0]=0.0;
for (unsigned int n=1;n<ExciteLength+1;++n) for (unsigned int n=1;n<ExciteLength+1;++n)
{ {
ExciteSignal[n] = sin(2.0*PI*f0*n*dT); double t = (n-1)*dT;
// cerr << ExciteSignal[n] << endl; ExciteSignal_volt[n] = sin(2.0*PI*f0*t);
t += 0.5*dT;
ExciteSignal_curr[n] = sin(2.0*PI*f0*t);
} }
return CalcNyquistNum(f0); return CalcNyquistNum(f0);
} }

3
FDTD/operator.h
View File

@ -147,7 +147,8 @@ public:
//Excitation time-signal //Excitation time-signal
unsigned int ExciteLength; unsigned int ExciteLength;
FDTD_FLOAT* ExciteSignal; FDTD_FLOAT* ExciteSignal_volt;
FDTD_FLOAT* ExciteSignal_curr;
//E-Field/voltage Excitation //E-Field/voltage Excitation
unsigned int E_Exc_Count; unsigned int E_Exc_Count;