From fe4688c27f39318a5739feffa4a5c809fd8db8fa Mon Sep 17 00:00:00 2001 From: Mark Olesen 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 8b93ea74c3..ff83ae3616 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("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::writeValueEntry(os); } diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index 6d0bd7e488..112be32386 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::write(os); os.writeEntryIfDifferent("T", "T", TName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); os.writeEntryIfDifferent("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::writeValueEntry(os); } diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C index bbc871e6b8..e08ce4d68e 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::write(os); os.writeEntryIfDifferent("p", "p", pName_); os.writeEntryIfDifferent("psi", "thermo:psi", psiName_); - writeEntry("value", os); + fvPatchField::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 ba6b51f3d2..b8243c017b 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::write(os); os.writeEntry("kappaMethod", KMethodTypeNames_[method_]); os.writeEntryIfDifferent("kappa","none", kappaName_); diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C index 83dfb3eb3b..58c9b2147b 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C index 98c1d8258b..eec156bbb6 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index 9f3b22d053..9fb48aa278 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::write(os); os.writeEntry("thetaProperties", thetaProps_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index 77b08137bc..9c11cf8913 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::write(os); os.writeEntry("thetaProperties", thetaProps_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index ca656a739e..1e9619c65e 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::write(os); traction_.writeEntry("traction", os); pressure_.writeEntry("pressure", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C index f0fdb53f43..be853da48b 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::write(os); traction_.writeEntry("traction", os); pressure_.writeEntry("pressure", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C index b58cadd63d..7c1bb0e8d6 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 7db5c443d3..9377eb2e07 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 onto a new patch + //- Construct by mapping given patch field onto a new patch basicSymmetryPointPatchField ( const basicSymmetryPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H index 4571da163f..1ceaba98a4 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 onto a new patch + //- Construct by mapping given patch field onto a new patch calculatedPointPatchField ( const calculatedPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H index 6113b73f32..616743df38 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 onto a new patch + //- Construct by mapping given patch field onto a new patch coupledPointPatchField ( const coupledPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H index f79cc07cd8..ed53c84404 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 onto a new patch + //- Construct by mapping given patch field onto a new patch fixedValuePointPatchField ( const fixedValuePointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C index f9eacfb3be..e47b18e14a 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 +bool Foam::valuePointPatchField::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::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 @@ -164,7 +199,7 @@ template void Foam::valuePointPatchField::write(Ostream& os) const { pointPatchField::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 ee6e119341..f49bce09a0 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, public Field { +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::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 onto a new patch + //- Construct by mapping given patch field onto a new patch valuePointPatchField ( const valuePointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H index 2a9e712375..1026efac17 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 onto a new patch + //- Construct by mapping given patch field onto a new patch zeroGradientPointPatchField ( const zeroGradientPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H index e3c19117c9..f8cccfa7b0 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 onto a new patch + //- Construct by mapping given patch field onto a new patch cyclicPointPatchField ( const cyclicPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H index d24e73e5cf..600fc2080b 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 onto a new patch + //- Construct by mapping given patch field onto a new patch cyclicSlipPointPatchField ( const cyclicSlipPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H index 44e8b0d633..146c79dfdc 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 onto a new patch + //- Construct by mapping given patch field onto a new patch emptyPointPatchField ( const emptyPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H index 08264693c0..982884b84a 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 onto a new patch + //- Construct by mapping given patch field onto a new patch nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H index 6741795e03..ed9f82d669 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 onto a new patch + //- Construct by mapping given patch field onto a new patch processorPointPatchField ( const processorPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H index 50d8243521..b4d5a5396a 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 onto a new patch + //- Construct by mapping given patch field onto a new patch processorCyclicPointPatchField ( const processorCyclicPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H index 5fa3778483..7be7b6ff01 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 onto a new patch + //- Construct by mapping given patch field onto a new patch symmetryPointPatchField ( const symmetryPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H index f25e7c8f06..1422a61320 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 onto a new patch + //- Construct by mapping given patch field onto a new patch symmetryPlanePointPatchField ( const symmetryPlanePointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H index 2b3c1cd2ab..7b2ebc8586 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 onto a new patch + //- Construct by mapping given patch field onto a new patch wedgePointPatchField ( const wedgePointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C index 1b10db1f7e..af6f43bd5a 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::redirectPatchField() const // Make sure to construct the patchfield with up-to-date value OStringStream os; - static_cast&>(*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 69d489e3a1..d4c031350e 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 onto a new patch + //- Construct by mapping given patch field onto a new patch fixedNormalSlipPointPatchField ( const fixedNormalSlipPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H index 9f67b789cc..027cc956ad 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 onto a new patch + //- Construct by mapping given patch field onto a new patch slipPointPatchField ( const slipPointPatchField&, diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H index 32e1ad2d7e..97723a1a94 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 onto a new patch + //- Construct by mapping given patch field onto a new patch pointPatchField ( const pointPatchField&, @@ -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& internalField() - const noexcept - { - return internalField_; - } + //- Return const-reference to the dimensioned internal field + const DimensionedField& internalField() const noexcept + { + return internalField_; + } - //- Return const-reference to the internal field values - const Field& primitiveField() const noexcept - { - return internalField_; - } + //- Return const-reference to the internal field values + const Field& 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&){} - virtual void operator==(const Field&){} - virtual void operator==(const Type&){} + virtual void operator==(const pointPatchField&){} + virtual void operator==(const Field&){} + 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 6570f60134..df8a340977 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("kappa", 0.41, kappa_); os.writeEntryIfDifferent("E", 9.8, E_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index c4af50f5a6..2266a1430a 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::write(os); os.writeEntry("mixingLength", mixingLength_); os.writeEntry("phi", this->phiName_); os.writeEntry("k", kName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index fca946ff5f..084965c11c 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::write(os); os.writeEntry("mixingLength", mixingLength_); os.writeEntry("phi", this->phiName_); os.writeEntry("k", kName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C index f375d61fd9..286eba0bbf 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::write(os); os.writeEntry("tau", tau0_); - writeEntry("value", os); + fvPatchField::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 63d5e27b79..ebe1493312 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::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 b5a6833644..9be86fab62 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::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 35eaa1af8c..7b78f74e81 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 void Foam::kqRWallFunctionFvPatchField::write(Ostream& os) const { zeroGradientFvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::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 1d8f374bcb..f2fec85614 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::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 77ca610cee..4f7e1c3591 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::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 59f42256bc..bc5357d3a4 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::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 76ed241788..4e36e6dac0 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::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 a8eb1c3d2a..5281d8159f 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::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 506d4caee1..af072fe580 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::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 4902ce4c69..0610d97a80 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::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 7f846f29a4..8d9e40ea65 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::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 573edc8bbc..d38f1632c5 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C index aff00e89ba..1c4216ed16 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); atmBoundaryLayer::write(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C index 7fc3d768e3..1590676c7b 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); atmBoundaryLayer::write(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C index 7cc4e9490d..12aff01673 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); atmBoundaryLayer::write(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C index 077a47391b..51eacba6a0 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); atmBoundaryLayer::write(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C index 34c01bdc69..de95132cd0 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::write(os); os.writeEntry("heatSource", heatSourceTypeNames[heatSource_]); os.writeEntry("alphaEff", alphaEffName_); Cp0_->writeData(os); q_->writeData(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C index da7b552fa0..461b3a46c7 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C index 2476dd5cea..8b290036ea 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C index 17161e0424..175f4d3c3a 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::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C index 07cff2cf50..da1a3fd09a 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::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C index 77dae9169f..deaae7c9dc 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::writeValueEntry(os); } diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C index 762eec3204..d5ddca515b 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C index a0964ff720..e6fdb5558d 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::write(os); pa_.writeEntry("pa", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C index 29c9b16a0f..30076a0f3c 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::write(os); + fvPatchField::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 2fd56f1a4a..43ac06e52f 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::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 b999e7f3d0..1ed9211e1b 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 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 2a26313135..f266ca1457 100644 --- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C @@ -211,7 +211,7 @@ template void Foam::calculatedFaPatchField::write(Ostream& os) const { faPatchField::write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H index 725a24812f..e800cb7a0c 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 onto a new patch + //- Construct by mapping given patch field onto a new patch calculatedFaPatchField ( const calculatedFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C index f51167f35c..5a029c1d5c 100644 --- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C @@ -178,7 +178,7 @@ template void Foam::coupledFaPatchField::write(Ostream& os) const { faPatchField::write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H index 45c7969bf9..a7c959c76b 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 - // onto a new patch + //- Construct by mapping the given fixedGradient patch field + //- onto a new patch fixedGradientFaPatchField ( const fixedGradientFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C index 5cc1d79061..9b786c0c8c 100644 --- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C @@ -133,7 +133,7 @@ template void Foam::fixedValueFaPatchField::write(Ostream& os) const { faPatchField::write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H index e363dcbe8a..a0ead76291 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 - // onto a new patch + //- Construct by mapping the given fixedValue patch field + //- onto a new patch fixedValueFaPatchField ( const fixedValueFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C index 72e0d958a8..226a11b02d 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 +bool Foam::mixedFaPatchField::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 Foam::mixedFaPatchField::mixedFaPatchField @@ -217,7 +269,7 @@ void Foam::mixedFaPatchField::write(Ostream& os) const refValue_.writeEntry("refValue", os); refGrad_.writeEntry("refGradient", os); valueFraction_.writeEntry("valueFraction", os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H index 9688abda35..e635690c1f 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 { - // Private data + // Private Data //- Value field Field 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 06bc08d8e9..becbcfcf05 100644 --- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C @@ -265,7 +265,7 @@ template void Foam::slicedFaPatchField::write(Ostream& os) const { faPatchField::write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H index 32f1b350a1..ef83ff9cd8 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 - // onto a new patch + //- Construct by mapping the given sliced patch field + //- onto a new patch slicedFaPatchField ( const slicedFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H index 22af0265ec..cfc991aba1 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 - // onto a new patch + //- Construct by mapping the given transform patch field + //- onto a new patch transformFaPatchField ( const transformFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H index bbb1493097..3a0c3ef6cc 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 - // onto a new patch + //- Construct by mapping the given zeroGradient patch field + //- onto a new patch zeroGradientFaPatchField ( const zeroGradientFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C index d1d340b8d9..d6fb84c4ed 100644 --- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C @@ -167,7 +167,7 @@ template void clampedPlateFaPatchField::write(Ostream& os) const { faPatchField::write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H index ad740c900b..acce423a43 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 + //- 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 1db9e22015..541dd89b0f 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::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 1f73182c1f..e254e255b4 100644 --- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C @@ -133,7 +133,7 @@ template void Foam::fixedValueOutflowFaPatchField::write(Ostream& os) const { faPatchField::write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H index fa22145c57..ffbf7b22ba 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 - // onto a new patch + //- Construct by mapping the given fixedValueOutflow patch field + //- onto a new patch fixedValueOutflowFaPatchField ( const fixedValueOutflowFaPatchField&, diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C index 361d58adb8..cf93fde241 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::write(Ostream& os) const faPatchField::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); this->refValue().writeEntry("inletValue", os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C index 1bba29333b..2abee7d91c 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::write { faPatchField::write(os); timeSeries_.write(os); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C index ff5fc8f317..8f04bb6514 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 +bool Foam::faPatchField::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::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 @@ -49,11 +85,11 @@ Foam::faPatchField::faPatchField ( const faPatch& p, const DimensionedField& iF, - const Field& f + const Field& pfld ) : faPatchFieldBase(p), - Field(f), + Field(pfld), internalField_(iF) {} @@ -61,14 +97,13 @@ Foam::faPatchField::faPatchField template Foam::faPatchField::faPatchField ( - const faPatchField& ptf, const faPatch& p, const DimensionedField& iF, - const faPatchFieldMapper& mapper + Field&& pfld ) : - faPatchFieldBase(ptf, p), - Field(ptf, mapper), + faPatchFieldBase(p), + Field(std::move(pfld)), internalField_(iF) {} @@ -101,6 +136,21 @@ Foam::faPatchField::faPatchField } +template +Foam::faPatchField::faPatchField +( + const faPatchField& ptf, + const faPatch& p, + const DimensionedField& iF, + const faPatchFieldMapper& mapper +) +: + faPatchFieldBase(ptf, p), + Field(ptf, mapper), + internalField_(iF) +{} + + template Foam::faPatchField::faPatchField ( diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H index bc915135c5..fd8196ddfb 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& 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::writeEntry("value", os); + } + public: @@ -259,12 +279,20 @@ public: const DimensionedField& ); - //- Construct from patch and internal field and patch field + //- Construct from patch, internal field and patch field faPatchField ( const faPatch&, const DimensionedField&, - const Field& + const Field& pfld + ); + + //- Construct from patch, internal field and patch field + faPatchField + ( + const faPatch&, + const DimensionedField&, + Field&& 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& internalField() - const noexcept - { - return internalField_; - } + //- Return const-reference to the dimensioned internal field + const DimensionedField& internalField() const noexcept + { + return internalField_; + } - //- Return const-reference to the internal field values - const Field& primitiveField() const noexcept - { - return internalField_; - } + //- Return const-reference to the internal field values + const Field& 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 93e3b6ccf4..d27fa0bfa6 100644 --- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C +++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C @@ -134,7 +134,7 @@ template void Foam::calculatedFaePatchField::write(Ostream& os) const { faePatchField::write(os); - this->writeEntry("value", os); + faePatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H index 3a3e2564e3..f2343d1f3f 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 { - public: //- Runtime type information @@ -81,7 +80,7 @@ public: const dictionary& ); - //- Construct by mapping given patchField onto a new patch + //- Construct by mapping given patch field onto a new patch calculatedFaePatchField ( const calculatedFaePatchField&, @@ -91,10 +90,7 @@ public: ); //- Construct as copy - calculatedFaePatchField - ( - const calculatedFaePatchField& - ); + calculatedFaePatchField(const calculatedFaePatchField&); //- Construct and return a clone virtual tmp> 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 e0e49569f5..0e8f5ef63e 100644 --- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C +++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C @@ -104,7 +104,7 @@ template void Foam::coupledFaePatchField::write(Ostream& os) const { faePatchField::write(os); - this->writeEntry("value", os); + faePatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H index 08630e0a00..a92fb3f175 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 { - public: //- Runtime type information @@ -74,7 +73,7 @@ public: const DimensionedField& ); - //- 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 c1a626036a..0455efdbcf 100644 --- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C +++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C @@ -92,7 +92,7 @@ template void Foam::fixedValueFaePatchField::write(Ostream& os) const { faePatchField::write(os); - this->writeEntry("value", os); + faePatchField::writeValueEntry(os); } diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H index 7d55e6aa05..7d36b4d063 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 { - public: //- Runtime type information @@ -81,8 +80,8 @@ public: const dictionary& ); - //- Construct by mapping the given fixedValueFaePatchField - // onto a new patch + //- Construct by mapping the given fixedValue patch field + //- onto a new patch fixedValueFaePatchField ( const fixedValueFaePatchField&, diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H index 134d1cda39..40caa47ba1 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 - // onto a new patch + //- Construct by mapping the given sliced patch field onto a new patch slicedFaePatchField ( const slicedFaePatchField&, diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H index 6034bad11f..180033d5e7 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&, - 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 f92bcd0b4e..03b86c0cda 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 { - 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 2bf557d703..d39e63eb25 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::processorFaePatchField {} -// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // - -template -Foam::processorFaePatchField::~processorFaePatchField() -{} - - // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H index 3b6c5f8585..c8f9e6441f 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 { - // 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 9c2ef73e2a..ff0d676a29 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 { - 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 12f943a652..017e642643 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 { - public: //- Runtime type information diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C index d45518577a..26cfa178c9 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 +bool Foam::faePatchField::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::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 @@ -49,11 +84,11 @@ Foam::faePatchField::faePatchField ( const faPatch& p, const DimensionedField& iF, - const Field& f + const Field& pfld ) : faePatchFieldBase(p), - Field(f), + Field(pfld), internalField_(iF) {} @@ -61,14 +96,13 @@ Foam::faePatchField::faePatchField template Foam::faePatchField::faePatchField ( - const faePatchField& ptf, const faPatch& p, const DimensionedField& iF, - const faPatchFieldMapper& mapper + Field&& pfld ) : - faePatchFieldBase(ptf, p), - Field(ptf, mapper), + faePatchFieldBase(p), + Field(std::move(pfld)), internalField_(iF) {} @@ -98,6 +132,21 @@ Foam::faePatchField::faePatchField } +template +Foam::faePatchField::faePatchField +( + const faePatchField& ptf, + const faPatch& p, + const DimensionedField& iF, + const faPatchFieldMapper& mapper +) +: + faePatchFieldBase(ptf, p), + Field(ptf, mapper), + internalField_(iF) +{} + + template Foam::faePatchField::faePatchField ( diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H index 720a4f00e5..d4b73f5b13 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& 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::writeEntry("value", os); + } + public: @@ -223,12 +242,20 @@ public: const DimensionedField& ); - //- Construct from patch and internal field and patch field + //- Construct from patch, internal field and patch field faePatchField ( const faPatch&, const DimensionedField&, - const Field& + const Field& pfld + ); + + //- Construct from patch, internal field and patch field + faePatchField + ( + const faPatch&, + const DimensionedField&, + Field&& 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& internalField() - const noexcept - { - return internalField_; - } + //- Return const-reference to the dimensioned internal field + const DimensionedField& internalField() const noexcept + { + return internalField_; + } - //- Return const-reference to the internal field values - const Field& primitiveField() const noexcept - { - return internalField_; - } + //- Return const-reference to the internal field values + const Field& 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 2293143980..bdd1de4779 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::write(os); os.writeEntry("relative", relative_); os.writeEntry("UInf", UInf_); os.writeEntry("phi", this->phiName_); - writeEntry("value", os); + fvPatchField::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 d9fd52e7d9..a39dd2e622 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::write(os); os.writeEntry("relative", relative_); inletValue_.writeEntry("inletValue", os); - writeEntry("value", os); + fvPatchField::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 649c6d15d1..4ac7e6d14e 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C index 6551b09b7a..1fdce54c39 100644 --- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C +++ b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C @@ -240,7 +240,7 @@ void Foam::exprValuePointPatchField::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 520c50d258..f9ecc13974 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C @@ -220,7 +220,7 @@ template void Foam::calculatedFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H index 8bda1044d5..075edc9345 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 onto a new patch + //- Construct by mapping given patch field onto a new patch calculatedFvPatchField ( const calculatedFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C index 9af6d0d988..c68079214a 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C @@ -213,7 +213,7 @@ template void Foam::coupledFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C index 51fc8fd9e8..1f23f5acc6 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::write(Ostream& os) const refValue_.writeEntry("refValue", os); refGrad_.writeEntry("refGradient", os); valueFraction_.writeEntry("valueFraction", os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H index 346fc3def6..3429c1bbf4 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 onto a new patch + //- Construct by mapping given patch field onto a new patch extrapolatedCalculatedFvPatchField ( const extrapolatedCalculatedFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C index e2ca03ba1f..f022f059db 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C @@ -156,7 +156,7 @@ template void Foam::fixedValueFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H index e192bfba74..13f7092153 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 - // onto a new patch + //- Construct by mapping the given fixedValue patch field + //- onto a new patch fixedValueFvPatchField ( const fixedValueFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C index a1ec7e3b99..3aa783d5b6 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 +bool Foam::mixedFvPatchField::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 Foam::mixedFvPatchField::mixedFvPatchField @@ -239,7 +291,7 @@ void Foam::mixedFvPatchField::write(Ostream& os) const refGrad_.writeEntry("refGradient", os); valueFraction_.writeEntry("valueFraction", os); source_.writeEntry("source", os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H index deec0f77d9..3181d45b9c 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 { - // Private data + // Private Data //- Value field Field refValue_; @@ -104,6 +104,21 @@ class mixedFvPatchField Field 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 f444464af0..d886c4d8d3 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C @@ -265,7 +265,7 @@ template void Foam::slicedFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H index 8d1d515251..21ffe3bf11 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 - // onto a new patch + //- Construct by mapping the given sliced patch field onto a new patch slicedFvPatchField ( const slicedFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H index 53766157f8..4bb2e5016f 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 - // onto a new patch + //- Construct by mapping the given transform patch field + //- onto a new patch transformFvPatchField ( const transformFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H index 19902ae54b..05cc20e4b5 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 - // onto a new patch + //- Construct by mapping the given zeroGradient patch field + //- onto a new patch zeroGradientFvPatchField ( const zeroGradientFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C index b796999044..80ffb25e5c 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C @@ -459,7 +459,7 @@ template void Foam::cyclicACMIFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C index 61a7e49820..462335d418 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C @@ -439,7 +439,7 @@ template void Foam::cyclicAMIFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C index 9ebb26fbd5..cdad8bd4bd 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::write(Ostream& os) const { fvPatchField::write(os); os.writeEntry("advectiveSpeed", advectiveU_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C index ade392b016..c894f8d5af 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::write(os); os.writeEntryIfDifferent("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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C index e8148719a0..275cd38151 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::write(os); os.writeEntryIfDifferent("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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index c3ff10de38..7090d4f49d 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::write(Ostream& os) const os.writeEntry("lInf", lInf_); } - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C index 0ad7d09639..e247e42d98 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::redirectPatchField() const // Make sure to construct the patchfield with up-to-date value OStringStream os; - static_cast&>(*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 b946c66c7d..cc824309b6 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C index c9718a9d7a..3a7ccee838 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::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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C index de5afa2c80..c50dea362f 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H index 8ab8a2be5d..d36397c073 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 - // onto a new patch + //- Construct by mapping the given fixedInternalValue patch field + //- onto a new patch fixedInternalValueFvPatchField ( const fixedInternalValueFvPatchField&, diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C index 3c4c046598..0f38fdc737 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::write(Ostream& os) const os.writeEntry("minJump", minJump_); } - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C index f818753a31..b34710df2f 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::write(Ostream& os) const jump_.writeEntry("jump", os); } - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C index 283d7cfb9e..d6d8a6eb24 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::write(Ostream& os) const { fvPatchField::write(os); meanValue_->writeData(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C index 8157fe7bd8..98b4a3af5b 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::write(Ostream& os) const { fvPatchField::write(os); meanValue_->writeData(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C index 4e559b0ca4..bb58e32123 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntry("fixTangentialInflow", fixTangentialInflow_); @@ -191,7 +191,7 @@ const normalVelocity_->write(os); os.endBlock(); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C index f4abae24a6..557ffce494 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::write(Ostream& os) const if (writeValue_) { os.writeEntry("writeValue", "true"); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C index 26166054f1..bf7f79e066 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::write(os); os.writeEntryIfDifferent("p", "p", pName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C index 8cdf7aa347..d9237a2403 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::write(Ostream& os) const profile_->writeData(os); os.writeEntry("direction", dir_); os.writeEntry("origin", origin_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index d2b3751b96..60e974ab55 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C index a1edea1a77..a13f174803 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("rho", "rho", rhoName_); os.writeEntryIfDifferent("rhoOutlet", -VGREAT, rhoOutlet_); } - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C index b3909cc88f..fd02bf04bc 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C index d90bd730a6..437e18eadf 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::write(Ostream& os) const { freestreamValue().writeEntry("freestreamValue", os); } - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C index 84042e179f..148b18ad74 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); freestreamValue().writeEntry("freestreamValue", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C index 4302bd4781..7953ad230d 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::write(os); freestreamValue().writeEntry("freestreamValue", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C index 9d7ba73865..cce6c7b6af 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::write(Ostream& os) const fvPatchField::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); this->refValue().writeEntry("inletValue", os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C index 173f3829ce..84198f6e2e 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", this->phiName_); os.writeEntryIfDifferent("psi", "psi", psiName_); os.writeEntry("gamma", gamma_); T0_.writeEntry("T0", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C index dee4c053b8..4bffab315d 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C index 3a6d2f7f0f..ddf69cd2dd 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::write(os); os.writeEntryIfDifferent("alpha", "alpha", alphaName_); inletVelocity_.writeEntry("inletVelocity", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C index 21ad7cdc0a..cd3da65504 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::write(Ostream& os) const fvPatchField::write(os); mappedPatchBase::write(os); mappedPatchFieldBase::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C index b3bbd452ce..ec190df0f1 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::write(Ostream& os) const { fvPatchField::write(os); mappedPatchFieldBase::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C index f0b9e4144b..da5c416101 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("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); os.writeEntry("nbrPhi", nbrPhiName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C index f0643e915b..973d696f24 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C index bd3c912d46..e1806f21b7 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("rho", "rho", rhoName_); } - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index e6a90deaab..f4fabe7729 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C index 5c236bdfef..039c126276 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::write(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C index c1fef7c612..8c621154a3 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::write(Ostream& os) const fvPatchField::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); this->refValue().writeEntry("outletValue", os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C index 7838e12c3f..32ea26c9fa 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::write(Ostream& os) const os.endBlock(); os.writeEntryIfDifferent("phi", "phi", phiName_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C index 64dc0e549c..7f92fff288 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C index 0c7141fc13..7f26c14fa9 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::write(Ostream& os) const if (writeValue_) { os.writeEntry("writeValue", "true"); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C index a5e0af6171..1b6a532d22 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::write(os); os.writeEntryIfDifferent("phaseFraction", "alpha", phaseFraction_); os.writeEntry("rho", rho_); os.writeEntry("pRefValue", pRefValue_); os.writeEntry("pRefPoint", pRefPoint_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C index 321a85d299..67de38f255 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::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("timeScale", 0.0, timeScale_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("U", "U", UName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 80429a5830..4f1f1b5a4e 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); inletDir_.writeEntry("inletDirection", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index c0ef598984..ffe06dfa7e 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); inletDir_.writeEntry("inletDirection", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index 34f089687f..6676732f48 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C index a30aa581c5..94d7392f31 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); if (tangentialVelocity_.size()) { tangentialVelocity_.writeEntry("tangentialVelocity", os); } - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index 629aad6f38..720c1b57d5 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 7a0a8bfd74..4b316b0e67 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::write(os); os.writeEntry("phi", phiName_); os.writeEntry("rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C index a93495d6fb..46e5bce753 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C index ddb0204626..5bfce07557 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); os.writeEntryIfDifferent("alpha", "none", alphaName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C index 16ef1a9e75..9baf21bbba 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::write(os); os.writeEntryIfDifferent("rho", "rho", rhoName_); p_.writeEntry("p", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C index 424839342c..53fa406082 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); os.writeEntryIfDifferent("ph_rgh", "ph_rgh", ph_rghName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C index 42dfb9c088..41fe07eee8 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); p0_.writeEntry("p0", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C index 512d5dbd64..b583ffed98 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::write(os); os.writeEntry("phi", phiName()); omega_->writeData(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C index 9a8aad29f2..91dfeebc25 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::write(os); os.writeEntry("origin", origin_); os.writeEntry("axis", axis_); omega_->writeData(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C index 923582b389..7c62b6b298 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::write(os); os.writeEntryIfDifferent("T", "T", TName_); os.writeEntryIfDifferent("p", "p", pName_); os.writeEntryIfDifferent("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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C index 2d700f99e5..15208df805 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::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 843068589b..b4e4a38435 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C index 1bd5718888..d3957f09ae 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index ec63722e69..f484255a08 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::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("phi", "phi", phiName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C index e014c44d80..184252a32c 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::write { fvPatchField::write(os); uniformValue_->writeData(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C index f6daed7a87..b3bcd97273 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntry("rho", rhoName_); os.writeEntry("psi", psiName_); os.writeEntry("gamma", gamma_); p0_.writeEntry("p0", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C index 79c18cc670..b6ad51dd07 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("psi", "thermo:psi", psiName_); os.writeEntry("gamma", gamma_); T0_.writeEntry("T0", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C index 6e5e2dfc5c..8071d987a0 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::write(os); U_->writeData(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C index 1e7508dc47..3f82557b9e 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::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C index 80331851cb..f947bfb24f 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::write } L_.write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C index 996575e5e2..8b12da4d1b 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::write(Ostream& os) const os.writeEntry("fluctuationScale", fluctuationScale_); referenceField_.writeEntry("referenceField", os); os.writeEntry("alpha", alpha_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C index d4c054908c..453e96a5f2 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::write(os); os.writeEntry("intensity", intensity_); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", this->phiName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C index 54141fdc76..f691d7252f 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::write(os); os.writeEntry("rho", rho_); os.writeEntry("pRefValue", pRefValue_); os.writeEntry("pRefPoint", pRefPoint_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C index d9d53982c3..f57aa6488c 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::write(Ostream& os) const { fixedGradientFvPatchField::write(os); uniformGradient_->writeData(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C index 4b8f236dc3..106737b8e7 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::write(Ostream& os) const { fvPatchField::write(os); uniformValue_->writeData(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C index 1a40889aca..d981820e78 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::write(Ostream& os) const fvPatchField::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); this->uniformInletValue_->writeData(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C index 4bede8adaa..0125ba01b7 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::write(os); uniformValue_->writeData(os); if (ramp_) { ramp_->writeData(os); } - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C index f9a64f8722..1ebfba5288 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::write(os); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntry("rho", rhoName_); os.writeEntry("psi", psiName_); os.writeEntry("gamma", gamma_); p0_->writeData(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C index 1ee1eec1c6..308999acab 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntry("lowerBound", lowerBound_); os.writeEntry("upperBound", upperBound_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C index 94b3a2522e..7318a394af 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::write(os); flowRate_->writeData(os); os.writeEntry("alpha", alphaName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index 0be57ad252..0eb44f87fa 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("zeta", "zeta", zetaName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C index aede4cebf4..3afc210796 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::write(Ostream& os) const os.writeEntry("lInf", this->lInf_); } - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index f2a7c4133f..d8d50701e8 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 +bool Foam::fvPatchField::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::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 @@ -47,6 +82,20 @@ Foam::fvPatchField::fvPatchField {} +template +Foam::fvPatchField::fvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const word& patchType +) +: + fvPatchFieldBase(p, patchType), + Field(p.size()), + internalField_(iF) +{} + + template Foam::fvPatchField::fvPatchField ( @@ -66,11 +115,11 @@ Foam::fvPatchField::fvPatchField ( const fvPatch& p, const DimensionedField& iF, - const word& patchType + const Field& pfld ) : - fvPatchFieldBase(p, patchType), - Field(p.size()), + fvPatchFieldBase(p), + Field(pfld), internalField_(iF) {} @@ -80,11 +129,11 @@ Foam::fvPatchField::fvPatchField ( const fvPatch& p, const DimensionedField& iF, - const Field& f + Field&& pfld ) : fvPatchFieldBase(p), - Field(f), + Field(std::move(pfld)), internalField_(iF) {} diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index 84d1e333cb..3d23bc0a2c 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& 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::writeEntry("value", os); + } + public: @@ -295,6 +314,14 @@ public: const DimensionedField& ); + //- Construct from patch, internal field and patch type + fvPatchField + ( + const fvPatch&, + const DimensionedField&, + 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&, - const word& patchType + const Field& pfld ); - //- Construct from patch and internal field and patch field + //- Construct from patch, internal field and patch field fvPatchField ( const fvPatch&, const DimensionedField&, - const Field& + Field&& 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& internalField() - const noexcept - { - return internalField_; - } + //- Return const-reference to the dimensioned internal field + const DimensionedField& internalField() const noexcept + { + return internalField_; + } - //- Return const-reference to the internal field values - const Field& primitiveField() const noexcept - { - return internalField_; - } + //- Return const-reference to the internal field values + const Field& 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 fac044a301..838f03b2ff 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 onto a new patch + //- Construct by mapping given patch field onto a new patch calculatedFvsPatchField ( const calculatedFvsPatchField&, diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H index 15da665a62..6d3d19f7e3 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 - // onto a new patch + //- Construct by mapping the given fixedValue patch field + //- onto a new patch fixedValueFvsPatchField ( const fixedValueFvsPatchField&, diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H index 1f185b83f4..d5ce648c96 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 - // onto a new patch + //- Construct by mapping the given sliced patch field onto a new patch slicedFvsPatchField ( const slicedFvsPatchField&, diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C index c88be8b532..8997ac61fc 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 +bool Foam::fvsPatchField::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::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 @@ -52,11 +87,11 @@ Foam::fvsPatchField::fvsPatchField ( const fvPatch& p, const DimensionedField& iF, - const Field& f + const Field& pfld ) : fvsPatchFieldBase(p), - Field(f), + Field(pfld), internalField_(iF) {} @@ -64,14 +99,13 @@ Foam::fvsPatchField::fvsPatchField template Foam::fvsPatchField::fvsPatchField ( - const fvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + Field&& pfld ) : - fvsPatchFieldBase(ptf, p), - Field(ptf, mapper), + fvsPatchFieldBase(p), + Field(std::move(pfld)), internalField_(iF) {} @@ -108,6 +142,21 @@ Foam::fvsPatchField::fvsPatchField } +template +Foam::fvsPatchField::fvsPatchField +( + const fvsPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fvsPatchFieldBase(ptf, p), + Field(ptf, mapper), + internalField_(iF) +{} + + template Foam::fvsPatchField::fvsPatchField(const fvsPatchField& ptf) : @@ -161,7 +210,7 @@ template void Foam::fvsPatchField::write(Ostream& os) const { os.writeEntry("type", type()); - this->writeEntry("value", os); + Field::writeEntry("value", os); } diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H index 3ee2f1dc26..1eb422705a 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& 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::writeEntry("value", os); + } + public: @@ -217,12 +237,20 @@ public: const DimensionedField& ); - //- Construct from patch and internal field and patch field + //- Construct from patch, internal field and patch field fvsPatchField ( const fvPatch&, const DimensionedField&, - const Field& + const Field& pfld + ); + + //- Construct from patch, internal field and patch field + fvsPatchField + ( + const fvPatch&, + const DimensionedField&, + Field&& 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& internalField() - const noexcept - { - return internalField_; - } + //- Return const-reference to the dimensioned internal field + const DimensionedField& internalField() + const noexcept + { + return internalField_; + } - //- Return const-reference to the internal field values - const Field& primitiveField() const noexcept - { - return internalField_; - } + //- Return const-reference to the internal field values + const Field& 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 2e76dd66e9..a359d8fe66 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C +++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C @@ -126,7 +126,7 @@ template void Foam::cellMotionFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } // ************************************************************************* // diff --git a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H index 08dcc13a09..b94b01d537 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H +++ b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H @@ -143,7 +143,7 @@ public: { slipFvPatchField::write(os); // Only so we can easily postprocess. - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } }; diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C index 5150f706f0..7ff26948cb 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 8c9224a49b..fe7841d377 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 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 ccde191494..792daffdcf 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 f1a7ae4a29..b73fab2a6d 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 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 f4af033961..ddf65df7fb 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::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 34ae75cc68..f77cec2353 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 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 a2a9fa10f5..aca3b49f05 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 8985f06dc8..bacd84bc1e 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 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 3d24412823..92c499d624 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::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 3114eb82e5..0c39ddc7d2 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 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 645313a746..8d6b096d59 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::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 6020c47d3b..2a46c18454 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 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 b22f5e8d05..8bdfdd3ef7 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C @@ -261,7 +261,7 @@ const pointPatchField::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 f261d3db46..e8105cd39d 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 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 bfdb5643ff..ba83666650 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 8536c06917..284ad8e84c 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 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 00bfded5d7..88bc831f56 100644 --- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C +++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C @@ -108,7 +108,7 @@ void Foam::genericFaPatchField::write(Ostream& os) const { // Handle "value" separately genericPatchFieldBase::writeGeneric(os, true); - this->writeEntry("value", os); + faPatchField::writeValueEntry(os); } diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H index fece0812da..7ad03942e7 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 onto a new patch + //- Construct by mapping given patch field onto a new patch genericFaPatchField ( const genericFaPatchField&, diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C index 0f72c34600..122e534d31 100644 --- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C +++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C @@ -108,7 +108,7 @@ void Foam::genericFvPatchField::write(Ostream& os) const { // Handle "value" separately genericPatchFieldBase::writeGeneric(os, true); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H index 7c527fe050..f74273dcee 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 onto a new patch + //- Construct by mapping given patch field onto a new patch genericFvPatchField ( const genericFvPatchField&, diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C index a982f110cd..fbf1504573 100644 --- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C +++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C @@ -108,7 +108,7 @@ void Foam::genericFvsPatchField::write(Ostream& os) const { // Handle "value" separately genericPatchFieldBase::writeGeneric(os, true); - this->writeEntry("value", os); + fvsPatchField::writeValueEntry(os); } diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H index 3fe2a26c57..0447dd9971 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 onto a new patch + //- Construct by mapping given patch field onto a new patch genericFvsPatchField ( const genericFvsPatchField&, diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H index 59b3be11f4..f772014971 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 onto a new patch + //- Construct by mapping given patch field onto a new patch genericPointPatchField ( const genericPointPatchField&, diff --git a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C index c239481f9e..b2fad27088 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 26e7997b05..0afd14f059 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 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 e9051ae8e8..8b52d2d10e 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 onto a new patch + //- Construct by mapping given patch field onto a new patch zeroFixedValuePointPatchField ( const zeroFixedValuePointPatchField&, diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H index 0c4017cd8d..fa2d54f387 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 onto a new patch + //- Construct by mapping given patch field onto a new patch cyclicACMIPointPatchField ( const cyclicACMIPointPatchField&, diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H index d3237db8e5..78a8148c09 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 onto a new patch + //- Construct by mapping given patch field onto a new patch cyclicAMIPointPatchField ( const cyclicAMIPointPatchField&, diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H index 6d43549b71..cdf99837c4 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 onto a new patch + //- Construct by mapping given patch field onto a new patch uniformFixedValuePointPatchField ( const uniformFixedValuePointPatchField&, diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C index aad795f2a9..c4dea30df3 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C index 88de315419..71e56b5359 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C index a5e71cb4c3..869b4c9dec 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C index b4f5015493..0e80d181e2 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C index 4d3f2fce75..49adb64b19 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C index 8b70903941..dd385480e3 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C index c26a7b863a..2ee1f2a848 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::write(os); os.writeEntry("kappa", kappa_); os.writeEntry("E", E_); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C index 606eb24625..fb54a88b1a 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 edbdc4b09c..13340dc1b6 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 85675f0e35..35d9034a0c 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 1bd84898be..b51d8be812 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 a3d75d2fcc..72145995d1 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> adjointInletNuaTildaFvPatchScalarField::valueBoundaryCoeffs void adjointInletNuaTildaFvPatchScalarField::write(Ostream& os) const { - fvPatchScalarField::write(os); - writeEntry("value", os); + fvPatchField::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 2ef57ef0c0..1f296db56b 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 void Foam::adjointOutletFluxFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); + fvPatchField::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 8a0aefde32..dbbfac5451 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 ef16a37865..32cc4f76c9 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 f66e1972e7..2382fa4e17 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::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 e920a5d26b..68fab059d3 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::write(os); os.writeEntry("solverName", adjointSolverName_); + fvPatchField::writeValueEntry(os); } diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index b1b8750625..2c0e2f98bf 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::write(os); os.writeEntry("thetaProperties", thetaProps_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C index a57d9ebf09..166a9a9e0e 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::write(os); os.writeEntry("kabs", kabs_); os.writeEntry("max", max_); os.writeEntryIfDifferent("kdes", scalar(0), kdes_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index 8e065b876a..910ccf5abf 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::write(os); os.writeEntry("thetaProperties", thetaProps_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C index 6e37273ea0..2ec483d3e8 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::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C index b7cc56fcaa..90cf5c7570 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::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C index e15a790684..dae81c48d9 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::write(os); dmdt_.writeEntry("dmdt", os); mDotL_.writeEntry("mDotL", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 6e449c5080..c405a54f1a 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::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C index d6d88cae2e..147842955d 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::write(os); os.writeEntry("sourceFieldName", sourceFieldName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C index 580c3e9cfc..cce56b32a4 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::write(os); os.writeEntry("relax", relax_); q_.writeEntry("q", os); - writeEntry("value", os); + fvPatchField::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 f2d159e07d..a1d4580da7 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::write(os); os.writeEntry("specularityCoefficient", specularityCoefficient_); - writeEntry("value", os); + fvPatchField::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 85f52e183b..d46037600c 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::write(os); os.writeEntry("restitutionCoefficient", restitutionCoefficient_); os.writeEntry("specularityCoefficient", specularityCoefficient_); - writeEntry("value", os); + fvPatchField::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 03d3a85cbe..84d56ae636 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::write(os); os.writeEntry("specularityCoefficient", specularityCoefficient_); - writeEntry("value", os); + fvPatchField::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 6d2663a470..6947267135 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::write(os); os.writeEntry("restitutionCoefficient", restitutionCoefficient_); os.writeEntry("specularityCoefficient", specularityCoefficient_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C index 9270915c13..0f26223b0f 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::write(os); os.writeEntryIfDifferent ( "filmRegion", diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C index 6c88b5302c..fb60eb8235 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::write(os); os.writeEntryIfDifferent ( "filmRegion", @@ -202,7 +202,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write ); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C index 549b41fd52..8847b50a72 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::write(os); os.writeEntryIfDifferent ( "filmRegion", @@ -227,7 +227,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write ); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C index 651f1349e0..0ecc19035a 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::write(os); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); os.writeEntryIfDifferent("deltaf", "deltaf", deltafName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C index dca945f905..d8c0c9436d 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::write(os); + os.writeEntryIfDifferent ( "filmRegion", @@ -204,7 +205,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write GammaMean_->writeData(os); a_->writeData(os); omega_->writeData(os); - writeEntry("value", os); + + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C index 5bd9ea6a50..0833e9e46f 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::write(os); + os.writeEntryIfDifferent ( "filmRegion", @@ -203,7 +204,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write GammaMean_->writeData(os); a_->writeData(os); omega_->writeData(os); - writeEntry("value", os); + + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C index 2d326128ec..b0e370a718 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("Cmu", 0.09, Cmu_); os.writeEntryIfDifferent("kappa", 0.41, kappa_); os.writeEntryIfDifferent("Prt", 0.85, Prt_); - writeEntry("value", os); + + fvPatchField::writeValueEntry(os); } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C index 286d932162..63661a0c4a 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::writeValueEntry(os); } diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C index 3c6da0ce0c..e804362b8b 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 06947e016d..e67f00ff6a 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 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 52073798fe..df6763d435 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::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 339040f8fa..9bc259d00e 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 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 519776723a..51d9c4d2d0 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::write(os); os.writeEntry("L", L_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index 26aa93d2ec..90fc37d1e2 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::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::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C index 90899164ac..16e7f55cd5 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::write(os); temperatureCoupledBase::write(os); qrIncident_.writeEntry("qrIncident", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C index 668940de76..2661d4ba2e 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::write(os); os.writeEntryIfDifferent("p", "p", pName_); os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("rho", "rho", rhoName_); diff --git a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C index f34d171eae..2d1ecc121c 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::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 49d6b0ce93..8c17484d03 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::write(os); os.writeEntry("pBack", pBack_); os.writeEntryIfDifferent("c1", 0, c1_); os.writeEntryIfDifferent("A1", 0, A1_); @@ -256,7 +256,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::write(Ostream& os) const os.writeEntryIfDifferent("U", "U", UName_); os.writeEntryIfDifferent("M", 0, M_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C index ac72f78aec..5e7b8daa3a 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::write(os); os.writeEntry("outletPatch", outletPatchName_); os.writeEntryIfDifferent("phi", "phi", phiName_); os.writeEntry("Q", Q_); os.writeEntry("TMin", TMin_); os.writeEntry("TMax", TMax_); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C index e27c587628..d9d00a8bd3 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::write(os); mappedPatchBase::write(os); os.writeEntryIfDifferent("c", 0, c_); os.writeEntryIfDifferent("phi", "phi", phiName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C index 1af5600c2a..579989b7f1 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::write(os); os.writeEntryIfDifferent("rho", "rho", rhoName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index 8ce9d2e6ef..053d10cf06 100644 --- a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -428,7 +428,7 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() template void thermalBaffle1DFvPatchScalarField::write(Ostream& os) const { - mixedFvPatchScalarField::write(os); + mixedFvPatchField::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 d3a6193123..c898f212d2 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::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index e1b836fb11..cba676c86c 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::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 5dc9ad16eb..ad59b17622 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::write(os); //os.writeEntry("Tnbr", TnbrName_); os.writeEntryIfDifferent("Tnbr", "T", TnbrName_); diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index afd5c6d0ad..f0f4c23109 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("Prt", 0.85, Prt_); os.writeEntryIfDifferent("kappa", 0.41, kappa_); os.writeEntryIfDifferent("E", 9.8, E_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index 2e24370be4..6849f44a1f 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::write(os); os.writeEntryIfDifferent("Prt", 0.85, Prt_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C index d289f63444..0c5a302f14 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::write(os); writeLocalEntries(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C index fb8df7ace9..0dd64ccb0e 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::write(os); Tinf_.writeEntry("Tinf", os); alphaWall_.writeEntry("alphaWall", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C index 50952eb0e3..8f3f0de5ac 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::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C index 0ff842683a..4e85bb0a00 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::write(os); - this->writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C index 75192df266..6d1a541014 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::write(os); + fvPatchField::writeValueEntry(os); } diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C index 27f4bea985..7fce1ae957 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::write(os); os.writeEntryIfDifferent("T", "T", TName_); } diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C index 53a3e74fbf..6cd7f1e5e8 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::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 b97fffa818..3257b4de80 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::write(os); os.writeEntryIfDifferent("T", "T", TName_); os.writeEntryIfDifferent("qRadExt", Zero, qRadExt_); os.writeEntryIfDifferent("qRadExtDir", Zero, qRadExtDir_); diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C index 614bb8b573..f0548c186a 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::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 a0d90058d5..9ead8ee5c8 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::write(os); } diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C index 7cc73bc526..8762e82676 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::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::writeValueEntry(os); } diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C index 7b1f9c7cd0..68eb91f02d 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::write(os); os.writeEntry ( @@ -440,7 +440,7 @@ void Foam::speciesSorptionFvPatchScalarField::write(Ostream& os) const mass_.writeEntry("mass", os); os.writeEntryIfDifferent("p", "p", pName_); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C index 9a8e306c78..580b4e7310 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::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 473f4acc95..7e1c16b502 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::writeValueEntry(os); } diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C index 0997a7cd49..7f61ba30b0 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::writeValueEntry(os); } diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C index b748264df6..1b46c9c63d 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("T", "T", TName_); theta0_->writeData(os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C index e83e93461b..e0344b0b86 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::writeValueEntry(os); } diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C index a0aa069ae1..55709d97ef 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::write(os); p_.writeEntry("p", os); - writeEntry("value", os); + fvPatchField::writeValueEntry(os); } diff --git a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C index 257ad4f852..a974fe80b5 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::writeValueEntry(os); } diff --git a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C index 66b6b9d6a0..ec40b89819 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::writeValueEntry(os); } diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C index 481d88d98f..be8cbfb7c3 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 8ccff2d454..e71e9044ef 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 onto a new patch + //- Construct by mapping given patch field onto a new patch waveMakerPointPatchVectorField ( const waveMakerPointPatchVectorField&,