ENH: surfaceNoise - updated surface output

This commit is contained in:
Andrew Heather
2017-03-10 09:08:46 +00:00
parent a2f54aef3c
commit 4bc957cc3e

View File

@ -609,9 +609,9 @@ void surfaceNoise::calculate()
// Determine frequency range of interest // Determine frequency range of interest
// Note: freqencies have fixed interval, and are in the range // Note: freqencies have fixed interval, and are in the range
// 0 to fftWriteInterval_*(n-1)*deltaf // 0 to fftWriteInterval_*(n-1)*deltaf
label f0 = ceil(fLower_/deltaf/fftWriteInterval_); label f0 = ceil(fLower_/deltaf/scalar(fftWriteInterval_));
label f1 = floor(fUpper_/deltaf/fftWriteInterval_); label f1 = floor(fUpper_/deltaf/scalar(fftWriteInterval_));
label nFreq = f0 == f1 ? 0 : f1 - f0 + 1; label nFreq = f1 - f0;
scalarField PrmsfAve(nFreq, 0); scalarField PrmsfAve(nFreq, 0);
scalarField PSDfAve(nFreq, 0); scalarField PSDfAve(nFreq, 0);
@ -625,9 +625,9 @@ void surfaceNoise::calculate()
} }
else else
{ {
for (label i = f0; i <= f1; ++i) forAll(fOut, i)
{ {
label freqI = i*fftWriteInterval_; label freqI = (i + f0)*fftWriteInterval_;
fOut[i] = freq1[freqI]; fOut[i] = freq1[freqI];
const word gName = "fft"; const word gName = "fft";
@ -637,7 +637,7 @@ void surfaceNoise::calculate()
gName, gName,
"Prmsf", "Prmsf",
freq1[freqI], freq1[freqI],
surfPrmsf[i], surfPrmsf[i + f0],
procFaceOffset, procFaceOffset,
writePrmsf_ writePrmsf_
); );
@ -648,7 +648,7 @@ void surfaceNoise::calculate()
gName, gName,
"PSDf", "PSDf",
freq1[freqI], freq1[freqI],
surfPSDf[i], surfPSDf[i + f0],
procFaceOffset, procFaceOffset,
writePSDf_ writePSDf_
); );
@ -658,7 +658,7 @@ void surfaceNoise::calculate()
gName, gName,
"PSD", "PSD",
freq1[freqI], freq1[freqI],
noiseFFT::PSD(surfPSDf[i]), noiseFFT::PSD(surfPSDf[i + f0]),
procFaceOffset, procFaceOffset,
writePSD_ writePSD_
); );
@ -668,7 +668,7 @@ void surfaceNoise::calculate()
gName, gName,
"SPL", "SPL",
freq1[freqI], freq1[freqI],
noiseFFT::SPL(surfPSDf[i]*deltaf), noiseFFT::SPL(surfPSDf[i + f0]*deltaf),
procFaceOffset, procFaceOffset,
writeSPL_ writeSPL_
); );