ENH: surfaceNoise - only write on the master process

This commit is contained in:
Andrew Heather 2018-04-17 16:00:03 +01:00
parent a230e8d408
commit a1b4b20bf4
2 changed files with 95 additions and 56 deletions

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,6 +44,9 @@ void Foam::noiseModel::readWriteOption
{ {
dict.readIfPresent(lookup, option); dict.readIfPresent(lookup, option);
// Only writing on the master process
option = option && Pstream::master();
if (option) if (option)
{ {
Info<< " " << lookup << ": " << "yes" << endl; Info<< " " << lookup << ": " << "yes" << endl;

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015-2017 OpenCFD Ltd. \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -679,45 +679,68 @@ void surfaceNoise::calculate()
} }
} }
graph Prmsfg if (Pstream::master())
( {
"Average Prms(f)", graph Prmsfg
"f [Hz]", (
"P(f) [Pa]", "Average Prms(f)",
fOut, "f [Hz]",
PrmsfAve "P(f) [Pa]",
); fOut,
Prmsfg.write(outDir, graph::wordify(Prmsfg.title()), graphFormat_); PrmsfAve
);
Prmsfg.write
(
outDir,
graph::wordify(Prmsfg.title()),
graphFormat_
);
graph PSDfg graph PSDfg
( (
"Average PSD_f(f)", "Average PSD_f(f)",
"f [Hz]", "f [Hz]",
"PSD(f) [PaPa_Hz]", "PSD(f) [PaPa_Hz]",
fOut, fOut,
PSDfAve PSDfAve
); );
PSDfg.write(outDir, graph::wordify(PSDfg.title()), graphFormat_); PSDfg.write
(
outDir,
graph::wordify(PSDfg.title()),
graphFormat_
);
graph PSDg graph PSDg
( (
"Average PSD_dB_Hz(f)", "Average PSD_dB_Hz(f)",
"f [Hz]", "f [Hz]",
"PSD(f) [dB_Hz]", "PSD(f) [dB_Hz]",
fOut, fOut,
noiseFFT::PSD(PSDfAve) noiseFFT::PSD(PSDfAve)
); );
PSDg.write(outDir, graph::wordify(PSDg.title()), graphFormat_); PSDg.write
(
outDir,
graph::wordify(PSDg.title()),
graphFormat_
);
graph SPLg graph SPLg
( (
"Average SPL_dB(f)", "Average SPL_dB(f)",
"f [Hz]", "f [Hz]",
"SPL(f) [dB]", "SPL(f) [dB]",
fOut, fOut,
noiseFFT::SPL(PSDfAve*deltaf) noiseFFT::SPL(PSDfAve*deltaf)
); );
SPLg.write(outDir, graph::wordify(SPLg.title()), graphFormat_); SPLg.write
(
outDir,
graph::wordify(SPLg.title()),
graphFormat_
);
}
} }
@ -765,25 +788,38 @@ void surfaceNoise::calculate()
surfaceAverage(surfPrms13f2[i], procFaceOffset); surfaceAverage(surfPrms13f2[i], procFaceOffset);
} }
graph PSD13g if (Pstream::master())
( {
"Average PSD13_dB_Hz(fm)", graph PSD13g
"fm [Hz]", (
"PSD(fm) [dB_Hz]", "Average PSD13_dB_Hz(fm)",
octave13FreqCentre, "fm [Hz]",
noiseFFT::PSD(PSDfAve) "PSD(fm) [dB_Hz]",
); octave13FreqCentre,
PSD13g.write(outDir, graph::wordify(PSD13g.title()), graphFormat_); noiseFFT::PSD(PSDfAve)
);
PSD13g.write
(
outDir,
graph::wordify(PSD13g.title()),
graphFormat_
);
graph SPL13g graph SPL13g
( (
"Average SPL13_dB(fm)", "Average SPL13_dB(fm)",
"fm [Hz]", "fm [Hz]",
"SPL(fm) [dB]", "SPL(fm) [dB]",
octave13FreqCentre, octave13FreqCentre,
noiseFFT::SPL(Prms13f2Ave) noiseFFT::SPL(Prms13f2Ave)
); );
SPL13g.write(outDir, graph::wordify(SPL13g.title()), graphFormat_); SPL13g.write
(
outDir,
graph::wordify(SPL13g.title()),
graphFormat_
);
}
} }
} }
} }