diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C index 61a7f21207..6f292c3532 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C +++ b/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_ ( diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H index 8432d4d1ee..e9f612f71d 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H +++ b/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 diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.C index 687a7d9938..74d376f4d2 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.C +++ b/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_ diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.H index 9a9ae34924..0af50c6c4d 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.H +++ b/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 diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C index 64fd4b8487..ce529c421e 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C +++ b/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), diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H index 9b77cbbe1b..4ea80be9b0 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H +++ b/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 diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C index 6a1ffe271b..96a2fbd58c 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C +++ b/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, diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H index 33eadabeb5..f29b327ff3 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H +++ b/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 diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C index a7f351b5b7..d2099bb1cf 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/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_ diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H index d2e81c6528..218e69c9ea 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/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 diff --git a/applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.C b/applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.C index eae94a1039..8d113b8868 100644 --- a/applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.C +++ b/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_ ( diff --git a/applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H b/applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H index bab531ce4d..5953a6a804 100644 --- a/applications/solvers/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H +++ b/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 diff --git a/applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C index 47c8ab21cd..5b638357f2 100644 --- a/applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/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_ diff --git a/applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H index 1e94222934..309722c989 100644 --- a/applications/solvers/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/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 diff --git a/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C b/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C index fd33527ddc..1854990d68 100644 --- a/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C +++ b/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_ diff --git a/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H index b8b0a7504b..d02b077f01 100644 --- a/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H +++ b/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 diff --git a/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C b/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C index 91eb6fe04d..390df3f23e 100644 --- a/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C +++ b/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_ diff --git a/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H index 12546a7ba9..e84c0dd395 100644 --- a/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H +++ b/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 diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C index 480dcb883b..50b31b858a 100644 --- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C +++ b/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}) diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H index 34c6780bb2..06121051a4 100644 --- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H +++ b/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 ); diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C index 886b03326e..8063f77c84 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C +++ b/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::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::New return autoPtr ( - cstrIter()(name, constraintType, coeffs, mesh) + cstrIter()(name, constraintType, mesh, coeffs) ); } diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H index 1ab9fc559b..b2fdfb1d23 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H +++ b/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::New(name_, dict, mesh_) + fvConstraint::New(name_, mesh_, dict) ); } }; @@ -170,8 +170,8 @@ public: static autoPtr New ( const word& name, - const dictionary& dict, - const fvMesh& mesh + const fvMesh& mesh, + const dictionary& dict ); diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C index 35e754cde5..73147aaf61 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C +++ b/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()); diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.C b/src/finiteVolume/cfdTools/general/fvModels/fvModel.C index d80732487e..82f2663f86 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.C +++ b/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::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::New return autoPtr ( - cstrIter()(name, modelType, coeffs, mesh) + cstrIter()(name, modelType, mesh, coeffs) ); } diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H index eac612c74c..0f6ca06c01 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H +++ b/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::New(name_, dict, mesh_) + fvModel::New(name_, mesh_, dict) ); } }; @@ -227,8 +227,8 @@ public: static autoPtr New ( const word& name, - const dictionary& dict, - const fvMesh& mesh + const fvMesh& mesh, + const dictionary& dict ); diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C index 04f3e1512d..9da5a876be 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C +++ b/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()); diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C index 57c7d99407..55fff7fa54 100644 --- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C +++ b/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), diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H index 9a64d676d3..1ed76c48a0 100644 --- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H +++ b/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 diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C index 5452fa6d40..2bfd1c7b55 100644 --- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C +++ b/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(); diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H index 8a30cd4e98..df87319c2b 100644 --- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H +++ b/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 ); diff --git a/src/fvConstraints/limitMag/limitMag.C b/src/fvConstraints/limitMag/limitMag.C index ed349b0d6b..7e3c3c40f2 100644 --- a/src/fvConstraints/limitMag/limitMag.C +++ b/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) diff --git a/src/fvConstraints/limitMag/limitMag.H b/src/fvConstraints/limitMag/limitMag.H index ef7c4eca38..551d0cb975 100644 --- a/src/fvConstraints/limitMag/limitMag.H +++ b/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 diff --git a/src/fvConstraints/limitPressure/limitPressure.C b/src/fvConstraints/limitPressure/limitPressure.C index efa41b399a..9329b1e79e 100644 --- a/src/fvConstraints/limitPressure/limitPressure.C +++ b/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), diff --git a/src/fvConstraints/limitPressure/limitPressure.H b/src/fvConstraints/limitPressure/limitPressure.H index 8f09fbbd39..22f626e0ff 100644 --- a/src/fvConstraints/limitPressure/limitPressure.H +++ b/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 diff --git a/src/fvConstraints/limitTemperature/limitTemperature.C b/src/fvConstraints/limitTemperature/limitTemperature.C index b2e0df7314..3370c20cca 100644 --- a/src/fvConstraints/limitTemperature/limitTemperature.C +++ b/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), diff --git a/src/fvConstraints/limitTemperature/limitTemperature.H b/src/fvConstraints/limitTemperature/limitTemperature.H index f237208665..3d8d9b6db2 100644 --- a/src/fvConstraints/limitTemperature/limitTemperature.H +++ b/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 diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.C b/src/fvConstraints/meanVelocityForce/meanVelocityForce.C index 46dd8b4ebc..1772c996c5 100644 --- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.C +++ b/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)), diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H b/src/fvConstraints/meanVelocityForce/meanVelocityForce.H index 2f7b1c401d..b6edd65580 100644 --- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H +++ b/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 diff --git a/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C b/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C index b4265b7ed9..c67c5ef97b 100644 --- a/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C +++ b/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(); diff --git a/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H b/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H index a10f6dadc7..42d8041c35 100644 --- a/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H +++ b/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 ); diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.C b/src/fvModels/derived/accelerationSource/accelerationSource.C index e7ba1b61d5..a57acbf4f3 100644 --- a/src/fvModels/derived/accelerationSource/accelerationSource.C +++ b/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) diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.H b/src/fvModels/derived/accelerationSource/accelerationSource.H index 04e8edf23c..365799fa52 100644 --- a/src/fvModels/derived/accelerationSource/accelerationSource.H +++ b/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 ); diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C index 0c100aac77..01fe18687f 100644 --- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C +++ b/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), diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H index 8ed9a30444..8abc03370d 100644 --- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H +++ b/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 diff --git a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C index fa561040e2..b5d9126fd1 100644 --- a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C +++ b/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) { diff --git a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H index d2880b1fb5..4cf9c86bf3 100644 --- a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H +++ b/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 diff --git a/src/fvModels/derived/buoyancyForce/buoyancyForce.C b/src/fvModels/derived/buoyancyForce/buoyancyForce.C index 7a201ec246..38052d2634 100644 --- a/src/fvModels/derived/buoyancyForce/buoyancyForce.C +++ b/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_ diff --git a/src/fvModels/derived/buoyancyForce/buoyancyForce.H b/src/fvModels/derived/buoyancyForce/buoyancyForce.H index 238b0ccc1b..c8f730a673 100644 --- a/src/fvModels/derived/buoyancyForce/buoyancyForce.H +++ b/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 diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C index edc02d2a75..982e312f3a 100644 --- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C +++ b/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), diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index 3b1f36a042..21df8f34a0 100644 --- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/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 diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C index 9093e39e8b..5b7a2c818d 100644 --- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C +++ b/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) diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H index 8c0c05b61c..d2f53a64f6 100644 --- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H +++ b/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 diff --git a/src/fvModels/derived/heatSource/heatSource.C b/src/fvModels/derived/heatSource/heatSource.C index c85b5b7880..f561643bc7 100644 --- a/src/fvModels/derived/heatSource/heatSource.C +++ b/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) { diff --git a/src/fvModels/derived/heatSource/heatSource.H b/src/fvModels/derived/heatSource/heatSource.H index 15bf226fa4..6c318544e4 100644 --- a/src/fvModels/derived/heatSource/heatSource.H +++ b/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 ); diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.C b/src/fvModels/derived/heatTransfer/heatTransfer.C index 1bed0f7191..afeed0ea0b 100644 --- a/src/fvModels/derived/heatTransfer/heatTransfer.C +++ b/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), diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.H b/src/fvModels/derived/heatTransfer/heatTransfer.H index 9049d7fc60..9ea5a413e8 100644 --- a/src/fvModels/derived/heatTransfer/heatTransfer.H +++ b/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 ); diff --git a/src/fvModels/derived/massSource/massSource.C b/src/fvModels/derived/massSource/massSource.C index a0fd427e1a..0ee021fd4b 100644 --- a/src/fvModels/derived/massSource/massSource.C +++ b/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_(), diff --git a/src/fvModels/derived/massSource/massSource.H b/src/fvModels/derived/massSource/massSource.H index 0c00988c5d..c54b424bd3 100644 --- a/src/fvModels/derived/massSource/massSource.H +++ b/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 diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C index cf4f5b63f0..111c443c8c 100644 --- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C +++ b/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) diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H index e83e24c462..c06ed563f8 100644 --- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H +++ b/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 diff --git a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C index 381ee706d8..52caa1c2d6 100644 --- a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C +++ b/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(); diff --git a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H index 4895d37120..4de834b072 100644 --- a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H +++ b/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 diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C index d46ac0bf51..769f2b9103 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C +++ b/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), diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H index 7532875b02..eabe0b212d 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H +++ b/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 ); diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C index d3ef4ec354..b62385f2ac 100644 --- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C +++ b/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("U", "U")), accelerations_(nullptr), g_ diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H index 37c0e86d27..9ffab50ed6 100644 --- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H +++ b/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 diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C index 3782fb6e3c..21530c00ab 100644 --- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C +++ b/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) { diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H index 600ea8dcd8..244d369c88 100644 --- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H +++ b/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 diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C index e78a91253f..3d374782c4 100644 --- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C +++ b/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), diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H index 39694e5ad0..c9b336b420 100644 --- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/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 diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C index 89934ecade..8969ce5c16 100644 --- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C +++ b/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), diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H index f3cbf05460..e3149f3c9c 100644 --- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H +++ b/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 diff --git a/src/fvModels/general/codedFvModel/codedFvModel.C b/src/fvModels/general/codedFvModel/codedFvModel.C index b66354fb5a..392d3e286a 100644 --- a/src/fvModels/general/codedFvModel/codedFvModel.C +++ b/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(); diff --git a/src/fvModels/general/codedFvModel/codedFvModel.H b/src/fvModels/general/codedFvModel/codedFvModel.H index bb6539ed87..790a329719 100644 --- a/src/fvModels/general/codedFvModel/codedFvModel.H +++ b/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 ); diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C index 263e50e377..622094c74b 100644 --- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C +++ b/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) { diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H b/src/fvModels/general/semiImplicitSource/semiImplicitSource.H index 82510f8e76..79aedbb726 100644 --- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H +++ b/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 diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C index 50b9f148c2..34d402747b 100644 --- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C +++ b/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_ ( diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H index 333b7be265..c291ab59f9 100644 --- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H +++ b/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 diff --git a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C index 10ce720cea..98ef922061 100644 --- a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C +++ b/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), diff --git a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H index 0e4e87858e..45c31babd2 100644 --- a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H +++ b/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 ); diff --git a/src/fvModels/interRegion/interRegionModel/interRegionModel.C b/src/fvModels/interRegion/interRegionModel/interRegionModel.C index ce3fb643e6..f7d6690d3c 100644 --- a/src/fvModels/interRegion/interRegionModel/interRegionModel.C +++ b/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), diff --git a/src/fvModels/interRegion/interRegionModel/interRegionModel.H b/src/fvModels/interRegion/interRegionModel/interRegionModel.H index 190de106c5..af5ab26700 100644 --- a/src/fvModels/interRegion/interRegionModel/interRegionModel.H +++ b/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 ); diff --git a/src/lagrangian/parcel/fvModels/clouds/clouds.C b/src/lagrangian/parcel/fvModels/clouds/clouds.C index e3e63099de..c8ca965ef1 100644 --- a/src/lagrangian/parcel/fvModels/clouds/clouds.C +++ b/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 diff --git a/src/lagrangian/parcel/fvModels/clouds/clouds.H b/src/lagrangian/parcel/fvModels/clouds/clouds.H index 65d82f61fb..617c98d5af 100644 --- a/src/lagrangian/parcel/fvModels/clouds/clouds.H +++ b/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 diff --git a/src/radiationModels/fvModels/radiation/radiation.C b/src/radiationModels/fvModels/radiation/radiation.C index 277d4864d8..5e6abc22e8 100644 --- a/src/radiationModels/fvModels/radiation/radiation.C +++ b/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 diff --git a/src/radiationModels/fvModels/radiation/radiation.H b/src/radiationModels/fvModels/radiation/radiation.H index c1c3437926..8ccf33068b 100644 --- a/src/radiationModels/fvModels/radiation/radiation.H +++ b/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 diff --git a/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C b/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C index b6607d00a8..f387c48f03 100644 --- a/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C +++ b/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_(), diff --git a/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H b/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H index fa813afd1b..8d8eb248a9 100644 --- a/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H +++ b/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 diff --git a/src/waves/fvModels/forcing/forcing.C b/src/waves/fvModels/forcing/forcing.C index 579480637b..a51c5bc5af 100644 --- a/src/waves/fvModels/forcing/forcing.C +++ b/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_(), diff --git a/src/waves/fvModels/forcing/forcing.H b/src/waves/fvModels/forcing/forcing.H index f81a4d6291..fb918a8d30 100644 --- a/src/waves/fvModels/forcing/forcing.H +++ b/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 ); diff --git a/src/waves/fvModels/isotropicDamping/isotropicDamping.C b/src/waves/fvModels/isotropicDamping/isotropicDamping.C index ba4dd738e0..4334911d39 100644 --- a/src/waves/fvModels/isotropicDamping/isotropicDamping.C +++ b/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("U", "U")), value_("value", dimVelocity, vector::uniform(NaN)) { diff --git a/src/waves/fvModels/isotropicDamping/isotropicDamping.H b/src/waves/fvModels/isotropicDamping/isotropicDamping.H index 9224201960..e9c9938da0 100644 --- a/src/waves/fvModels/isotropicDamping/isotropicDamping.H +++ b/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 ); diff --git a/src/waves/fvModels/verticalDamping/verticalDamping.C b/src/waves/fvModels/verticalDamping/verticalDamping.C index e7b048ca16..a31506f4b3 100644 --- a/src/waves/fvModels/verticalDamping/verticalDamping.C +++ b/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("U", "U")) {} diff --git a/src/waves/fvModels/verticalDamping/verticalDamping.H b/src/waves/fvModels/verticalDamping/verticalDamping.H index 11d88ffa90..0c77667ecc 100644 --- a/src/waves/fvModels/verticalDamping/verticalDamping.H +++ b/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 ); diff --git a/src/waves/fvModels/waveForcing/waveForcing.C b/src/waves/fvModels/waveForcing/waveForcing.C index d3b9d5bbe6..81beaf4892 100644 --- a/src/waves/fvModels/waveForcing/waveForcing.C +++ b/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("liquidPhase")), alphaName_(IOobject::groupName("alpha", liquidPhaseName_)), diff --git a/src/waves/fvModels/waveForcing/waveForcing.H b/src/waves/fvModels/waveForcing/waveForcing.H index 5b01a595e3..12c4e63477 100644 --- a/src/waves/fvModels/waveForcing/waveForcing.H +++ b/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 );