From d58ff052108554a8b7e57272538134a4e2e86c5b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 15:41:52 +0000
Subject: [PATCH] fftRenumber: Corrected namespace
---
src/randomProcesses/fft/fftRenumber.C | 24 +++---------------------
src/randomProcesses/fft/fftRenumber.H | 18 +++++++++++++++++-
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/randomProcesses/fft/fftRenumber.C b/src/randomProcesses/fft/fftRenumber.C
index 235bcd24a6..07f8b238be 100644
--- a/src/randomProcesses/fft/fftRenumber.C
+++ b/src/randomProcesses/fft/fftRenumber.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,16 +32,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// recursively evaluate the indexing necessary to do the folding of
-// the fft data. We recurse until we have the indexing ncessary for
-// the folding in all directions.
-
-void fftRenumberRecurse
+void Foam::fftRenumberRecurse
(
List<complex>& data,
List<complex>& renumData,
@@ -101,12 +92,7 @@ void fftRenumberRecurse
}
-// fftRenumber : fold the n-d data array to get the fft components in
-// the right places.
-
-#include "fftRenumber.H"
-
-void fftRenumber
+void Foam::fftRenumber
(
List<complex>& data,
const labelList& nn
@@ -135,8 +121,4 @@ void fftRenumber
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/randomProcesses/fft/fftRenumber.H b/src/randomProcesses/fft/fftRenumber.H
index bc77adb0b1..fa2e50c580 100644
--- a/src/randomProcesses/fft/fftRenumber.H
+++ b/src/randomProcesses/fft/fftRenumber.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -47,6 +47,22 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Recursively evaluate the indexing necessary to do the folding of the fft
+// data. We recurse until we have the indexing ncessary for the folding in all
+// directions.
+void fftRenumberRecurse
+(
+ List<complex>& data,
+ List<complex>& renumData,
+ const labelList& nn,
+ label nnprod,
+ label ii,
+ label l1,
+ label l2
+);
+
+
+// Fold the n-d data array to get the fft components in the right places.
void fftRenumber
(
List<complex>& data,
--
GitLab