fvModels, fvConstraints: Updated constructor argument order for consistency with functionObjects

Following the convention chosen for functionObjects the coefficients dictionary
argument is last in constructor argument list.

applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C

@@ -55,11 +55,11 @@ Foam::fv::compressible::VoFCavitation::VoFCavitation
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
 
     mixture_
     (

applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H

@@ -125,8 +125,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.C

@@ -53,11 +53,11 @@ Foam::fv::VoFClouds::VoFClouds
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     phaseName_(dict.lookup("phase")),
     carrierPhaseName_(dict.lookup("carrierPhase")),
     thermo_

applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,8 +98,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C

@@ -81,11 +81,11 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     alphaSolidT_(),
     L_("L", dimEnergy/dimMass, NaN),

applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H

@@ -155,8 +155,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C

@@ -53,11 +53,11 @@ Foam::fv::VoFSurfaceFilm::VoFSurfaceFilm
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     surfaceFilm_
     (
         thermoSurfaceFilm::typeName,

applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,8 +85,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C

@@ -56,11 +56,11 @@ Foam::fv::compressible::VoFTurbulenceDamping::VoFTurbulenceDamping
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     phaseName_(dict.lookupOrDefault("phase", word::null)),
     delta_("delta", dimLength, dict),
     mixture_

applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H

@@ -135,8 +135,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.C

@@ -54,11 +54,11 @@ Foam::fv::VoFCavitation::VoFCavitation
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
 
     mixture_
     (

applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H

@@ -123,8 +123,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C

@@ -53,11 +53,11 @@ Foam::fv::VoFTurbulenceDamping::VoFTurbulenceDamping
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     phaseName_(dict.lookupOrDefault("phase", word::null)),
     delta_("delta", dimLength, dict),
     mixture_

applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H

@@ -133,8 +133,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,11 +179,11 @@ Foam::fv::interfaceTurbulenceDamping::interfaceTurbulenceDamping
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     phaseName_(dict.lookup("phase")),
     delta_("delta", dimLength, dict),
     phase_

applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,8 +149,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,11 +132,11 @@ Foam::fv::phaseTurbulenceStabilisation::phaseTurbulenceStabilisation
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     phaseName_(dict.lookup("phase")),
     alphaInversion_("alphaInversion", dimless, dict),
     phase_

applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,8 +135,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

etc/codeTemplates/dynamicCode/codedFvModelTemplate.C

@@ -96,11 +96,11 @@ ${typeName}FvModel${SourceType}
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs())
 {
     if (${verbose:-false})

etc/codeTemplates/dynamicCode/codedFvModelTemplate.H

@@ -53,7 +53,7 @@ class ${typeName}FvModel${SourceType}
 {
     // Private Data
 
-        //- The set of cells the fvConstraint applies to
+        //- The set of cells the fvModel applies to
         fvCellSet set_;
 
 
@@ -73,8 +73,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,8 +61,8 @@ Foam::fvConstraint::fvConstraint
 (
     const word& name,
     const word& constraintType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
     name_(name),
@@ -81,8 +81,8 @@ Foam::fvConstraint::fvConstraint
 Foam::autoPtr<Foam::fvConstraint> Foam::fvConstraint::New
 (
     const word& name,
-    const dictionary& coeffs,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& coeffs
 )
 {
     const word constraintType(coeffs.lookup("type"));
@@ -111,7 +111,7 @@ Foam::autoPtr<Foam::fvConstraint> Foam::fvConstraint::New
 
     return autoPtr<fvConstraint>
     (
-        cstrIter()(name, constraintType, coeffs, mesh)
+        cstrIter()(name, constraintType, mesh, coeffs)
     );
 }
 

src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,10 +105,10 @@ public:
             (
                 const word& name,
                 const word& constraintType,
-                const dictionary& dict,
+                const fvMesh& mesh,
-                const fvMesh& mesh
+                const dictionary& dict
             ),
-            (name, constraintType, dict, mesh)
+            (name, constraintType, mesh, dict)
         );
 
 
@@ -119,8 +119,8 @@ public:
         (
             const word& name,
             const word& constraintType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Return clone
@@ -158,7 +158,7 @@ public:
 
                 return autoPtr<fvConstraint>
                 (
-                    fvConstraint::New(name_, dict, mesh_)
+                    fvConstraint::New(name_, mesh_, dict)
                 );
             }
         };
@@ -170,8 +170,8 @@ public:
         static autoPtr<fvConstraint> New
         (
             const word& name,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -192,7 +192,7 @@ Foam::fvConstraints::fvConstraints
                 (
                     i,
                     name,
-                    fvConstraint::New(name, constraintDict, mesh).ptr()
+                    fvConstraint::New(name, mesh, constraintDict).ptr()
                 );
 
                 constrainedFields_.set(i, new wordHashSet());

src/finiteVolume/cfdTools/general/fvModels/fvModel.C

@@ -73,8 +73,8 @@ Foam::fvModel::fvModel
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
     name_(name),
@@ -93,8 +93,8 @@ Foam::fvModel::fvModel
 Foam::autoPtr<Foam::fvModel> Foam::fvModel::New
 (
     const word& name,
-    const dictionary& coeffs,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& coeffs
 )
 {
     const word modelType(coeffs.lookup("type"));
@@ -123,7 +123,7 @@ Foam::autoPtr<Foam::fvModel> Foam::fvModel::New
 
     return autoPtr<fvModel>
     (
-        cstrIter()(name, modelType, coeffs, mesh)
+        cstrIter()(name, modelType, mesh, coeffs)
     );
 }
 

src/finiteVolume/cfdTools/general/fvModels/fvModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,10 +135,10 @@ public:
             (
                 const word& name,
                 const word& modelType,
-                const dictionary& dict,
+                const fvMesh& mesh,
-                const fvMesh& mesh
+                const dictionary& dict
             ),
-            (name, modelType, dict, mesh)
+            (name, modelType, mesh, dict)
         );
 
 
@@ -176,8 +176,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Return clone
@@ -215,7 +215,7 @@ public:
 
                 return autoPtr<fvModel>
                 (
-                    fvModel::New(name_, dict, mesh_)
+                    fvModel::New(name_, mesh_, dict)
                 );
             }
         };
@@ -227,8 +227,8 @@ public:
         static autoPtr<fvModel> New
         (
             const word& name,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/finiteVolume/cfdTools/general/fvModels/fvModels.C

@@ -192,7 +192,7 @@ Foam::fvModels::fvModels
                 (
                     i,
                     name,
-                    fvModel::New(name, modelDict, mesh).ptr()
+                    fvModel::New(name, mesh, modelDict).ptr()
                 );
 
                 addSupFields_.set(i, new wordHashSet());

src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,11 +95,11 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvConstraint(name, modelType, dict, mesh),
+    fvConstraint(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     mode_(temperatureMode::uniform),
     TValue_(nullptr),

src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,8 +135,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,11 +111,11 @@ Foam::fv::fixedValueConstraint::fixedValueConstraint
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvConstraint(name, modelType, dict, mesh),
+    fvConstraint(name, modelType, mesh, dict),
     set_(mesh, coeffs())
 {
     readCoeffs();

src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,8 +114,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvConstraints/limitMag/limitMag.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,11 +112,11 @@ Foam::fv::limitMag::limitMag
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvConstraint(name, modelType, dict, mesh),
+    fvConstraint(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     fieldName_(word::null),
     max_(vGreat)

src/fvConstraints/limitMag/limitMag.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,8 +106,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvConstraints/limitPressure/limitPressure.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,11 +159,11 @@ Foam::fv::limitPressure::limitPressure
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvConstraint(name, modelType, dict, mesh),
+    fvConstraint(name, modelType, mesh, dict),
     pName_(word::null),
     pMin_("pMin", dimPressure, 0),
     pMax_("pMax", dimPressure, great),

src/fvConstraints/limitPressure/limitPressure.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,8 +105,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvConstraints/limitTemperature/limitTemperature.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,11 +61,11 @@ Foam::fv::limitTemperature::limitTemperature
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvConstraint(name, modelType, dict, mesh),
+    fvConstraint(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     Tmin_(-vGreat),
     Tmax_(vGreat),

src/fvConstraints/limitTemperature/limitTemperature.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,8 +109,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvConstraints/meanVelocityForce/meanVelocityForce.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,11 +90,11 @@ Foam::fv::meanVelocityForce::meanVelocityForce
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvConstraint(name, modelType, dict, mesh),
+    fvConstraint(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     UName_(word::null),
     Ubar_(vector::uniform(NaN)),

src/fvConstraints/meanVelocityForce/meanVelocityForce.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,8 +126,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,11 +67,11 @@ Foam::fv::patchMeanVelocityForce::patchMeanVelocityForce
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    meanVelocityForce(sourceName, modelType, dict, mesh),
+    meanVelocityForce(sourceName, modelType, mesh, dict),
     patch_(word::null)
 {
     readCoeffs();

src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,8 +103,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/derived/accelerationSource/accelerationSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,11 +57,11 @@ Foam::fv::accelerationSource::accelerationSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     UName_(word::null),
     velocity_(nullptr)

src/fvModels/derived/accelerationSource/accelerationSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,8 +117,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/derived/actuationDiskSource/actuationDiskSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,11 +101,11 @@ Foam::fv::actuationDiskSource::actuationDiskSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     phaseName_(word::null),
     UName_(word::null),

src/fvModels/derived/actuationDiskSource/actuationDiskSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,8 +153,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,11 +67,11 @@ Foam::fv::buoyancyEnergy::buoyancyEnergy
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     phaseName_(word::null),
     UName_(word::null)
 {

src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,8 +93,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/buoyancyForce/buoyancyForce.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,11 +66,11 @@ Foam::fv::buoyancyForce::buoyancyForce
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     phaseName_(word::null),
     UName_(word::null),
     g_

src/fvModels/derived/buoyancyForce/buoyancyForce.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,8 +96,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -171,11 +171,11 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     secondaryMassFlowRate_(NaN),
     secondaryInletT_(NaN),

src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -187,8 +187,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/explicitPorositySource/explicitPorositySource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,11 +79,11 @@ Foam::fv::explicitPorositySource::explicitPorositySource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     UNames_(),
     porosityPtr_(nullptr)

src/fvModels/derived/explicitPorositySource/explicitPorositySource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,8 +118,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/heatSource/heatSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,11 +92,11 @@ Foam::fv::heatSource::heatSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     q_(nullptr)
 {

src/fvModels/derived/heatSource/heatSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,8 +94,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/derived/heatTransfer/heatTransfer.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,11 +68,11 @@ Foam::fv::heatTransfer::heatTransfer
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     semiImplicit_(false),
     TName_(word::null),

src/fvModels/derived/heatTransfer/heatTransfer.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,8 +131,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/derived/massSource/massSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -203,11 +203,11 @@ Foam::fv::massSource::massSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     phaseName_(),
     rhoName_(),

src/fvModels/derived/massSource/massSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,8 +163,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,11 +81,11 @@ Foam::fv::phaseLimitStabilisation::phaseLimitStabilisation
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     fieldName_(word::null),
     rateName_(word::null),
     residualAlpha_(NaN)

src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,8 +116,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,11 +57,11 @@ Foam::fv::radialActuationDiskSource::radialActuationDiskSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    actuationDiskSource(name, modelType, dict, mesh),
+    actuationDiskSource(name, modelType, mesh, dict),
     radialCoeffs_()
 {
     readCoeffs();

src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,8 +138,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/rotorDiskSource/rotorDiskSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -509,11 +509,11 @@ Foam::fv::rotorDiskSource::rotorDiskSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     UName_(word::null),
     omega_(0),

src/fvModels/derived/rotorDiskSource/rotorDiskSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -266,8 +266,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,11 +129,11 @@ Foam::fv::sixDoFAccelerationSource::sixDoFAccelerationSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     UName_(coeffs().lookupOrDefault<word>("U", "U")),
     accelerations_(nullptr),
     g_

src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,8 +119,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,11 +107,11 @@ Foam::fv::solidEquilibriumEnergySource::solidEquilibriumEnergySource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     phaseName_(word::null),
     solidPhaseName_(word::null)
 {

src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,8 +109,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -220,11 +220,11 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     Tsol_(NaN),
     Tliq_(NaN),

src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H

@@ -246,8 +246,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/derived/volumeFractionSource/volumeFractionSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -265,11 +265,11 @@ Foam::fv::volumeFractionSource::volumeFractionSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     phiName_(word::null),
     rhoName_(word::null),
     UName_(word::null),

src/fvModels/derived/volumeFractionSource/volumeFractionSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -193,8 +193,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/general/codedFvModel/codedFvModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,8 +151,8 @@ Foam::fvModel& Foam::fv::codedFvModel::redirectFvModel() const
         redirectFvModelPtr_ = fvModel::New
         (
             name(),
-            constructDict,
+            mesh(),
-            mesh()
+            constructDict
         );
     }
     return redirectFvModelPtr_();
@@ -228,11 +228,11 @@ Foam::fv::codedFvModel::codedFvModel
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     fieldName_(word::null)
 {
     readCoeffs();

src/fvModels/general/codedFvModel/codedFvModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,8 +173,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/general/semiImplicitSource/semiImplicitSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -195,11 +195,11 @@ Foam::fv::semiImplicitSource::semiImplicitSource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     set_(mesh, coeffs()),
     volumeMode_(volumeMode::absolute)
 {

src/fvModels/general/semiImplicitSource/semiImplicitSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -189,8 +189,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Destructor

src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,11 +60,11 @@ Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    interRegionModel(name, modelType, dict, mesh),
+    interRegionModel(name, modelType, mesh, dict),
     UName_(word::null),
     filter_
     (

src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,8 +114,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,11 +78,11 @@ Foam::fv::interRegionHeatTransfer::interRegionHeatTransfer
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    interRegionModel(name, modelType, dict, mesh),
+    interRegionModel(name, modelType, mesh, dict),
     semiImplicit_(false),
     TName_(word::null),
     TNbrName_(word::null),

src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,8 +134,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/fvModels/interRegion/interRegionModel/interRegionModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,11 +133,11 @@ Foam::fv::interRegionModel::interRegionModel
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     master_(false),
     nbrRegionName_(word::null),
     interpolationMethod_(directMethod::typeName),

src/fvModels/interRegion/interRegionModel/interRegionModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,8 +98,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/lagrangian/parcel/fvModels/clouds/clouds.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,11 +52,11 @@ Foam::fv::clouds::clouds
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     g_
     (
         IOobject

src/lagrangian/parcel/fvModels/clouds/clouds.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,8 +146,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/radiationModels/fvModels/radiation/radiation.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,11 +52,11 @@ Foam::fv::radiation::radiation
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     radiation_
     (
         radiationModel::New

src/radiationModels/fvModels/radiation/radiation.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,8 +83,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,11 +57,11 @@ Foam::fv::surfaceFilms::surfaceFilms
 (
     const word& sourceName,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(sourceName, modelType, dict, mesh),
+    fvModel(sourceName, modelType, mesh, dict),
     surfaceFilms_(),
     surfaceFilmPrimaryRhoNames_(),
     fieldNames_(),

src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,8 +93,8 @@ public:
         (
             const word& sourceName,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
         //- Disallow default bitwise copy construction

src/waves/fvModels/forcing/forcing.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,11 +179,11 @@ Foam::fv::forcing::forcing
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    fvModel(name, modelType, dict, mesh),
+    fvModel(name, modelType, mesh, dict),
     lambda_("lambda", dimless/dimTime, NaN),
     scale_(nullptr),
     origins_(),

src/waves/fvModels/forcing/forcing.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,8 +106,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/waves/fvModels/isotropicDamping/isotropicDamping.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,11 +71,11 @@ Foam::fv::isotropicDamping::isotropicDamping
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    forcing(name, modelType, dict, mesh),
+    forcing(name, modelType, mesh, dict),
     UName_(coeffs().lookupOrDefault<word>("U", "U")),
     value_("value", dimVelocity, vector::uniform(NaN))
 {

src/waves/fvModels/isotropicDamping/isotropicDamping.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,8 +131,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/waves/fvModels/verticalDamping/verticalDamping.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,11 +63,11 @@ Foam::fv::verticalDamping::verticalDamping
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    forcing(name, modelType, dict, mesh),
+    forcing(name, modelType, mesh, dict),
     UName_(coeffs().lookupOrDefault<word>("U", "U"))
 {}
 

src/waves/fvModels/verticalDamping/verticalDamping.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,8 +139,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );
 
 

src/waves/fvModels/waveForcing/waveForcing.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,11 +50,11 @@ Foam::fv::waveForcing::waveForcing
 (
     const word& name,
     const word& modelType,
-    const dictionary& dict,
+    const fvMesh& mesh,
-    const fvMesh& mesh
+    const dictionary& dict
 )
 :
-    forcing(name, modelType, dict, mesh),
+    forcing(name, modelType, mesh, dict),
     waves_(waveSuperposition::New(mesh)),
     liquidPhaseName_(coeffs().lookup<word>("liquidPhase")),
     alphaName_(IOobject::groupName("alpha", liquidPhaseName_)),

src/waves/fvModels/waveForcing/waveForcing.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,8 +132,8 @@ public:
         (
             const word& name,
             const word& modelType,
-            const dictionary& dict,
+            const fvMesh& mesh,
-            const fvMesh& mesh
+            const dictionary& dict
         );