diff --git a/src/randomProcesses/noise/noiseFFT/noiseFFT.C b/src/randomProcesses/noise/noiseFFT/noiseFFT.C
index 4db02ad4a363cbdaab7365174c82e74814c69a04..836606088b72fa630c40cbaef7cbd31a69a97861 100644
--- a/src/randomProcesses/noise/noiseFFT/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT/noiseFFT.C
@@ -443,8 +443,7 @@ Foam::graph Foam::noiseFFT::PSD(const graph& gPSDf) const
Foam::graph Foam::noiseFFT::octaves
(
const graph& g,
- const labelUList& freqBandIDs,
- bool integrate
+ const labelUList& freqBandIDs
) const
{
if (freqBandIDs.size() < 2)
@@ -478,22 +477,12 @@ Foam::graph Foam::noiseFFT::octaves
if (fb0 == fb1) continue;
- if (integrate)
+ for (label freqI = fb0; freqI < fb1; ++freqI)
{
- for (label freqI = fb0; freqI < fb1; ++freqI)
- {
- label f0 = f[freqI];
- label f1 = f[freqI + 1];
- scalar dataAve = 0.5*(data[freqI] + data[freqI + 1]);
- octData[bandI] += dataAve*(f1 - f0);
- }
- }
- else
- {
- for (label freqI = fb0; freqI < fb1; ++freqI)
- {
- octData[bandI] += data[freqI];
- }
+ label f0 = f[freqI];
+ label f1 = f[freqI + 1];
+ scalar dataAve = 0.5*(data[freqI] + data[freqI + 1]);
+ octData[bandI] += dataAve*(f1 - f0);
}
}
diff --git a/src/randomProcesses/noise/noiseFFT/noiseFFT.H b/src/randomProcesses/noise/noiseFFT/noiseFFT.H
index c7013c63d1cb378a234360e6cb59a3e6bd95ee0d..56209c7baa4945a11298372d647e76bbe8d2007c 100644
--- a/src/randomProcesses/noise/noiseFFT/noiseFFT.H
+++ b/src/randomProcesses/noise/noiseFFT/noiseFFT.H
@@ -177,8 +177,7 @@ public:
graph octaves
(
const graph& g,
- const labelUList& freqBandIDs,
- bool integrate
+ const labelUList& freqBandIDs
) const;
//- Convert the db into Pa
diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
index 3e0c491292d84c6e7712c9f086b732f92645f03f..3eba67f032fc385225390f591c9826f4a1166594 100644
--- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
+++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
@@ -183,22 +183,8 @@ void pointNoise::processData
// 1/3 octave data
// ---------------
- // PSD [Pa^2/Hz]
- graph PSD13f(nfft.octaves(PSDf, octave13BandIDs, false));
-
// Integrated PSD = P(rms)^2 [Pa^2]
- graph Prms13f2(nfft.octaves(PSDf, octave13BandIDs, true));
-
- graph PSD13g
- (
- "PSD13_dB_Hz(fm)",
- "fm [Hz]",
- "PSD(fm) [dB_Hz]",
- octave13FreqCentre,
- noiseFFT::PSD(PSD13f.y())
- );
- Info<< " Creating graph for " << PSD13g.title() << endl;
- PSD13g.write(outDir, graph::wordify(PSD13g.title()), graphFormat_);
+ graph Prms13f(nfft.octaves(PSDf, octave13BandIDs));
graph SPL13g
(
@@ -206,7 +192,7 @@ void pointNoise::processData
"fm [Hz]",
"SPL(fm) [dB]",
octave13FreqCentre,
- noiseFFT::SPL(Prms13f2.y())
+ noiseFFT::SPL(Prms13f.y())
);
Info<< " Creating graph for " << SPL13g.title() << endl;
SPL13g.write(outDir, graph::wordify(SPL13g.title()), graphFormat_);
diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
index b97622dd4ae65c4500c81849cbfcb4686ba9bca8..b047f00db325c093706bc3f052b104e83dd4ffb6 100644
--- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
+++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
@@ -536,12 +536,10 @@ void surfaceNoise::calculate()
bandSize = octave13BandIDs.size() - 1;
}
- List<scalarField> surfPSD13f(bandSize);
- List<scalarField> surfPrms13f2(bandSize);
- forAll(surfPSD13f, freqI)
+ List<scalarField> surfPrms13f(bandSize);
+ forAll(surfPrms13f, freqI)
{
- surfPSD13f[freqI].setSize(nLocalFace);
- surfPrms13f2[freqI].setSize(nLocalFace);
+ surfPrms13f[freqI].setSize(nLocalFace);
}
const windowModel& win = windowModelPtr_();
@@ -566,17 +564,13 @@ void surfaceNoise::calculate()
surfPSDf[i][faceI] = PSDf.y()[freqI];
}
- // PSD [Pa^2/Hz]
- graph PSD13f(nfft.octaves(PSDf, octave13BandIDs, false));
-
// Integrated PSD = P(rms)^2 [Pa^2]
- graph Prms13f2(nfft.octaves(PSDf, octave13BandIDs, true));
+ graph Prms13f(nfft.octaves(PSDf, octave13BandIDs));
// Store the 1/3 octave results in slot for face of surface
- forAll(surfPSD13f, freqI)
+ forAll(surfPrms13f, freqI)
{
- surfPSD13f[freqI][faceI] = PSD13f.y()[freqI];
- surfPrms13f2[freqI][faceI] = Prms13f2.y()[freqI];
+ surfPrms13f[freqI][faceI] = Prms13f.y()[freqI];
}
}
}
@@ -739,70 +733,35 @@ void surfaceNoise::calculate()
{
fileName outDir(outDirBase/"oneThirdOctave");
- scalarField PSDfAve(surfPSD13f.size(), Zero);
- scalarField Prms13f2Ave(surfPSD13f.size(), Zero);
+ scalarField PSDfAve(surfPrms13f.size(), Zero);
+ scalarField Prms13fAve(surfPrms13f.size(), Zero);
- forAll(surfPSD13f, i)
+ forAll(surfPrms13f, i)
{
- PSDfAve[i] = writeSurfaceData
- (
- outDir,
- fNameBase,
- "PSD13f",
- octave13FreqCentre[i],
- surfPSD13f[i],
- procFaceOffset,
- writeOctaves_
- );
- writeSurfaceData
- (
- outDir,
- fNameBase,
- "PSD13",
- octave13FreqCentre[i],
- noiseFFT::PSD(surfPSD13f[i]),
- procFaceOffset,
- writeOctaves_
- );
writeSurfaceData
(
outDir,
fNameBase,
"SPL13",
octave13FreqCentre[i],
- noiseFFT::SPL(surfPrms13f2[i]),
+ noiseFFT::SPL(surfPrms13f[i]),
procFaceOffset,
writeOctaves_
);
- Prms13f2Ave[i] =
- surfaceAverage(surfPrms13f2[i], procFaceOffset);
+ Prms13fAve[i] =
+ surfaceAverage(surfPrms13f[i], procFaceOffset);
}
if (Pstream::master())
{
- graph PSD13g
- (
- "Average PSD13_dB_Hz(fm)",
- "fm [Hz]",
- "PSD(fm) [dB_Hz]",
- octave13FreqCentre,
- noiseFFT::PSD(PSDfAve)
- );
- PSD13g.write
- (
- outDir,
- graph::wordify(PSD13g.title()),
- graphFormat_
- );
-
graph SPL13g
(
"Average SPL13_dB(fm)",
"fm [Hz]",
"SPL(fm) [dB]",
octave13FreqCentre,
- noiseFFT::SPL(Prms13f2Ave)
+ noiseFFT::SPL(Prms13fAve)
);
SPL13g.write
(