From fe4688c27f39318a5739feffa4a5c809fd8db8fa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 31 Jan 2023 15:26:31 +0100
Subject: [PATCH] ENH: patch fields writeValueEntry method (frequently used)
- add base-level readValueEntry, readMixedEntries methods
that allow optional or mandatory reading.
STYLE: wording for patch fields comments
---
.../T/smoluchowskiJumpTFvPatchScalarField.C | 4 +-
.../BCs/U/maxwellSlipUFvPatchVectorField.C | 4 +-
.../BCs/rho/fixedRhoFvPatchScalarField.C | 5 +-
...woPhaseRadCoupledMixedFvPatchScalarField.C | 2 +-
.../adjointOutletPressureFvPatchScalarField.C | 4 +-
.../adjointOutletVelocityFvPatchVectorField.C | 4 +-
.../alphaContactAngleFvPatchScalarField.C | 4 +-
.../alphaContactAngleFvPatchScalarField.C | 4 +-
.../tractionDisplacementFvPatchVectorField.C | 4 +-
...DisplacementCorrectionFvPatchVectorField.C | 4 +-
etc/codeTemplates/BC/BC.C | 2 +-
.../basicSymmetryPointPatchField.H | 2 +-
.../calculated/calculatedPointPatchField.H | 2 +-
.../basic/coupled/coupledPointPatchField.H | 2 +-
.../fixedValue/fixedValuePointPatchField.H | 2 +-
.../basic/value/valuePointPatchField.C | 39 ++++++-
.../basic/value/valuePointPatchField.H | 28 ++++-
.../zeroGradientPointPatchField.H | 2 +-
.../constraint/cyclic/cyclicPointPatchField.H | 2 +-
.../cyclicSlip/cyclicSlipPointPatchField.H | 2 +-
.../constraint/empty/emptyPointPatchField.H | 2 +-
...nonuniformTransformCyclicPointPatchField.H | 2 +-
.../processor/processorPointPatchField.H | 2 +-
.../processorCyclicPointPatchField.H | 2 +-
.../symmetry/symmetryPointPatchField.H | 2 +-
.../symmetryPlanePointPatchField.H | 2 +-
.../constraint/wedge/wedgePointPatchField.H | 2 +-
.../codedFixedValuePointPatchField.C | 2 +-
.../fixedNormalSlipPointPatchField.H | 2 +-
.../derived/slip/slipPointPatchField.H | 2 +-
.../pointPatchField/pointPatchField.H | 76 ++++++-------
...ayatillekeWallFunctionFvPatchScalarField.C | 2 +-
...thDissipationRateInletFvPatchScalarField.C | 4 +-
...ngLengthFrequencyInletFvPatchScalarField.C | 4 +-
.../fixedShearStressFvPatchVectorField.C | 4 +-
.../epsilonWallFunctionFvPatchScalarField.C | 2 +-
.../kLowReWallFunctionFvPatchScalarField.C | 2 +-
.../kqRWallFunctionFvPatchField.C | 2 +-
.../nutLowReWallFunctionFvPatchScalarField.C | 2 +-
...utUBlendedWallFunctionFvPatchScalarField.C | 2 +-
.../nutURoughWallFunctionFvPatchScalarField.C | 2 +-
...tUSpaldingWallFunctionFvPatchScalarField.C | 2 +-
...UTabulatedWallFunctionFvPatchScalarField.C | 2 +-
.../nutUWallFunctionFvPatchScalarField.C | 2 +-
.../nutkRoughWallFunctionFvPatchScalarField.C | 2 +-
.../nutkWallFunctionFvPatchScalarField.C | 2 +-
.../omegaWallFunctionFvPatchScalarField.C | 2 +-
...ndaryLayerInletEpsilonFvPatchScalarField.C | 4 +-
...atmBoundaryLayerInletKFvPatchScalarField.C | 4 +-
...oundaryLayerInletOmegaFvPatchScalarField.C | 4 +-
...daryLayerInletVelocityFvPatchVectorField.C | 4 +-
...entHeatFluxTemperatureFvPatchScalarField.C | 4 +-
...atmAlphatkWallFunctionFvPatchScalarField.C | 2 +-
...atmEpsilonWallFunctionFvPatchScalarField.C | 2 +-
.../atmNutUWallFunctionFvPatchScalarField.C | 2 +-
.../atmNutWallFunctionFvPatchScalarField.C | 2 +-
.../atmNutkWallFunctionFvPatchScalarField.C | 2 +-
.../atmOmegaWallFunctionFvPatchScalarField.C | 2 +-
.../freeSurfacePressureFvPatchScalarField.C | 4 +-
.../freeSurfaceVelocityFvPatchVectorField.C | 4 +-
...yMotionDisplacementPointPatchVectorField.C | 2 +-
...yMotionDisplacementPointPatchVectorField.H | 2 +-
.../basic/calculated/calculatedFaPatchField.C | 2 +-
.../basic/calculated/calculatedFaPatchField.H | 2 +-
.../basic/coupled/coupledFaPatchField.C | 2 +-
.../fixedGradient/fixedGradientFaPatchField.H | 4 +-
.../basic/fixedValue/fixedValueFaPatchField.C | 2 +-
.../basic/fixedValue/fixedValueFaPatchField.H | 4 +-
.../basic/mixed/mixedFaPatchField.C | 56 +++++++++-
.../basic/mixed/mixedFaPatchField.H | 33 +++++-
.../basic/sliced/slicedFaPatchField.C | 2 +-
.../basic/sliced/slicedFaPatchField.H | 4 +-
.../basic/transform/transformFaPatchField.H | 4 +-
.../zeroGradient/zeroGradientFaPatchField.H | 4 +-
.../clampedPlate/clampedPlateFaPatchField.C | 2 +-
.../clampedPlate/clampedPlateFaPatchField.H | 2 +-
.../edgeNormalFixedValueFaPatchVectorField.C | 2 +-
.../fixedValueOutflowFaPatchField.C | 2 +-
.../fixedValueOutflowFaPatchField.H | 4 +-
.../inletOutlet/inletOutletFaPatchField.C | 2 +-
...timeVaryingUniformFixedValueFaPatchField.C | 2 +-
.../faPatchFields/faPatchField/faPatchField.C | 64 +++++++++--
.../faPatchFields/faPatchField/faPatchField.H | 85 ++++++++++-----
.../calculated/calculatedFaePatchField.C | 2 +-
.../calculated/calculatedFaePatchField.H | 14 +--
.../basic/coupled/coupledFaePatchField.C | 2 +-
.../basic/coupled/coupledFaePatchField.H | 7 +-
.../fixedValue/fixedValueFaePatchField.C | 2 +-
.../fixedValue/fixedValueFaePatchField.H | 9 +-
.../basic/sliced/slicedFaePatchField.H | 3 +-
.../constraint/cyclic/cyclicFaePatchField.H | 6 +-
.../constraint/empty/emptyFaePatchField.H | 5 +-
.../processor/processorFaePatchField.C | 7 --
.../processor/processorFaePatchField.H | 10 +-
.../symmetry/symmetryFaePatchField.H | 5 +-
.../constraint/wedge/wedgeFaePatchField.H | 5 +-
.../faePatchField/faePatchField.C | 63 +++++++++--
.../faePatchField/faePatchField.H | 84 ++++++++++-----
.../SRFFreestreamVelocityFvPatchVectorField.C | 4 +-
.../SRFVelocityFvPatchVectorField.C | 4 +-
.../SRFWallVelocityFvPatchVectorField.C | 4 +-
.../exprValuePointPatchField.C | 2 +-
.../basic/calculated/calculatedFvPatchField.C | 2 +-
.../basic/calculated/calculatedFvPatchField.H | 2 +-
.../basic/coupled/coupledFvPatchField.C | 2 +-
.../directionMixedFvPatchField.C | 2 +-
.../extrapolatedCalculatedFvPatchField.H | 2 +-
.../basic/fixedValue/fixedValueFvPatchField.C | 2 +-
.../basic/fixedValue/fixedValueFvPatchField.H | 4 +-
.../basic/mixed/mixedFvPatchField.C | 56 +++++++++-
.../basic/mixed/mixedFvPatchField.H | 23 +++-
.../basic/sliced/slicedFvPatchField.C | 2 +-
.../basic/sliced/slicedFvPatchField.H | 3 +-
.../basic/transform/transformFvPatchField.H | 4 +-
.../zeroGradient/zeroGradientFvPatchField.H | 4 +-
.../cyclicACMI/cyclicACMIFvPatchField.C | 2 +-
.../cyclicAMI/cyclicAMIFvPatchField.C | 2 +-
.../acousticWaveTransmissiveFvPatchField.C | 2 +-
.../activeBaffleVelocityFvPatchVectorField.C | 4 +-
...ureForceBaffleVelocityFvPatchVectorField.C | 4 +-
.../derived/advective/advectiveFvPatchField.C | 2 +-
.../codedFixedValueFvPatchField.C | 2 +-
...lindricalInletVelocityFvPatchVectorField.C | 2 +-
...lectrostaticDepositionFvPatchScalarField.C | 4 +-
.../fixedFluxPressureFvPatchScalarField.C | 4 +-
.../fixedInternalValueFvPatchField.H | 4 +-
.../derived/fixedJump/fixedJumpFvPatchField.C | 2 +-
.../fixedJumpAMI/fixedJumpAMIFvPatchField.C | 2 +-
.../derived/fixedMean/fixedMeanFvPatchField.C | 2 +-
.../fixedMeanOutletInletFvPatchField.C | 2 +-
...malInletOutletVelocityFvPatchVectorField.C | 4 +-
.../fixedNormalSlipFvPatchField.C | 2 +-
...ureCompressibleDensityFvPatchScalarField.C | 2 +-
.../fixedProfile/fixedProfileFvPatchField.C | 2 +-
.../flowRateInletVelocityFvPatchVectorField.C | 2 +-
...flowRateOutletVelocityFvPatchVectorField.C | 2 +-
.../fluxCorrectedVelocityFvPatchVectorField.C | 4 +-
.../freestream/freestreamFvPatchField.C | 2 +-
.../freestreamPressureFvPatchScalarField.C | 4 +-
.../freestreamVelocityFvPatchVectorField.C | 4 +-
.../inletOutlet/inletOutletFvPatchField.C | 2 +-
...OutletTotalTemperatureFvPatchScalarField.C | 4 +-
.../interfaceCompressionFvPatchScalarField.C | 4 +-
...erstitialInletVelocityFvPatchVectorField.C | 2 +-
.../mappedField/mappedFieldFvPatchField.C | 2 +-
.../mappedFixedValueFvPatchField.C | 2 +-
.../mappedFlowRateFvPatchVectorField.C | 2 +-
...mappedVelocityFluxFixedValueFvPatchField.C | 4 +-
...FlowRateOutletVelocityFvPatchVectorField.C | 2 +-
.../movingWallVelocityFvPatchVectorField.C | 4 +-
.../derived/noSlip/noSlipFvPatchVectorField.C | 2 +-
.../outletInlet/outletInletFvPatchField.C | 2 +-
.../outletMappedUniformInletFvPatchField.C | 2 +-
...utletPhaseMeanVelocityFvPatchVectorField.C | 2 +-
.../partialSlip/partialSlipFvPatchField.C | 2 +-
...aseHydrostaticPressureFvPatchScalarField.C | 4 +-
.../plenumPressureFvPatchScalarField.C | 4 +-
...tedInletOutletVelocityFvPatchVectorField.C | 4 +-
...eDirectedInletVelocityFvPatchVectorField.C | 4 +-
...tOutletParSlipVelocityFvPatchVectorField.C | 4 +-
...ureInletOutletVelocityFvPatchVectorField.C | 4 +-
.../pressureInletVelocityFvPatchVectorField.C | 4 +-
...malInletOutletVelocityFvPatchVectorField.C | 4 +-
...IDControlInletVelocityFvPatchVectorField.C | 2 +-
...phaInletOutletVelocityFvPatchVectorField.C | 2 +-
.../prghPressureFvPatchScalarField.C | 4 +-
...talHydrostaticPressureFvPatchScalarField.C | 4 +-
.../prghTotalPressureFvPatchScalarField.C | 4 +-
...ureInletOutletVelocityFvPatchVectorField.C | 4 +-
.../rotatingWallVelocityFvPatchVectorField.C | 4 +-
.../supersonicFreestreamFvPatchVectorField.C | 4 +-
...urfaceNormalFixedValueFvPatchVectorField.C | 2 +-
...lFlowRateInletVelocityFvPatchVectorField.C | 2 +-
.../swirlInletVelocityFvPatchVectorField.C | 2 +-
.../syringePressureFvPatchScalarField.C | 4 +-
.../timeVaryingMappedFixedValueFvPatchField.C | 2 +-
.../totalPressureFvPatchScalarField.C | 4 +-
.../totalTemperatureFvPatchScalarField.C | 4 +-
...ranslatingWallVelocityFvPatchVectorField.C | 4 +-
.../turbulentDFSEMInletFvPatchVectorField.C | 2 +-
.../turbulentDigitalFilterInletFvPatchField.C | 2 +-
.../turbulentInletFvPatchField.C | 2 +-
...sityKineticEnergyInletFvPatchScalarField.C | 4 +-
...ityHydrostaticPressureFvPatchScalarField.C | 4 +-
.../uniformFixedGradientFvPatchField.C | 2 +-
.../uniformFixedValueFvPatchField.C | 2 +-
.../uniformInletOutletFvPatchField.C | 2 +-
...niformNormalFixedValueFvPatchVectorField.C | 4 +-
.../uniformTotalPressureFvPatchScalarField.C | 4 +-
.../variableHeightFlowRateFvPatchField.C | 4 +-
...tFlowRateInletVelocityFvPatchVectorField.C | 2 +-
.../waveSurfacePressureFvPatchScalarField.C | 4 +-
.../waveTransmissiveFvPatchField.C | 2 +-
.../fvPatchFields/fvPatchField/fvPatchField.C | 61 +++++++++--
.../fvPatchFields/fvPatchField/fvPatchField.H | 100 +++++++++++-------
.../calculated/calculatedFvsPatchField.H | 2 +-
.../fixedValue/fixedValueFvsPatchField.H | 4 +-
.../basic/sliced/slicedFvsPatchField.H | 3 +-
.../fvsPatchField/fvsPatchField.C | 65 ++++++++++--
.../fvsPatchField/fvsPatchField.H | 86 ++++++++++-----
.../cellMotion/cellMotionFvPatchField.C | 2 +-
.../surfaceSlipDisplacementFvPatchField.H | 2 +-
...llatingDisplacementPointPatchVectorField.C | 2 +-
...llatingDisplacementPointPatchVectorField.H | 2 +-
...OscillatingVelocityPointPatchVectorField.C | 2 +-
...OscillatingVelocityPointPatchVectorField.H | 2 +-
...llatingDisplacementPointPatchVectorField.C | 2 +-
...llatingDisplacementPointPatchVectorField.H | 2 +-
...oscillatingVelocityPointPatchVectorField.C | 2 +-
...oscillatingVelocityPointPatchVectorField.H | 2 +-
...surfaceDisplacementPointPatchVectorField.C | 2 +-
...surfaceDisplacementPointPatchVectorField.H | 2 +-
...aceSlipDisplacementPointPatchVectorField.C | 2 +-
...aceSlipDisplacementPointPatchVectorField.H | 2 +-
...polatedDisplacementPointPatchVectorField.C | 2 +-
...polatedDisplacementPointPatchVectorField.H | 2 +-
.../waveDisplacementPointPatchVectorField.C | 2 +-
.../waveDisplacementPointPatchVectorField.H | 2 +-
.../genericFaPatchField/genericFaPatchField.C | 2 +-
.../genericFaPatchField/genericFaPatchField.H | 2 +-
.../genericFvPatchField/genericFvPatchField.C | 2 +-
.../genericFvPatchField/genericFvPatchField.H | 2 +-
.../genericFvsPatchField.C | 2 +-
.../genericFvsPatchField.H | 2 +-
.../genericPointPatchField.H | 2 +-
...edPointDisplacementPointPatchVectorField.C | 2 +-
...edPointDisplacementPointPatchVectorField.H | 2 +-
.../zeroFixedValuePointPatchField.H | 2 +-
.../cyclicACMIPointPatchField.H | 2 +-
.../cyclicAMIPointPatchField.H | 2 +-
.../uniformFixedValuePointPatchField.H | 2 +-
...djointFarFieldPressureFvPatchScalarField.C | 4 +-
...djointFarFieldVelocityFvPatchVectorField.C | 4 +-
.../adjointInletVelocityFvPatchVectorField.C | 4 +-
.../adjointOutletPressureFvPatchScalarField.C | 4 +-
.../adjointOutletVelocityFvPatchVectorField.C | 4 +-
...ointOutletVelocityFluxFvPatchVectorField.C | 4 +-
.../adjointWallVelocityFvPatchVectorField.C | 4 +-
...jointWallVelocityLowReFvPatchVectorField.C | 4 +-
...djointFarFieldNuaTildaFvPatchScalarField.C | 4 +-
.../adjointFarFieldTMVar1FvPatchScalarField.C | 4 +-
.../adjointFarFieldTMVar2FvPatchScalarField.C | 4 +-
.../adjointInletNuaTildaFvPatchScalarField.C | 4 +-
.../adjointOutletFluxFvPatchField.C | 2 +-
.../adjointOutletKaFvPatchScalarField.C | 4 +-
.../adjointOutletNuaTildaFvPatchScalarField.C | 4 +-
...ointOutletNuaTildaFluxFvPatchScalarField.C | 4 +-
.../adjointOutletWaFvPatchScalarField.C | 4 +-
.../alphaContactAngleFvPatchScalarField.C | 4 +-
...imeVaryingMassSorptionFvPatchScalarField.C | 4 +-
.../alphaContactAngleFvPatchScalarField.C | 4 +-
...allBoilingWallFunctionFvPatchScalarField.C | 2 +-
...ayatillekeWallFunctionFvPatchScalarField.C | 2 +-
...haseChangeWallFunctionFvPatchScalarField.C | 2 +-
...allBoilingWallFunctionFvPatchScalarField.C | 2 +-
.../copiedFixedValueFvPatchScalarField.C | 2 +-
...ixedMultiPhaseHeatFluxFvPatchScalarField.C | 2 +-
...sonJacksonParticleSlipFvPatchVectorField.C | 4 +-
...onJacksonParticleThetaFvPatchScalarField.C | 4 +-
...sonJacksonParticleSlipFvPatchVectorField.C | 4 +-
...onJacksonParticleThetaFvPatchScalarField.C | 4 +-
...sRadiativeCoupledMixedFvPatchScalarField.C | 2 +-
...ysisTemperatureCoupledFvPatchScalarField.C | 4 +-
...rolysisVelocityCoupledFvPatchVectorField.C | 4 +-
...ilmHeightInletVelocityFvPatchVectorField.C | 4 +-
...linedFilmNusseltHeightFvPatchScalarField.C | 6 +-
...lmNusseltInletVelocityFvPatchVectorField.C | 6 +-
...alphatFilmWallFunctionFvPatchScalarField.C | 3 +-
.../nutkFilmWallFunctionFvPatchScalarField.C | 2 +-
...gidBodyDisplacementPointPatchVectorField.C | 2 +-
...gidBodyDisplacementPointPatchVectorField.H | 2 +-
...gidBodyDisplacementPointPatchVectorField.C | 2 +-
...gidBodyDisplacementPointPatchVectorField.H | 2 +-
...convectiveHeatTransferFvPatchScalarField.C | 2 +-
...allHeatFluxTemperatureFvPatchScalarField.C | 4 +-
...fixedIncidentRadiationFvPatchScalarField.C | 4 +-
...emperatureCoupledMixedFvPatchScalarField.C | 2 +-
...pedMassWallTemperatureFvPatchScalarField.C | 2 +-
...tletMachNumberPressureFvPatchScalarField.C | 4 +-
...ppedUniformInletHeatAdditionFvPatchField.C | 4 +-
...ableBaffleMassFractionFvPatchScalarField.C | 4 +-
...ermeableBaffleVelocityFvPatchVectorField.C | 4 +-
.../thermalBaffle1DFvPatchScalarField.C | 2 +-
...RateAdvectiveDiffusiveFvPatchScalarField.C | 2 +-
...tureCoupledBaffleMixedFvPatchScalarField.C | 2 +-
...eratureRadCoupledMixedFvPatchScalarField.C | 2 +-
...ayatillekeWallFunctionFvPatchScalarField.C | 2 +-
.../alphatWallFunctionFvPatchScalarField.C | 2 +-
.../sorptionWallFunctionFvPatchScalarField.C | 4 +-
.../wallHeatTransferFvPatchScalarField.C | 4 +-
.../energyJump/energyJumpFvPatchScalarField.C | 2 +-
.../energyJumpAMIFvPatchScalarField.C | 2 +-
.../gradientEnergyFvPatchScalarField.C | 4 +-
.../MarshakRadiationFvPatchScalarField.C | 2 +-
...iationFixedTemperatureFvPatchScalarField.C | 2 +-
...iffusiveRadiationMixedFvPatchScalarField.C | 2 +-
...veViewFactorFixedValueFvPatchScalarField.C | 2 +-
...iffusiveRadiationMixedFvPatchScalarField.C | 2 +-
.../enthalpySorptionFvPatchScalarField.C | 4 +-
.../speciesSorptionFvPatchScalarField.C | 4 +-
...haContactAngleTwoPhaseFvPatchScalarField.C | 2 +-
...stantAlphaContactAngleFvPatchScalarField.C | 2 +-
...namicAlphaContactAngleFvPatchScalarField.C | 2 +-
...ndentAlphaContactAngleFvPatchScalarField.C | 2 +-
...ryingAlphaContactAngleFvPatchScalarField.C | 2 +-
.../alphaFixedPressureFvPatchScalarField.C | 4 +-
.../waveAlpha/waveAlphaFvPatchScalarField.C | 2 +-
.../waveVelocityFvPatchVectorField.C | 2 +-
.../waveMakerPointPatchVectorField.C | 2 +-
.../waveMakerPointPatchVectorField.H | 2 +-
310 files changed, 1138 insertions(+), 648 deletions(-)
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index 8b93ea74c32..ff83ae36166 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -203,7 +203,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
// Write
void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
@@ -213,7 +213,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
os.writeEntry("accommodationCoeff", accommodationCoeff_);
Twall_.writeEntry("Twall", os);
os.writeEntry("gamma", gamma_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 6d0bd7e4884..112be323862 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -197,7 +197,7 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("T", "T", TName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
@@ -212,7 +212,7 @@ void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
refValue().writeEntry("refValue", os);
valueFraction().writeEntry("valueFraction", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
index bbc871e6b8c..e08ce4d68e9 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
@@ -115,11 +115,10 @@ void Foam::fixedRhoFvPatchScalarField::updateCoeffs()
void Foam::fixedRhoFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
-
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("p", "p", pName_);
os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
index ba6b51f3d29..b8243c017be 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
@@ -485,7 +485,7 @@ void turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
os.writeEntry("kappaMethod", KMethodTypeNames_[method_]);
os.writeEntryIfDifferent<word>("kappa","none", kappaName_);
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index 83dfb3eb3bf..58c9b2147b3 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -102,8 +102,8 @@ void Foam::adjointOutletPressureFvPatchScalarField::updateCoeffs()
void Foam::adjointOutletPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 98c1d8258bd..eec156bbb67 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -107,8 +107,8 @@ void Foam::adjointOutletVelocityFvPatchVectorField::updateCoeffs()
void Foam::adjointOutletVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 9f3b22d0531..9fb48aa2780 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -126,9 +126,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("thetaProperties", thetaProps_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 77b08137bcb..9c11cf89130 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -126,9 +126,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("thetaProperties", thetaProps_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index ca656a739e3..1e9619c65e7 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -195,10 +195,10 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs()
void tractionDisplacementFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
traction_.writeEntry("traction", os);
pressure_.writeEntry("pressure", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index f0fdb53f43e..be853da48b3 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -182,10 +182,10 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs()
// Write
void tractionDisplacementCorrectionFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
traction_.writeEntry("traction", os);
pressure_.writeEntry("pressure", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index b58cadd63d6..7c1bb0e8d60 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -225,7 +225,7 @@ void Foam::CLASS::write
fieldData_.writeEntry("fieldData", os);
timeVsData_->writeData(os);
os.writeEntry("wordData", wordData_);
- this->writeEntry("value", os);
+ FVPATCHF::writeValueEntry(os);
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
index 7db5c443d39..9377eb2e070 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
@@ -74,7 +74,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
basicSymmetryPointPatchField
(
const basicSymmetryPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
index 4571da163f5..1ceaba98a4b 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
@@ -77,7 +77,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
calculatedPointPatchField
(
const calculatedPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
index 6113b73f326..616743df38a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
@@ -78,7 +78,7 @@ public:
const dictionary& dict
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
coupledPointPatchField
(
const coupledPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index f79cc07cd8f..ed53c844042 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -78,7 +78,7 @@ public:
const bool valueRequired=true
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
fixedValuePointPatchField
(
const fixedValuePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index f9eacfb3bef..e47b18e14a5 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2019-2022 OpenCFD Ltd.
+ Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -29,6 +29,41 @@ License
#include "valuePointPatchField.H"
#include "pointPatchFieldMapper.H"
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::valuePointPatchField<Type>::readValueEntry
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = pointPatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+ if (eptr)
+ {
+ Field<Type>::assign(*eptr, p.size());
+ return true;
+ }
+
+ if (IOobjectOption::isReadRequired(readOpt))
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entry 'value' : missing for patch " << p.name()
+ << " in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ return false;
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
template<class Type>
@@ -164,7 +199,7 @@ template<class Type>
void Foam::valuePointPatchField<Type>::write(Ostream& os) const
{
pointPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index ee6e119341b..f49bce09a0a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
- Copyright (C) 2020 OpenCFD Ltd.
+ Copyright (C) 2020-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef valuePointPatchField_H
-#define valuePointPatchField_H
+#ifndef Foam_valuePointPatchField_H
+#define Foam_valuePointPatchField_H
#include "pointPatchField.H"
@@ -55,6 +55,26 @@ class valuePointPatchField
public pointPatchField<Type>,
public Field<Type>
{
+protected:
+
+ // Protected Member Functions
+
+ //- Read the "value" entry into \c *this.
+ // The reading can be optional (default), mandatory etc.
+ // \returns True on success
+ bool readValueEntry
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+ //- Write \c *this field as a "value" entry
+ void writeValueEntry(Ostream& os) const
+ {
+ Field<Type>::writeEntry("value", os);
+ }
+
+
public:
//- Declare type-name, virtual type (with debug switch)
@@ -85,7 +105,7 @@ public:
const bool valueRequired=true
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
valuePointPatchField
(
const valuePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
index 2a9e712375e..1026efac17c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
@@ -76,7 +76,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
zeroGradientPointPatchField
(
const zeroGradientPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index e3c19117c9b..f8cccfa7b01 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -83,7 +83,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
cyclicPointPatchField
(
const cyclicPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
index d24e73e5cf8..600fc2080be 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
@@ -78,7 +78,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
cyclicSlipPointPatchField
(
const cyclicSlipPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
index 44e8b0d6335..146c79dfdc1 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
@@ -78,7 +78,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
emptyPointPatchField
(
const emptyPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
index 08264693c07..982884b84a3 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
@@ -78,7 +78,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
nonuniformTransformCyclicPointPatchField
(
const nonuniformTransformCyclicPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 6741795e034..ed9f82d6692 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -82,7 +82,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
processorPointPatchField
(
const processorPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index 50d8243521a..b4d5a5396a3 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -87,7 +87,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
processorCyclicPointPatchField
(
const processorCyclicPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
index 5fa37784838..7be7b6ff01e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
@@ -78,7 +78,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
symmetryPointPatchField
(
const symmetryPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
index f25e7c8f066..1422a613205 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
@@ -83,7 +83,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
symmetryPlanePointPatchField
(
const symmetryPlanePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
index 2b3c1cd2abb..7b2ebc85869 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
@@ -78,7 +78,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
wedgePointPatchField
(
const wedgePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index 1b10db1f7ef..af6f43bd5a6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -238,7 +238,7 @@ Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
// Make sure to construct the patchfield with up-to-date value
OStringStream os;
- static_cast<const Field<Type>&>(*this).writeEntry("value", os);
+ this->writeValueEntry(os);
IStringStream is(os.str());
dictionary constructDict(is);
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
index 69d489e3a19..d4c031350ed 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
@@ -95,7 +95,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
fixedNormalSlipPointPatchField
(
const fixedNormalSlipPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
index 9f67b789cc7..027cc956ad2 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
@@ -77,7 +77,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
slipPointPatchField
(
const slipPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 32e1ad2d7e4..97723a1a940 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -47,6 +47,7 @@ SourceFiles
#include "pointPatch.H"
#include "DimensionedField.H"
+#include "fieldTypes.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,8 +56,8 @@ namespace Foam
{
// Forward Declarations
-class objectRegistry;
class dictionary;
+class objectRegistry;
class pointPatchFieldMapper;
class pointMesh;
@@ -266,7 +267,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
pointPatchField
(
const pointPatchField<Type>&,
@@ -361,47 +362,46 @@ public:
static const word& zeroGradientType();
- // Attributes
+ // Attributes
- //- True if this patch field fixes a value
- virtual bool fixesValue() const
- {
- return false;
- }
+ //- True if this patch field fixes a value
+ virtual bool fixesValue() const
+ {
+ return false;
+ }
- //- True if this patch field is coupled
- virtual bool coupled() const
- {
- return false;
- }
+ //- True if this patch field is coupled
+ virtual bool coupled() const
+ {
+ return false;
+ }
- //- The constraint type this pointPatchField implements.
- virtual const word& constraintType() const
- {
- return word::null;
- }
+ //- The constraint type this pointPatchField implements.
+ virtual const word& constraintType() const
+ {
+ return word::null;
+ }
- // Access
+ // Access
- //- Return the patch size
- label size() const
- {
- return patch().size();
- }
+ //- Return the patch size
+ label size() const
+ {
+ return patch().size();
+ }
- //- Return const-reference to the dimensioned internal field
- const DimensionedField<Type, pointMesh>& internalField()
- const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the dimensioned internal field
+ const DimensionedField<Type, pointMesh>& internalField() const noexcept
+ {
+ return internalField_;
+ }
- //- Return const-reference to the internal field values
- const Field<Type>& primitiveField() const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the internal field values
+ const Field<Type>& primitiveField() const noexcept
+ {
+ return internalField_;
+ }
// Evaluation Functions
@@ -537,9 +537,9 @@ public:
// By generic these do nothing unless the patch actually has boundary
// values
- virtual void operator==(const pointPatchField<Type>&){}
- virtual void operator==(const Field<Type>&){}
- virtual void operator==(const Type&){}
+ virtual void operator==(const pointPatchField<Type>&){}
+ virtual void operator==(const Field<Type>&){}
+ virtual void operator==(const Type&){}
// Ostream Operator
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 6570f60134c..df8a3409778 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -292,7 +292,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeEntry("Prt", Prt_);
os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
os.writeEntryIfDifferent<scalar>("E", 9.8, E_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index c4af50f5a64..2266a1430a2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -168,11 +168,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("mixingLength", mixingLength_);
os.writeEntry("phi", this->phiName_);
os.writeEntry("k", kName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index fca946ff5fd..084965c11c0 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -157,11 +157,11 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("mixingLength", mixingLength_);
os.writeEntry("phi", this->phiName_);
os.writeEntry("k", kName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index f375d61fd9d..286eba0bbf0 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -128,9 +128,9 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
void Foam::fixedShearStressFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("tau", tau0_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 63d5e27b791..ebe14933128 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -615,7 +615,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::write
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index b5a68336441..9be86fab62e 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -204,7 +204,7 @@ void Foam::kLowReWallFunctionFvPatchScalarField::write
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 35eaa1af8ca..7b78f74e819 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -103,7 +103,7 @@ template<class Type>
void Foam::kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
{
zeroGradientFvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
index 1d8f374bcb4..f2fec85614d 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
@@ -137,7 +137,7 @@ void Foam::nutLowReWallFunctionFvPatchScalarField::write
) const
{
nutWallFunctionFvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
index 77ca610ceea..4f7e1c35918 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
@@ -232,7 +232,7 @@ void Foam::nutUBlendedWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 59f42256bc5..bc5357d3a40 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -343,7 +343,7 @@ void Foam::nutURoughWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
index 76ed2417884..4e36e6dac0d 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
@@ -350,7 +350,7 @@ void Foam::nutUSpaldingWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index a8eb1c3d2af..5281d8159f1 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -225,7 +225,7 @@ void Foam::nutUTabulatedWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
index 506d4caee15..af072fe580c 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
@@ -313,7 +313,7 @@ void Foam::nutUWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
index 4902ce4c698..0610d97a80c 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
@@ -242,7 +242,7 @@ void Foam::nutkRoughWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
index 7f846f29a47..8d9e40ea65d 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
@@ -270,7 +270,7 @@ void Foam::nutkWallFunctionFvPatchScalarField::write
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 573edc8bbca..d38f1632c5c 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -606,7 +606,7 @@ void Foam::omegaWallFunctionFvPatchScalarField::write
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index aff00e89bae..1c4216ed16a 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -149,10 +149,10 @@ void atmBoundaryLayerInletEpsilonFvPatchScalarField::rmap
void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
atmBoundaryLayer::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index 7fc3d768e3f..1590676c7b3 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -148,10 +148,10 @@ void atmBoundaryLayerInletKFvPatchScalarField::rmap
void atmBoundaryLayerInletKFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
atmBoundaryLayer::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
index 7cc4e9490d7..12aff016737 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
@@ -147,10 +147,10 @@ void atmBoundaryLayerInletOmegaFvPatchScalarField::rmap
void atmBoundaryLayerInletOmegaFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
atmBoundaryLayer::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 077a47391b1..51eacba6a09 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -148,10 +148,10 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::rmap
void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
atmBoundaryLayer::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index 34c01bdc692..de95132cd03 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -230,12 +230,12 @@ void atmTurbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
void atmTurbulentHeatFluxTemperatureFvPatchScalarField::write(Ostream& os) const
{
- fixedGradientFvPatchScalarField::write(os);
+ fixedGradientFvPatchField<scalar>::write(os);
os.writeEntry("heatSource", heatSourceTypeNames[heatSource_]);
os.writeEntry("alphaEff", alphaEffName_);
Cp0_->writeData(os);
q_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
index da7b552fa08..461b3a46c77 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
@@ -321,7 +321,7 @@ void atmAlphatkWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C
index 2476dd5ceab..8b290036ea3 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C
@@ -236,7 +236,7 @@ void Foam::atmEpsilonWallFunctionFvPatchScalarField::write
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C
index 17161e04243..175f4d3c3a2 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C
@@ -215,7 +215,7 @@ void atmNutUWallFunctionFvPatchScalarField::write(Ostream& os) const
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
index 07cff2cf504..da1a3fd09a5 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
@@ -236,7 +236,7 @@ void atmNutWallFunctionFvPatchScalarField::write(Ostream& os) const
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
index 77dae9169f6..deaae7c9dc7 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
@@ -223,7 +223,7 @@ void atmNutkWallFunctionFvPatchScalarField::write(Ostream& os) const
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C
index 762eec32049..d5ddca515b7 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C
@@ -220,7 +220,7 @@ void Foam::atmOmegaWallFunctionFvPatchScalarField::write
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
index a0964ff7206..e6fdb5558d2 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
@@ -166,9 +166,9 @@ void Foam::freeSurfacePressureFvPatchScalarField::updateCoeffs()
void Foam::freeSurfacePressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
pa_.writeEntry("pa", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
index 29c9b16a0f1..30076a0f3ce 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
@@ -113,8 +113,8 @@ void Foam::freeSurfaceVelocityFvPatchVectorField::updateCoeffs()
void Foam::freeSurfaceVelocityFvPatchVectorField::write(Ostream& os) const
{
- fixedGradientFvPatchVectorField::write(os);
- writeEntry("value", os);
+ fixedGradientFvPatchField<vector>::write(os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index 2fd56f1a4a2..43ac06e52f6 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -181,7 +181,7 @@ void solidBodyMotionDisplacementPointPatchVectorField::
write(Ostream& os) const
{
// Note: write value
- fixedValuePointPatchVectorField::write(os);
+ fixedValuePointPatchField<vector>::write(os);
os.writeEntry(solidBodyMotionFunction::typeName, SBMFPtr_->type());
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
index b999e7f3d04..1ed9211e1b6 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
@@ -86,7 +86,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
solidBodyMotionDisplacementPointPatchVectorField
(
const solidBodyMotionDisplacementPointPatchVectorField&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
index 2a263131359..f266ca14571 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
@@ -211,7 +211,7 @@ template<class Type>
void Foam::calculatedFaPatchField<Type>::write(Ostream& os) const
{
faPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
index 725a24812fa..e800cb7a0c7 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
@@ -80,7 +80,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
calculatedFaPatchField
(
const calculatedFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
index f51167f35c0..5a029c1d5c8 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
@@ -178,7 +178,7 @@ template<class Type>
void Foam::coupledFaPatchField<Type>::write(Ostream& os) const
{
faPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
index 45c7969bf9c..a7c959c76b4 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
@@ -84,8 +84,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given fixedGradientFaPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedGradient patch field
+ //- onto a new patch
fixedGradientFaPatchField
(
const fixedGradientFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
index 5cc1d790616..9b786c0c8c7 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
@@ -133,7 +133,7 @@ template<class Type>
void Foam::fixedValueFaPatchField<Type>::write(Ostream& os) const
{
faPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
index e363dcbe8a9..a0ead76291c 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
@@ -80,8 +80,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given fixedValueFaPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedValue patch field
+ //- onto a new patch
fixedValueFaPatchField
(
const fixedValueFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index 72e0d958a8b..226a11b02dc 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
+ Copyright (C) 2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,7 +28,58 @@ License
#include "mixedFaPatchField.H"
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::mixedFaPatchField<Type>::readMixedEntries
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = faPatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ // If there is a 'refValue', also require all others
+ const auto* hasValue = dict.findEntry("refValue", keyType::LITERAL);
+
+ if (!hasValue && IOobjectOption::isReadOptional(readOpt))
+ {
+ return false;
+ }
+
+ const auto* hasGrad = dict.findEntry("refGradient", keyType::LITERAL);
+ const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
+
+ // Combined error message on failure
+ if (!hasValue || !hasGrad || !hasFrac)
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entries:";
+
+ if (!hasValue) FatalIOError << " 'refValue'";
+ if (!hasGrad) FatalIOError << " 'refGradient'";
+ if (!hasFrac) FatalIOError << " 'valueFraction'";
+
+ FatalIOError
+ << " : missing for patch " << p.name()
+ << " : in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ // Everything verified - can assign
+ refValue_.assign(*hasValue, p.size());
+ refGrad_.assign(*hasGrad, p.size());
+ valueFraction_.assign(*hasFrac, p.size());
+
+ return true;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::mixedFaPatchField<Type>::mixedFaPatchField
@@ -217,7 +269,7 @@ void Foam::mixedFaPatchField<Type>::write(Ostream& os) const
refValue_.writeEntry("refValue", os);
refGrad_.writeEntry("refGradient", os);
valueFraction_.writeEntry("valueFraction", os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
index 9688abda354..e635690c1f0 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
+ Copyright (C) 2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,6 +28,17 @@ Class
Foam::mixedFaPatchField
Description
+ This boundary condition provides a base class for 'mixed' type boundary
+ conditions, i.e. conditions that mix fixed value and patch-normal gradient
+ conditions.
+
+Usage
+ \table
+ Property | Description | Required | Default
+ refValue | fixed value | yes |
+ refGradient | patch normal gradient | yes |
+ valueFraction | value weighting (0-1) | yes |
+ \endtable
Author
Zeljko Tukovic, FMENA
@@ -37,8 +49,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef mixedFaPatchField_H
-#define mixedFaPatchField_H
+#ifndef Foam_mixedFaPatchField_H
+#define Foam_mixedFaPatchField_H
#include "faPatchField.H"
@@ -56,7 +68,7 @@ class mixedFaPatchField
:
public faPatchField<Type>
{
- // Private data
+ // Private Data
//- Value field
Field<Type> refValue_;
@@ -68,6 +80,21 @@ class mixedFaPatchField
scalarField valueFraction_;
+protected:
+
+ //- Read the "refValue", "refGradient" and "valueFraction" entries
+ //- into their respective places.
+ // The reading can be optional (default), mandatory etc.
+ // If refValue is to be read, refGradient and valueFraction must
+ // also exist.
+ // \returns True on success
+ bool readMixedEntries
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+
public:
//- Runtime type information
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
index 06bc08d8e99..becbcfcf051 100644
--- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
@@ -265,7 +265,7 @@ template<class Type>
void Foam::slicedFaPatchField<Type>::write(Ostream& os) const
{
faPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
index 32f1b350a1b..ef83ff9cd81 100644
--- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
@@ -103,8 +103,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given slicedFaPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given sliced patch field
+ //- onto a new patch
slicedFaPatchField
(
const slicedFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
index 22af0265ec9..cfc991aba16 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
@@ -81,8 +81,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given transformFaPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given transform patch field
+ //- onto a new patch
transformFaPatchField
(
const transformFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
index bbb14930979..3a0c3ef6cce 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
@@ -80,8 +80,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given zeroGradientFaPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given zeroGradient patch field
+ //- onto a new patch
zeroGradientFaPatchField
(
const zeroGradientFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
index d1d340b8d92..d6fb84c4ed6 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
@@ -167,7 +167,7 @@ template<class Type>
void clampedPlateFaPatchField<Type>::write(Ostream& os) const
{
faPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
index ad740c900b3..acce423a43f 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
@@ -98,7 +98,7 @@ public:
const dictionary&
);
- //- Construct by mapping the given clampedPlateFaPatchField<Type>
+ //- Construct by mapping the given clampedPlate patch field
//- onto a new patch
clampedPlateFaPatchField
(
diff --git a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
index 1db9e22015b..541dd89b0f5 100644
--- a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
@@ -134,7 +134,7 @@ void Foam::edgeNormalFixedValueFaPatchVectorField::updateCoeffs()
void Foam::edgeNormalFixedValueFaPatchVectorField::write(Ostream& os) const
{
- fixedValueFaPatchVectorField::write(os);
+ fixedValueFaPatchField<vector>::write(os);
refValue_.writeEntry("refValue", os);
}
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
index 1f73182c1ff..e254e255b44 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
@@ -133,7 +133,7 @@ template<class Type>
void Foam::fixedValueOutflowFaPatchField<Type>::write(Ostream& os) const
{
faPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
index fa22145c574..ffbf7b22bae 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
@@ -80,8 +80,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given fixedValueOutflowFaPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedValueOutflow patch field
+ //- onto a new patch
fixedValueOutflowFaPatchField
(
const fixedValueOutflowFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index 361d58adb8c..cf93fde241b 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -138,7 +138,7 @@ void Foam::inletOutletFaPatchField<Type>::write(Ostream& os) const
faPatchField<Type>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->refValue().writeEntry("inletValue", os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
index 1bba29333b6..2abee7d91c2 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
@@ -132,7 +132,7 @@ void Foam::timeVaryingUniformFixedValueFaPatchField<Type>::write
{
faPatchField<Type>::write(os);
timeSeries_.write(os);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index ff5fc8f3176..8f04bb6514a 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
- Copyright (C) 2020-2022 OpenCFD Ltd.
+ Copyright (C) 2020-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -26,9 +26,45 @@ License
\*---------------------------------------------------------------------------*/
+#include "dictionary.H"
#include "faPatchField.H"
#include "faPatchFieldMapper.H"
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::faPatchField<Type>::readValueEntry
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = faPatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+ if (eptr)
+ {
+ Field<Type>::assign(*eptr, p.size());
+ return true;
+ }
+
+ if (IOobjectOption::isReadRequired(readOpt))
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entry 'value' : missing for patch " << p.name()
+ << " in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ return false;
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
@@ -49,11 +85,11 @@ Foam::faPatchField<Type>::faPatchField
(
const faPatch& p,
const DimensionedField<Type, areaMesh>& iF,
- const Field<Type>& f
+ const Field<Type>& pfld
)
:
faPatchFieldBase(p),
- Field<Type>(f),
+ Field<Type>(pfld),
internalField_(iF)
{}
@@ -61,14 +97,13 @@ Foam::faPatchField<Type>::faPatchField
template<class Type>
Foam::faPatchField<Type>::faPatchField
(
- const faPatchField<Type>& ptf,
const faPatch& p,
const DimensionedField<Type, areaMesh>& iF,
- const faPatchFieldMapper& mapper
+ Field<Type>&& pfld
)
:
- faPatchFieldBase(ptf, p),
- Field<Type>(ptf, mapper),
+ faPatchFieldBase(p),
+ Field<Type>(std::move(pfld)),
internalField_(iF)
{}
@@ -101,6 +136,21 @@ Foam::faPatchField<Type>::faPatchField
}
+template<class Type>
+Foam::faPatchField<Type>::faPatchField
+(
+ const faPatchField<Type>& ptf,
+ const faPatch& p,
+ const DimensionedField<Type, areaMesh>& iF,
+ const faPatchFieldMapper& mapper
+)
+:
+ faPatchFieldBase(ptf, p),
+ Field<Type>(ptf, mapper),
+ internalField_(iF)
+{}
+
+
template<class Type>
Foam::faPatchField<Type>::faPatchField
(
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index bc915135c5e..fd8196ddfb7 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
- Copyright (C) 2019-2022 OpenCFD Ltd.
+ Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -51,6 +51,7 @@ SourceFiles
#include "faPatch.H"
#include "DimensionedField.H"
+#include "fieldTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,8 +59,8 @@ namespace Foam
{
// Forward Declarations
-class objectRegistry;
class dictionary;
+class objectRegistry;
class faPatchFieldMapper;
class areaMesh;
@@ -195,6 +196,25 @@ class faPatchField
//- Reference to internal field
const DimensionedField<Type, areaMesh>& internalField_;
+protected:
+
+ // Protected Member Functions
+
+ //- Read the "value" entry into \c *this.
+ // The reading can be optional (default), mandatory etc.
+ // \returns True on success
+ bool readValueEntry
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+ //- Write *this field as a "value" entry
+ void writeValueEntry(Ostream& os) const
+ {
+ Field<Type>::writeEntry("value", os);
+ }
+
public:
@@ -259,12 +279,20 @@ public:
const DimensionedField<Type, areaMesh>&
);
- //- Construct from patch and internal field and patch field
+ //- Construct from patch, internal field and patch field
+ faPatchField
+ (
+ const faPatch&,
+ const DimensionedField<Type, areaMesh>&,
+ const Field<Type>& pfld
+ );
+
+ //- Construct from patch, internal field and patch field
faPatchField
(
const faPatch&,
const DimensionedField<Type, areaMesh>&,
- const Field<Type>&
+ Field<Type>&& pfld
);
//- Construct from patch, internal field and dictionary
@@ -375,37 +403,36 @@ public:
static const word& zeroGradientType();
- // Attributes
+ // Attributes
- //- True if this patch field fixes a value.
- // Needed to check if a level has to be specified while solving
- // Poissons equations.
- virtual bool fixesValue() const
- {
- return false;
- }
+ //- True if this patch field fixes a value.
+ // Needed to check if a level has to be specified while solving
+ // Poissons equations.
+ virtual bool fixesValue() const
+ {
+ return false;
+ }
- //- True if this patch field is coupled
- virtual bool coupled() const
- {
- return false;
- }
+ //- True if this patch field is coupled
+ virtual bool coupled() const
+ {
+ return false;
+ }
- // Access
+ // Access
- //- Return const-reference to the dimensioned internal field
- const DimensionedField<Type, areaMesh>& internalField()
- const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the dimensioned internal field
+ const DimensionedField<Type, areaMesh>& internalField() const noexcept
+ {
+ return internalField_;
+ }
- //- Return const-reference to the internal field values
- const Field<Type>& primitiveField() const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the internal field values
+ const Field<Type>& primitiveField() const noexcept
+ {
+ return internalField_;
+ }
// Mapping
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
index 93e3b6ccf4a..d27fa0bfa69 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
@@ -134,7 +134,7 @@ template<class Type>
void Foam::calculatedFaePatchField<Type>::write(Ostream& os) const
{
faePatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faePatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
index 3a3e2564e30..f2343d1f3f5 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef calculatedFaePatchField_H
-#define calculatedFaePatchField_H
+#ifndef Foam_calculatedFaePatchField_H
+#define Foam_calculatedFaePatchField_H
#include "faePatchField.H"
@@ -57,7 +57,6 @@ class calculatedFaePatchField
:
public faePatchField<Type>
{
-
public:
//- Runtime type information
@@ -81,7 +80,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
calculatedFaePatchField
(
const calculatedFaePatchField<Type>&,
@@ -91,10 +90,7 @@ public:
);
//- Construct as copy
- calculatedFaePatchField
- (
- const calculatedFaePatchField<Type>&
- );
+ calculatedFaePatchField(const calculatedFaePatchField<Type>&);
//- Construct and return a clone
virtual tmp<faePatchField<Type>> clone() const
@@ -128,7 +124,7 @@ public:
virtual ~calculatedFaePatchField() = default;
- // Member functions
+ // Member Functions
// Access
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
index e0e49569f53..0e8f5ef63e5 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
@@ -104,7 +104,7 @@ template<class Type>
void Foam::coupledFaePatchField<Type>::write(Ostream& os) const
{
faePatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faePatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
index 08630e0a007..a92fb3f1751 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef coupledFaePatchField_H
-#define coupledFaePatchField_H
+#ifndef Foam_coupledFaePatchField_H
+#define Foam_coupledFaePatchField_H
#include "faePatchField.H"
#include "coupledFaPatch.H"
@@ -58,7 +58,6 @@ class coupledFaePatchField
:
public faePatchField<Type>
{
-
public:
//- Runtime type information
@@ -74,7 +73,7 @@ public:
const DimensionedField<Type, edgeMesh>&
);
- //- Construct from patch and internal field and patch field
+ //- Construct from patch, internal field and patch field
coupledFaePatchField
(
const faPatch&,
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
index c1a626036aa..0455efdbcfd 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
@@ -92,7 +92,7 @@ template<class Type>
void Foam::fixedValueFaePatchField<Type>::write(Ostream& os) const
{
faePatchField<Type>::write(os);
- this->writeEntry("value", os);
+ faePatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
index 7d55e6aa050..7d36b4d063e 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef fixedValueFaePatchField_H
-#define fixedValueFaePatchField_H
+#ifndef Foam_fixedValueFaePatchField_H
+#define Foam_fixedValueFaePatchField_H
#include "faePatchField.H"
@@ -57,7 +57,6 @@ class fixedValueFaePatchField
:
public faePatchField<Type>
{
-
public:
//- Runtime type information
@@ -81,8 +80,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given fixedValueFaePatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedValue patch field
+ //- onto a new patch
fixedValueFaePatchField
(
const fixedValueFaePatchField<Type>&,
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
index 134d1cda394..40caa47ba11 100644
--- a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
@@ -97,8 +97,7 @@ public:
const dictionary&
);
- //- Construct by mapping the given slicedFaePatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given sliced patch field onto a new patch
slicedFaePatchField
(
const slicedFaePatchField<Type>&,
diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
index 6034bad11f3..180033d5e79 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
@@ -39,8 +39,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef cyclicFaePatchField_H
-#define cyclicFaePatchField_H
+#ifndef Foam_cyclicFaePatchField_H
+#define Foam_cyclicFaePatchField_H
#include "coupledFaePatchField.H"
#include "cyclicFaPatch.H"
@@ -85,7 +85,7 @@ public:
(
const faPatch&,
const DimensionedField<Type, edgeMesh>&,
- const dictionary&
+ const dictionary& dict
);
//- Construct by mapping given cyclicFaePatchField onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
index f92bcd0b4ec..03b86c0cdaa 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef emptyFaePatchField_H
-#define emptyFaePatchField_H
+#ifndef Foam_emptyFaePatchField_H
+#define Foam_emptyFaePatchField_H
#include "faePatchField.H"
#include "emptyFaPatch.H"
@@ -58,7 +58,6 @@ class emptyFaePatchField
:
public faePatchField<Type>
{
-
public:
//- Runtime type information
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
index 2bf557d7034..d39e63eb255 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
@@ -122,11 +122,4 @@ Foam::processorFaePatchField<Type>::processorFaePatchField
{}
-// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::processorFaePatchField<Type>::~processorFaePatchField()
-{}
-
-
// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H
index 3b6c5f85859..c8f9e6441f8 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H
@@ -37,8 +37,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef processorFaePatchField_H
-#define processorFaePatchField_H
+#ifndef Foam_processorFaePatchField_H
+#define Foam_processorFaePatchField_H
#include "coupledFaePatchField.H"
#include "processorFaPatch.H"
@@ -57,7 +57,7 @@ class processorFaePatchField
:
public coupledFaePatchField<Type>
{
- // Private data
+ // Private Data
//- Local reference cast into the processor patch
const processorFaPatch& procPatch_;
@@ -135,8 +135,8 @@ public:
}
- // Destructor
- virtual ~processorFaePatchField();
+ //- Destructor
+ virtual ~processorFaePatchField() = default;
// Member Functions
diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
index 9c2ef73e2a4..ff0d676a291 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
@@ -39,8 +39,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef symmetryFaePatchField_H
-#define symmetryFaePatchField_H
+#ifndef Foam_symmetryFaePatchField_H
+#define Foam_symmetryFaePatchField_H
#include "faePatchField.H"
#include "symmetryFaPatch.H"
@@ -59,7 +59,6 @@ class symmetryFaePatchField
:
public faePatchField<Type>
{
-
public:
//- Runtime type information
diff --git a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H
index 12f943a652a..017e6426437 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H
@@ -37,8 +37,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef wedgeFaePatchField_H
-#define wedgeFaePatchField_H
+#ifndef Foam_wedgeFaePatchField_H
+#define Foam_wedgeFaePatchField_H
#include "faePatchField.H"
#include "wedgeFaPatch.H"
@@ -57,7 +57,6 @@ class wedgeFaePatchField
:
public faePatchField<Type>
{
-
public:
//- Runtime type information
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
index d45518577a1..26cfa178c9b 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
- Copyright (C) 2022 OpenCFD Ltd.
+ Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -29,6 +29,41 @@ License
#include "faePatchField.H"
#include "faPatchFieldMapper.H"
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::faePatchField<Type>::readValueEntry
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = faePatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+ if (eptr)
+ {
+ Field<Type>::assign(*eptr, p.size());
+ return true;
+ }
+
+ if (IOobjectOption::isReadRequired(readOpt))
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entry 'value' : missing for patch " << p.name()
+ << " in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ return false;
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
@@ -49,11 +84,11 @@ Foam::faePatchField<Type>::faePatchField
(
const faPatch& p,
const DimensionedField<Type, edgeMesh>& iF,
- const Field<Type>& f
+ const Field<Type>& pfld
)
:
faePatchFieldBase(p),
- Field<Type>(f),
+ Field<Type>(pfld),
internalField_(iF)
{}
@@ -61,14 +96,13 @@ Foam::faePatchField<Type>::faePatchField
template<class Type>
Foam::faePatchField<Type>::faePatchField
(
- const faePatchField<Type>& ptf,
const faPatch& p,
const DimensionedField<Type, edgeMesh>& iF,
- const faPatchFieldMapper& mapper
+ Field<Type>&& pfld
)
:
- faePatchFieldBase(ptf, p),
- Field<Type>(ptf, mapper),
+ faePatchFieldBase(p),
+ Field<Type>(std::move(pfld)),
internalField_(iF)
{}
@@ -98,6 +132,21 @@ Foam::faePatchField<Type>::faePatchField
}
+template<class Type>
+Foam::faePatchField<Type>::faePatchField
+(
+ const faePatchField<Type>& ptf,
+ const faPatch& p,
+ const DimensionedField<Type, edgeMesh>& iF,
+ const faPatchFieldMapper& mapper
+)
+:
+ faePatchFieldBase(ptf, p),
+ Field<Type>(ptf, mapper),
+ internalField_(iF)
+{}
+
+
template<class Type>
Foam::faePatchField<Type>::faePatchField
(
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index 720a4f00e50..d4b73f5b137 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -51,6 +51,7 @@ SourceFiles
#include "faPatch.H"
#include "DimensionedField.H"
+#include "fieldTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,9 +59,8 @@ namespace Foam
{
// Forward Declarations
-
-class objectRegistry;
class dictionary;
+class objectRegistry;
class faPatchFieldMapper;
class edgeMesh;
@@ -159,6 +159,25 @@ class faePatchField
//- Reference to internal field
const DimensionedField<Type, edgeMesh>& internalField_;
+protected:
+
+ // Protected Member Functions
+
+ //- Read the "value" entry into \c *this.
+ // The reading can be optional (default), mandatory etc.
+ // \returns True on success
+ bool readValueEntry
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+ //- Write \c *this field as a "value" entry
+ void writeValueEntry(Ostream& os) const
+ {
+ Field<Type>::writeEntry("value", os);
+ }
+
public:
@@ -223,12 +242,20 @@ public:
const DimensionedField<Type, edgeMesh>&
);
- //- Construct from patch and internal field and patch field
+ //- Construct from patch, internal field and patch field
+ faePatchField
+ (
+ const faPatch&,
+ const DimensionedField<Type, edgeMesh>&,
+ const Field<Type>& pfld
+ );
+
+ //- Construct from patch, internal field and patch field
faePatchField
(
const faPatch&,
const DimensionedField<Type, edgeMesh>&,
- const Field<Type>&
+ Field<Type>&& pfld
);
//- Construct from patch, internal field and dictionary
@@ -339,37 +366,36 @@ public:
static const word& calculatedType();
- // Attributes
+ // Attributes
- //- True if this patch field fixes a value.
- // Needed to check if a level has to be specified while solving
- // Poissons equations.
- virtual bool fixesValue() const
- {
- return false;
- }
+ //- True if this patch field fixes a value.
+ // Needed to check if a level has to be specified while solving
+ // Poissons equations.
+ virtual bool fixesValue() const
+ {
+ return false;
+ }
- //- True if this patch field is coupled
- virtual bool coupled() const
- {
- return false;
- }
+ //- True if this patch field is coupled
+ virtual bool coupled() const
+ {
+ return false;
+ }
- // Access
+ // Access
- //- Return const-reference to the dimensioned internal field
- const DimensionedField<Type, edgeMesh>& internalField()
- const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the dimensioned internal field
+ const DimensionedField<Type, edgeMesh>& internalField() const noexcept
+ {
+ return internalField_;
+ }
- //- Return const-reference to the internal field values
- const Field<Type>& primitiveField() const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the internal field values
+ const Field<Type>& primitiveField() const noexcept
+ {
+ return internalField_;
+ }
// Mapping
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index 2293143980b..bdd1de47797 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -160,11 +160,11 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
void Foam::SRFFreestreamVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("relative", relative_);
os.writeEntry("UInf", UInf_);
os.writeEntry("phi", this->phiName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
index d9fd52e7d97..a39dd2e6226 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
@@ -154,10 +154,10 @@ void Foam::SRFVelocityFvPatchVectorField::updateCoeffs()
void Foam::SRFVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("relative", relative_);
inletValue_.writeEntry("inletValue", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
index 649c6d15d15..4ac7e6d14ef 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
@@ -131,8 +131,8 @@ void Foam::SRFWallVelocityFvPatchVectorField::updateCoeffs()
void Foam::SRFWallVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
index 6551b09b7aa..1fdce54c392 100644
--- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
+++ b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
@@ -240,7 +240,7 @@ void Foam::exprValuePointPatchField<Type>::write(Ostream& os) const
this->parent_bctype::write(os);
expressions::patchExprFieldBase::write(os);
- this->writeEntry("value", os);
+ this->writeValueEntry(os);
driver_.writeCommon(os, this->debug_ || debug);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index 520c50d258f..f9ecc13974f 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -220,7 +220,7 @@ template<class Type>
void Foam::calculatedFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index 8bda1044d52..075edc93450 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -93,7 +93,7 @@ public:
const bool valueRequired=true
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
calculatedFvPatchField
(
const calculatedFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 9af6d0d9888..c68079214a9 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -213,7 +213,7 @@ template<class Type>
void Foam::coupledFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index 51fc8fd9e8f..1f23f5acc60 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
@@ -208,7 +208,7 @@ void Foam::directionMixedFvPatchField<Type>::write(Ostream& os) const
refValue_.writeEntry("refValue", os);
refGrad_.writeEntry("refGradient", os);
valueFraction_.writeEntry("valueFraction", os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
index 346fc3def68..3429c1bbf44 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -92,7 +92,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
extrapolatedCalculatedFvPatchField
(
const extrapolatedCalculatedFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index e2ca03ba1f8..f022f059db6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -156,7 +156,7 @@ template<class Type>
void Foam::fixedValueFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index e192bfba747..13f70921531 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -105,8 +105,8 @@ public:
const bool valueRequired=true
);
- //- Construct by mapping the given fixedValueFvPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedValue patch field
+ //- onto a new patch
fixedValueFvPatchField
(
const fixedValueFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index a1ec7e3b996..3aa783d5b64 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
+ Copyright (C) 2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,7 +28,58 @@ License
#include "mixedFvPatchField.H"
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::mixedFvPatchField<Type>::readMixedEntries
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = fvPatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ // If there is a 'refValue', also require all others
+ const auto* hasValue = dict.findEntry("refValue", keyType::LITERAL);
+
+ if (!hasValue && IOobjectOption::isReadOptional(readOpt))
+ {
+ return false;
+ }
+
+ const auto* hasGrad = dict.findEntry("refGradient", keyType::LITERAL);
+ const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
+
+ // Combined error message on failure
+ if (!hasValue || !hasGrad || !hasFrac)
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entries:";
+
+ if (!hasValue) FatalIOError << " 'refValue'";
+ if (!hasGrad) FatalIOError << " 'refGradient'";
+ if (!hasFrac) FatalIOError << " 'valueFraction'";
+
+ FatalIOError
+ << " : missing for patch " << p.name()
+ << " : in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ // Everything verified - can assign
+ refValue_.assign(*hasValue, p.size());
+ refGrad_.assign(*hasGrad, p.size());
+ valueFraction_.assign(*hasFrac, p.size());
+
+ return true;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::mixedFvPatchField<Type>::mixedFvPatchField
@@ -239,7 +291,7 @@ void Foam::mixedFvPatchField<Type>::write(Ostream& os) const
refGrad_.writeEntry("refGradient", os);
valueFraction_.writeEntry("valueFraction", os);
source_.writeEntry("source", os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index deec0f77d95..3181d45b9c5 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -70,8 +70,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef mixedFvPatchField_H
-#define mixedFvPatchField_H
+#ifndef Foam_mixedFvPatchField_H
+#define Foam_mixedFvPatchField_H
#include "fvPatchField.H"
@@ -89,7 +89,7 @@ class mixedFvPatchField
:
public fvPatchField<Type>
{
- // Private data
+ // Private Data
//- Value field
Field<Type> refValue_;
@@ -104,6 +104,21 @@ class mixedFvPatchField
Field<Type> source_;
+protected:
+
+ //- Read the 'refValue', 'refGradient' and 'valueFraction' entries
+ //- into their respective places.
+ // The reading can be optional (default), mandatory etc.
+ // If 'refValue' is to be read, refGradient and valueFraction must
+ // also exist.
+ // \returns True on success
+ bool readMixedEntries
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+
public:
//- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index f444464af00..d886c4d8d37 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -265,7 +265,7 @@ template<class Type>
void Foam::slicedFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 8d1d5152519..21ffe3bf115 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -103,8 +103,7 @@ public:
const dictionary&
);
- //- Construct by mapping the given slicedFvPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given sliced patch field onto a new patch
slicedFvPatchField
(
const slicedFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index 53766157f87..4bb2e5016f3 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -80,8 +80,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given transformFvPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given transform patch field
+ //- onto a new patch
transformFvPatchField
(
const transformFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
index 19902ae54b6..05cc20e4b52 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
@@ -90,8 +90,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given zeroGradientFvPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given zeroGradient patch field
+ //- onto a new patch
zeroGradientFvPatchField
(
const zeroGradientFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index b7969990447..80ffb25e5c6 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -459,7 +459,7 @@ template<class Type>
void Foam::cyclicACMIFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 61a7e49820c..462335d4180 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -439,7 +439,7 @@ template<class Type>
void Foam::cyclicAMIFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C
index 9ebb26fbd5f..cdad8bd4bd3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C
@@ -112,7 +112,7 @@ void Foam::acousticWaveTransmissiveFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
os.writeEntry("advectiveSpeed", advectiveU_);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index ade392b016d..c894f8d5af2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -295,14 +295,14 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
void Foam::activeBaffleVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("p", "p", pName_);
os.writeEntry("cyclicPatch", cyclicPatchName_);
os.writeEntry("orientation", orientation_);
os.writeEntry("openingTime", openingTime_);
os.writeEntry("maxOpenFractionDelta", maxOpenFractionDelta_);
os.writeEntry("openFraction", openFraction_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index e8148719a0c..275cd381513 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -380,7 +380,7 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
void Foam::activePressureForceBaffleVelocityFvPatchVectorField::
write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("p", "p", pName_);
os.writeEntry("cyclicPatch", cyclicPatchName_);
os.writeEntry("openingTime", openingTime_);
@@ -389,7 +389,7 @@ write(Ostream& os) const
os.writeEntry("minThresholdValue", minThresholdValue_);
os.writeEntry("forceBased", fBased_);
os.writeEntry("opening", opening_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index c3ff10de383..7090d4f49d5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -339,7 +339,7 @@ void Foam::advectiveFvPatchField<Type>::write(Ostream& os) const
os.writeEntry("lInf", lInf_);
}
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 0ad7d096396..e247e42d980 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -236,7 +236,7 @@ Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
// Make sure to construct the patchfield with up-to-date value
OStringStream os;
- static_cast<const Field<Type>&>(*this).writeEntry("value", os);
+ this->writeValueEntry(os);
IStringStream is(os.str());
dictionary constructDict(is);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index b946c66c7d1..cc824309b6d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -158,7 +158,7 @@ void Foam::cylindricalInletVelocityFvPatchVectorField::write(Ostream& os) const
axialVelocity_->writeData(os);
radialVelocity_->writeData(os);
rpm_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index c9718a9d7ae..3a7ccee8383 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -543,7 +543,7 @@ void Foam::electrostaticDepositionFvPatchScalarField::updateCoeffs()
void Foam::electrostaticDepositionFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
h_.writeEntry("h", os);
@@ -574,7 +574,7 @@ void Foam::electrostaticDepositionFvPatchScalarField::write(Ostream& os) const
qcum_.writeEntry("qCumulative", os);
Vfilm_.writeEntry("Vfilm", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index de5afa2c806..c50dea362f5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -174,8 +174,8 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
{
- fixedGradientFvPatchScalarField::write(os);
- writeEntry("value", os);
+ fixedGradientFvPatchField<scalar>::write(os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
index 8ab8a2be5dc..d36397c0736 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
@@ -100,8 +100,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given fixedInternalValueFvPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedInternalValue patch field
+ //- onto a new patch
fixedInternalValueFvPatchField
(
const fixedInternalValueFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 3c4c0465985..0f38fdc737b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -277,7 +277,7 @@ void Foam::fixedJumpFvPatchField<Type>::write(Ostream& os) const
os.writeEntry("minJump", minJump_);
}
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index f818753a311..b34710df2f6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -178,7 +178,7 @@ void Foam::fixedJumpAMIFvPatchField<Type>::write(Ostream& os) const
jump_.writeEntry("jump", os);
}
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index 283d7cfb9ef..d6d8a6eb248 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -132,7 +132,7 @@ void Foam::fixedMeanFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
meanValue_->writeData(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
index 8157fe7bd89..98b4a3af5bf 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
@@ -144,7 +144,7 @@ void Foam::fixedMeanOutletInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
meanValue_->writeData(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index 4e559b0ca40..bb58e321233 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -183,7 +183,7 @@ void Foam::fixedNormalInletOutletVelocityFvPatchVectorField::write
)
const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntry("fixTangentialInflow", fixTangentialInflow_);
@@ -191,7 +191,7 @@ const
normalVelocity_->write(os);
os.endBlock();
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index f4abae24a6c..557ffce4949 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -186,7 +186,7 @@ void Foam::fixedNormalSlipFvPatchField<Type>::write(Ostream& os) const
if (writeValue_)
{
os.writeEntry("writeValue", "true");
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
index 26166054f1d..bf7f79e066b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
@@ -129,7 +129,7 @@ void Foam::fixedPressureCompressibleDensityFvPatchScalarField::write
{
fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("p", "p", pName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index 8cdf7aa347b..d9237a2403f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -163,7 +163,7 @@ void Foam::fixedProfileFvPatchField<Type>::write(Ostream& os) const
profile_->writeData(os);
os.writeEntry("direction", dir_);
os.writeEntry("origin", origin_);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index d2b3751b964..60e974ab553 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -258,7 +258,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
{
os.writeEntry("extrapolateProfile", extrapolateProfile_);
}
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index a1edea1a779..a13f174803c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -238,7 +238,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::write(Ostream& os) const
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntryIfDifferent<scalar>("rhoOutlet", -VGREAT, rhoOutlet_);
}
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index b3909cc88fe..fd02bf04bc0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -135,10 +135,10 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
void Foam::fluxCorrectedVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index d90bd730a6f..437e18eadf1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -208,7 +208,7 @@ void Foam::freestreamFvPatchField<Type>::write(Ostream& os) const
{
freestreamValue().writeEntry("freestreamValue", os);
}
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index 84042e179f0..148b18ad74d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -131,10 +131,10 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
void Foam::freestreamPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
freestreamValue().writeEntry("freestreamValue", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
index 4302bd4781f..7953ad230d1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
@@ -118,9 +118,9 @@ void Foam::freestreamVelocityFvPatchVectorField::updateCoeffs()
void Foam::freestreamVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
freestreamValue().writeEntry("freestreamValue", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 9d7ba738655..cce6c7b6af4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -140,7 +140,7 @@ void Foam::inletOutletFvPatchField<Type>::write(Ostream& os) const
fvPatchField<Type>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->refValue().writeEntry("inletValue", os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 173f3829ce7..84198f6e2e7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -191,13 +191,13 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::updateCoeffs()
void Foam::inletOutletTotalTemperatureFvPatchScalarField::write(Ostream& os)
const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
os.writeEntryIfDifferent<word>("psi", "psi", psiName_);
os.writeEntry("gamma", gamma_);
T0_.writeEntry("T0", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C
index dee4c053b8e..4bffab315db 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C
@@ -110,8 +110,8 @@ void Foam::interfaceCompressionFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index 3a6d2f7f0fe..ddf69cd2ddb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -147,7 +147,7 @@ void Foam::interstitialInletVelocityFvPatchVectorField::write(Ostream& os) const
fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("alpha", "alpha", alphaName_);
inletVelocity_.writeEntry("inletVelocity", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
index 21ad7cdc0ad..cd3da655042 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
@@ -193,7 +193,7 @@ void Foam::mappedFieldFvPatchField<Type>::write(Ostream& os) const
fvPatchField<Type>::write(os);
mappedPatchBase::write(os);
mappedPatchFieldBase<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
index b3bbd452cea..ec190df0f18 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
@@ -140,7 +140,7 @@ void Foam::mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
mappedPatchFieldBase<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
index f0b9e4144b9..da5c4161011 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
@@ -193,7 +193,7 @@ void Foam::mappedFlowRateFvPatchVectorField::write
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntry("nbrPhi", nbrPhiName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
index f0643e915b5..973d696f244 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
@@ -236,9 +236,9 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
- this->writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
index bd3c912d463..e1806f21b7e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
@@ -253,7 +253,7 @@ void Foam::matchedFlowRateOutletVelocityFvPatchVectorField::write
os.writeEntry("volumetric", volumetric_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
}
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
index e6a90deaab1..f4fabe7729c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
@@ -149,8 +149,8 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs()
void Foam::movingWallVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
index 5c236bdfef1..039c126276e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
@@ -89,7 +89,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
void Foam::noSlipFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index c1fef7c612e..8c621154a30 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -140,7 +140,7 @@ void Foam::outletInletFvPatchField<Type>::write(Ostream& os) const
fvPatchField<Type>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->refValue().writeEntry("outletValue", os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 7838e12c3f2..32ea26c9fa2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -462,7 +462,7 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::write(Ostream& os) const
os.endBlock();
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 64dc0e549c1..7f92fff2889 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -174,7 +174,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::write
os.writeEntry("Umean", Umean_);
os.writeEntry("alpha", alphaName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 0c7141fc13a..7f26c14fa95 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -207,7 +207,7 @@ void Foam::partialSlipFvPatchField<Type>::write(Ostream& os) const
if (writeValue_)
{
os.writeEntry("writeValue", "true");
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index a5e0af6171e..1b6a532d228 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -162,12 +162,12 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
void Foam::phaseHydrostaticPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("phaseFraction", "alpha", phaseFraction_);
os.writeEntry("rho", rho_);
os.writeEntry("pRefValue", pRefValue_);
os.writeEntry("pRefPoint", pRefPoint_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 321a85d299b..67de38f2557 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -287,7 +287,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
void Foam::plenumPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("gamma", gamma_);
os.writeEntry("R", R_);
os.writeEntry("supplyMassFlowRate", supplyMassFlowRate_);
@@ -304,7 +304,7 @@ void Foam::plenumPressureFvPatchScalarField::write(Ostream& os) const
os.writeEntryIfDifferent<scalar>("timeScale", 0.0, timeScale_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("U", "U", UName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index 80429a58308..4f1f1b5a4e8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -187,11 +187,11 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
inletDir_.writeEntry("inletDirection", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index c0ef5989848..ffe06dfa7e6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -175,11 +175,11 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
inletDir_.writeEntry("inletDirection", os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 34f089687f5..6676732f485 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -161,10 +161,10 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index a30aa581c51..94d7392f311 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -190,13 +190,13 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::write
)
const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
if (tangentialVelocity_.size())
{
tangentialVelocity_.writeEntry("tangentialVelocity", os);
}
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index 629aad6f384..720c1b57d57 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -140,10 +140,10 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::pressureInletVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 7a0a8bfd740..4b316b0e675 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -157,10 +157,10 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("phi", phiName_);
os.writeEntry("rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index a93495d6fb1..46e5bce7535 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -367,7 +367,7 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::write
os.writeEntry("error", error_);
os.writeEntry("errorIntegral", errorIntegral_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index ddb02046260..5bfce075573 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -182,7 +182,7 @@ void Foam::pressurePermeableAlphaInletOutletVelocityFvPatchVectorField::write
Ostream& os
) const
{
- mixedFvPatchVectorField::write(os);
+ mixedFvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntryIfDifferent<word>("alpha", "none", alphaName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index 16ef1a9e750..9baf21bbbab 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -171,10 +171,10 @@ void Foam::prghPressureFvPatchScalarField::updateCoeffs()
void Foam::prghPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
p_.writeEntry("p", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
index 424839342cf..53fa4060828 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
@@ -148,12 +148,12 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntryIfDifferent<word>("ph_rgh", "ph_rgh", ph_rghName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 42dfb9c0884..41fe07eee82 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -188,12 +188,12 @@ void Foam::prghTotalPressureFvPatchScalarField::updateCoeffs()
void Foam::prghTotalPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
p0_.writeEntry("p0", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 512d5dbd64f..b583ffed984 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -129,10 +129,10 @@ void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("phi", phiName());
omega_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 9a8aad29f2b..91dfeebc25f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -147,11 +147,11 @@ void Foam::rotatingWallVelocityFvPatchVectorField::updateCoeffs()
void Foam::rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("origin", origin_);
os.writeEntry("axis", axis_);
omega_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 923582b3898..7c62b6b2981 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -294,7 +294,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("T", "T", TName_);
os.writeEntryIfDifferent<word>("p", "p", pName_);
os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
@@ -302,7 +302,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
os.writeEntry("pInf", pInf_);
os.writeEntry("TInf", TInf_);
os.writeEntry("gamma", gamma_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index 2d700f99e5b..15208df805b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -171,7 +171,7 @@ void Foam::surfaceNormalFixedValueFvPatchVectorField::updateCoeffs()
void Foam::surfaceNormalFixedValueFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
refValue_.writeEntry("refValue", os);
if (ramp_)
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 843068589b4..b4e4a38435b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -210,7 +210,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
os.writeEntry("axis", axis_);
flowRate_->writeData(os);
rpm_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
index 1bd5718888b..d3957f09ae1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
@@ -159,7 +159,7 @@ void Foam::swirlInletVelocityFvPatchVectorField::write(Ostream& os) const
axialVelocity_->writeData(os);
radialVelocity_->writeData(os);
tangentialVelocity_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index ec63722e69c..f484255a086 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -230,7 +230,7 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("Ap", Ap_);
os.writeEntry("Sp", Sp_);
@@ -244,7 +244,7 @@ void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
os.writeEntry("ams", ams_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index e014c44d80c..184252a32cc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -202,7 +202,7 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
{
fvPatchField<Type>::write(os);
uniformValue_->writeData(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index f6daed7a877..b3bcd972734 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -244,14 +244,14 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs()
void Foam::totalPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntry("rho", rhoName_);
os.writeEntry("psi", psiName_);
os.writeEntry("gamma", gamma_);
p0_.writeEntry("p0", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 79c18cc670d..b6ad51dd078 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -179,13 +179,13 @@ void Foam::totalTemperatureFvPatchScalarField::updateCoeffs()
void Foam::totalTemperatureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
os.writeEntry("gamma", gamma_);
T0_.writeEntry("T0", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index 6e5e2dfc5c5..8071d987a03 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -119,9 +119,9 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs()
void Foam::translatingWallVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
U_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 1e7508dc474..3f82557b9e0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -1027,7 +1027,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
{
L_->writeData(os);
}
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C
index 80331851cb9..f947bfb24f5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C
@@ -425,7 +425,7 @@ void Foam::turbulentDigitalFilterInletFvPatchField<Type>::write
}
L_.write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 996575e5e2e..8b12da4d1b3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -201,7 +201,7 @@ void Foam::turbulentInletFvPatchField<Type>::write(Ostream& os) const
os.writeEntry("fluctuationScale", fluctuationScale_);
referenceField_.writeEntry("referenceField", os);
os.writeEntry("alpha", alpha_);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index d4c054908c9..453e96a5f2d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -151,11 +151,11 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("intensity", intensity_);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index 54141fdc76b..f691d7252f5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -145,11 +145,11 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("rho", rho_);
os.writeEntry("pRefValue", pRefValue_);
os.writeEntry("pRefPoint", pRefPoint_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index d9d53982c3e..f57aa6488ca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -139,7 +139,7 @@ void Foam::uniformFixedGradientFvPatchField<Type>::write(Ostream& os) const
{
fixedGradientFvPatchField<Type>::write(os);
uniformGradient_->writeData(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 4b8f236dc38..106737b8e7e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -182,7 +182,7 @@ void Foam::uniformFixedValueFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
uniformValue_->writeData(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 1a40889aca4..d981820e787 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -169,7 +169,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::write(Ostream& os) const
fvPatchField<Type>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->uniformInletValue_->writeData(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
index 4bede8adaae..0125ba01b7a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
@@ -178,13 +178,13 @@ void Foam::uniformNormalFixedValueFvPatchVectorField::updateCoeffs()
void Foam::uniformNormalFixedValueFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
uniformValue_->writeData(os);
if (ramp_)
{
ramp_->writeData(os);
}
- this->writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index f9a64f87229..1ebfba52884 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -228,14 +228,14 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs()
void Foam::uniformTotalPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntry("rho", rhoName_);
os.writeEntry("psi", psiName_);
os.writeEntry("gamma", gamma_);
p0_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index 1ee1eec1c6c..308999acab8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -174,11 +174,11 @@ void Foam::variableHeightFlowRateFvPatchScalarField::updateCoeffs()
void Foam::variableHeightFlowRateFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntry("lowerBound", lowerBound_);
os.writeEntry("upperBound", upperBound_);
- this->writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 94b3a2522e3..7318a394af4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -139,7 +139,7 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
fvPatchField<vector>::write(os);
flowRate_->writeData(os);
os.writeEntry("alpha", alphaName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 0be57ad2525..0eb44f87fa6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -225,11 +225,11 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
void Foam::waveSurfacePressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("zeta", "zeta", zetaName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index aede4cebf43..3afc210796f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -155,7 +155,7 @@ void Foam::waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
os.writeEntry("lInf", this->lInf_);
}
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index f2a7c4133f8..d8d50701e81 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2015-2022 OpenCFD Ltd.
+ Copyright (C) 2015-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -32,6 +32,41 @@ License
#include "fvPatchFieldMapper.H"
#include "volMesh.H"
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::fvPatchField<Type>::readValueEntry
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = fvPatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+ if (eptr)
+ {
+ Field<Type>::assign(*eptr, p.size());
+ return true;
+ }
+
+ if (IOobjectOption::isReadRequired(readOpt))
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entry 'value' : missing for patch " << p.name()
+ << " in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ return false;
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
@@ -47,6 +82,20 @@ Foam::fvPatchField<Type>::fvPatchField
{}
+template<class Type>
+Foam::fvPatchField<Type>::fvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const word& patchType
+)
+:
+ fvPatchFieldBase(p, patchType),
+ Field<Type>(p.size()),
+ internalField_(iF)
+{}
+
+
template<class Type>
Foam::fvPatchField<Type>::fvPatchField
(
@@ -66,11 +115,11 @@ Foam::fvPatchField<Type>::fvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const word& patchType
+ const Field<Type>& pfld
)
:
- fvPatchFieldBase(p, patchType),
- Field<Type>(p.size()),
+ fvPatchFieldBase(p),
+ Field<Type>(pfld),
internalField_(iF)
{}
@@ -80,11 +129,11 @@ Foam::fvPatchField<Type>::fvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const Field<Type>& f
+ Field<Type>&& pfld
)
:
fvPatchFieldBase(p),
- Field<Type>(f),
+ Field<Type>(std::move(pfld)),
internalField_(iF)
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 84d1e333cb5..3d23bc0a2c5 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
- Copyright (C) 2019-2022 OpenCFD Ltd.
+ Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -59,8 +59,8 @@ namespace Foam
{
// Forward Declarations
-class objectRegistry;
class dictionary;
+class objectRegistry;
class fvPatchFieldMapper;
class volMesh;
@@ -231,6 +231,25 @@ class fvPatchField
//- Reference to internal field
const DimensionedField<Type, volMesh>& internalField_;
+protected:
+
+ // Protected Member Functions
+
+ //- Read the "value" entry into \c *this.
+ // The reading can be optional (default), mandatory etc.
+ // \returns True on success
+ bool readValueEntry
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+ //- Write \c *this field as a "value" entry
+ void writeValueEntry(Ostream& os) const
+ {
+ Field<Type>::writeEntry("value", os);
+ }
+
public:
@@ -295,6 +314,14 @@ public:
const DimensionedField<Type, volMesh>&
);
+ //- Construct from patch, internal field and patch type
+ fvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const word& patchType
+ );
+
//- Construct from patch, internal field and value
fvPatchField
(
@@ -303,20 +330,20 @@ public:
const Type& value
);
- //- Construct from patch and internal field and patch type
+ //- Construct from patch, internal field and patch field
fvPatchField
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
- const word& patchType
+ const Field<Type>& pfld
);
- //- Construct from patch and internal field and patch field
+ //- Construct from patch, internal field and patch field
fvPatchField
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
- const Field<Type>&
+ Field<Type>&& pfld
);
//- Construct from patch, internal field and dictionary
@@ -435,44 +462,43 @@ public:
static const word& zeroGradientType();
- // Attributes
+ // Attributes
- //- True if this patch field fixes a value.
- // Needed to check if a level has to be specified while solving
- // Poissons equations.
- virtual bool fixesValue() const
- {
- return false;
- }
+ //- True if this patch field fixes a value.
+ // Needed to check if a level has to be specified while solving
+ // Poissons equations.
+ virtual bool fixesValue() const
+ {
+ return false;
+ }
- //- True if the value of the patch field
- //- is altered by assignment (the default)
- virtual bool assignable() const
- {
- return true;
- }
+ //- True if the value of the patch field
+ //- is altered by assignment (the default)
+ virtual bool assignable() const
+ {
+ return true;
+ }
- //- True if this patch field is coupled
- virtual bool coupled() const
- {
- return false;
- }
+ //- True if this patch field is coupled
+ virtual bool coupled() const
+ {
+ return false;
+ }
- // Access
+ // Access
- //- Return const-reference to the dimensioned internal field
- const DimensionedField<Type, volMesh>& internalField()
- const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the dimensioned internal field
+ const DimensionedField<Type, volMesh>& internalField() const noexcept
+ {
+ return internalField_;
+ }
- //- Return const-reference to the internal field values
- const Field<Type>& primitiveField() const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the internal field values
+ const Field<Type>& primitiveField() const noexcept
+ {
+ return internalField_;
+ }
// Mapping Functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
index fac044a3017..838f03b2ffc 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
@@ -77,7 +77,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
calculatedFvsPatchField
(
const calculatedFvsPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index 15da665a625..6d3d19f7e33 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -77,8 +77,8 @@ public:
const dictionary&
);
- //- Construct by mapping the given fixedValueFvsPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given fixedValue patch field
+ //- onto a new patch
fixedValueFvsPatchField
(
const fixedValueFvsPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index 1f185b83f41..d5ce648c96f 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -97,8 +97,7 @@ public:
const dictionary&
);
- //- Construct by mapping the given slicedFvsPatchField<Type>
- // onto a new patch
+ //- Construct by mapping the given sliced patch field onto a new patch
slicedFvsPatchField
(
const slicedFvsPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index c88be8b5327..8997ac61fc1 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
- Copyright (C) 2017-2022 OpenCFD Ltd.
+ Copyright (C) 2017-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -32,6 +32,41 @@ License
#include "surfaceMesh.H"
#include "fvPatchFieldMapper.H"
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::fvsPatchField<Type>::readValueEntry
+(
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt
+)
+{
+ const auto& p = fvsPatchFieldBase::patch();
+
+ if (!p.size()) return true; // Can be exceptionally lazy
+ if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+ const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+ if (eptr)
+ {
+ Field<Type>::assign(*eptr, p.size());
+ return true;
+ }
+
+ if (IOobjectOption::isReadRequired(readOpt))
+ {
+ FatalIOErrorInFunction(dict)
+ << "Required entry 'value' : missing for patch " << p.name()
+ << " in dictionary " << dict.relativeName() << nl
+ << exit(FatalIOError);
+ }
+
+ return false;
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
@@ -52,11 +87,11 @@ Foam::fvsPatchField<Type>::fvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const Field<Type>& f
+ const Field<Type>& pfld
)
:
fvsPatchFieldBase(p),
- Field<Type>(f),
+ Field<Type>(pfld),
internalField_(iF)
{}
@@ -64,14 +99,13 @@ Foam::fvsPatchField<Type>::fvsPatchField
template<class Type>
Foam::fvsPatchField<Type>::fvsPatchField
(
- const fvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ Field<Type>&& pfld
)
:
- fvsPatchFieldBase(ptf, p),
- Field<Type>(ptf, mapper),
+ fvsPatchFieldBase(p),
+ Field<Type>(std::move(pfld)),
internalField_(iF)
{}
@@ -108,6 +142,21 @@ Foam::fvsPatchField<Type>::fvsPatchField
}
+template<class Type>
+Foam::fvsPatchField<Type>::fvsPatchField
+(
+ const fvsPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fvsPatchFieldBase(ptf, p),
+ Field<Type>(ptf, mapper),
+ internalField_(iF)
+{}
+
+
template<class Type>
Foam::fvsPatchField<Type>::fvsPatchField(const fvsPatchField<Type>& ptf)
:
@@ -161,7 +210,7 @@ template<class Type>
void Foam::fvsPatchField<Type>::write(Ostream& os) const
{
os.writeEntry("type", type());
- this->writeEntry("value", os);
+ Field<Type>::writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 3ee2f1dc26d..1eb422705a5 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2019-2022 OpenCFD Ltd.
+ Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -49,6 +49,7 @@ SourceFiles
#include "fvPatch.H"
#include "DimensionedField.H"
+#include "fieldTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,8 +57,8 @@ namespace Foam
{
// Forward Declarations
-class objectRegistry;
class dictionary;
+class objectRegistry;
class fvPatchFieldMapper;
class surfaceMesh;
@@ -153,6 +154,25 @@ class fvsPatchField
//- Reference to internal field
const DimensionedField<Type, surfaceMesh>& internalField_;
+protected:
+
+ // Protected Member Functions
+
+ //- Read the "value" entry into \c *this.
+ // The reading can be optional (default), mandatory etc.
+ // \returns True on success
+ bool readValueEntry
+ (
+ const dictionary& dict,
+ IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+ );
+
+ //- Write \c *this field as a "value" entry
+ void writeValueEntry(Ostream& os) const
+ {
+ Field<Type>::writeEntry("value", os);
+ }
+
public:
@@ -217,12 +237,20 @@ public:
const DimensionedField<Type, surfaceMesh>&
);
- //- Construct from patch and internal field and patch field
+ //- Construct from patch, internal field and patch field
fvsPatchField
(
const fvPatch&,
const DimensionedField<Type, surfaceMesh>&,
- const Field<Type>&
+ const Field<Type>& pfld
+ );
+
+ //- Construct from patch, internal field and patch field
+ fvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ Field<Type>&& pfld
);
//- Construct from patch, internal field and dictionary
@@ -338,37 +366,37 @@ public:
static const word& calculatedType();
- // Attributes
+ // Attributes
- //- True if this patch field fixes a value.
- // Needed to check if a level has to be specified while solving
- // Poissons equations.
- virtual bool fixesValue() const
- {
- return false;
- }
+ //- True if this patch field fixes a value.
+ // Needed to check if a level has to be specified while solving
+ // Poissons equations.
+ virtual bool fixesValue() const
+ {
+ return false;
+ }
- //- True if this patch field is coupled
- virtual bool coupled() const
- {
- return false;
- }
+ //- True if this patch field is coupled
+ virtual bool coupled() const
+ {
+ return false;
+ }
- // Access
+ // Access
- //- Return const-reference to the dimensioned internal field
- const DimensionedField<Type, surfaceMesh>& internalField()
- const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the dimensioned internal field
+ const DimensionedField<Type, surfaceMesh>& internalField()
+ const noexcept
+ {
+ return internalField_;
+ }
- //- Return const-reference to the internal field values
- const Field<Type>& primitiveField() const noexcept
- {
- return internalField_;
- }
+ //- Return const-reference to the internal field values
+ const Field<Type>& primitiveField() const noexcept
+ {
+ return internalField_;
+ }
// Mapping Functions
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
index 2e76dd66e9c..a359d8fe668 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
@@ -126,7 +126,7 @@ template<class Type>
void Foam::cellMotionFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
index 08dcc13a099..b94b01d5374 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
+++ b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
@@ -143,7 +143,7 @@ public:
{
slipFvPatchField<Type>::write(os);
// Only so we can easily postprocess.
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
};
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index 5150f706f08..7ff26948cb4 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -187,7 +187,7 @@ void angularOscillatingDisplacementPointPatchVectorField::write
os.writeEntry("amplitude", amplitude_);
os.writeEntry("omega", omega_);
p0_.writeEntry("p0", os);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
index 8c9224a49b0..fe7841d3775 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
@@ -86,7 +86,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
angularOscillatingDisplacementPointPatchVectorField
(
const angularOscillatingDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index ccde191494a..792daffdcfe 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -192,7 +192,7 @@ void angularOscillatingVelocityPointPatchVectorField::write
os.writeEntry("amplitude", amplitude_);
os.writeEntry("omega", omega_);
p0_.writeEntry("p0", os);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
index f1a7ae4a29d..b73fab2a6d5 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
@@ -86,7 +86,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
angularOscillatingVelocityPointPatchVectorField
(
const angularOscillatingVelocityPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index f4af0339612..ddf65df7fb0 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -121,7 +121,7 @@ void oscillatingDisplacementPointPatchVectorField::write(Ostream& os) const
pointPatchField<vector>::write(os);
os.writeEntry("amplitude", amplitude_);
os.writeEntry("omega", omega_);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
index 34ae75cc68a..f77cec23538 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
@@ -81,7 +81,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
oscillatingDisplacementPointPatchVectorField
(
const oscillatingDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index a2a9fa10f5d..aca3b49f051 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -165,7 +165,7 @@ void oscillatingVelocityPointPatchVectorField::write(Ostream& os) const
os.writeEntry("amplitude", amplitude_);
os.writeEntry("omega", omega_);
p0_.writeEntry("p0", os);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
index 8985f06dc87..bacd84bc1e3 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
@@ -83,7 +83,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
oscillatingVelocityPointPatchVectorField
(
const oscillatingVelocityPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 3d244128239..92c499d6249 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -463,7 +463,7 @@ void Foam::surfaceDisplacementPointPatchVectorField::updateCoeffs()
void Foam::surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
{
- fixedValuePointPatchVectorField::write(os);
+ fixedValuePointPatchField<vector>::write(os);
os.writeEntry("velocity", velocity_);
os.writeEntry("geometry", surfacesDict_);
os.writeEntry("projectMode", projectModeNames_[projectMode_]);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index 3114eb82e50..0c39ddc7d29 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -154,7 +154,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
surfaceDisplacementPointPatchVectorField
(
const surfaceDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 645313a7461..8d6b096d59d 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -422,7 +422,7 @@ void Foam::surfaceSlipDisplacementPointPatchVectorField::write
Ostream& os
) const
{
- pointPatchVectorField::write(os);
+ pointPatchField<vector>::write(os);
os.writeEntry("geometry", surfacesDict_);
os.writeEntry("projectMode", projectModeNames_[projectMode_]);
os.writeEntry("projectDirection", projectDir_);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
index 6020c47d3bb..2a46c184546 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
@@ -144,7 +144,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
surfaceSlipDisplacementPointPatchVectorField
(
const surfaceSlipDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index b22f5e8d05f..8bdfdd3ef7c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -261,7 +261,7 @@ const
pointPatchField<vector>::write(os);
os.writeEntry("field", fieldName_);
os.writeEntry("interpolationScheme", interpolationScheme_);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
index f261d3db46b..e8105cd39de 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
@@ -120,7 +120,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
uniformInterpolatedDisplacementPointPatchVectorField
(
const uniformInterpolatedDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index bfdb5643ff2..ba83666650e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -127,7 +127,7 @@ void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
os.writeEntry("amplitude", amplitude_);
os.writeEntry("omega", omega_);
os.writeEntry("waveNumber", waveNumber_);
- writeEntry("value", os);
+ this->writeValueEntry( os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
index 8536c06917f..284ad8e84cc 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
@@ -82,7 +82,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
waveDisplacementPointPatchVectorField
(
const waveDisplacementPointPatchVectorField&,
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
index 00bfded5d76..88bc831f560 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
@@ -108,7 +108,7 @@ void Foam::genericFaPatchField<Type>::write(Ostream& os) const
{
// Handle "value" separately
genericPatchFieldBase::writeGeneric(os, true);
- this->writeEntry("value", os);
+ faPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H
index fece0812dad..7ad03942e79 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H
@@ -88,7 +88,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
genericFaPatchField
(
const genericFaPatchField<Type>&,
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 0f72c34600b..122e534d311 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -108,7 +108,7 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
{
// Handle "value" separately
genericPatchFieldBase::writeGeneric(os, true);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
index 7c527fe050f..f74273dceeb 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
@@ -88,7 +88,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
genericFvPatchField
(
const genericFvPatchField<Type>&,
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
index a982f110cd7..fbf15045737 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
@@ -108,7 +108,7 @@ void Foam::genericFvsPatchField<Type>::write(Ostream& os) const
{
// Handle "value" separately
genericPatchFieldBase::writeGeneric(os, true);
- this->writeEntry("value", os);
+ fvsPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H
index 3fe2a26c57e..0447dd99710 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H
@@ -87,7 +87,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
genericFvsPatchField
(
const genericFvsPatchField<Type>&,
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index 59b3be11f4b..f7720149719 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -84,7 +84,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
genericPointPatchField
(
const genericPointPatchField<Type>&,
diff --git a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
index c239481f9e8..b2fad27088f 100644
--- a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
+++ b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
@@ -446,7 +446,7 @@ const
os.writeEntry("dataWritten", dataWritten_);
}
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
index 26e7997b05e..0afd14f0591 100644
--- a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
+++ b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
@@ -129,7 +129,7 @@ public:
const dictionary& dict
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
lumpedPointDisplacementPointPatchVectorField
(
const lumpedPointDisplacementPointPatchVectorField& rhs,
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
index e9051ae8e84..8b52d2d10e6 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
@@ -85,7 +85,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
zeroFixedValuePointPatchField
(
const zeroFixedValuePointPatchField<Type>&,
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 0c4017cd8dd..fa2d54f387c 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -129,7 +129,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
cyclicACMIPointPatchField
(
const cyclicACMIPointPatchField<Type>&,
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index d3237db8e59..78a8148c099 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -129,7 +129,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
cyclicAMIPointPatchField
(
const cyclicAMIPointPatchField<Type>&,
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
index 6d43549b71e..cdf99837c41 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -103,7 +103,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<Type> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
uniformFixedValuePointPatchField
(
const uniformFixedValuePointPatchField<Type>&,
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
index aad795f2a93..c4dea30df3d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
@@ -252,9 +252,9 @@ Foam::adjointFarFieldPressureFvPatchScalarField::gradientBoundaryCoeffs() const
void Foam::adjointFarFieldPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
index 88de315419b..71e56b53594 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
@@ -185,9 +185,9 @@ Foam::adjointFarFieldVelocityFvPatchVectorField::valueBoundaryCoeffs
void Foam::adjointFarFieldVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
index a5e71cb4c33..869b4c9dec5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
@@ -131,9 +131,9 @@ Foam::adjointInletVelocityFvPatchVectorField::valueBoundaryCoeffs
void Foam::adjointInletVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index b4f50154939..0e80d181e24 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -160,9 +160,9 @@ void Foam::adjointOutletPressureFvPatchScalarField::updateCoeffs()
void Foam::adjointOutletPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 4d3f2fce75d..49adb64b193 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -164,9 +164,9 @@ void Foam::adjointOutletVelocityFvPatchVectorField::evaluate
void Foam::adjointOutletVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
index 8b70903941d..dd385480e3e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
@@ -207,9 +207,9 @@ void Foam::adjointOutletVelocityFluxFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
index c26a7b863a7..2ee1f2a8483 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
@@ -225,11 +225,11 @@ void Foam::adjointWallVelocityFvPatchVectorField::updateCoeffs()
void Foam::adjointWallVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
os.writeEntry("kappa", kappa_);
os.writeEntry("E", E_);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
index 606eb246250..fb54a88b1a2 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
@@ -110,9 +110,9 @@ void Foam::adjointWallVelocityLowReFvPatchVectorField::updateCoeffs()
void Foam::adjointWallVelocityLowReFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
- writeEntry("value", os);
+ fvPatchField<vector>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
index edbdc4b09ca..13340dc1b60 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
@@ -159,9 +159,9 @@ valueBoundaryCoeffs
void adjointFarFieldNuaTildaFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
index 85675f0e352..35d9034a0c8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
@@ -157,9 +157,9 @@ valueBoundaryCoeffs
void adjointFarFieldTMVar1FvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
index 1bd84898be7..b51d8be8124 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
@@ -157,9 +157,9 @@ valueBoundaryCoeffs
void adjointFarFieldTMVar2FvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
index a3d75d2fccb..72145995d1f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
@@ -119,9 +119,9 @@ tmp<Field<scalar>> adjointInletNuaTildaFvPatchScalarField::valueBoundaryCoeffs
void adjointInletNuaTildaFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
index 2ef57ef0c03..1f296db56b5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
@@ -143,7 +143,7 @@ template<class Type>
void Foam::adjointOutletFluxFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<Type>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
index 8a0aefde325..dbbfac54511 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
@@ -125,9 +125,9 @@ void adjointOutletKaFvPatchScalarField::updateCoeffs()
void adjointOutletKaFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
index ef16a37865c..32cc4f76c9b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
@@ -123,9 +123,9 @@ void adjointOutletNuaTildaFvPatchScalarField::updateCoeffs()
void adjointOutletNuaTildaFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
index f66e1972e79..2382fa4e17b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
@@ -146,9 +146,9 @@ adjointOutletNuaTildaFluxFvPatchScalarField::gradientInternalCoeffs() const
void adjointOutletNuaTildaFluxFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
index e920a5d26b4..68fab059d3e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
@@ -125,9 +125,9 @@ void adjointOutletWaFvPatchScalarField::updateCoeffs()
void adjointOutletWaFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("solverName", adjointSolverName_);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index b1b87506256..2c0e2f98bf2 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -129,9 +129,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("thetaProperties", thetaProps_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
index a57d9ebf090..166a9a9e0e0 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
@@ -258,13 +258,13 @@ void Foam::timeVaryingMassSorptionFvPatchScalarField::updateCoeffs()
void Foam::timeVaryingMassSorptionFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("kabs", kabs_);
os.writeEntry("max", max_);
os.writeEntryIfDifferent<scalar>("kdes", scalar(0), kdes_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 8e065b876a4..910ccf5abf7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -129,9 +129,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("thetaProperties", thetaProps_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
index 6e37273ea06..2ec483d3e89 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -199,7 +199,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
os.writeEntry("fixedDmdt", fixedDmdt_);
os.writeEntry("L", L_);
dmdt_.writeEntry("dmdt", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
index b7cc56fcaae..90cf5c75707 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
@@ -323,7 +323,7 @@ void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::write
os.writeEntry("kappa", kappa_);
os.writeEntry("E", E_);
dmdt_.writeEntry("dmdt", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
index e15a7906845..dae81c48d9f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -128,7 +128,7 @@ write(Ostream& os) const
fvPatchField<scalar>::write(os);
dmdt_.writeEntry("dmdt", os);
mDotL_.writeEntry("mDotL", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 6e449c5080d..c405a54f1a9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -1323,7 +1323,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::write(Ostream& os) const
qq_.writeEntry("qQuenching", os);
alphatConv_.writeEntry("alphatConv", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index d6d88cae2ef..147842955da 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -112,7 +112,7 @@ void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
os.writeEntry("sourceFieldName", sourceFieldName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
index 580c3e9cfc8..cce56b32a40 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
@@ -198,7 +198,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::write(Ostream& os) const
fvPatchField<scalar>::write(os);
os.writeEntry("relax", relax_);
q_.writeEntry("q", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index f2d159e07d5..a1d4580da78 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -240,9 +240,9 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("specularityCoefficient", specularityCoefficient_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 85f52e183bb..d46037600c9 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -279,10 +279,10 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("restitutionCoefficient", restitutionCoefficient_);
os.writeEntry("specularityCoefficient", specularityCoefficient_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 03d3a85cbe2..84d56ae6361 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -236,9 +236,9 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntry("specularityCoefficient", specularityCoefficient_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 6d2663a4705..69472671352 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -271,10 +271,10 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("restitutionCoefficient", restitutionCoefficient_);
os.writeEntry("specularityCoefficient", specularityCoefficient_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index 9270915c133..0f26223b0fe 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -412,7 +412,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>
(
"filmRegion",
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 6c88b5302c6..fb60eb82359 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -187,7 +187,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>
(
"filmRegion",
@@ -202,7 +202,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write
);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 549b41fd524..8847b50a72a 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -212,7 +212,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>
(
"filmRegion",
@@ -227,7 +227,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write
);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
index 651f1349e05..0ecc19035a5 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
@@ -129,11 +129,11 @@ void Foam::filmHeightInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::filmHeightInletVelocityFvPatchVectorField::write(Ostream& os) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntryIfDifferent<word>("deltaf", "deltaf", deltafName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index dca945f9053..d8c0c9436d4 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -194,7 +194,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write
Ostream& os
) const
{
- fixedValueFvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
+
os.writeEntryIfDifferent<word>
(
"filmRegion",
@@ -204,7 +205,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write
GammaMean_->writeData(os);
a_->writeData(os);
omega_->writeData(os);
- writeEntry("value", os);
+
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 5bd9ea6a50d..0833e9e46f7 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -193,7 +193,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
+
os.writeEntryIfDifferent<word>
(
"filmRegion",
@@ -203,7 +204,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write
GammaMean_->writeData(os);
a_->writeData(os);
omega_->writeData(os);
- writeEntry("value", os);
+
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index 2d326128ecb..b0e370a7189 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -257,7 +257,8 @@ void alphatFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeEntryIfDifferent<scalar>("Cmu", 0.09, Cmu_);
os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
os.writeEntryIfDifferent<scalar>("Prt", 0.85, Prt_);
- writeEntry("value", os);
+
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index 286d9321626..63661a0c4a5 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -273,7 +273,7 @@ void nutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
{
nutWallFunctionFvPatchScalarField::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index 3c6da0ce0cd..e804362b8b2 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -274,7 +274,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
initialPoints_.writeEntry("initialPoints", os);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
index 06947e016db..e67f00ff6ac 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -113,7 +113,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
sixDoFRigidBodyDisplacementPointPatchVectorField
(
const sixDoFRigidBodyDisplacementPointPatchVectorField&,
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index 52073798fed..df6763d4350 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -200,7 +200,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::write
pointPatchField<vector>::write(os);
motion_.write(os);
initialPoints_.writeEntry("initialPoints", os);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
index 339040f8fa2..9bc259d00e7 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -88,7 +88,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
(
const uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField&,
diff --git a/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 519776723ad..51d9c4d2d07 100644
--- a/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -164,7 +164,7 @@ void convectiveHeatTransferFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
os.writeEntry("L", L_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 26aa93d2ec0..90fc37d1e29 100644
--- a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -476,7 +476,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("mode", operationModeNames[mode_]);
temperatureCoupledBase::write(os);
@@ -537,7 +537,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
refValue().writeEntry("refValue", os);
refGrad().writeEntry("refGradient", os);
valueFraction().writeEntry("valueFraction", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
index 90899164ac7..16e7f55cd5b 100644
--- a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
@@ -195,10 +195,10 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::write
Ostream& os
) const
{
- fixedGradientFvPatchScalarField::write(os);
+ fixedGradientFvPatchField<scalar>::write(os);
temperatureCoupledBase::write(os);
qrIncident_.writeEntry("qrIncident", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 668940de761..2661d4ba2e3 100644
--- a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -767,7 +767,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("p", "p", pName_);
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
diff --git a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
index f34d171eae5..2d1ecc121ce 100644
--- a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
@@ -217,7 +217,7 @@ void Foam::lumpedMassWallTemperatureFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
temperatureCoupledBase::write(os);
os.writeEntry("Cp", Cp_);
diff --git a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index 49d6b0ce93b..8c17484d037 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -244,7 +244,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
void Foam::outletMachNumberPressureFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("pBack", pBack_);
os.writeEntryIfDifferent<scalar>("c1", 0, c1_);
os.writeEntryIfDifferent<scalar>("A1", 0, A1_);
@@ -256,7 +256,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::write(Ostream& os) const
os.writeEntryIfDifferent<word>("U", "U", UName_);
os.writeEntryIfDifferent<scalar>("M", 0, M_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index ac72f78aecf..5e7b8daa3a7 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -190,14 +190,14 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("outletPatch", outletPatchName_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
os.writeEntry("Q", Q_);
os.writeEntry("TMin", TMin_);
os.writeEntry("TMax", TMax_);
- this->writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
index e27c5876282..d9d00a8bd3f 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
@@ -170,11 +170,11 @@ void Foam::semiPermeableBaffleMassFractionFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
mappedPatchBase::write(os);
os.writeEntryIfDifferent<scalar>("c", 0, c_);
os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
index 1af5600c2a6..579989b7f16 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
@@ -170,9 +170,9 @@ void Foam::semiPermeableBaffleVelocityFvPatchVectorField::write
Ostream& os
) const
{
- fvPatchVectorField::write(os);
+ fvPatchField<vector>::write(os);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 8ce9d2e6ef6..053d10cf062 100644
--- a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -428,7 +428,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
template<class solidType>
void thermalBaffle1DFvPatchScalarField<solidType>::write(Ostream& os) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
mappedPatchBase::write(os);
if (this->owner())
diff --git a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index d3a6193123b..c898f212d25 100644
--- a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -206,7 +206,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::write
os.writeEntry("phi", phiName_);
os.writeEntry("rho", rhoName_);
os.writeEntry("massFluxFraction", massFluxFraction_);
- this->writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index e1b836fb116..cba676c86c3 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -460,7 +460,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
os.writeEntry("Tnbr", TnbrName_);
if (thicknessLayer_)
{
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 5dc9ad16eb7..ad59b17622a 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -721,7 +721,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
//os.writeEntry("Tnbr", TnbrName_);
os.writeEntryIfDifferent<word>("Tnbr", "T", TnbrName_);
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index afd5c6d0ad2..f0f4c231090 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -330,7 +330,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeEntryIfDifferent<scalar>("Prt", 0.85, Prt_);
os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
os.writeEntryIfDifferent<scalar>("E", 9.8, E_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index 2e24370be4a..6849f44a1f0 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -132,7 +132,7 @@ void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<scalar>("Prt", 0.85, Prt_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
index d289f634448..0c5a302f14f 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
@@ -405,11 +405,11 @@ void sorptionWallFunctionFvPatchScalarField::updateCoeffs()
void sorptionWallFunctionFvPatchScalarField::write(Ostream& os) const
{
- fixedGradientFvPatchScalarField::write(os);
+ fixedGradientFvPatchField<scalar>::write(os);
writeLocalEntries(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index fb8df7ace95..0dd64ccb0e2 100644
--- a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -175,10 +175,10 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
Tinf_.writeEntry("Tinf", os);
alphaWall_.writeEntry("alphaWall", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
index 50952eb0e34..8f3f0de5acf 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
@@ -140,7 +140,7 @@ void Foam::energyJumpFvPatchScalarField::updateCoeffs()
void Foam::energyJumpFvPatchScalarField::write(Ostream& os) const
{
fixedJumpFvPatchField<scalar>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
index 0ff842683ab..4e85bb0a002 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
@@ -138,7 +138,7 @@ void Foam::energyJumpAMIFvPatchScalarField::updateCoeffs()
void Foam::energyJumpAMIFvPatchScalarField::write(Ostream& os) const
{
fixedJumpAMIFvPatchField<scalar>::write(os);
- this->writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
index 75192df2666..6d1a541014f 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
@@ -121,8 +121,8 @@ void Foam::gradientEnergyFvPatchScalarField::updateCoeffs()
void Foam::gradientEnergyFvPatchScalarField::write(Ostream& os) const
{
- fixedGradientFvPatchScalarField::write(os);
- this->writeEntry("value", os);
+ fixedGradientFvPatchField<scalar>::write(os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
index 27f4bea985b..7fce1ae957a 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
@@ -168,7 +168,7 @@ void Foam::radiation::MarshakRadiationFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("T", "T", TName_);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
index 53a3e74fbf8..6cd7f1e5e83 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
@@ -188,7 +188,7 @@ void Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
Trad_.writeEntry("Trad", os);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index b97fffa8184..3257b4de806 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -373,7 +373,7 @@ void Foam::radiation::greyDiffusiveRadiationMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
os.writeEntryIfDifferent<word>("T", "T", TName_);
os.writeEntryIfDifferent<scalar>("qRadExt", Zero, qRadExt_);
os.writeEntryIfDifferent<vector>("qRadExtDir", Zero, qRadExtDir_);
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 614bb8b5734..f0548c186a2 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -199,7 +199,7 @@ write
Ostream& os
) const
{
- fixedValueFvPatchScalarField::write(os);
+ fixedValueFvPatchField<scalar>::write(os);
qro_.writeEntry("qro", os);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index a0d90058d50..9ead8ee5c8a 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -305,7 +305,7 @@ void Foam::radiation::wideBandDiffusiveRadiationMixedFvPatchScalarField::write
Ostream& os
) const
{
- mixedFvPatchScalarField::write(os);
+ mixedFvPatchField<scalar>::write(os);
}
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
index 7cc73bc526e..8762e826767 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
@@ -304,7 +304,7 @@ void Foam::enthalpySorptionFvPatchScalarField::updateCoeffs()
void Foam::enthalpySorptionFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry("enthalpyModel", enthalpyModelTypeNames[enthalpyModel_]);
@@ -323,7 +323,7 @@ void Foam::enthalpySorptionFvPatchScalarField::write(Ostream& os) const
dhdt_.writeEntry("dhdt", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
index 7b1f9c7cd0a..68eb91f02db 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
@@ -417,7 +417,7 @@ void Foam::speciesSorptionFvPatchScalarField::updateCoeffs()
void Foam::speciesSorptionFvPatchScalarField::write(Ostream& os) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
os.writeEntry
(
@@ -440,7 +440,7 @@ void Foam::speciesSorptionFvPatchScalarField::write(Ostream& os) const
mass_.writeEntry("mass", os);
os.writeEntryIfDifferent<word>("p", "p", pName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 9a8e306c785..580b4e73109 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -159,7 +159,7 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::write
Ostream& os
) const
{
- fixedGradientFvPatchScalarField::write(os);
+ fixedGradientFvPatchField<scalar>::write(os);
os.writeEntry("limit", limitControlNames_[limit_]);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index 473f4acc952..7e1c16b5020 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -117,7 +117,7 @@ void Foam::constantAlphaContactAngleFvPatchScalarField::write
{
alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
os.writeEntry("theta0", theta0_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index 0997a7cd49d..7f61ba30b07 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -153,7 +153,7 @@ void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
os.writeEntry("uTheta", uTheta_);
os.writeEntry("thetaA", thetaA_);
os.writeEntry("thetaR", thetaR_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index b748264df62..1b46c9c63dd 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -126,7 +126,7 @@ void Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::write
alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
os.writeEntryIfDifferent<word>("T", "T", TName_);
theta0_->writeData(os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index e83e93461b1..e0344b0b865 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -138,7 +138,7 @@ void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
os.writeEntry("thetaT0", thetaT0_);
os.writeEntry("te", te_);
os.writeEntry("thetaTe", thetaTe_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index a0aa069ae1b..55709d97ef0 100644
--- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -159,9 +159,9 @@ void Foam::alphaFixedPressureFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fvPatchField<scalar>::write(os);
p_.writeEntry("p", os);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 257ad4f8522..a974fe80b55 100644
--- a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -125,7 +125,7 @@ void Foam::waveAlphaFvPatchScalarField::write(Ostream& os) const
os.writeEntry("waveDictName", waveDictName_);
- writeEntry("value", os);
+ fvPatchField<scalar>::writeValueEntry(os);
}
diff --git a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index 66b6b9d6a03..ec40b898190 100644
--- a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -125,7 +125,7 @@ void Foam::waveVelocityFvPatchVectorField::write(Ostream& os) const
os.writeEntry("waveDictName", waveDictName_);
- writeEntry("value", os);
+ fvPatchField<vector>::writeValueEntry(os);
}
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
index 481d88d98f5..be8cbfb7c30 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
@@ -460,7 +460,7 @@ void Foam::waveMakerPointPatchVectorField::write(Ostream& os) const
os.writeEntry("rampTime", rampTime_);
os.writeEntry("secondOrder", secondOrder_);
os.writeEntry("nPaddle", nPaddle_);
- writeEntry("value", os);
+ this->writeValueEntry(os);
}
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
index 8ccff2d454f..e71e9044efa 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
@@ -239,7 +239,7 @@ public:
const dictionary&
);
- //- Construct by mapping given patchField<vector> onto a new patch
+ //- Construct by mapping given patch field onto a new patch
waveMakerPointPatchVectorField
(
const waveMakerPointPatchVectorField&,
--
GitLab