From 15b52c7ec5f13a5ed55a113da03ce3693e56e875 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 7 Dec 2012 18:36:14 +0000 Subject: [PATCH] ENH: Updated noiseFFT --- src/randomProcesses/noise/noiseFFT.C | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C index 0efa5c43f2..9a7ca7cd95 100644 --- a/src/randomProcesses/noise/noiseFFT.C +++ b/src/randomProcesses/noise/noiseFFT.C @@ -27,8 +27,8 @@ License #include "IFstream.H" #include "DynamicList.H" #include "fft.H" -#include "mathematicalConstants.H" #include "SubField.H" +#include "mathematicalConstants.H" // * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * // @@ -61,7 +61,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip) { FatalErrorIn ( - "noiseFFT::noiseFFT(const fileName& pFileName, const label skip)" + "noiseFFT::noiseFFT(const fileName&, const label)" ) << "Cannot read file " << pFileName << exit(FatalError); } @@ -76,11 +76,8 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip) if (!pFile.good() || pFile.eof()) { - FatalErrorIn - ( - "noiseFFT::noiseFFT(const fileName& pFileName, " - "const label skip)" - ) << "Number of points in file " << pFileName + FatalErrorIn("noiseFFT::noiseFFT(const fileName&, const label)") + << "Number of points in file " << pFileName << " is less than the number to be skipped = " << skip << exit(FatalError); } @@ -136,7 +133,7 @@ Foam::tmp Foam::noiseFFT::window if ((N + ni*windowOffset) > size()) { - FatalErrorIn("noiseFFT::window(const label N, const label n) const") + FatalErrorIn("noiseFFT::window(const label, const label) const") << "Requested window is outside set of data" << endl << "number of data = " << size() << endl << "size of window = " << N << endl @@ -215,10 +212,10 @@ Foam::graph Foam::noiseFFT::meanPf { if (N > size()) { - FatalErrorIn("noiseFFT::meanPf(const label N, const label nw) const") - << "Requested window is outside set of data" << endl - << "number of data = " << size() << endl - << "size of window = " << N << endl + FatalErrorIn("noiseFFT::meanPf(const label, const label) const") + << "Requested window is outside set of data" << nl + << "number of data = " << size() << nl + << "size of window = " << N << nl << "window = " << nw << exit(FatalError); } @@ -261,7 +258,7 @@ Foam::graph Foam::noiseFFT::RMSmeanPf { if (N > size()) { - FatalErrorIn("noiseFFT::RMSmeanPf(const label N, const label nw) const") + FatalErrorIn("noiseFFT::RMSmeanPf(const label, const label) const") << "Requested window is outside set of data" << endl << "number of data = " << size() << endl << "size of window = " << N << endl