From ca72b0a963e432a23bfa32bcc97d31bfd63a336d Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sat, 27 May 2023 16:56:10 +0100 Subject: [PATCH] fvPatchFields: Removed all fvPatchFields requiring user specified data from the null-constructor table This avoids potential hidden run-time errors caused by solvers running with boundary conditions which are not fully specified. Note that "null-constructor" here means the constructor from patch and internal field only, no data is provided. Constraint and simple BCs such as 'calculated', 'zeroGradient' and others which do not require user input to fully specify their operation remain on the null-constructor table for the construction of fields with for example all 'calculated' or all 'zeroGradient' BCs. A special version of the 'inletOutlet' fvPatchField named 'zeroInletOutlet' has been added in which the inlet value is hard-coded to zero which allows this BC to be included on the null-constructor table. This is useful for the 'age' functionObject to avoid the need to provide the 'age' volScalarField at time 0 unless special inlet or outlet BCs are required. Also for isothermalFilm in which the 'alpha' field is created automatically from the 'delta' field if it is not present and can inherit 'zeroInletOutlet' from 'delta' if appropriate. If a specific 'inletValue' is require or other more complex BCs then the 'alpha' field file must be provided to specify these BCs as before. Following this improvement it will now be possible to remove the null-constructors from all fvPatchFields not added to the null-constructor table, which is most of them, thus reducing the amount of code and maintenance overhead and making easier and more obvious to write new fvPatchField types. --- .../alphaOne/alphaOneFvPatchScalarField.C | 2 +- .../ejectionModels/dripping/dripping.H | 2 +- .../fixedInterfacialAreaDiameter.H | 2 +- .../splitMeshRegions/splitMeshRegions.C | 2 +- bin/reactingMultiphaseEulerFoam | 6 +- .../RAS/LamBremhorstKE/LamBremhorstKE.H | 5 +- .../RAS/LienCubicKE/LienCubicKE.H | 3 +- .../RAS/LienLeschziner/LienLeschziner.H | 5 +- .../RAS/ShihQuadraticKE/ShihQuadraticKE.H | 5 +- .../incompressible/RAS/kkLOmega/kkLOmega.H | 5 +- .../incompressible/RAS/qZeta/qZeta.C | 4 +- .../incompressible/RAS/qZeta/qZeta.H | 5 +- .../Base/kOmegaSST/kOmegaSSTBase.H | 5 +- .../momentumTransportModels/RAS/LRR/LRR.H | 5 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 5 +- .../RAS/RNGkEpsilon/RNGkEpsilon.H | 5 +- .../momentumTransportModels/RAS/SSG/SSG.H | 5 +- .../RAS/kEpsilon/kEpsilon.H | 5 +- .../RAS/kOmega/kOmega.H | 5 +- .../RAS/kOmega2006/kOmega2006.H | 5 +- .../RAS/realizableKE/realizableKE.H | 5 +- .../momentumTransportModels/RAS/v2f/v2f.H | 5 +- .../eddyViscosity/eddyViscosity.C | 22 +--- .../continuousGasKEpsilon.C | 3 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.H | 5 +- .../kEpsilonLopesdaCosta.H | 3 +- src/combustionModels/FSD/FSD.H | 4 +- .../mixtureFraction/mixtureFraction.H | 4 +- src/finiteVolume/Make/files | 1 + .../calculated/calculatedFvPatchFields.C | 7 +- .../extrapolatedCalculatedFvPatchFields.C | 6 +- .../fixedValue/fixedValueFvPatchFields.C | 5 +- .../zeroGradient/zeroGradientFvPatchFields.C | 6 +- .../constraint/cyclic/cyclicFvPatchFields.C | 5 +- .../cyclicSlip/cyclicSlipFvPatchFields.C | 5 +- .../constraint/empty/emptyFvPatchFields.C | 5 +- .../internal/internalFvPatchFields.C | 5 +- .../jumpCyclic/jumpCyclicFvPatchFields.C | 4 +- .../nonConformalCyclicFvPatchFields.C | 5 +- .../nonConformalErrorFvPatchFields.C | 5 +- ...nonConformalProcessorCyclicFvPatchFields.C | 5 +- .../processor/processorFvPatchFields.C | 5 +- .../processorCyclicFvPatchFields.C | 5 +- .../symmetry/symmetryFvPatchFields.C | 5 +- .../symmetryPlaneFvPatchFields.C | 5 +- .../constraint/wedge/wedgeFvPatchFields.C | 5 +- .../fixedNormalSlipFvPatchFields.C | 7 +- .../inletOutlet/inletOutletFvPatchField.C | 7 +- .../inletOutlet/inletOutletFvPatchFields.C | 5 +- .../mappedInternalValueFvPatchFields.C | 3 +- .../derived/noSlip/noSlipFvPatchVectorField.C | 5 +- .../derived/slip/slipFvPatchFields.C | 5 +- .../zeroInletOutletFvPatchField.C | 60 +++++++++ .../zeroInletOutletFvPatchField.H | 123 ++++++++++++++++++ .../zeroInletOutletFvPatchFields.C | 43 ++++++ .../zeroInletOutletFvPatchFields.H | 49 +++++++ .../zeroInletOutletFvPatchFieldsFwd.H | 50 +++++++ .../fvPatchFields/fvPatchField/fvPatchField.H | 47 ++++++- .../fvPatchField/fvPatchFieldNew.C | 19 ++- src/functionObjects/field/age/age.C | 12 +- .../ReynoldsAnalogy/ReynoldsAnalogy.H | 4 +- .../cellMotion/cellMotionFvPatchFields.C | 5 +- .../waveDisplacementPointPatchVectorField.H | 4 +- .../fixedEnergyFvPatchScalarField.C | 4 +- .../gradientEnergyFvPatchScalarField.C | 4 +- .../mixedEnergyFvPatchScalarField.C | 4 +- .../fixedUnburntEnthalpyFvPatchScalarField.C | 6 +- ...radientUnburntEnthalpyFvPatchScalarField.C | 5 +- .../mixedUnburntEnthalpyFvPatchScalarField.C | 5 +- tutorials/fluid/hotRoomComfort/0/DR | 41 ------ tutorials/fluid/hotRoomComfort/0/PMV | 41 ------ tutorials/fluid/hotRoomComfort/0/PPD | 41 ------ .../flamePropagationWithObstacles/README | 2 +- .../multiRegion/film/VoFToFilm/0/film/delta | 6 +- 74 files changed, 500 insertions(+), 333 deletions(-) create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.H create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.C create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.H create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFieldsFwd.H delete mode 100644 tutorials/fluid/hotRoomComfort/0/DR delete mode 100644 tutorials/fluid/hotRoomComfort/0/PMV delete mode 100644 tutorials/fluid/hotRoomComfort/0/PPD diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C b/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C index 0a30e6af7d..d4edcd211c 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C @@ -106,7 +106,7 @@ void Foam::alphaOneFvPatchScalarField::write(Ostream& os) const namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, alphaOneFvPatchScalarField diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H index 566d869b0a..f27eca0d85 100644 --- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H +++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H @@ -28,7 +28,7 @@ Description Dripping film to cloud ejection transfer model On an inverted surface if the film thickness is sufficient to generate a - valid parcel the equivalent mass is removed from the film and transfered to + valid parcel the equivalent mass is removed from the film and transferred to the cloud as a parcel containing droplets with a diameter obtained from the specified parcelDistribution. diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H b/applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H index 5b7fa66a04..07fde2e836 100644 --- a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H +++ b/applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H @@ -27,7 +27,7 @@ Class Description fixedInterfacialArea dispersed-phase diameter model. The interfacial are is set by providing phase surface area divided by phase - volume, AvbyAlpha, etiher as a constant value or as a field. + volume, AvbyAlpha, either as a constant value or as a field. SourceFiles fixedInterfacialAreaDiameter.C diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index c43be09f5b..513f1887d0 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -900,7 +900,7 @@ void createAndWriteRegion const label nNewPatches = newI; - // Move all deleteable patches to the end + // Move all delete-able patches to the end forAll(oldToNew, patchi) { if (oldToNew[patchi] == -1) diff --git a/bin/reactingMultiphaseEulerFoam b/bin/reactingMultiphaseEulerFoam index b5a573fb71..c2a3e154e9 100755 --- a/bin/reactingMultiphaseEulerFoam +++ b/bin/reactingMultiphaseEulerFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -28,12 +28,12 @@ # Description # Script to inform the user that the reactingMultiphaseEulerFoam solver has # been renamed and replaces the original multiphaseEulerFoam, providing -# much more general and extensible funcionality. +# much more general and extensible functionality. # #------------------------------------------------------------------------------ echo "The reactingMultiphaseEulerFoam solver has been renamed" \ "and replaces the original multiphaseEulerFoam," -echo "providing much more general and extensible funcionality." +echo "providing much more general and extensible functionality." #------------------------------------------------------------------------------ diff --git a/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H index 15e65b950f..50ac9e1109 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -167,8 +167,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H index fe17ca053a..00ddab84fe 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H +++ b/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H @@ -193,8 +193,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.H b/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.H index b5fb7a7a8f..964526c6b9 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.H +++ b/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -181,8 +181,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.H b/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.H index 685c5a9d4c..4d62a65397 100644 --- a/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.H +++ b/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -168,8 +168,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(0.09*k_), - epsilon_.boundaryField().types() + epsilon_/(0.09*k_) ); } diff --git a/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.H b/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.H index 01bf69d992..0d47f37553 100644 --- a/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.H +++ b/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -286,8 +286,7 @@ public: return volScalarField::New ( "k", - kt_ + kl_, - omega_.boundaryField().types() + kt_ + kl_ ); } diff --git a/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C b/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C index 9ba59191fd..e6b8a94720 100644 --- a/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C @@ -181,7 +181,7 @@ qZeta::qZeta this->groupName("q"), runTime_.name(), mesh_, - IOobject::NO_READ, + IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), sqrt(max(k_, kMin_)), @@ -195,7 +195,7 @@ qZeta::qZeta this->groupName("zeta"), runTime_.name(), mesh_, - IOobject::NO_READ, + IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), max(epsilon_, epsilonMin_)/(2.0*q_), diff --git a/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.H b/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.H index 518003ac6c..4921ec2d2b 100644 --- a/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.H +++ b/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -199,8 +199,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H index b05b35b45d..daa51543ce 100644 --- a/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H +++ b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -304,8 +304,7 @@ public: return volScalarField::New ( "epsilon", - betaStar_*k_*omega_, - omega_.boundaryField().types() + betaStar_*k_*omega_ ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H index b694893fcd..1f6c489011 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -195,8 +195,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H index d42a7bee48..8d37435744 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -189,8 +189,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H index 8c63ea5aaa..638d887ca8 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -190,8 +190,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H index 0d153338ff..8e8a48990f 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -186,8 +186,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H index 700b90584a..7111a15c1d 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -187,8 +187,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H index 53337aba7e..a7ed0a1052 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -174,8 +174,7 @@ public: return volScalarField::New ( "epsilon", - betaStar_*k_*omega_, - omega_.boundaryField().types() + betaStar_*k_*omega_ ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H index 60993847e4..ef352b34ed 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -189,8 +189,7 @@ public: return volScalarField::New ( "epsilon", - betaStar_*k_*omega_, - omega_.boundaryField().types() + betaStar_*k_*omega_ ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H index 9e748c71cb..f604a5c524 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -191,8 +191,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(0.09*k_), - epsilon_.boundaryField().types() + epsilon_/(0.09*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H index 0acd1e17cd..daae01139f 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -244,8 +244,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C index 429dccf78f..7458855224 100644 --- a/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C @@ -81,30 +81,10 @@ template Foam::tmp Foam::eddyViscosity::sigma() const { - tmp tk(k()); - - // Get list of patchField type names from k - wordList patchFieldTypes(tk().boundaryField().types()); - - // For k patchField types which do not have an equivalent for symmTensor - // set to calculated - forAll(patchFieldTypes, i) - { - if - ( - !fvPatchField::patchConstructorTablePtr_ - ->found(patchFieldTypes[i]) - ) - { - patchFieldTypes[i] = calculatedFvPatchField::typeName; - } - } - return volSymmTensorField::New ( this->groupName("R"), - ((2.0/3.0)*I)*tk() - (nut_)*dev(twoSymm(fvc::grad(this->U_))), - patchFieldTypes + ((2.0/3.0)*I)*k() - (nut_)*dev(twoSymm(fvc::grad(this->U_))) ); } diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index 4b7af316de..026f47c803 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C @@ -275,8 +275,7 @@ continuousGasKEpsilon::sigma() const return volSymmTensorField::New ( this->groupName("R"), - ((2.0/3.0)*I)*tk() - (nutEff_)*dev(twoSymm(fvc::grad(this->U_))), - tk().boundaryField().types() + ((2.0/3.0)*I)*tk() - (nutEff_)*dev(twoSymm(fvc::grad(this->U_))) ); } diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H index 8ab1fd7356..ba289c7002 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H +++ b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -235,8 +235,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H index 3f5089cb81..6dd64918b6 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H @@ -213,8 +213,7 @@ public: return volScalarField::New ( "omega", - epsilon_/(Cmu_*k_), - epsilon_.boundaryField().types() + epsilon_/(Cmu_*k_) ); } diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H index d4ba2e08f9..4bf87f5c8c 100644 --- a/src/combustionModels/FSD/FSD.H +++ b/src/combustionModels/FSD/FSD.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ Description omegaEq. This omegaEq is obtained from the flamelet solution for different strain rates and fit using a exponential distribution. - The spacial distribution of the consumption speed (omega) is obtained also + The spatial distribution of the consumption speed (omega) is obtained also from a strained flamelet solution and it is assumed to have a gaussian distribution. diff --git a/src/combustionModels/radiationModels/sootModels/mixtureFraction/mixtureFraction.H b/src/combustionModels/radiationModels/sootModels/mixtureFraction/mixtureFraction.H index 58b26dfe79..7b66eae6ef 100644 --- a/src/combustionModels/radiationModels/sootModels/mixtureFraction/mixtureFraction.H +++ b/src/combustionModels/radiationModels/sootModels/mixtureFraction/mixtureFraction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description The soot is not considered into the thermodynamics of the system and it is not considered as an extra specie in the solver. - The spacial distribution is given by the normalisation of the first product + The spatial distribution is given by the normalisation of the first product on the rhs of the reaction by default or it can be added as input. For example in the radiationProperties dictionary set: diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index a0c0c18460..7a66747b63 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -189,6 +189,7 @@ $(derivedFvPatchFields)/freestream/freestreamFvPatchFields.C $(derivedFvPatchFields)/freestreamVelocity/freestreamVelocityFvPatchVectorField.C $(derivedFvPatchFields)/freestreamPressure/freestreamPressureFvPatchScalarField.C $(derivedFvPatchFields)/inletOutlet/inletOutletFvPatchFields.C +$(derivedFvPatchFields)/zeroInletOutlet/zeroInletOutletFvPatchFields.C $(derivedFvPatchFields)/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C $(derivedFvPatchFields)/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C $(derivedFvPatchFields)/mappedInternalValue/mappedInternalValueFvPatchFields.C diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFields.C index 45dcf4d76b..a450ec1a4f 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "calculatedFvPatchFields.H" #include "fvPatchFields.H" -#include "volMesh.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -35,8 +34,8 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makeTemplatePatchTypeField(label, calculated); -makePatchFields(calculated); +makeNullConstructableTemplatePatchTypeField(label, calculated); +makeNullConstructablePatchFields(calculated); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C index 8c054f5dfa..afcbedf2d8 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,8 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "extrapolatedCalculatedFvPatchFields.H" -#include "fvPatchFields.H" -#include "volMesh.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -35,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(extrapolatedCalculated); +makeNullConstructablePatchFields(extrapolatedCalculated); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFields.C index 8f3653a209..a1846c449a 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "fixedValueFvPatchFields.H" -#include "volFields.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(fixedValue); +makeNullConstructablePatchFields(fixedValue); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFields.C index d9472e7d94..f95800ea6b 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "zeroGradientFvPatchFields.H" -#include "fvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -35,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(zeroGradient); +makeNullConstructablePatchFields(zeroGradient); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFields.C index dbb29abb83..ad60362cd3 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "cyclicFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(cyclic); +makeNullConstructablePatchFields(cyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C index d11692fa12..72c193c367 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "cyclicSlipFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(cyclicSlip); +makeNullConstructablePatchFields(cyclicSlip); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFields.C index dffd107f2a..b227208bea 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "emptyFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(empty); +makeNullConstructablePatchFields(empty); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchFields.C index 60c33bd016..c26d53bd7b 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "internalFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(internal); +makeNullConstructablePatchFields(internal); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C index 76f9ac6030..a01c2a9617 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,8 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "jumpCyclicFvPatchFields.H" -#include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchFields.C index c81a8f7c6e..df03ee769e 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "nonConformalCyclicFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(nonConformalCyclic); +makeNullConstructablePatchFields(nonConformalCyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchFields.C index cc7980e571..e0fbeda651 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "nonConformalErrorFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(nonConformalError); +makeNullConstructablePatchFields(nonConformalError); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchFields.C index a4717471be..09a12657d4 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "nonConformalProcessorCyclicFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(nonConformalProcessorCyclic); +makeNullConstructablePatchFields(nonConformalProcessorCyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFields.C index 9a175eb4e6..061a948725 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "processorFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(processor); +makeNullConstructablePatchFields(processor); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C index f126b31b73..65cb1818da 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "processorCyclicFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(processorCyclic); +makeNullConstructablePatchFields(processorCyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFields.C index 7de0371572..897d0f2bd7 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "symmetryFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(symmetry); +makeNullConstructablePatchFields(symmetry); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C index 39adcd4e76..f96de2547b 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "symmetryPlaneFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(symmetryPlane); +makeNullConstructablePatchFields(symmetryPlane); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C index 08c2bc737d..51adfe48da 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "wedgeFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(wedge); +makeNullConstructablePatchFields(wedge); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C index c39fddff18..29302dd0dd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "fixedNormalSlipFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,8 +33,8 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makeTemplatePatchTypeField(vector, fixedNormalSlip); -makeTemplatePatchTypeField(tensor, fixedNormalSlip); +makeNullConstructableTemplatePatchTypeField(vector, fixedNormalSlip); +makeNullConstructableTemplatePatchTypeField(tensor, fixedNormalSlip); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C index 90c530715c..1487a9dcf8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,8 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField { this->refValue() = Zero; this->refGrad() = Zero; - this->valueFraction() = 0.0; + this->valueFraction() = 0; + fvPatchField::operator=(Zero); } @@ -69,7 +70,7 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField } this->refGrad() = Zero; - this->valueFraction() = 0.0; + this->valueFraction() = 0; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFields.C index 3cd789a8c2..f207a73679 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,9 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#include "volFields.H" -#include "surfaceFields.H" #include "inletOutletFvPatchFields.H" +#include "surfaceFields.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchFields.C index 7eafeb8d9e..e08fc9324a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "mappedInternalValueFvPatchFields.H" -#include "volMesh.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C index e2fb062fdf..92d27dcf93 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "noSlipFvPatchVectorField.H" -#include "volFields.H" #include "fvcMeshPhi.H" #include "addToRunTimeSelectionTable.H" @@ -117,7 +116,7 @@ void Foam::noSlipFvPatchVectorField::write(Ostream& os) const namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchVectorField, noSlipFvPatchVectorField diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFields.C index 41c6a2cbfd..7eaf59685c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "slipFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(slip); +makeNullConstructablePatchFields(slip); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C new file mode 100644 index 0000000000..4bdb0304b2 --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C @@ -0,0 +1,60 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "zeroInletOutletFvPatchField.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::zeroInletOutletFvPatchField::zeroInletOutletFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + inletOutletFvPatchField(p, iF) +{ + if (dict.found("value")) + { + fvPatchField::operator= + ( + Field("value", dict, p.size()) + ); + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +void Foam::zeroInletOutletFvPatchField::write(Ostream& os) const +{ + fvPatchField::write(os); + writeEntry(os, "value", *this); +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.H new file mode 100644 index 0000000000..12afa38a73 --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.H @@ -0,0 +1,123 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::zeroInletOutletFvPatchField + +Description + This boundary condition provides a generic outflow condition + + Zero gradient is applied for outflow and a zero value applied for reverse + flow. + +Usage + Example of the boundary condition specification: + \verbatim + + { + type zeroInletOutlet; + } + \endverbatim + +See also + Foam::inletOutletFvPatchField + Foam::zeroGradientFvPatchField + +SourceFiles + zeroInletOutletFvPatchField.C + +\*---------------------------------------------------------------------------*/ + +#ifndef zeroInletOutletFvPatchField_H +#define zeroInletOutletFvPatchField_H + +#include "inletOutletFvPatchField.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class zeroInletOutletFvPatchField Declaration +\*---------------------------------------------------------------------------*/ + +template +class zeroInletOutletFvPatchField +: + public inletOutletFvPatchField +{ + +public: + + //- Runtime type information + TypeName("zeroInletOutlet"); + + + // Constructors + + using inletOutletFvPatchField::inletOutletFvPatchField; + + //- Construct from patch, internal field and dictionary + zeroInletOutletFvPatchField + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp> clone + ( + const DimensionedField& iF + ) const + { + return tmp> + ( + new zeroInletOutletFvPatchField(*this, iF) + ); + } + + + // Member Functions + + //- Write + virtual void write(Ostream&) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "zeroInletOutletFvPatchField.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.C new file mode 100644 index 0000000000..b48510fe3b --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.C @@ -0,0 +1,43 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "zeroInletOutletFvPatchFields.H" +#include "surfaceFields.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +makeNullConstructablePatchFields(zeroInletOutlet); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.H new file mode 100644 index 0000000000..40a7605af6 --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFields.H @@ -0,0 +1,49 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#ifndef zeroInletOutletFvPatchFields_H +#define zeroInletOutletFvPatchFields_H + +#include "zeroInletOutletFvPatchField.H" +#include "fieldTypes.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makePatchTypeFieldTypedefs(zeroInletOutlet); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFieldsFwd.H new file mode 100644 index 0000000000..d09cf7b46f --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchFieldsFwd.H @@ -0,0 +1,50 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#ifndef zeroInletOutletFvPatchFieldsFwd_H +#define zeroInletOutletFvPatchFieldsFwd_H + +#include "fieldTypes.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +template class zeroInletOutletFvPatchField; + +makePatchTypeFieldTypedefs(zeroInletOutlet); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index 75a32d301f..4c514cabb8 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H @@ -598,12 +598,6 @@ public: #define addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \ - addToRunTimeSelectionTable \ - ( \ - PatchTypeField, \ - typePatchTypeField, \ - patch \ - ); \ addToRunTimeSelectionTable \ ( \ PatchTypeField, \ @@ -618,6 +612,19 @@ public: ); +#define addToNullConstructablePatchFieldRunTimeSelection( \ + PatchTypeField, typePatchTypeField) \ + \ + addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \ + \ + addToRunTimeSelectionTable \ + ( \ + PatchTypeField, \ + typePatchTypeField, \ + patch \ + ); + + // Use with caution #define addRemovableToPatchFieldRunTimeSelection( \ PatchTypeField, typePatchTypeField) \ @@ -642,6 +649,16 @@ public: addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) +// For null-constructable non-templated patch fields +#define makeNullConstructablePatchTypeField(PatchTypeField, typePatchTypeField)\ + defineTypeNameAndDebug(typePatchTypeField, 0); \ + addToNullConstructablePatchFieldRunTimeSelection \ + ( \ + PatchTypeField, \ + typePatchTypeField \ + ) + + // For non-templated patch fields - use with caution #define makeRemovablePatchTypeField(PatchTypeField, typePatchTypeField) \ defineTypeNameAndDebug(typePatchTypeField, 0); \ @@ -662,10 +679,28 @@ public: ) +// For null-constructable templated patch fields +#define makeNullConstructableTemplatePatchTypeField(fieldType, type) \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + CAT4(type, FvPatch, CAPITALIZE(fieldType), Field), \ + 0 \ + ); \ + addToNullConstructablePatchFieldRunTimeSelection \ + ( \ + CAT3(fvPatch, CAPITALIZE(fieldType), Field), \ + CAT4(type, FvPatch, CAPITALIZE(fieldType), Field) \ + ) + + #define makePatchFields(type) \ FOR_ALL_FIELD_TYPES(makeTemplatePatchTypeField, type) +#define makeNullConstructablePatchFields(type) \ + FOR_ALL_FIELD_TYPES(makeNullConstructableTemplatePatchTypeField, type) + + #define makePatchFieldTypeName(fieldType, type) \ defineNamedTemplateTypeNameAndDebug \ ( \ diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C index 4cc4c0c5fe..a8abf1adaf 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,11 +49,12 @@ Foam::tmp> Foam::fvPatchField::New if (cstrIter == patchConstructorTablePtr_->end()) { FatalErrorInFunction - << "Unknown patchField type " - << patchFieldType << nl << nl - << "Valid patchField types are :" << endl + << "Unknown null-constructable patchField type " << patchFieldType + << " for patch " << p.name() << " of type " << p.type() + << " for field " << iF.name() << nl << nl + << "Valid null-constructable patchField types are :" << endl << patchConstructorTablePtr_->sortedToc() - << exit(FatalError); + << abort(FatalError); } if @@ -136,7 +137,8 @@ Foam::tmp> Foam::fvPatchField::New ( dict ) << "Unknown patchField type " << patchFieldType - << " for patch type " << p.type() << nl << nl + << " for patch " << p.name() << " of type " << p.type() + << " for field " << iF.name() << nl << nl << "Valid patchField types are :" << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -164,6 +166,7 @@ Foam::tmp> Foam::fvPatchField::New ) << "inconsistent patch and patchField types for \n" " patch type " << p.type() << " and patchField type " << patchFieldType + << " for field " << iF.name() << exit(FatalIOError); } } @@ -192,7 +195,9 @@ Foam::tmp> Foam::fvPatchField::New if (cstrIter == patchMapperConstructorTablePtr_->end()) { FatalErrorInFunction - << "Unknown patchField type " << ptf.type() << nl << nl + << "Unknown patchField type " << ptf.type() + << " for patch " << p.name() << " of type " << p.type() + << " for field " << iF.name() << nl << nl << "Valid patchField types are :" << endl << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); diff --git a/src/functionObjects/field/age/age.C b/src/functionObjects/field/age/age.C index 0b6813b266..bcacc1c6b3 100644 --- a/src/functionObjects/field/age/age.C +++ b/src/functionObjects/field/age/age.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License #include "fvModels.H" #include "fvConstraints.H" #include "momentumTransportModel.H" -#include "inletOutletFvPatchField.H" +#include "zeroInletOutletFvPatchField.H" #include "wallFvPatch.H" #include "zeroGradientFvPatchField.H" #include "addToRunTimeSelectionTable.H" @@ -53,7 +53,7 @@ Foam::wordList Foam::functionObjects::age::patchTypes() const wordList result ( mesh_.boundary().size(), - inletOutletFvPatchField::typeName + zeroInletOutletFvPatchField::typeName ); forAll(mesh_.boundary(), patchi) @@ -167,12 +167,6 @@ bool Foam::functionObjects::age::execute() Foam::fvConstraints::New(mesh_) ); - // This only works because the null constructed inletValue for an - // inletOutletFvPatchField is zero. If we needed any other value we would - // have to loop over the inletOutlet patches and explicitly set the - // inletValues. We would need to change the interface of inletOutlet in - // order to do this. - const surfaceScalarField& phi = mesh_.lookupObject(phiName_); diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H index c5d9ca29f7..a600654f81 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ Usage \endtable Note: - Cp and rho are required only for incompressible flow calclulations. + Cp and rho are required only for incompressible flow calculations. SourceFiles ReynoldsAnalogy.C diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C index ce6456594e..e2f8b0eb6d 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C +++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "cellMotionFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePatchFields(cellMotion); +makeNullConstructablePatchFields(cellMotion); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H index 6f717cff36..78b65c4729 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,7 @@ Description Specified surface wave moving boundary. The motion is a cosine wave with specified amplitude, frequency, wave number - and optional leading and trailing spacial ramps and temporal ramp + and optional leading and trailing spatial ramps and temporal ramp to allow the motion to be applied to an initially flat surface. Usage diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C index a63cb8893b..7282c3f430 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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,7 @@ void Foam::fixedEnergyFvPatchScalarField::updateCoeffs() namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, fixedEnergyFvPatchScalarField diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C index 6193fd6df9..cdf80682f6 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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,7 +145,7 @@ void Foam::gradientEnergyFvPatchScalarField::write(Ostream& os) const namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, gradientEnergyFvPatchScalarField diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C index 34adf4e8c9..b1990c9416 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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,7 +145,7 @@ void Foam::mixedEnergyFvPatchScalarField::updateCoeffs() namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, mixedEnergyFvPatchScalarField diff --git a/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C index a40512429e..4cb444af40 100644 --- a/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/multicomponentThermo/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,10 +26,8 @@ License #include "fixedUnburntEnthalpyFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" -#include "volFields.H" #include "psiuMulticomponentThermo.H" - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::fixedUnburntEnthalpyFvPatchScalarField:: @@ -109,7 +107,7 @@ void Foam::fixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, fixedUnburntEnthalpyFvPatchScalarField diff --git a/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C index 1e8bb16382..b6063092e9 100644 --- a/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/multicomponentThermo/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,6 @@ License #include "gradientUnburntEnthalpyFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" -#include "volFields.H" #include "psiuMulticomponentThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -115,7 +114,7 @@ void Foam::gradientUnburntEnthalpyFvPatchScalarField::updateCoeffs() namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, gradientUnburntEnthalpyFvPatchScalarField diff --git a/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C index 61779c96db..3c685f22a0 100644 --- a/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/multicomponentThermo/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,6 @@ License #include "mixedUnburntEnthalpyFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" -#include "volFields.H" #include "psiuMulticomponentThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -123,7 +122,7 @@ void Foam::mixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() namespace Foam { - makePatchTypeField + makeNullConstructablePatchTypeField ( fvPatchScalarField, mixedUnburntEnthalpyFvPatchScalarField diff --git a/tutorials/fluid/hotRoomComfort/0/DR b/tutorials/fluid/hotRoomComfort/0/DR deleted file mode 100644 index 1f278e672c..0000000000 --- a/tutorials/fluid/hotRoomComfort/0/DR +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object DR; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type calculated; - value uniform 0; - } - inlet - { - type calculated; - value uniform 16.61; - } - outlet - { - type calculated; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/fluid/hotRoomComfort/0/PMV b/tutorials/fluid/hotRoomComfort/0/PMV deleted file mode 100644 index 6e34edd5d4..0000000000 --- a/tutorials/fluid/hotRoomComfort/0/PMV +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object PMV; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.40936; - -boundaryField -{ - walls - { - type calculated; - value uniform 1.40936; - } - inlet - { - type calculated; - value uniform -1.18438; - } - outlet - { - type calculated; - value uniform 1.40936; - } -} - - -// ************************************************************************* // diff --git a/tutorials/fluid/hotRoomComfort/0/PPD b/tutorials/fluid/hotRoomComfort/0/PPD deleted file mode 100644 index 296066aa0b..0000000000 --- a/tutorials/fluid/hotRoomComfort/0/PPD +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object PPD; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 46.0115; - -boundaryField -{ - walls - { - type calculated; - value uniform 46.0115; - } - inlet - { - type calculated; - value uniform 34.4876; - } - outlet - { - type calculated; - value uniform 46.0115; - } -} - - -// ************************************************************************* // diff --git a/tutorials/legacy/combustion/PDRFoam/flamePropagationWithObstacles/README b/tutorials/legacy/combustion/PDRFoam/flamePropagationWithObstacles/README index 8e71fd3b1f..dc38c832cd 100644 --- a/tutorials/legacy/combustion/PDRFoam/flamePropagationWithObstacles/README +++ b/tutorials/legacy/combustion/PDRFoam/flamePropagationWithObstacles/README @@ -4,5 +4,5 @@ Step to introduce the PDR fields: 1) Create zero-size patches for wall or/and coupled baffles in the boundary file. -2) Specify the boundary contitions for these patches in the fields. +2) Specify the boundary conditions for these patches in the fields. 3) Create the new PDR mesh using the PDRMesh utility. diff --git a/tutorials/multiRegion/film/VoFToFilm/0/film/delta b/tutorials/multiRegion/film/VoFToFilm/0/film/delta index 8d347ca4a0..b6e8bb980f 100644 --- a/tutorials/multiRegion/film/VoFToFilm/0/film/delta +++ b/tutorials/multiRegion/film/VoFToFilm/0/film/delta @@ -33,14 +33,12 @@ boundaryField bottom { - type inletOutlet; - inletValue $internalField; + type zeroInletOutlet; } atmosphere { - type inletOutlet; - inletValue $internalField; + type zeroInletOutlet; } }