diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C index 97f2cb775f3f9ddb4a29f3d2a97ac97629e0f3e1..61653947eaa78b1c6def79881c8bbecda449ad9b 100644 --- a/applications/utilities/postProcessing/noise/noise.C +++ b/applications/utilities/postProcessing/noise/noise.C @@ -74,8 +74,7 @@ Usage } } - // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // Number of samples in sampling window, default = 2^16 (=65536) N 4096; // Write interval for FFT data, default = 1 diff --git a/applications/utilities/postProcessing/noise/noiseDict b/applications/utilities/postProcessing/noise/noiseDict index ca808462c4c2dceccc6d51c0da878557d969aae7..9323c98df62c4cf1d1c08388bfce21b3697dbe1c 100644 --- a/applications/utilities/postProcessing/noise/noiseDict +++ b/applications/utilities/postProcessing/noise/noiseDict @@ -72,8 +72,7 @@ surfaceNoiseCoeffs // Reference density (to convert from kinematic to static pressure) rhoRef 1.205; - // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // Number of samples in sampling window, default = 2^16 (=65536) N 4096; // 8192; // 4096; // Lower frequency limit, default = 25Hz @@ -123,8 +122,7 @@ pointNoiseCoeffs // Reference density (to convert from kinematic to static pressure) rhoRef 1.2; - // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // Number of samples in sampling window, default = 2^16 (=65536) N 4096; // Lower frequency limit, default = 25Hz diff --git a/src/randomProcesses/fft/fft.C b/src/randomProcesses/fft/fft.C index 658e477f1e25c6615ee599288cd360f9a22a02a2..260bc1901e0bc627a77d1f5efb22577adac285d4 100644 --- a/src/randomProcesses/fft/fft.C +++ b/src/randomProcesses/fft/fft.C @@ -95,20 +95,6 @@ void Foam::fft::transform transformDirection dir ) { - forAll(nn, idim) - { - // Check for power of two - unsigned int dimCount = nn[idim]; - if (!dimCount || (dimCount & (dimCount - 1))) - { - FatalErrorInFunction - << "number of elements in direction " << idim - << " is not a power of 2" << endl - << " Number of elements in each direction = " << nn - << abort(FatalError); - } - } - // Copy field into fftw containers const label N = field.size(); fftw_complex in[N], out[N]; diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C index 84ba84ca4be2b13f77479f73294095ecc71a9d16..008d161cbd95fe11ec0a1fdda236e5e0a6e48ed5 100644 --- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C +++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C @@ -206,16 +206,6 @@ bool Foam::noiseModel::read(const dictionary& dict) dict.readIfPresent("maxPressure", maxPressure_); dict.readIfPresent("outputPrefix", outputPrefix_); - // Check number of samples - must be a power of 2 for our FFT - bool powerOf2 = ((nSamples_ != 0) && !(nSamples_ & (nSamples_ - 1))); - if (!powerOf2) - { - FatalIOErrorInFunction(dict) - << "N: Number of samples in sampling windows must be a " - << "power of 2" - << exit(FatalIOError); - } - if (fLower_ < 0) { FatalIOErrorInFunction(dict) diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H index b74e053dd003a1e9702d94c7d807758928f530ff..336f46ca8637335510aa9347ec911a741fac74c2 100644 --- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H +++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H @@ -66,9 +66,6 @@ Description writeOctaves | Write octaves data | no | yes \endtable -Note - The number of samples in the sampling window must be a power of 2 - SourceFiles noiseModel.C diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H index 3e05e14cb7d45606bb593bc426e08d7ade41fc4d..1a860fe8e2cc330454659aeeff80b051024385df 100644 --- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H +++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H @@ -33,8 +33,7 @@ Description // Pressure reference pRef 0; - // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // Number of samples in sampling window, default = 2^16 (=65536) N 4096; // Lower frequency bounds diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H index ad7cedebcc054f150868f94b1072488416514e07..6cb08327ea5f8cfb3edb6d1ac1807e02f818cd2f 100644 --- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H +++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H @@ -33,8 +33,7 @@ Description // Pressure reference pRef 0; - // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // Number of samples in sampling window, default = 2^16 (=65536) N 4096; // Lower frequency bounds diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point index 2f640c98c266e3e1b03ffd55a96b9d17d0cb1314..b7935e68103d6d1b7d6b5a3aea5e0594bbfc7202 100644 --- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point +++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point @@ -45,7 +45,7 @@ pointNoiseCoeffs separator " "; // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // default = 2^16 (=65536) N 4096; rhoRef 1.205; diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface index a1206332108d2ae5b968e302999c171f77598fa4..6d620735bc48128aed9642f01e6b306f62d8e7f7 100644 --- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface +++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface @@ -56,7 +56,7 @@ surfaceNoiseCoeffs p Curle; // Number of samples in sampling window - // Must be a power of 2, default = 2^16 (=65536) + // default = 2^16 (=65536) N 1024; rhoRef 1.205;