limit the gauss excitation to max timesteps

pull/1/head
Thorsten Liebig 2010-05-05 17:28:00 +02:00
parent e3a12c959d
commit 065c05eeae
2 changed files with 8 additions and 3 deletions

View File

@ -74,7 +74,7 @@ bool Excitation::setupExcitation( TiXmlElement* Excite, unsigned int maxTS )
case 0: case 0:
Excite->QueryDoubleAttribute("f0",&f0); Excite->QueryDoubleAttribute("f0",&f0);
Excite->QueryDoubleAttribute("fc",&fc); Excite->QueryDoubleAttribute("fc",&fc);
CalcGaussianPulsExcitation(f0,fc); CalcGaussianPulsExcitation(f0,fc,maxTS);
break; break;
case 1: case 1:
Excite->QueryDoubleAttribute("f0",&f0); Excite->QueryDoubleAttribute("f0",&f0);
@ -122,11 +122,16 @@ unsigned int Excitation::GetMaxExcitationTimestep() const
return maxStep; return maxStep;
} }
void Excitation::CalcGaussianPulsExcitation(double f0, double fc) void Excitation::CalcGaussianPulsExcitation(double f0, double fc, int nTS)
{ {
if (dT==0) return; if (dT==0) return;
Length = (unsigned int)(2.0 * 9.0/(2.0*PI*fc) / dT); Length = (unsigned int)(2.0 * 9.0/(2.0*PI*fc) / dT);
if ((int)Length>nTS)
{
cerr << "Operator::CalcGaussianPulsExcitation: Requested excitation pusle would be " << Length << " timesteps or " << Length * dT << " s long. Cutting to max number of timesteps!" << endl;
Length=(unsigned int)nTS;
}
// cerr << "Operator::CalcGaussianPulsExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl; // cerr << "Operator::CalcGaussianPulsExcitation: Length of the excite signal: " << ExciteLength << " timesteps" << endl;
delete[] Signal_volt; delete[] Signal_volt;
delete[] Signal_curr; delete[] Signal_curr;

View File

@ -70,7 +70,7 @@ protected:
//! Calculate a custom signal //! Calculate a custom signal
virtual void CalcCustomExcitation(double f0, int nTS, string signal); virtual void CalcCustomExcitation(double f0, int nTS, string signal);
//! Calculate an excitation with center of f0 and the half bandwidth fc //! Calculate an excitation with center of f0 and the half bandwidth fc
virtual void CalcGaussianPulsExcitation(double f0, double fc); virtual void CalcGaussianPulsExcitation(double f0, double fc, int nTS);
//! Calculate a sinusoidal excitation with frequency f0 and a duration of nTS number of timesteps //! Calculate a sinusoidal excitation with frequency f0 and a duration of nTS number of timesteps
virtual void CalcSinusExcitation(double f0, int nTS); virtual void CalcSinusExcitation(double f0, int nTS);
//! Calculate a dirac impuls excitation //! Calculate a dirac impuls excitation