diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C index ad81aa82d1..b21f816e03 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,6 +42,19 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField {} +Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + pName_(dict.lookupOrDefault("p", "p")), + psiName_(dict.lookupOrDefault("psi", "thermo:psi")) +{} + + Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField ( const fixedRhoFvPatchScalarField& ptf, @@ -56,19 +69,6 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField {} -Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - pName_(dict.lookupOrDefault("p", "p")), - psiName_(dict.lookupOrDefault("psi", "thermo:psi")) -{} - - Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField ( const fixedRhoFvPatchScalarField& frpsf, diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C index 22d97bc719..edf44aad9a 100644 --- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C @@ -42,6 +42,18 @@ adjointOutletPressureFvPatchScalarField {} +Foam::adjointOutletPressureFvPatchScalarField:: +adjointOutletPressureFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict) +{} + + Foam::adjointOutletPressureFvPatchScalarField:: adjointOutletPressureFvPatchScalarField ( @@ -55,18 +67,6 @@ adjointOutletPressureFvPatchScalarField {} -Foam::adjointOutletPressureFvPatchScalarField:: -adjointOutletPressureFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict) -{} - - Foam::adjointOutletPressureFvPatchScalarField:: adjointOutletPressureFvPatchScalarField ( diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index 61de72e85e..3460747dcd 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,19 +82,6 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField -( - const alphaContactAngleFvPatchScalarField& gcpsf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - zeroGradientFvPatchScalarField(gcpsf, p, iF, mapper), - thetaProps_(gcpsf.thetaProps_) -{} - - alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField ( const fvPatch& p, @@ -109,6 +96,19 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField } +alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +( + const alphaContactAngleFvPatchScalarField& gcpsf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + zeroGradientFvPatchScalarField(gcpsf, p, iF, mapper), + thetaProps_(gcpsf.thetaProps_) +{} + + alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField ( const alphaContactAngleFvPatchScalarField& gcpsf, diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index 2c44437f9f..1ad1f84cbe 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,20 +53,6 @@ JohnsonJacksonParticleSlipFvPatchVectorField {} -Foam::JohnsonJacksonParticleSlipFvPatchVectorField:: -JohnsonJacksonParticleSlipFvPatchVectorField -( - const JohnsonJacksonParticleSlipFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - partialSlipFvPatchVectorField(ptf, p, iF, mapper), - specularityCoefficient_(ptf.specularityCoefficient_) -{} - - Foam::JohnsonJacksonParticleSlipFvPatchVectorField:: JohnsonJacksonParticleSlipFvPatchVectorField ( @@ -101,6 +87,20 @@ JohnsonJacksonParticleSlipFvPatchVectorField } +Foam::JohnsonJacksonParticleSlipFvPatchVectorField:: +JohnsonJacksonParticleSlipFvPatchVectorField +( + const JohnsonJacksonParticleSlipFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + partialSlipFvPatchVectorField(ptf, p, iF, mapper), + specularityCoefficient_(ptf.specularityCoefficient_) +{} + + Foam::JohnsonJacksonParticleSlipFvPatchVectorField:: JohnsonJacksonParticleSlipFvPatchVectorField ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index daafb84e82..9127e13cc3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,22 +53,6 @@ JohnsonJacksonParticleThetaFvPatchScalarField {} -Foam::JohnsonJacksonParticleThetaFvPatchScalarField:: -JohnsonJacksonParticleThetaFvPatchScalarField -( - const JohnsonJacksonParticleThetaFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - restitutionCoefficient_(ptf.restitutionCoefficient_), - specularityCoefficient_(ptf.specularityCoefficient_) -{ -} - - Foam::JohnsonJacksonParticleThetaFvPatchScalarField:: JohnsonJacksonParticleThetaFvPatchScalarField ( @@ -120,6 +104,22 @@ JohnsonJacksonParticleThetaFvPatchScalarField } +Foam::JohnsonJacksonParticleThetaFvPatchScalarField:: +JohnsonJacksonParticleThetaFvPatchScalarField +( + const JohnsonJacksonParticleThetaFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + restitutionCoefficient_(ptf.restitutionCoefficient_), + specularityCoefficient_(ptf.specularityCoefficient_) +{ +} + + Foam::JohnsonJacksonParticleThetaFvPatchScalarField:: JohnsonJacksonParticleThetaFvPatchScalarField ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C index 3ffa36ffa5..776ae0db72 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C @@ -110,6 +110,19 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField {} +alphatPhaseJayatillekeWallFunctionFvPatchScalarField:: +alphatPhaseJayatillekeWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + Prt_(dict.lookupOrDefault("Prt", 0.85)) +{} + + alphatPhaseJayatillekeWallFunctionFvPatchScalarField:: alphatPhaseJayatillekeWallFunctionFvPatchScalarField ( @@ -124,19 +137,6 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField {} -alphatPhaseJayatillekeWallFunctionFvPatchScalarField:: -alphatPhaseJayatillekeWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - Prt_(dict.lookupOrDefault("Prt", 0.85)) -{} - - alphatPhaseJayatillekeWallFunctionFvPatchScalarField:: alphatPhaseJayatillekeWallFunctionFvPatchScalarField ( diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index 42bc40bec1..7216f1a4f8 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,19 +82,6 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField -( - const alphaContactAngleFvPatchScalarField& gcpsf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - zeroGradientFvPatchScalarField(gcpsf, p, iF, mapper), - thetaProps_(gcpsf.thetaProps_) -{} - - alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField ( const fvPatch& p, @@ -109,6 +96,19 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField } +alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +( + const alphaContactAngleFvPatchScalarField& gcpsf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + zeroGradientFvPatchScalarField(gcpsf, p, iF, mapper), + thetaProps_(gcpsf.thetaProps_) +{} + + alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField ( const alphaContactAngleFvPatchScalarField& gcpsf, diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C index 49076e3ba5..a270da8ea8 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,21 +50,6 @@ tractionDisplacementCorrectionFvPatchVectorField } -tractionDisplacementCorrectionFvPatchVectorField:: -tractionDisplacementCorrectionFvPatchVectorField -( - const tractionDisplacementCorrectionFvPatchVectorField& tdpvf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedGradientFvPatchVectorField(tdpvf, p, iF, mapper), - traction_(mapper(tdpvf.traction_)), - pressure_(mapper(tdpvf.pressure_)) -{} - - tractionDisplacementCorrectionFvPatchVectorField:: tractionDisplacementCorrectionFvPatchVectorField ( @@ -82,6 +67,21 @@ tractionDisplacementCorrectionFvPatchVectorField } +tractionDisplacementCorrectionFvPatchVectorField:: +tractionDisplacementCorrectionFvPatchVectorField +( + const tractionDisplacementCorrectionFvPatchVectorField& tdpvf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedGradientFvPatchVectorField(tdpvf, p, iF, mapper), + traction_(mapper(tdpvf.traction_)), + pressure_(mapper(tdpvf.pressure_)) +{} + + tractionDisplacementCorrectionFvPatchVectorField:: tractionDisplacementCorrectionFvPatchVectorField ( diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index 9ff26a3bc9..2736c0aefc 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,21 +54,6 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField } -turbulentMixingLengthDissipationRateInletFvPatchScalarField:: -turbulentMixingLengthDissipationRateInletFvPatchScalarField -( - const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - inletOutletFvPatchScalarField(ptf, p, iF, mapper), - mixingLength_(ptf.mixingLength_), - kName_(ptf.kName_) -{} - - turbulentMixingLengthDissipationRateInletFvPatchScalarField:: turbulentMixingLengthDissipationRateInletFvPatchScalarField ( @@ -91,6 +76,21 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField } +turbulentMixingLengthDissipationRateInletFvPatchScalarField:: +turbulentMixingLengthDissipationRateInletFvPatchScalarField +( + const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + inletOutletFvPatchScalarField(ptf, p, iF, mapper), + mixingLength_(ptf.mixingLength_), + kName_(ptf.kName_) +{} + + turbulentMixingLengthDissipationRateInletFvPatchScalarField:: turbulentMixingLengthDissipationRateInletFvPatchScalarField ( diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index 71bb33fb29..6c86056983 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,21 +54,6 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField } -turbulentMixingLengthFrequencyInletFvPatchScalarField:: -turbulentMixingLengthFrequencyInletFvPatchScalarField -( - const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - inletOutletFvPatchScalarField(ptf, p, iF, mapper), - mixingLength_(ptf.mixingLength_), - kName_(ptf.kName_) -{} - - turbulentMixingLengthFrequencyInletFvPatchScalarField:: turbulentMixingLengthFrequencyInletFvPatchScalarField ( @@ -91,6 +76,21 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField } +turbulentMixingLengthFrequencyInletFvPatchScalarField:: +turbulentMixingLengthFrequencyInletFvPatchScalarField +( + const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + inletOutletFvPatchScalarField(ptf, p, iF, mapper), + mixingLength_(ptf.mixingLength_), + kName_(ptf.kName_) +{} + + turbulentMixingLengthFrequencyInletFvPatchScalarField:: turbulentMixingLengthFrequencyInletFvPatchScalarField ( diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C index 1f2c476b92..f975bb8d97 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,6 +48,17 @@ fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField {} +fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict) +{} + + fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField ( const fWallFunctionFvPatchScalarField& ptf, @@ -60,17 +71,6 @@ fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField {} -fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict) -{} - - fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField ( const fWallFunctionFvPatchScalarField& v2wfpsf, diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C index 2a245ae7a2..e65da2b757 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,6 +46,18 @@ kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField {} +kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + Ceps2_(dict.lookupOrDefault("Ceps2", 1.9)) +{} + + kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField ( const kLowReWallFunctionFvPatchScalarField& ptf, @@ -59,18 +71,6 @@ kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField {} -kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - Ceps2_(dict.lookupOrDefault("Ceps2", 1.9)) -{} - - kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField ( const kLowReWallFunctionFvPatchScalarField& kwfpsf, diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C index f619e40844..fce85bcbff 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,6 +54,17 @@ nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField {} +nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + nutWallFunctionFvPatchScalarField(p, iF, dict) +{} + + nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField ( const nutLowReWallFunctionFvPatchScalarField& ptf, @@ -66,17 +77,6 @@ nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField {} -nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - nutWallFunctionFvPatchScalarField(p, iF, dict) -{} - - nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField ( const nutLowReWallFunctionFvPatchScalarField& nlrwfpsf, diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index ede8b7343f..26673cdd36 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -142,6 +142,18 @@ nutUSpaldingWallFunctionFvPatchScalarField {} +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + nutWallFunctionFvPatchScalarField(p, iF, dict) +{} + + nutUSpaldingWallFunctionFvPatchScalarField:: nutUSpaldingWallFunctionFvPatchScalarField ( @@ -155,18 +167,6 @@ nutUSpaldingWallFunctionFvPatchScalarField {} -nutUSpaldingWallFunctionFvPatchScalarField:: -nutUSpaldingWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - nutWallFunctionFvPatchScalarField(p, iF, dict) -{} - - nutUSpaldingWallFunctionFvPatchScalarField:: nutUSpaldingWallFunctionFvPatchScalarField ( diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index 29fee9fc56..20e81da13e 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -137,6 +137,17 @@ nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField {} +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + nutWallFunctionFvPatchScalarField(p, iF, dict) +{} + + nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( const nutUWallFunctionFvPatchScalarField& ptf, @@ -149,17 +160,6 @@ nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField {} -nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - nutWallFunctionFvPatchScalarField(p, iF, dict) -{} - - nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( const nutUWallFunctionFvPatchScalarField& sawfpsf, diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C index e01c641464..4eaac02050 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,6 +81,23 @@ Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } +Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + Cmu_(dict.lookupOrDefault("Cmu", 0.09)), + kappa_(dict.lookupOrDefault("kappa", 0.41)), + E_(dict.lookupOrDefault("E", 9.8)), + yPlusLam_(yPlusLam(kappa_, E_)) +{ + checkType(); +} + + Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField ( const nutWallFunctionFvPatchScalarField& ptf, @@ -99,23 +116,6 @@ Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - Cmu_(dict.lookupOrDefault("Cmu", 0.09)), - kappa_(dict.lookupOrDefault("kappa", 0.41)), - E_(dict.lookupOrDefault("E", 9.8)), - yPlusLam_(yPlusLam(kappa_, E_)) -{ - checkType(); -} - - Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField ( const nutWallFunctionFvPatchScalarField& wfpsf, diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index fd11f96489..f03e842c34 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,6 +90,17 @@ nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField {} +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + nutWallFunctionFvPatchScalarField(p, iF, dict) +{} + + nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( const nutkWallFunctionFvPatchScalarField& ptf, @@ -102,17 +113,6 @@ nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField {} -nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - nutWallFunctionFvPatchScalarField(p, iF, dict) -{} - - nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( const nutkWallFunctionFvPatchScalarField& wfpsf, diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C index e57bc26d87..f44c3b852c 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,6 +47,17 @@ v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField {} +v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict) +{} + + v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField ( const v2WallFunctionFvPatchScalarField& ptf, @@ -59,17 +70,6 @@ v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField {} -v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict) -{} - - v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField ( const v2WallFunctionFvPatchScalarField& v2wfpsf, diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index 2c170ce80b..a016c9dbac 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,6 +98,19 @@ alphatJayatillekeWallFunctionFvPatchScalarField {} +alphatJayatillekeWallFunctionFvPatchScalarField:: +alphatJayatillekeWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + Prt_(dict.lookupOrDefault("Prt", 0.85)) +{} + + alphatJayatillekeWallFunctionFvPatchScalarField:: alphatJayatillekeWallFunctionFvPatchScalarField ( @@ -112,19 +125,6 @@ alphatJayatillekeWallFunctionFvPatchScalarField {} -alphatJayatillekeWallFunctionFvPatchScalarField:: -alphatJayatillekeWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - Prt_(dict.lookupOrDefault("Prt", 0.85)) -{} - - alphatJayatillekeWallFunctionFvPatchScalarField:: alphatJayatillekeWallFunctionFvPatchScalarField ( diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index 840a30f69f..0c57bf3ae2 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,6 +47,18 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField {} +alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + Prt_(dict.lookupOrDefault("Prt", 0.85)) +{} + + alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ( const alphatWallFunctionFvPatchScalarField& ptf, @@ -60,18 +72,6 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField {} -alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - Prt_(dict.lookupOrDefault("Prt", 0.85)) -{} - - alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ( const alphatWallFunctionFvPatchScalarField& awfpsf, diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index bb41990e13..4a5d02b823 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,6 +48,19 @@ convectiveHeatTransferFvPatchScalarField {} +convectiveHeatTransferFvPatchScalarField:: +convectiveHeatTransferFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + L_(dict.lookup("L")) +{} + + convectiveHeatTransferFvPatchScalarField:: convectiveHeatTransferFvPatchScalarField ( @@ -62,19 +75,6 @@ convectiveHeatTransferFvPatchScalarField {} -convectiveHeatTransferFvPatchScalarField:: -convectiveHeatTransferFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - L_(dict.lookup("L")) -{} - - convectiveHeatTransferFvPatchScalarField:: convectiveHeatTransferFvPatchScalarField ( diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C index 782363bc4e..a25b37aed2 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,18 @@ externalCoupledTemperatureMixedFvPatchScalarField {} +Foam::externalCoupledTemperatureMixedFvPatchScalarField:: +externalCoupledTemperatureMixedFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + externalCoupledMixedFvPatchField(p, iF, dict) +{} + + Foam::externalCoupledTemperatureMixedFvPatchScalarField:: externalCoupledTemperatureMixedFvPatchScalarField ( @@ -65,18 +77,6 @@ externalCoupledTemperatureMixedFvPatchScalarField {} -Foam::externalCoupledTemperatureMixedFvPatchScalarField:: -externalCoupledTemperatureMixedFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - externalCoupledMixedFvPatchField(p, iF, dict) -{} - - Foam::externalCoupledTemperatureMixedFvPatchScalarField:: externalCoupledTemperatureMixedFvPatchScalarField ( diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index cf6e2084fe..e89cd7f47d 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,30 +59,6 @@ thermalBaffle1DFvPatchScalarField {} -template -thermalBaffle1DFvPatchScalarField:: -thermalBaffle1DFvPatchScalarField -( - const thermalBaffle1DFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mappedPatchBase(p.patch(), ptf), - mixedFvPatchScalarField(ptf, p, iF, mapper), - TName_(ptf.TName_), - baffleActivated_(ptf.baffleActivated_), - thickness_(mapper(ptf.thickness_)), - Qs_(mapper(ptf.Qs_)), - solidDict_(ptf.solidDict_), - solidPtr_(ptf.solidPtr_), - qrPrevious_(mapper(ptf.qrPrevious_)), - qrRelaxation_(ptf.qrRelaxation_), - qrName_(ptf.qrName_) -{} - - template thermalBaffle1DFvPatchScalarField:: thermalBaffle1DFvPatchScalarField @@ -135,10 +111,33 @@ thermalBaffle1DFvPatchScalarField refGrad() = 0.0; valueFraction() = 0.0; } - } +template +thermalBaffle1DFvPatchScalarField:: +thermalBaffle1DFvPatchScalarField +( + const thermalBaffle1DFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mappedPatchBase(p.patch(), ptf), + mixedFvPatchScalarField(ptf, p, iF, mapper), + TName_(ptf.TName_), + baffleActivated_(ptf.baffleActivated_), + thickness_(mapper(ptf.thickness_)), + Qs_(mapper(ptf.Qs_)), + solidDict_(ptf.solidDict_), + solidPtr_(ptf.solidPtr_), + qrPrevious_(mapper(ptf.qrPrevious_)), + qrRelaxation_(ptf.qrRelaxation_), + qrName_(ptf.qrName_) +{} + + template thermalBaffle1DFvPatchScalarField:: thermalBaffle1DFvPatchScalarField diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index 04f6cabb83..377a4d90b0 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,24 +58,6 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField } -turbulentTemperatureCoupledBaffleMixedFvPatchScalarField:: -turbulentTemperatureCoupledBaffleMixedFvPatchScalarField -( - const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - temperatureCoupledBase(patch(), ptf), - TnbrName_(ptf.TnbrName_), - thicknessLayers_(ptf.thicknessLayers_), - kappaLayers_(ptf.kappaLayers_), - contactRes_(ptf.contactRes_) -{} - - turbulentTemperatureCoupledBaffleMixedFvPatchScalarField:: turbulentTemperatureCoupledBaffleMixedFvPatchScalarField ( @@ -136,6 +118,24 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField } +turbulentTemperatureCoupledBaffleMixedFvPatchScalarField:: +turbulentTemperatureCoupledBaffleMixedFvPatchScalarField +( + const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + temperatureCoupledBase(patch(), ptf), + TnbrName_(ptf.TnbrName_), + thicknessLayers_(ptf.thicknessLayers_), + kappaLayers_(ptf.kappaLayers_), + contactRes_(ptf.contactRes_) +{} + + turbulentTemperatureCoupledBaffleMixedFvPatchScalarField:: turbulentTemperatureCoupledBaffleMixedFvPatchScalarField ( diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C index 8191c02681..f31dcb3e01 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,26 +60,6 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField } -turbulentTemperatureRadCoupledMixedFvPatchScalarField:: -turbulentTemperatureRadCoupledMixedFvPatchScalarField -( - const turbulentTemperatureRadCoupledMixedFvPatchScalarField& psf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(psf, p, iF, mapper), - temperatureCoupledBase(patch(), psf), - TnbrName_(psf.TnbrName_), - qrNbrName_(psf.qrNbrName_), - qrName_(psf.qrName_), - thicknessLayers_(psf.thicknessLayers_), - kappaLayers_(psf.kappaLayers_), - contactRes_(psf.contactRes_) -{} - - turbulentTemperatureRadCoupledMixedFvPatchScalarField:: turbulentTemperatureRadCoupledMixedFvPatchScalarField ( @@ -142,6 +122,26 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField } +turbulentTemperatureRadCoupledMixedFvPatchScalarField:: +turbulentTemperatureRadCoupledMixedFvPatchScalarField +( + const turbulentTemperatureRadCoupledMixedFvPatchScalarField& psf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(psf, p, iF, mapper), + temperatureCoupledBase(patch(), psf), + TnbrName_(psf.TnbrName_), + qrNbrName_(psf.qrNbrName_), + qrName_(psf.qrName_), + thicknessLayers_(psf.thicknessLayers_), + kappaLayers_(psf.kappaLayers_), + contactRes_(psf.contactRes_) +{} + + turbulentTemperatureRadCoupledMixedFvPatchScalarField:: turbulentTemperatureRadCoupledMixedFvPatchScalarField ( diff --git a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C index 84d37a9b9d..57dfaec5a8 100644 --- a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C +++ b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,6 +99,19 @@ nutkAtmRoughWallFunctionFvPatchScalarField {} +nutkAtmRoughWallFunctionFvPatchScalarField:: +nutkAtmRoughWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + nutkWallFunctionFvPatchScalarField(p, iF, dict), + z0_("z0", dict, p.size()) +{} + + nutkAtmRoughWallFunctionFvPatchScalarField:: nutkAtmRoughWallFunctionFvPatchScalarField ( @@ -113,19 +126,6 @@ nutkAtmRoughWallFunctionFvPatchScalarField {} -nutkAtmRoughWallFunctionFvPatchScalarField:: -nutkAtmRoughWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - nutkWallFunctionFvPatchScalarField(p, iF, dict), - z0_("z0", dict, p.size()) -{} - - nutkAtmRoughWallFunctionFvPatchScalarField:: nutkAtmRoughWallFunctionFvPatchScalarField ( diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C index 0ac0415ef4..9ddc1a7ea7 100644 --- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,21 +46,6 @@ SRFFreestreamVelocityFvPatchVectorField {} -Foam::SRFFreestreamVelocityFvPatchVectorField:: -SRFFreestreamVelocityFvPatchVectorField -( - const SRFFreestreamVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - inletOutletFvPatchVectorField(ptf, p, iF, mapper), - relative_(ptf.relative_), - UInf_(ptf.UInf_) -{} - - Foam::SRFFreestreamVelocityFvPatchVectorField:: SRFFreestreamVelocityFvPatchVectorField ( @@ -79,6 +64,21 @@ SRFFreestreamVelocityFvPatchVectorField } +Foam::SRFFreestreamVelocityFvPatchVectorField:: +SRFFreestreamVelocityFvPatchVectorField +( + const SRFFreestreamVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + inletOutletFvPatchVectorField(ptf, p, iF, mapper), + relative_(ptf.relative_), + UInf_(ptf.UInf_) +{} + + Foam::SRFFreestreamVelocityFvPatchVectorField:: SRFFreestreamVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C index b175297f02..fd265b6535 100644 --- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,19 @@ Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField {} +Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict), + relative_(dict.lookup("relative")), + inletValue_("inletValue", dict, p.size()) +{} + + Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const SRFVelocityFvPatchVectorField& ptf, @@ -57,19 +70,6 @@ Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField {} -Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict), - relative_(dict.lookup("relative")), - inletValue_("inletValue", dict, p.size()) -{} - - Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const SRFVelocityFvPatchVectorField& srfvpvf, diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C index 0484786473..a73be554be 100644 --- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,6 +41,17 @@ Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField {} +Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict) +{} + + Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField ( const SRFWallVelocityFvPatchVectorField& ptf, @@ -53,17 +64,6 @@ Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField {} -Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict) -{} - - Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField ( const SRFWallVelocityFvPatchVectorField& srfvpvf, diff --git a/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C index 953fcf7378..88fdba15b8 100644 --- a/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,26 +48,6 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField } -Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField -( - const MarshakRadiationFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - radiationCoupledBase - ( - p, - ptf.emissivityMethod(), - ptf.emissivity_, - mapper - ), - TName_(ptf.TName_) -{} - - Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField ( const fvPatch& p, @@ -97,6 +77,26 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField } +Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField +( + const MarshakRadiationFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + radiationCoupledBase + ( + p, + ptf.emissivityMethod(), + ptf.emissivity_, + mapper + ), + TName_(ptf.TName_) +{} + + Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField ( const MarshakRadiationFvPatchScalarField& ptf, diff --git a/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C index f28e87a607..32c1e9e612 100644 --- a/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,27 +49,6 @@ MarshakRadiationFixedTemperatureFvPatchScalarField } -Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: -MarshakRadiationFixedTemperatureFvPatchScalarField -( - const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - radiationCoupledBase - ( - p, - ptf.emissivityMethod(), - ptf.emissivity_, - mapper - ), - Trad_(mapper(ptf.Trad_)) -{} - - Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: MarshakRadiationFixedTemperatureFvPatchScalarField ( @@ -94,6 +73,27 @@ MarshakRadiationFixedTemperatureFvPatchScalarField } +Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: +MarshakRadiationFixedTemperatureFvPatchScalarField +( + const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + radiationCoupledBase + ( + p, + ptf.emissivityMethod(), + ptf.emissivity_, + mapper + ), + Trad_(mapper(ptf.Trad_)) +{} + + Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: MarshakRadiationFixedTemperatureFvPatchScalarField ( diff --git a/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index f0fbd965e9..efaaaef972 100644 --- a/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,27 +53,6 @@ greyDiffusiveRadiationMixedFvPatchScalarField } -Foam::greyDiffusiveRadiationMixedFvPatchScalarField:: -greyDiffusiveRadiationMixedFvPatchScalarField -( - const greyDiffusiveRadiationMixedFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - radiationCoupledBase - ( - p, - ptf.emissivityMethod(), - ptf.emissivity_, - mapper - ), - TName_(ptf.TName_) -{} - - Foam::greyDiffusiveRadiationMixedFvPatchScalarField:: greyDiffusiveRadiationMixedFvPatchScalarField ( @@ -107,6 +86,27 @@ greyDiffusiveRadiationMixedFvPatchScalarField } +Foam::greyDiffusiveRadiationMixedFvPatchScalarField:: +greyDiffusiveRadiationMixedFvPatchScalarField +( + const greyDiffusiveRadiationMixedFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + radiationCoupledBase + ( + p, + ptf.emissivityMethod(), + ptf.emissivity_, + mapper + ), + TName_(ptf.TName_) +{} + + Foam::greyDiffusiveRadiationMixedFvPatchScalarField:: greyDiffusiveRadiationMixedFvPatchScalarField ( diff --git a/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C index 57f5aeb9e0..b2397131ae 100644 --- a/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,27 +44,6 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField {} -Foam::greyDiffusiveViewFactorFixedValueFvPatchScalarField:: -greyDiffusiveViewFactorFixedValueFvPatchScalarField -( - const greyDiffusiveViewFactorFixedValueFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchScalarField(ptf, p, iF, mapper), - radiationCoupledBase - ( - patch(), - ptf.emissivityMethod(), - ptf.emissivity_, - mapper - ), - qro_(mapper(ptf.qro_)) -{} - - Foam::greyDiffusiveViewFactorFixedValueFvPatchScalarField:: greyDiffusiveViewFactorFixedValueFvPatchScalarField ( @@ -92,6 +71,27 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField } +Foam::greyDiffusiveViewFactorFixedValueFvPatchScalarField:: +greyDiffusiveViewFactorFixedValueFvPatchScalarField +( + const greyDiffusiveViewFactorFixedValueFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + radiationCoupledBase + ( + patch(), + ptf.emissivityMethod(), + ptf.emissivity_, + mapper + ), + qro_(mapper(ptf.qro_)) +{} + + Foam::greyDiffusiveViewFactorFixedValueFvPatchScalarField:: greyDiffusiveViewFactorFixedValueFvPatchScalarField ( diff --git a/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index 9db3ade229..c2b58fa858 100644 --- a/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,27 +54,6 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField } -Foam::wideBandDiffusiveRadiationMixedFvPatchScalarField:: -wideBandDiffusiveRadiationMixedFvPatchScalarField -( - const wideBandDiffusiveRadiationMixedFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - radiationCoupledBase - ( - p, - ptf.emissivityMethod(), - ptf.emissivity_, - mapper - ), - TName_(ptf.TName_) -{} - - Foam::wideBandDiffusiveRadiationMixedFvPatchScalarField:: wideBandDiffusiveRadiationMixedFvPatchScalarField ( @@ -111,6 +90,27 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField } +Foam::wideBandDiffusiveRadiationMixedFvPatchScalarField:: +wideBandDiffusiveRadiationMixedFvPatchScalarField +( + const wideBandDiffusiveRadiationMixedFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + radiationCoupledBase + ( + p, + ptf.emissivityMethod(), + ptf.emissivity_, + mapper + ), + TName_(ptf.TName_) +{} + + Foam::wideBandDiffusiveRadiationMixedFvPatchScalarField:: wideBandDiffusiveRadiationMixedFvPatchScalarField ( diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C index 748c224239..38489dd648 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,6 +44,21 @@ filmHeightInletVelocityFvPatchVectorField {} +Foam::filmHeightInletVelocityFvPatchVectorField:: +filmHeightInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict), + phiName_(dict.lookupOrDefault("phi", "phi")), + rhoName_(dict.lookupOrDefault("rho", "rho")), + deltafName_(dict.lookupOrDefault("delta", "delta")) +{} + + Foam::filmHeightInletVelocityFvPatchVectorField:: filmHeightInletVelocityFvPatchVectorField ( @@ -60,21 +75,6 @@ filmHeightInletVelocityFvPatchVectorField {} -Foam::filmHeightInletVelocityFvPatchVectorField:: -filmHeightInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict), - phiName_(dict.lookupOrDefault("phi", "phi")), - rhoName_(dict.lookupOrDefault("rho", "rho")), - deltafName_(dict.lookupOrDefault("delta", "delta")) -{} - - Foam::filmHeightInletVelocityFvPatchVectorField:: filmHeightInletVelocityFvPatchVectorField ( diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C index fbb90331cf..10d468e689 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,6 +44,21 @@ inclinedFilmNusseltHeightFvPatchScalarField {} +Foam::inclinedFilmNusseltHeightFvPatchScalarField:: +inclinedFilmNusseltHeightFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + GammaMean_(Function1::New("GammaMean", dict)), + a_(Function1::New("a", dict)), + omega_(Function1::New("omega", dict)) +{} + + Foam::inclinedFilmNusseltHeightFvPatchScalarField:: inclinedFilmNusseltHeightFvPatchScalarField ( @@ -60,21 +75,6 @@ inclinedFilmNusseltHeightFvPatchScalarField {} -Foam::inclinedFilmNusseltHeightFvPatchScalarField:: -inclinedFilmNusseltHeightFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - GammaMean_(Function1::New("GammaMean", dict)), - a_(Function1::New("a", dict)), - omega_(Function1::New("omega", dict)) -{} - - Foam::inclinedFilmNusseltHeightFvPatchScalarField:: inclinedFilmNusseltHeightFvPatchScalarField ( diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C index 4151f1d8ed..b4df3f9f2e 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,6 +44,21 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField {} +Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField:: +inclinedFilmNusseltInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict), + GammaMean_(Function1::New("GammaMean", dict)), + a_(Function1::New("a", dict)), + omega_(Function1::New("omega", dict)) +{} + + Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField:: inclinedFilmNusseltInletVelocityFvPatchVectorField ( @@ -60,21 +75,6 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField {} -Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField:: -inclinedFilmNusseltInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict), - GammaMean_(Function1::New("GammaMean", dict)), - a_(Function1::New("a", dict)), - omega_(Function1::New("omega", dict)) -{} - - Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField:: inclinedFilmNusseltInletVelocityFvPatchVectorField ( diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C index 7108db7801..a1a729a9ec 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,6 +59,23 @@ alphatFilmWallFunctionFvPatchScalarField {} +alphatFilmWallFunctionFvPatchScalarField:: +alphatFilmWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict), + B_(dict.lookupOrDefault("B", 5.5)), + yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05)), + Cmu_(dict.lookupOrDefault("Cmu", 0.09)), + kappa_(dict.lookupOrDefault("kappa", 0.41)), + Prt_(dict.lookupOrDefault("Prt", 0.85)) +{} + + alphatFilmWallFunctionFvPatchScalarField:: alphatFilmWallFunctionFvPatchScalarField ( @@ -77,23 +94,6 @@ alphatFilmWallFunctionFvPatchScalarField {} -alphatFilmWallFunctionFvPatchScalarField:: -alphatFilmWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - B_(dict.lookupOrDefault("B", 5.5)), - yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05)), - Cmu_(dict.lookupOrDefault("Cmu", 0.09)), - kappa_(dict.lookupOrDefault("kappa", 0.41)), - Prt_(dict.lookupOrDefault("Prt", 0.85)) -{} - - alphatFilmWallFunctionFvPatchScalarField:: alphatFilmWallFunctionFvPatchScalarField ( diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C index 0756ac4d3e..d5838f0573 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C @@ -165,6 +165,19 @@ nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField {} +nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + nutkWallFunctionFvPatchScalarField(p, iF, dict), + B_(dict.lookupOrDefault("B", 5.5)), + yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05)) +{} + + nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField ( const nutkFilmWallFunctionFvPatchScalarField& ptf, @@ -179,19 +192,6 @@ nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField {} -nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - nutkWallFunctionFvPatchScalarField(p, iF, dict), - B_(dict.lookupOrDefault("B", 5.5)), - yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05)) -{} - - nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField ( const nutkFilmWallFunctionFvPatchScalarField& wfpsf, diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C index eb88c4569e..9756bc7581 100644 --- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C +++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,29 +52,6 @@ thermalBaffleFvPatchScalarField {} -thermalBaffleFvPatchScalarField:: -thermalBaffleFvPatchScalarField -( - const thermalBaffleFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - turbulentTemperatureRadCoupledMixedFvPatchScalarField - ( - ptf, - p, - iF, - mapper - ), - owner_(ptf.owner_), - baffle_(), - dict_(ptf.dict_), - extrudeMeshPtr_() -{} - - thermalBaffleFvPatchScalarField:: thermalBaffleFvPatchScalarField ( @@ -120,6 +97,29 @@ thermalBaffleFvPatchScalarField } +thermalBaffleFvPatchScalarField:: +thermalBaffleFvPatchScalarField +( + const thermalBaffleFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + turbulentTemperatureRadCoupledMixedFvPatchScalarField + ( + ptf, + p, + iF, + mapper + ), + owner_(ptf.owner_), + baffle_(), + dict_(ptf.dict_), + extrudeMeshPtr_() +{} + + thermalBaffleFvPatchScalarField:: thermalBaffleFvPatchScalarField ( diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C index a5e1c261cd..8a4ca09ce3 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,18 +40,6 @@ Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField {} -Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField -( - const energyJumpFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedJumpFvPatchField(ptf, p, iF, mapper) -{} - - Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField ( const fvPatch& p, @@ -75,6 +63,18 @@ Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField } +Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField +( + const energyJumpFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedJumpFvPatchField(ptf, p, iF, mapper) +{} + + Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField ( const energyJumpFvPatchScalarField& ptf, diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C index 3e82f09197..7fc7468b26 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,18 +40,6 @@ Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField {} -Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField -( - const energyJumpAMIFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedJumpAMIFvPatchField(ptf, p, iF, mapper) -{} - - Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField ( const fvPatch& p, @@ -75,6 +63,18 @@ Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField } +Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField +( + const energyJumpAMIFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedJumpAMIFvPatchField(ptf, p, iF, mapper) +{} + + Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField ( const energyJumpAMIFvPatchScalarField& ptf, diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C index 7099a2c2be..a63cb8893b 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,6 +42,18 @@ fixedEnergyFvPatchScalarField {} +Foam::fixedEnergyFvPatchScalarField:: +fixedEnergyFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict) +{} + + Foam::fixedEnergyFvPatchScalarField:: fixedEnergyFvPatchScalarField ( @@ -55,18 +67,6 @@ fixedEnergyFvPatchScalarField {} -Foam::fixedEnergyFvPatchScalarField:: -fixedEnergyFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict) -{} - - Foam::fixedEnergyFvPatchScalarField:: fixedEnergyFvPatchScalarField ( diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C index 5457d58965..6193fd6df9 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,6 +44,18 @@ gradientEnergyFvPatchScalarField {} +Foam::gradientEnergyFvPatchScalarField:: +gradientEnergyFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedGradientFvPatchScalarField(p, iF, dict) +{} + + Foam::gradientEnergyFvPatchScalarField:: gradientEnergyFvPatchScalarField ( @@ -57,18 +69,6 @@ gradientEnergyFvPatchScalarField {} -Foam::gradientEnergyFvPatchScalarField:: -gradientEnergyFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedGradientFvPatchScalarField(p, iF, dict) -{} - - Foam::gradientEnergyFvPatchScalarField:: gradientEnergyFvPatchScalarField ( diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C index 911549b57e..34adf4e8c9 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,6 +47,18 @@ mixedEnergyFvPatchScalarField } +Foam::mixedEnergyFvPatchScalarField:: +mixedEnergyFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + mixedFvPatchScalarField(p, iF, dict) +{} + + Foam::mixedEnergyFvPatchScalarField:: mixedEnergyFvPatchScalarField ( @@ -60,18 +72,6 @@ mixedEnergyFvPatchScalarField {} -Foam::mixedEnergyFvPatchScalarField:: -mixedEnergyFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - mixedFvPatchScalarField(p, iF, dict) -{} - - Foam::mixedEnergyFvPatchScalarField:: mixedEnergyFvPatchScalarField ( diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C index 686cd721cd..eacf0ec281 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,18 @@ fixedUnburntEnthalpyFvPatchScalarField {} +Foam::fixedUnburntEnthalpyFvPatchScalarField:: +fixedUnburntEnthalpyFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF, dict) +{} + + Foam::fixedUnburntEnthalpyFvPatchScalarField:: fixedUnburntEnthalpyFvPatchScalarField ( @@ -56,18 +68,6 @@ fixedUnburntEnthalpyFvPatchScalarField {} -Foam::fixedUnburntEnthalpyFvPatchScalarField:: -fixedUnburntEnthalpyFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict) -{} - - Foam::fixedUnburntEnthalpyFvPatchScalarField:: fixedUnburntEnthalpyFvPatchScalarField ( diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C index ad2bcc0eff..12048084af 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,6 +42,18 @@ gradientUnburntEnthalpyFvPatchScalarField {} +Foam::gradientUnburntEnthalpyFvPatchScalarField:: +gradientUnburntEnthalpyFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedGradientFvPatchScalarField(p, iF, dict) +{} + + Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( @@ -55,18 +67,6 @@ gradientUnburntEnthalpyFvPatchScalarField {} -Foam::gradientUnburntEnthalpyFvPatchScalarField:: -gradientUnburntEnthalpyFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedGradientFvPatchScalarField(p, iF, dict) -{} - - Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C index 34c4c1e279..0e0bbdba04 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,6 +46,18 @@ mixedUnburntEnthalpyFvPatchScalarField } +Foam::mixedUnburntEnthalpyFvPatchScalarField:: +mixedUnburntEnthalpyFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + mixedFvPatchScalarField(p, iF, dict) +{} + + Foam::mixedUnburntEnthalpyFvPatchScalarField:: mixedUnburntEnthalpyFvPatchScalarField ( @@ -59,18 +71,6 @@ mixedUnburntEnthalpyFvPatchScalarField {} -Foam::mixedUnburntEnthalpyFvPatchScalarField:: -mixedUnburntEnthalpyFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - mixedFvPatchScalarField(p, iF, dict) -{} - - Foam::mixedUnburntEnthalpyFvPatchScalarField:: mixedUnburntEnthalpyFvPatchScalarField ( diff --git a/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C index 2510a95b7d..bde6e738d7 100644 --- a/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C +++ b/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C @@ -45,23 +45,6 @@ dynamicAlphaContactAngleFvPatchScalarField {} -Foam::dynamicAlphaContactAngleFvPatchScalarField:: -dynamicAlphaContactAngleFvPatchScalarField -( - const dynamicAlphaContactAngleFvPatchScalarField& gcpsf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), - theta0_(gcpsf.theta0_), - uTheta_(gcpsf.uTheta_), - thetaA_(gcpsf.thetaA_), - thetaR_(gcpsf.thetaR_) -{} - - Foam::dynamicAlphaContactAngleFvPatchScalarField:: dynamicAlphaContactAngleFvPatchScalarField ( @@ -80,6 +63,23 @@ dynamicAlphaContactAngleFvPatchScalarField } +Foam::dynamicAlphaContactAngleFvPatchScalarField:: +dynamicAlphaContactAngleFvPatchScalarField +( + const dynamicAlphaContactAngleFvPatchScalarField& gcpsf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), + theta0_(gcpsf.theta0_), + uTheta_(gcpsf.uTheta_), + thetaA_(gcpsf.thetaA_), + thetaR_(gcpsf.thetaR_) +{} + + Foam::dynamicAlphaContactAngleFvPatchScalarField:: dynamicAlphaContactAngleFvPatchScalarField ( diff --git a/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C index 3b2a8e0e61..129ed730c7 100644 --- a/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C +++ b/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,23 +46,6 @@ timeVaryingAlphaContactAngleFvPatchScalarField {} -Foam::timeVaryingAlphaContactAngleFvPatchScalarField:: -timeVaryingAlphaContactAngleFvPatchScalarField -( - const timeVaryingAlphaContactAngleFvPatchScalarField& gcpsf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), - t0_(gcpsf.t0_), - thetaT0_(gcpsf.thetaT0_), - te_(gcpsf.te_), - thetaTe_(gcpsf.te_) -{} - - Foam::timeVaryingAlphaContactAngleFvPatchScalarField:: timeVaryingAlphaContactAngleFvPatchScalarField ( @@ -81,6 +64,23 @@ timeVaryingAlphaContactAngleFvPatchScalarField } +Foam::timeVaryingAlphaContactAngleFvPatchScalarField:: +timeVaryingAlphaContactAngleFvPatchScalarField +( + const timeVaryingAlphaContactAngleFvPatchScalarField& gcpsf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), + t0_(gcpsf.t0_), + thetaT0_(gcpsf.thetaT0_), + te_(gcpsf.te_), + thetaTe_(gcpsf.te_) +{} + + Foam::timeVaryingAlphaContactAngleFvPatchScalarField:: timeVaryingAlphaContactAngleFvPatchScalarField ( diff --git a/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C index b531eb9d28..d5f1b8db89 100644 --- a/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C +++ b/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,20 +44,6 @@ alphaFixedPressureFvPatchScalarField {} -Foam::alphaFixedPressureFvPatchScalarField:: -alphaFixedPressureFvPatchScalarField -( - const alphaFixedPressureFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchScalarField(ptf, p, iF, mapper), - p_(mapper(ptf.p_)) -{} - - Foam::alphaFixedPressureFvPatchScalarField:: alphaFixedPressureFvPatchScalarField ( @@ -83,6 +69,20 @@ alphaFixedPressureFvPatchScalarField } +Foam::alphaFixedPressureFvPatchScalarField:: +alphaFixedPressureFvPatchScalarField +( + const alphaFixedPressureFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + p_(mapper(ptf.p_)) +{} + + Foam::alphaFixedPressureFvPatchScalarField:: alphaFixedPressureFvPatchScalarField (