Merge remote-tracking branch 'origin/develop' into develop-pre-release

BuildIssues.txt

@@ -118,4 +118,34 @@ your `~/.spack/packages.yaml` file:
 It appears that spack will otherwise ignore any paraview+qt version
 and attempt to install a paraview~qt version instead.
 
+---------------------------
+Building on Darwin (Mac-OS)
+---------------------------
+
+Support for Darwin is incomplete, but has been provisioned for.
+
+The following are typical (as of yet) unresolved issues.
+
+* Scotch, ptscotch:
+  - The librt linkage is required for Linux, but not for Darwin.
+
+  Current resolution:
+  Edit or patch
+      src/parallel/decompose/ptscotchDecomp/Make/options
+      src/parallel/decompose/scotchDecomp/Make/options
+
+  to remove the '-lrt' library
+
+* CGAL:
+  - ThirdParty CGAL will normally need to be compiled without mpfr/gmp.
+    This should be done manually prior to building OpenFOAM or other
+    ThirdParty. Eg,
+
+        cd $WM_THIRD_PARTY_DIR
+        ./makeCGAL gmp-none mpfr-none
+
+  The erroneous references to gmp/mpfr library can be directly removed
+  from the wmake/rules/General/CGAL, but it is more advisable to
+  override them instead in the wmake/rules/darwin64Clang/CGAL file.
+
 --

applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H

@@ -94,11 +94,11 @@ class basicSubGrid
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        basicSubGrid(const basicSubGrid&);
+        //- No copy construct
+        basicSubGrid(const basicSubGrid&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const basicSubGrid&);
+        //- No copy assignment
+        void operator=(const basicSubGrid&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H

@@ -82,11 +82,11 @@ class basicSubGrid
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        basicSubGrid(const basicSubGrid&);
+        //- No copy construct
+        basicSubGrid(const basicSubGrid&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const basicSubGrid&);
+        //- No copy assignment
+        void operator=(const basicSubGrid&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H

@@ -74,11 +74,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        PDRDragModel(const PDRDragModel&);
+        //- No copy construct
+        PDRDragModel(const PDRDragModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PDRDragModel&);
+        //- No copy assignment
+        void operator=(const PDRDragModel&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H

@@ -108,11 +108,11 @@ class basic
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        basic(const basic&);
+        //- No copy construct
+        basic(const basic&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const basic&);
+        //- No copy assignment
+        void operator=(const basic&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H

@@ -70,11 +70,11 @@ class Gulder
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        Gulder(const Gulder&);
+        //- No copy construct
+        Gulder(const Gulder&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const Gulder&);
+        //- No copy assignment
+        void operator=(const Gulder&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H

@@ -66,11 +66,11 @@ class SCOPEBlend
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        SCOPEBlend(const SCOPEBlend&);
+        //- No copy construct
+        SCOPEBlend(const SCOPEBlend&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SCOPEBlend&);
+        //- No copy assignment
+        void operator=(const SCOPEBlend&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H

@@ -84,11 +84,11 @@ class SCOPEXiEq
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        SCOPEXiEq(const SCOPEXiEq&);
+        //- No copy construct
+        SCOPEXiEq(const SCOPEXiEq&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SCOPEXiEq&);
+        //- No copy assignment
+        void operator=(const SCOPEXiEq&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H

@@ -79,11 +79,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        XiEqModel(const XiEqModel&);
+        //- No copy construct
+        XiEqModel(const XiEqModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiEqModel&);
+        //- No copy assignment
+        void operator=(const XiEqModel&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H

@@ -65,11 +65,11 @@ class instability
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        instability(const instability&);
+        //- No copy construct
+        instability(const instability&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const instability&);
+        //- No copy assignment
+        void operator=(const instability&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H

@@ -60,11 +60,11 @@ class KTS
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        KTS(const KTS&);
+        //- No copy construct
+        KTS(const KTS&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const KTS&);
+        //- No copy assignment
+        void operator=(const KTS&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H

@@ -70,11 +70,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        XiGModel(const XiGModel&);
+        //- No copy construct
+        XiGModel(const XiGModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiGModel&);
+        //- No copy assignment
+        void operator=(const XiGModel&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H

@@ -69,11 +69,11 @@ class instabilityG
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        instabilityG(const instabilityG&);
+        //- No copy construct
+        instabilityG(const instabilityG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const instabilityG&);
+        //- No copy assignment
+        void operator=(const instabilityG&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H

@@ -130,11 +130,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        XiModel(const XiModel&);
+        //- No copy construct
+        XiModel(const XiModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiModel&);
+        //- No copy assignment
+        void operator=(const XiModel&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H

@@ -67,11 +67,11 @@ class algebraic
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        algebraic(const algebraic&);
+        //- No copy construct
+        algebraic(const algebraic&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const algebraic&);
+        //- No copy assignment
+        void operator=(const algebraic&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H

@@ -55,11 +55,11 @@ class fixed
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        fixed(const fixed&);
+        //- No copy construct
+        fixed(const fixed&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fixed&);
+        //- No copy assignment
+        void operator=(const fixed&) = delete;
 
 
 public:

applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H

@@ -67,11 +67,11 @@ class transport
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        transport(const transport&);
+        //- No copy construct
+        transport(const transport&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const transport&);
+        //- No copy assignment
+        void operator=(const transport&) = delete;
 
 
 public:

applications/solvers/multiphase/MPPICInterFoam/correctPhi.H

@@ -8,4 +8,4 @@ CorrectPhi
     pimple
 );
 
-#include "continuityErrs.H"
\ No newline at end of file
+#include "continuityErrs.H"

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H

@@ -56,11 +56,11 @@ class VoFPatchTransfer
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        VoFPatchTransfer(const VoFPatchTransfer&);
+        //- No copy construct
+        VoFPatchTransfer(const VoFPatchTransfer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const VoFPatchTransfer&);
+        //- No copy assignment
+        void operator=(const VoFPatchTransfer&) = delete;
 
 
 protected:

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H

@@ -135,11 +135,14 @@ class VoFSolidificationMeltingSource
         template<class RhoFieldType>
         void apply(const RhoFieldType& rho, fvMatrix<scalar>& eqn);
 
-        //- Disallow default bitwise copy construct
-        VoFSolidificationMeltingSource(const VoFSolidificationMeltingSource&);
+        //- No copy construct
+        VoFSolidificationMeltingSource
+        (
+            const VoFSolidificationMeltingSource&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const VoFSolidificationMeltingSource&);
+        //- No copy assignment
+        void operator=(const VoFSolidificationMeltingSource&) = delete;
 
 
 public: