Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 # Get version info and arch-path
 . $WM_PROJECT_DIR/etc/config.sh/functions
-_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/libccmio)
+_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/ccmio)
 
 set -x
 

etc/config.csh/CGAL

@@ -50,7 +50,7 @@
 #
 #------------------------------------------------------------------------------
 
-set boost_version=boost-system
+set boost_version=boost_1_61_0
 set cgal_version=CGAL-4.8
 
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version

etc/config.csh/FFTW

@@ -48,7 +48,7 @@
 #
 #------------------------------------------------------------------------------
 
-set fftw_version=fftw-system
+set fftw_version=fftw-3.3.4
 
 setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
 

etc/config.sh/CGAL

@@ -49,7 +49,7 @@
 #         - the LD_LIBRARY_PATH is not adjusted.
 #------------------------------------------------------------------------------
 
-boost_version=boost-system
+boost_version=boost_1_61_0
 cgal_version=CGAL-4.8
 
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version

etc/config.sh/FFTW

@@ -47,7 +47,7 @@
 #         - the LD_LIBRARY_PATH is not adjusted.
 #------------------------------------------------------------------------------
 
-fftw_version=fftw-system
+fftw_version=fftw-3.3.4
 
 export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
 

etc/config.sh/ccmio

@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config.sh/libccmio
+#     etc/config.sh/ccmio
 #
 # Description
 #     Setup file for libccmio include/libraries.

etc/config.sh/functions

@@ -116,7 +116,7 @@ else
     # Cleanup environment:
     # ~~~~~~~~~~~~~~~~~~~~
     unset WM_BASH_FUNCTIONS
-    unset _foamAddPath _foamAddLib _foamAddMan
+    unset -f _foamAddPath _foamAddLib _foamAddMan
-    unset _foamSource _foamEval
+    unset -f _foamSource _foamEval
 
 fi

src/Allwmake

@@ -58,10 +58,9 @@ wmake $targetType sampling
 
 # Compile scotchDecomp, metisDecomp etc.
 parallel/Allwmake $targetType $*
+randomProcesses/Allwmake $targetType $*
 
 wmake $targetType ODE
-wmake $targetType randomProcesses
-
 wmake $targetType fvMotionSolver
 
 transportModels/Allwmake $targetType $*

src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C

@@ -80,7 +80,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::writeEddyOBJ() const
         //    label i2 = ((i + 1) % nPoint) + nPoint;
         //    os  << "l " << i1 << " " << i2 << nl;
         //}
-    }   
+    }
 
     {
         const Time& time = db().time();
@@ -95,7 +95,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::writeEddyOBJ() const
             const eddy& e = eddies_[eddyI];
             pointOffset += e.writeSurfaceOBJ(pointOffset, patchNormal_, os);
         }
-    }                 
+    }
 }
 
 
@@ -141,7 +141,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::writeLumleyCoeffs() const
             scalar eta = sqrt(-ii/3.0);
             os  << xi << token::TAB << eta << token::TAB
                 << ii << token::TAB << iii << endl;
-        }    
+        }
     }
 
     // After interpolation
@@ -1107,7 +1107,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
     writeEntryIfDifferent(os, "d", 1.0, d_);
     writeEntryIfDifferent(os, "kappa", 0.41, kappa_);
     writeEntryIfDifferent(os, "perturb", 1e-5, perturb_);
-    writeEntryIfDifferent(os, "nCellPerEddy", 5, nCellPerEddy_);
+    writeEntryIfDifferent<label>(os, "nCellPerEddy", 5, nCellPerEddy_);
     writeEntryIfDifferent(os, "writeEddies", false, writeEddies_);
 
     if (!interpolateR_)

src/randomProcesses/Kmesh/Kmesh.C

@@ -35,7 +35,7 @@ inline Foam::label Foam::Kmesh::index
     const label i,
     const label j,
     const label k,
-    const labelList& nn
+    const UList<int>& nn
 )
 {
     return (k + j*nn[2] + i*nn[1]*nn[2]);

src/randomProcesses/Kmesh/Kmesh.H

@@ -57,7 +57,7 @@ class Kmesh
         vector l_;
 
         //- Multi-dimensional addressing array
-        labelList nn_;
+        List<int> nn_;
 
         //- Maximum wavenumber
         scalar kmax_;
@@ -71,7 +71,7 @@ class Kmesh
             const label i,
             const label j,
             const label k,
-            const labelList& nn
+            const UList<int>& nn
         );
 
 
@@ -92,7 +92,7 @@ public:
             return l_;
         }
 
-        const labelList& nn() const
+        const List<int>& nn() const
         {
             return nn_;
         }

src/randomProcesses/fft/fft.C

@@ -37,7 +37,7 @@ namespace Foam
 void fft::transform
 (
     complexField& field,
-    const labelList& nn,
+    const UList<int>& nn,
     transformDirection dir
 )
 {
@@ -112,7 +112,7 @@ void fft::transform
 tmp<complexField> fft::forwardTransform
 (
     const tmp<complexField>& tfield,
-    const labelList& nn
+    const UList<int>& nn
 )
 {
     tmp<complexField> tfftField(new complexField(tfield));
@@ -128,7 +128,7 @@ tmp<complexField> fft::forwardTransform
 tmp<complexField> fft::reverseTransform
 (
     const tmp<complexField>& tfield,
-    const labelList& nn
+    const UList<int>& nn
 )
 {
     tmp<complexField> tifftField(new complexField(tfield));
@@ -144,7 +144,7 @@ tmp<complexField> fft::reverseTransform
 tmp<complexVectorField> fft::forwardTransform
 (
     const tmp<complexVectorField>& tfield,
-    const labelList& nn
+    const UList<int>& nn
 )
 {
     tmp<complexVectorField> tfftVectorField
@@ -173,7 +173,7 @@ tmp<complexVectorField> fft::forwardTransform
 tmp<complexVectorField> fft::reverseTransform
 (
     const tmp<complexVectorField>& tfield,
-    const labelList& nn
+    const UList<int>& nn
 )
 {
     tmp<complexVectorField> tifftVectorField

src/randomProcesses/fft/fft.H

@@ -32,6 +32,9 @@ Description
     reverse).  The dimensionality and organisation of the array of values
     in space is supplied in the nn indexing array.
 
+Note
+    The fftw library uses int only (no longs) for its dimensionality.
+
 SourceFiles
     fft.C
 
@@ -41,7 +44,7 @@ SourceFiles
 #define fft_H
 
 #include "complexFields.H"
-#include "labelList.H"
+#include "UList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,7 +66,7 @@ public:
     static void transform
     (
         complexField& field,
-        const labelList& nn,
+        const UList<int>& nn,
         transformDirection fftDirection
     );
 
@@ -71,28 +74,28 @@ public:
     static tmp<complexField> forwardTransform
     (
         const tmp<complexField>& field,
-        const labelList& nn
+        const UList<int>& nn
     );
 
 
     static tmp<complexField> reverseTransform
     (
         const tmp<complexField>& field,
-        const labelList& nn
+        const UList<int>& nn
     );
 
 
     static tmp<complexVectorField> forwardTransform
     (
         const tmp<complexVectorField>& field,
-        const labelList& nn
+        const UList<int>& nn
     );
 
 
     static tmp<complexVectorField> reverseTransform
     (
         const tmp<complexVectorField>& field,
-        const labelList& nn
+        const UList<int>& nn
     );
 };
 

src/randomProcesses/noise/noiseFFT/noiseFFT.C

@@ -246,7 +246,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::Pf
             fft::reverseTransform
             (
                 ReComplexField(tpn),
-                labelList(1, tpn().size())
+                List<int>(1, tpn().size())
             )
         )
     );