From c0ba7bf05ac7503c418b9c424caeb3809c31133f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Nov 2017 00:49:24 +0100
Subject: [PATCH] STYLE: use Ostream writeEntry when writing key/value entries
- makes for clearer code
ENH: make writeIfDifferent part of Ostream
---
.../T/smoluchowskiJumpTFvPatchScalarField.C | 14 +++--
.../BCs/U/maxwellSlipUFvPatchVectorField.C | 20 ++++----
.../BCs/rho/fixedRhoFvPatchScalarField.C | 4 +-
.../alphaContactAngleFvPatchScalarField.C | 3 +-
.../alphaContactAngleFvPatchScalarField.C | 3 +-
.../alphaContactAngleFvPatchScalarField.C | 3 +-
.../alphaContactAngleFvPatchScalarField.C | 3 +-
...allBoilingWallFunctionFvPatchScalarField.C | 6 +--
...ayatillekeWallFunctionFvPatchScalarField.C | 8 +--
...allBoilingWallFunctionFvPatchScalarField.C | 30 +++++------
.../copiedFixedValueFvPatchScalarField.C | 3 +-
...ixedMultiPhaseHeatFluxFvPatchScalarField.C | 2 +-
.../KocamustafaogullariIshii.C | 2 +-
.../TolubinskiKostanchuk.C | 6 +--
.../departureDiameterModel.C | 2 +-
.../departureFrequencyModel.C | 2 +-
.../nucleationSiteModel/nucleationSiteModel.C | 2 +-
.../Lavieville/Lavieville.C | 2 +-
.../partitioningModels/cosine/cosine.C | 6 +--
.../partitioningModels/linear/linear.C | 6 +--
.../partitioningModel/partitioningModel.C | 2 +-
...sonJacksonParticleSlipFvPatchVectorField.C | 3 +-
...onJacksonParticleThetaFvPatchScalarField.C | 6 +--
...sonJacksonParticleSlipFvPatchVectorField.C | 3 +-
...onJacksonParticleThetaFvPatchScalarField.C | 6 +--
etc/codeTemplates/BC/BC.C | 6 +--
src/OSspecific/POSIX/cpuInfo/cpuInfo.C | 26 +++-------
src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H | 22 +++++++-
src/OpenFOAM/fields/Fields/Field/Field.C | 5 +-
.../UniformDimensionedField.C | 6 +--
.../codedFixedValuePointPatchField.C | 6 +--
.../fixedNormalSlipPointPatchField.C | 3 +-
.../pointPatchField/pointPatchField.C | 22 +-------
.../pointPatchField/pointPatchField.H | 11 ----
.../global/profiling/profilingInformation.C | 10 +---
.../interpolationLookUpTable.C | 10 ++--
.../tableReaders/csv/csvTableReader.C | 13 ++---
.../tableReaders/tableReader.C | 5 +-
.../basic/generic/genericPolyPatch.C | 6 +--
.../constraint/cyclic/cyclicPolyPatch.C | 12 ++---
.../constraint/oldCyclic/oldCyclicPolyPatch.C | 18 +++----
.../constraint/processor/processorPolyPatch.C | 6 +--
.../processorCyclicPolyPatch.C | 9 +---
.../polyPatches/polyPatch/polyPatch.C | 6 +--
.../functions/Function1/Scale/Scale.C | 8 +--
.../functions/Function1/Table/TableBase.C | 25 ++++-----
.../functions/Function1/ramp/ramp.C | 12 +++--
...convectiveHeatTransferFvPatchScalarField.C | 2 +-
...pedMassWallTemperatureFvPatchScalarField.C | 5 +-
...ppedUniformInletHeatAdditionFvPatchField.C | 11 ++--
.../thermalBaffle1DFvPatchScalarField.C | 5 +-
...RateAdvectiveDiffusiveFvPatchScalarField.C | 7 ++-
...tureCoupledBaffleMixedFvPatchScalarField.C | 3 +-
...eratureRadCoupledMixedFvPatchScalarField.C | 9 ++--
...ayatillekeWallFunctionFvPatchScalarField.C | 8 +--
.../alphatWallFunctionFvPatchScalarField.C | 2 +-
...ayatillekeWallFunctionFvPatchScalarField.C | 8 +--
.../atmBoundaryLayer/atmBoundaryLayer.C | 18 +++----
...thDissipationRateInletFvPatchScalarField.C | 7 ++-
...ngLengthFrequencyInletFvPatchScalarField.C | 7 ++-
.../fixedShearStressFvPatchVectorField.C | 2 +-
.../porousBafflePressureFvPatchField.C | 9 ++--
.../epsilonWallFunctionFvPatchScalarField.C | 6 +--
.../fWallFunctionFvPatchScalarField.C | 6 +--
.../kLowReWallFunctionFvPatchScalarField.C | 8 +--
.../nutURoughWallFunctionFvPatchScalarField.C | 9 ++--
...UTabulatedWallFunctionFvPatchScalarField.C | 3 +-
.../nutWallFunctionFvPatchScalarField.C | 6 +--
.../omegaWallFunctionFvPatchScalarField.C | 10 ++--
.../v2WallFunctionFvPatchScalarField.C | 6 +--
src/dynamicMesh/attachDetach/attachDetach.C | 28 +++++-----
src/dynamicMesh/boundaryPatch/boundaryPatch.C | 4 +-
...yMotionDisplacementPointPatchVectorField.C | 4 +-
.../perfectInterface/perfectInterface.C | 36 ++++---------
src/dynamicMesh/setUpdater/setUpdater.C | 27 +++-------
.../slidingInterface/slidingInterface.C | 48 +++++++----------
.../cfdTools/general/MRF/MRFZone.C | 17 +++----
.../SRFFreestreamVelocityFvPatchVectorField.C | 6 +--
.../SRFVelocityFvPatchVectorField.C | 2 +-
.../cfdTools/general/fvOptions/fvOptionIO.C | 13 +++--
.../activeBaffleVelocityFvPatchVectorField.C | 18 +++----
...ureForceBaffleVelocityFvPatchVectorField.C | 23 +++------
.../derived/advective/advectiveFvPatchField.C | 8 +--
.../codedFixedValueFvPatchField.C | 6 +--
.../codedMixed/codedMixedFvPatchField.C | 3 +-
...lindricalInletVelocityFvPatchVectorField.C | 4 +-
.../derived/fan/fanFvPatchField.C | 9 ++--
.../derived/fixedJump/fixedJumpFvPatchField.C | 3 +-
.../fixedJumpAMI/fixedJumpAMIFvPatchField.C | 3 +-
...malInletOutletVelocityFvPatchVectorField.C | 12 ++---
...ureCompressibleDensityFvPatchScalarField.C | 2 +-
.../fixedProfile/fixedProfileFvPatchField.C | 4 +-
.../flowRateInletVelocityFvPatchVectorField.C | 7 ++-
...flowRateOutletVelocityFvPatchVectorField.C | 4 +-
.../fluxCorrectedVelocityFvPatchVectorField.C | 4 +-
.../freestream/freestreamFvPatchField.C | 6 +--
.../freestreamPressureFvPatchScalarField.C | 6 +--
.../inletOutlet/inletOutletFvPatchField.C | 5 +-
...OutletTotalTemperatureFvPatchScalarField.C | 8 +--
...erstitialInletVelocityFvPatchVectorField.C | 2 +-
.../mappedField/mappedPatchFieldBase.C | 9 ++--
.../mappedFlowRateFvPatchVectorField.C | 6 +--
...mappedVelocityFluxFixedValueFvPatchField.C | 2 +-
...FlowRateOutletVelocityFvPatchVectorField.C | 8 ++-
.../outletInlet/outletInletFvPatchField.C | 5 +-
.../outletMappedUniformInletFvPatchField.C | 8 +--
...utletPhaseMeanVelocityFvPatchVectorField.C | 6 +--
...aseHydrostaticPressureFvPatchScalarField.C | 12 ++---
.../plenumPressureFvPatchScalarField.C | 36 +++++--------
...tedInletOutletVelocityFvPatchVectorField.C | 4 +-
...eDirectedInletVelocityFvPatchVectorField.C | 4 +-
...tOutletParSlipVelocityFvPatchVectorField.C | 4 +-
...ureInletOutletVelocityFvPatchVectorField.C | 2 +-
.../pressureInletVelocityFvPatchVectorField.C | 4 +-
...malInletOutletVelocityFvPatchVectorField.C | 4 +-
...IDControlInletVelocityFvPatchVectorField.C | 25 ++++-----
.../prghPressureFvPatchScalarField.C | 2 +-
...talHydrostaticPressureFvPatchScalarField.C | 8 +--
.../prghTotalPressureFvPatchScalarField.C | 6 +--
...ureInletOutletVelocityFvPatchVectorField.C | 2 +-
.../rotatingWallVelocityFvPatchVectorField.C | 4 +-
.../supersonicFreestreamFvPatchVectorField.C | 14 ++---
...lFlowRateInletVelocityFvPatchVectorField.C | 8 +--
.../swirlInletVelocityFvPatchVectorField.C | 4 +-
.../syringePressureFvPatchScalarField.C | 22 ++++----
.../timeVaryingMappedFixedValueFvPatchField.C | 13 ++---
.../totalPressureFvPatchScalarField.C | 10 ++--
.../totalTemperatureFvPatchScalarField.C | 8 +--
.../turbulentDFSEMInletFvPatchVectorField.C | 26 +++++-----
.../turbulentInletFvPatchField.C | 5 +-
...sityKineticEnergyInletFvPatchScalarField.C | 6 +--
...ityHydrostaticPressureFvPatchScalarField.C | 6 +--
.../uniformInletOutletFvPatchField.C | 5 +-
.../uniformTotalPressureFvPatchScalarField.C | 10 ++--
.../variableHeightFlowRateFvPatchField.C | 9 ++--
...tFlowRateInletVelocityFvPatchVectorField.C | 2 +-
.../waveSurfacePressureFvPatchScalarField.C | 6 +--
.../waveTransmissiveFvPatchField.C | 17 +++----
.../fvPatchFields/fvPatchField/fvPatchField.C | 22 +-------
.../fvPatchFields/fvPatchField/fvPatchField.H | 11 ----
.../fvsPatchField/fvsPatchField.C | 2 +-
...llatingDisplacementPointPatchVectorField.C | 15 ++----
...OscillatingVelocityPointPatchVectorField.C | 15 ++----
...llatingDisplacementPointPatchVectorField.C | 6 +--
...oscillatingVelocityPointPatchVectorField.C | 6 +--
...surfaceDisplacementPointPatchVectorField.C | 10 ++--
...aceSlipDisplacementPointPatchVectorField.C | 11 ++--
...meVaryingMappedFixedValuePointPatchField.C | 13 ++---
...polatedDisplacementPointPatchVectorField.C | 6 +--
.../waveDisplacementPointPatchVectorField.C | 9 ++--
.../genericFvPatchField/genericFvPatchField.C | 2 +-
.../genericPointPatchField.C | 2 +-
.../phaseProperties/phasePropertiesIO.C | 17 +++----
.../submodels/CloudSubModelBase.C | 3 +-
.../DispersionRASModel/DispersionRASModel.C | 5 +-
src/lumpedPointMotion/lumpedPointState.C | 2 +-
.../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C | 3 +-
.../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 38 ++++++--------
.../cyclicPeriodicAMIPolyPatch.C | 23 ++-------
.../coordinateSystems/coordinateSystem.C | 14 +++--
.../mappedPolyPatch/mappedPatchBase.C | 3 +-
.../mappedVariableThicknessWallPolyPatch.C | 2 +-
.../regionCoupledBase.C | 12 ++---
...sRadiativeCoupledMixedFvPatchScalarField.C | 19 +++----
...ysisTemperatureCoupledFvPatchScalarField.C | 10 ++--
...rolysisVelocityCoupledFvPatchVectorField.C | 10 ++--
...ilmHeightInletVelocityFvPatchVectorField.C | 6 +--
...linedFilmNusseltHeightFvPatchScalarField.C | 3 +-
...lmNusseltInletVelocityFvPatchVectorField.C | 3 +-
...alphatFilmWallFunctionFvPatchScalarField.C | 13 +++--
.../nutkFilmWallFunctionFvPatchScalarField.C | 7 ++-
.../thermalBaffleFvPatchScalarField.C | 5 +-
src/rigidBodyDynamics/bodies/cuboid/cuboid.C | 11 ++--
.../bodies/masslessBody/masslessBody.C | 3 +-
.../bodies/rigidBody/rigidBody.C | 15 ++----
src/rigidBodyDynamics/bodies/sphere/sphere.C | 11 ++--
.../bodies/subBody/subBody.C | 7 +--
src/rigidBodyDynamics/joints/Pa/Pa.C | 3 +-
src/rigidBodyDynamics/joints/Ra/Ra.C | 3 +-
src/rigidBodyDynamics/joints/joint/joint.C | 2 +-
src/rigidBodyDynamics/joints/joint/jointI.H | 4 +-
.../linearAxialAngularSpring.C | 15 ++----
.../restraints/linearDamper/linearDamper.C | 3 +-
.../restraints/linearSpring/linearSpring.C | 19 ++-----
.../restraints/restraint/rigidBodyRestraint.C | 6 +--
.../sphericalAngularDamper.C | 2 +-
.../rigidBodyModel/rigidBodyModel.C | 50 +++++++-----------
.../rigidBodyModelStateIO.C | 8 +--
.../rigidBodyMotion/rigidBodyMotionIO.C | 9 ++--
...gidBodyDisplacementPointPatchVectorField.C | 6 +--
.../sixDoFRigidBodyMotionAxisConstraint.C | 3 +-
.../sixDoFRigidBodyMotionLineConstraint.C | 6 +--
.../sixDoFRigidBodyMotionPlaneConstraint.C | 6 +--
.../sixDoFRigidBodyMotionPointConstraint.C | 3 +-
.../linearAxialAngularSpring.C | 15 ++----
.../restraints/linearDamper/linearDamper.C | 3 +-
.../restraints/linearSpring/linearSpring.C | 19 ++-----
.../sphericalAngularDamper.C | 2 +-
.../sphericalAngularSpring.C | 9 ++--
.../tabulatedAxialAngularSpring.C | 16 ++----
.../sixDoFRigidBodyMotionIO.C | 51 +++++++------------
.../sixDoFRigidBodyMotionStateIO.C | 18 +++----
src/surfMesh/surfZone/surfZone/surfZone.C | 9 ++--
.../MarshakRadiationFvPatchScalarField.C | 2 +-
...iffusiveRadiationMixedFvPatchScalarField.C | 4 +-
...veViewFactorFixedValueFvPatchScalarField.C | 2 +-
.../Reactions/solidReaction/solidReaction.C | 3 +-
.../Reactions/solidReaction/solidReactionI.H | 2 +-
.../solidArrheniusReactionRateI.H | 6 +--
.../NonEquilibriumReversibleReaction.C | 14 ++---
.../reaction/Reactions/Reaction/Reaction.C | 3 +-
.../Reactions/ReactionList/ReactionList.C | 15 +++---
.../ArrheniusReactionRateI.H | 6 +--
.../FallOffReactionRateI.H | 34 ++++---------
.../LandauTellerReactionRateI.H | 10 ++--
.../SRIFallOffFunction/SRIFallOffFunctionI.H | 10 ++--
.../TroeFallOffFunctionI.H | 8 +--
.../powerSeries/powerSeriesReactionRateI.H | 8 +--
.../thirdBodyEfficienciesI.H | 2 +-
.../specie/transport/const/constTransport.C | 16 +++---
.../logPolynomial/logPolynomialTransport.C | 32 ++++++------
.../polynomial/polynomialTransport.C | 32 ++++++------
.../sutherland/sutherlandTransport.C | 16 +++---
...emperatureCoupledMixedFvPatchScalarField.C | 16 +++---
.../constant/constantSurfaceTension.C | 6 +--
.../temperatureDependentSurfaceTension.C | 6 +--
...stantAlphaContactAngleFvPatchScalarField.C | 2 +-
...namicAlphaContactAngleFvPatchScalarField.C | 8 +--
...ndentAlphaContactAngleFvPatchScalarField.C | 2 +-
...ryingAlphaContactAngleFvPatchScalarField.C | 8 +--
.../waveAlpha/waveAlphaFvPatchScalarField.C | 3 +-
.../waveVelocityFvPatchVectorField.C | 3 +-
232 files changed, 856 insertions(+), 1293 deletions(-)
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index d9a4a4e7df1..0590e8d0980 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -209,16 +209,14 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
- writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
+ os.writeEntryIfDifferent<word>("mu", "thermo:mu", muName_);
- os.writeKeyword("accommodationCoeff")
- << accommodationCoeff_ << token::END_STATEMENT << nl;
+ os.writeEntry("accommodationCoeff", accommodationCoeff_);
Twall_.writeEntry("Twall", os);
- os.writeKeyword("gamma")
- << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntry("gamma", gamma_);
writeEntry("value", os);
}
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 7f19817660b..c79f8d5062d 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -200,18 +200,16 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "T", "T", TName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
- writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_);
- writeEntryIfDifferent<word>(os, "tauMC", "tauMC", tauMCName_);
-
- os.writeKeyword("accommodationCoeff")
- << accommodationCoeff_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("T", "T", TName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
+ os.writeEntryIfDifferent<word>("mu", "thermo:mu", muName_);
+ os.writeEntryIfDifferent<word>("tauMC", "tauMC", tauMCName_);
+
+ os.writeEntry("accommodationCoeff", accommodationCoeff_);
Uwall_.writeEntry("Uwall", os);
- os.writeKeyword("thermalCreep")
- << thermalCreep_ << token::END_STATEMENT << nl;
- os.writeKeyword("curvature") << curvature_ << token::END_STATEMENT << nl;
+ os.writeEntry("thermalCreep", thermalCreep_);
+ os.writeEntry("curvature", curvature_);
refValue().writeEntry("refValue", os);
valueFraction().writeEntry("valueFraction", os);
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
index 5eefe82ff5d..d71824052f5 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
@@ -117,8 +117,8 @@ void Foam::fixedRhoFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "p", "p", this->pName_);
- writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
+ os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 6872ae0321e..9baa712b958 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -125,8 +125,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("thetaProperties")
- << thetaProps_ << token::END_STATEMENT << nl;
+ os.writeEntry("thetaProperties", thetaProps_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index a0d433f4e8b..d9c325a3ba3 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -125,8 +125,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("thetaProperties")
- << thetaProps_ << token::END_STATEMENT << nl;
+ os.writeEntry("thetaProperties", thetaProps_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index a0d433f4e8b..d9c325a3ba3 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -125,8 +125,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("thetaProperties")
- << thetaProps_ << token::END_STATEMENT << nl;
+ os.writeEntry("thetaProperties", thetaProps_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index b26ec2faa08..284992c64c9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -125,8 +125,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("thetaProperties")
- << thetaProps_ << token::END_STATEMENT << nl;
+ os.writeEntry("thetaProperties", thetaProps_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
index 2a4732fd971..464bbd01e42 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -138,9 +138,9 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("relax") << relax_ << token::END_STATEMENT << nl;
- os.writeKeyword("fixedDmdt") << fixedDmdt_ << token::END_STATEMENT << nl;
- os.writeKeyword("L") << L_ << token::END_STATEMENT << nl;
+ os.writeEntry("relax", relax_);
+ os.writeEntry("fixedDmdt", fixedDmdt_);
+ os.writeEntry("L", L_);
dmdt_.writeEntry("dmdt", os);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
index 7b854df507f..f6c4ca196e7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
@@ -334,10 +334,10 @@ void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::write
) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Prt", Prt_);
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
dmdt_.writeEntry("dmdt", os);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index a1ac6c46f65..e10422c800f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -596,42 +596,36 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("phaseType") << phaseTypeNames_[phaseType_]
- << token::END_STATEMENT << nl;
+ os.writeEntry("phaseType", phaseTypeNames_[phaseType_]);
- os.writeKeyword("relax") << relax_ << token::END_STATEMENT << nl;
+ os.writeEntry("relax", relax_);
switch (phaseType_)
{
case vaporPhase:
{
- os.writeKeyword("partitioningModel") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("partitioningModel");
partitioningModel_->write(os);
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
break;
}
case liquidPhase:
{
- os.writeKeyword("partitioningModel") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("partitioningModel");
partitioningModel_->write(os);
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os.writeKeyword("nucleationSiteModel") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("nucleationSiteModel");
nucleationSiteModel_->write(os);
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os.writeKeyword("departureDiamModel") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("departureDiamModel");
departureDiamModel_->write(os);
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os.writeKeyword("departureFreqModel") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("departureFreqModel");
departureFreqModel_->write(os);
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
break;
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index 63c85938cfd..f9142de5cf0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -109,8 +109,7 @@ void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("sourceField")
- << sourceFieldName_ << token::END_STATEMENT << nl;
+ os.writeEntry("sourceField", sourceFieldName_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
index c991a1a3336..c84f323e741 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
@@ -183,7 +183,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs()
void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("relax") << relax_ << token::END_STATEMENT << nl;
+ os.writeEntry("relax", relax_);
q_.writeEntry("q", os);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
index 53fe0e2f15b..c18a01cf0b0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
@@ -114,7 +114,7 @@ void Foam::wallBoilingModels::departureDiameterModels::
KocamustafaogullariIshii::write(Ostream& os) const
{
departureDiameterModel::write(os);
- os.writeKeyword("phi") << phi_ << token::END_STATEMENT << nl;
+ os.writeEntry("phi", phi_);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
index 71ef4f03c73..e2ec8ef829e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
@@ -90,9 +90,9 @@ void Foam::wallBoilingModels::departureDiameterModels::
TolubinskiKostanchuk::write(Ostream& os) const
{
departureDiameterModel::write(os);
- os.writeKeyword("dRef") << dRef_ << token::END_STATEMENT << nl;
- os.writeKeyword("dMax") << dMax_ << token::END_STATEMENT << nl;
- os.writeKeyword("dMin") << dMin_ << token::END_STATEMENT << nl;
+ os.writeEntry("dRef", dRef_);
+ os.writeEntry("dMax", dMax_);
+ os.writeEntry("dMin", dMin_);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
index 4c3564a006b..1c8c3dba407 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::departureDiameterModel::~departureDiameterModel()
void Foam::wallBoilingModels::departureDiameterModel::write(Ostream& os) const
{
- os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", this->type());
}
// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
index e87e520096b..e76f789cc60 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::departureFrequencyModel::~departureFrequencyModel()
void Foam::wallBoilingModels::departureFrequencyModel::write(Ostream& os) const
{
- os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", this->type());
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
index fbf495a5e2f..16c2112664c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::nucleationSiteModel::~nucleationSiteModel()
void Foam::wallBoilingModels::nucleationSiteModel::write(Ostream& os) const
{
- os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", this->type());
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
index 04b8c2917e2..581a83a6d1b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
@@ -88,7 +88,7 @@ void Foam::wallBoilingModels::partitioningModels::
Lavieville::write(Ostream& os) const
{
partitioningModel::write(os);
- os.writeKeyword("alphaCrit") << alphaCrit_ << token::END_STATEMENT << nl;
+ os.writeEntry("alphaCrit", alphaCrit_);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
index 1d157b67ab1..f9528677d4f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
@@ -97,10 +97,8 @@ void Foam::wallBoilingModels::partitioningModels::
cosine::write(Ostream& os) const
{
partitioningModel::write(os);
- os.writeKeyword("alphaLiquid1") << alphaLiquid1_
- << token::END_STATEMENT << nl;
- os.writeKeyword("alphaLiquid0") << alphaLiquid0_
- << token::END_STATEMENT << nl;
+ os.writeEntry("alphaLiquid1", alphaLiquid1_);
+ os.writeEntry("alphaLiquid0", alphaLiquid0_);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
index dd1142b1372..cc6d648f849 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
@@ -90,10 +90,8 @@ void Foam::wallBoilingModels::partitioningModels::
linear::write(Ostream& os) const
{
partitioningModel::write(os);
- os.writeKeyword("alphaLiquid1") << alphaLiquid1_
- << token::END_STATEMENT << nl;
- os.writeKeyword("alphaLiquid0") << alphaLiquid0_
- << token::END_STATEMENT << nl;
+ os.writeEntry("alphaLiquid1", alphaLiquid1_);
+ os.writeEntry("alphaLiquid0", alphaLiquid0_);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
index 7b68289d948..cb12aca1908 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::partitioningModel::~partitioningModel()
void Foam::wallBoilingModels::partitioningModel::write(Ostream& os) const
{
- os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", this->type());
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 651de2ea03f..a64155e4a0c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -245,8 +245,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("specularityCoefficient")
- << specularityCoefficient_ << token::END_STATEMENT << nl;
+ os.writeEntry("specularityCoefficient", specularityCoefficient_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 0fa9d5faf62..53431117d55 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -289,10 +289,8 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("restitutionCoefficient")
- << restitutionCoefficient_ << token::END_STATEMENT << nl;
- os.writeKeyword("specularityCoefficient")
- << specularityCoefficient_ << token::END_STATEMENT << nl;
+ os.writeEntry("restitutionCoefficient", restitutionCoefficient_);
+ os.writeEntry("specularityCoefficient", specularityCoefficient_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 651de2ea03f..a64155e4a0c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -245,8 +245,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("specularityCoefficient")
- << specularityCoefficient_ << token::END_STATEMENT << nl;
+ os.writeEntry("specularityCoefficient", specularityCoefficient_);
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 0fa9d5faf62..53431117d55 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -289,10 +289,8 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("restitutionCoefficient")
- << restitutionCoefficient_ << token::END_STATEMENT << nl;
- os.writeKeyword("specularityCoefficient")
- << specularityCoefficient_ << token::END_STATEMENT << nl;
+ os.writeEntry("restitutionCoefficient", restitutionCoefficient_);
+ os.writeEntry("specularityCoefficient", specularityCoefficient_);
writeEntry("value", os);
}
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index 5e32969aa4c..b0091f6900e 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -220,11 +220,11 @@ void Foam::CLASS::write
) const
{
FVPATCHF::write(os);
- os.writeKeyword("scalarData") << scalarData_ << token::END_STATEMENT << nl;
- os.writeKeyword("data") << data_ << token::END_STATEMENT << nl;
+ os.writeEntry("scalarData", scalarData_);
+ os.writeEntry("data", data_);
fieldData_.writeEntry("fieldData", os);
timeVsData_->writeData(os);
- os.writeKeyword("wordData") << wordData_ << token::END_STATEMENT << nl;
+ os.writeEntry("wordData", wordData_);
this->writeEntry("value", os);
}
diff --git a/src/OSspecific/POSIX/cpuInfo/cpuInfo.C b/src/OSspecific/POSIX/cpuInfo/cpuInfo.C
index 6dbd6abf4b2..e394ec7b222 100644
--- a/src/OSspecific/POSIX/cpuInfo/cpuInfo.C
+++ b/src/OSspecific/POSIX/cpuInfo/cpuInfo.C
@@ -174,26 +174,12 @@ void Foam::cpuInfo::write(Ostream& os) const
{
os.writeEntry("model_name", model_name);
}
- if (cpu_family != -1)
- {
- os.writeEntry("cpu_family", cpu_family);
- }
- if (model != -1)
- {
- os.writeEntry("model", model);
- }
- if (cpu_MHz > 0)
- {
- os.writeEntry("cpu_MHz", cpu_MHz);
- }
- if (cpu_cores > 0)
- {
- os.writeEntry("cpu_cores", cpu_cores);
- }
- if (siblings > 0)
- {
- os.writeEntry("siblings", siblings);
- }
+
+ os.writeEntryIfDifferent<int>("cpu_family", -1, cpu_family);
+ os.writeEntryIfDifferent<int>("model", -1, model);
+ os.writeEntryIfDifferent<float>("cpu_MHz", 0, cpu_MHz);
+ os.writeEntryIfDifferent<int>("cpu_cores", 0, cpu_cores);
+ os.writeEntryIfDifferent<int>("siblings", 0, siblings);
}
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index bf0150cb244..1c6d2131bc9 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -211,6 +211,26 @@ public:
return endEntry();
}
+ //- Write a keyword/value entry only when the two values differ.
+ // \param key the name of the entry
+ // \param value1 the reference value
+ // \param value2 the value to write if it differs from value1
+ template<class T>
+ Ostream& writeEntryIfDifferent
+ (
+ const word& key,
+ const T& value1,
+ const T& value2
+ )
+ {
+ if (value1 != value2)
+ {
+ writeEntry(key, value2);
+ }
+
+ return *this;
+ }
+
// Stream state functions
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index f6ca2a766c6..eaaf4830644 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -744,16 +744,15 @@ void Foam::Field<Type>::writeEntry(const word& keyword, Ostream& os) const
if (uniform)
{
- os << "uniform " << this->operator[](0) << token::END_STATEMENT;
+ os << "uniform " << this->operator[](0);
}
else
{
os << "nonuniform ";
List<Type>::writeEntry(os);
- os << token::END_STATEMENT;
}
- os << endl;
+ os << token::END_STATEMENT << nl;
}
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 94bf0ca6c88..9e722c6569a 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -97,10 +97,8 @@ bool Foam::UniformDimensionedField<Type>::writeData(Ostream& os) const
{
scalar multiplier;
os.writeKeyword("dimensions");
- this->dimensions().write(os, multiplier) << token::END_STATEMENT
- << nl;
- os.writeKeyword("value") << this->value()/multiplier << token::END_STATEMENT
- << nl << nl;
+ this->dimensions().write(os, multiplier) << token::END_STATEMENT << nl;
+ os.writeEntry("value", this->value()/multiplier) << nl;
return os.good();
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index 6f32877f626..16969e8dc9b 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -270,8 +270,7 @@ Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
// Make sure to construct the patchfield with up-to-date value
OStringStream os;
- os.writeKeyword("type") << name_ << token::END_STATEMENT
- << nl;
+ os.writeEntry("type", name_);
static_cast<const Field<Type>&>(*this).writeEntry("value", os);
IStringStream is(os.str());
dictionary dict(is);
@@ -333,8 +332,7 @@ template<class Type>
void Foam::codedFixedValuePointPatchField<Type>::write(Ostream& os) const
{
fixedValuePointPatchField<Type>::write(os);
- os.writeKeyword("name") << name_
- << token::END_STATEMENT << nl;
+ os.writeEntry("name", name_);
codedBase::writeCodeDict(os, dict_);
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
index cd99728ca50..c5941fade46 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
@@ -100,8 +100,7 @@ template<class Type>
void Foam::fixedNormalSlipPointPatchField<Type>::write(Ostream& os) const
{
slipPointPatchField<Type>::write(os);
- os.writeKeyword("n")
- << n_ << token::END_STATEMENT << nl;
+ os.writeEntry("n", n_);
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 2c98caa0e5c..b2016d79a3a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -113,29 +113,11 @@ const Foam::objectRegistry& Foam::pointPatchField<Type>::db() const
template<class Type>
void Foam::pointPatchField<Type>::write(Ostream& os) const
{
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
if (patchType_.size())
{
- os.writeKeyword("patchType") << patchType_
- << token::END_STATEMENT << nl;
- }
-}
-
-
-template<class Type>
-template<class EntryType>
-void Foam::pointPatchField<Type>::writeEntryIfDifferent
-(
- Ostream& os,
- const word& entryName,
- const EntryType& value1,
- const EntryType& value2
-) const
-{
- if (value1 != value2)
- {
- os.writeKeyword(entryName) << value2 << token::END_STATEMENT << nl;
+ os.writeEntry("patchType", patchType_);
}
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index b4ac7f2dc8d..40129b82ec7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -436,17 +436,6 @@ public:
//- Write
virtual void write(Ostream&) const;
- //- Helper function to write the keyword and entry only if the
- // values are not equal. The value is then output as value2
- template<class EntryType>
- void writeEntryIfDifferent
- (
- Ostream& os,
- const word& entryName,
- const EntryType& value1,
- const EntryType& value2
- ) const;
-
// Member operators
diff --git a/src/OpenFOAM/global/profiling/profilingInformation.C b/src/OpenFOAM/global/profiling/profilingInformation.C
index bc73478e518..24957284e1d 100644
--- a/src/OpenFOAM/global/profiling/profilingInformation.C
+++ b/src/OpenFOAM/global/profiling/profilingInformation.C
@@ -128,18 +128,12 @@ Foam::Ostream& Foam::profilingInformation::write
os.beginBlock(word("trigger" + Foam::name(id_)));
os.writeEntry("id", id_);
- if (id_ != parent().id())
- {
- os.writeEntry("parentId", parent().id());
- }
+ os.writeEntryIfDifferent("parentId", id_, parent().id());
os.writeEntry("description", description());
os.writeEntry("calls", calls() + (offset ? 1 : 0));
os.writeEntry("totalTime", totalTime() + elapsedTime);
os.writeEntry("childTime", childTime() + childTimes);
- if (maxMem_)
- {
- os.writeEntry("maxMem", maxMem_);
- }
+ os.writeEntryIfDifferent<int>("maxMem", 0, maxMem_);
os.writeEntry("onStack", Switch(onStack()));
os.endBlock();
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index 32e76884b61..f317ae5f708 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -354,19 +354,15 @@ void Foam::interpolationLookUpTable<Type>::write
control.writeHeader(os);
- os.writeKeyword("fields")
- << entries_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("output")
- << output_ << token::END_STATEMENT << nl;
+ os.writeEntry("fields", entries_);
+ os.writeEntry("output", output_);
if (this->size() == 0)
{
FatalErrorInFunction
<< "table is empty" << nl << exit(FatalError);
}
- os.writeKeyword("values")
- << *this << token::END_STATEMENT << nl;
+ os.writeEntry("values", *this);
}
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 51adcb3381c..bf972fda0a1 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -173,10 +173,8 @@ void Foam::csvTableReader<Type>::write(Ostream& os) const
{
tableReader<Type>::write(os);
- os.writeKeyword("hasHeaderLine")
- << headerLine_ << token::END_STATEMENT << nl;
- os.writeKeyword("timeColumn")
- << timeColumn_ << token::END_STATEMENT << nl;
+ os.writeEntry("hasHeaderLine", headerLine_);
+ os.writeEntry("timeColumn", timeColumn_);
// Force writing labelList in ascii
os.writeKeyword("valueColumns");
@@ -186,10 +184,13 @@ void Foam::csvTableReader<Type>::write(Ostream& os) const
os << componentColumns_;
os.format(IOstream::BINARY);
}
+ else
+ {
+ os << componentColumns_;
+ }
os << token::END_STATEMENT << nl;
- os.writeKeyword("separator")
- << string(separator_) << token::END_STATEMENT << nl;
+ os.writeEntry("separator", string(separator_));
}
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
index b3d96d50b0b..b32b3bfdc16 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
@@ -74,10 +74,7 @@ Foam::tableReader<Type>::~tableReader()
template<class Type>
void Foam::tableReader<Type>::write(Ostream& os) const
{
- if (this->type() != "openFoam")
- {
- os.writeEntry("readerType", this->type());
- }
+ os.writeEntryIfDifferent<word>("readerType", "openFoam", this->type());
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 22a1e1b0f78..6421a4ee53e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -126,10 +126,10 @@ const Foam::word& Foam::genericPolyPatch::actualType() const
void Foam::genericPolyPatch::write(Ostream& os) const
{
- os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
+ os.writeEntry("type", actualTypeName_);
patchIdentifier::write(os);
- os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
- os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
+ os.writeEntry("nFaces", size());
+ os.writeEntry("startFace", start());
forAllConstIter(dictionary, dict_, iter)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index d83efd4fed7..6544881f4a2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -1447,24 +1447,20 @@ void Foam::cyclicPolyPatch::write(Ostream& os) const
coupledPolyPatch::write(os);
if (!neighbPatchName_.empty())
{
- os.writeKeyword("neighbourPatch") << neighbPatchName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("neighbourPatch", neighbPatchName_);
}
coupleGroup_.write(os);
switch (transform())
{
case ROTATIONAL:
{
- os.writeKeyword("rotationAxis") << rotationAxis_
- << token::END_STATEMENT << nl;
- os.writeKeyword("rotationCentre") << rotationCentre_
- << token::END_STATEMENT << nl;
+ os.writeEntry("rotationAxis", rotationAxis_);
+ os.writeEntry("rotationCentre", rotationCentre_);
break;
}
case TRANSLATIONAL:
{
- os.writeKeyword("separationVector") << separationVector_
- << token::END_STATEMENT << nl;
+ os.writeEntry("separationVector", separationVector_);
break;
}
case NOORDERING:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index 7fdf0634754..5001f6e238f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -1221,28 +1221,24 @@ bool Foam::oldCyclicPolyPatch::order
void Foam::oldCyclicPolyPatch::write(Ostream& os) const
{
// Replacement of polyPatch::write to write 'cyclic' instead of type():
- os.writeKeyword("type") << cyclicPolyPatch::typeName
- << token::END_STATEMENT << nl;
+ os.writeEntry("type", cyclicPolyPatch::typeName);
patchIdentifier::write(os);
- os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
- os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
+ os.writeEntry("nFaces", size());
+ os.writeEntry("startFace", start());
- os.writeKeyword("featureCos") << featureCos_ << token::END_STATEMENT << nl;
+ os.writeEntry("featureCos", featureCos_);
switch (transform())
{
case ROTATIONAL:
{
- os.writeKeyword("rotationAxis") << rotationAxis_
- << token::END_STATEMENT << nl;
- os.writeKeyword("rotationCentre") << rotationCentre_
- << token::END_STATEMENT << nl;
+ os.writeEntry("rotationAxis", rotationAxis_);
+ os.writeEntry("rotationCentre", rotationCentre_);
break;
}
case TRANSLATIONAL:
{
- os.writeKeyword("separationVector") << separationVector_
- << token::END_STATEMENT << nl;
+ os.writeEntry("separationVector", separationVector_);
break;
}
default:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 0ad36956cbd..9c27fada851 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -1112,10 +1112,8 @@ bool Foam::processorPolyPatch::order
void Foam::processorPolyPatch::write(Ostream& os) const
{
coupledPolyPatch::write(os);
- os.writeKeyword("myProcNo") << myProcNo_
- << token::END_STATEMENT << nl;
- os.writeKeyword("neighbProcNo") << neighbProcNo_
- << token::END_STATEMENT << nl;
+ os.writeEntry("myProcNo", myProcNo_);
+ os.writeEntry("neighbProcNo", neighbProcNo_);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 02dcc6294ad..9163b5c19c3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -337,13 +337,8 @@ bool Foam::processorCyclicPolyPatch::order
void Foam::processorCyclicPolyPatch::write(Ostream& os) const
{
processorPolyPatch::write(os);
- os.writeKeyword("referPatch") << referPatchName_
- << token::END_STATEMENT << nl;
- if (tag_ != -1)
- {
- os.writeKeyword("tag") << tag_
- << token::END_STATEMENT << nl;
- }
+ os.writeEntry("referPatch", referPatchName_);
+ os.writeEntryIfDifferent<label>("tag", -1, tag_);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index 1494fb273d5..d48d7e30caa 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -374,10 +374,10 @@ void Foam::polyPatch::clearAddressing()
void Foam::polyPatch::write(Ostream& os) const
{
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
patchIdentifier::write(os);
- os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
- os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
+ os.writeEntry("nFaces", size());
+ os.writeEntry("startFace", start());
}
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index db5779edda3..c952a6f6c84 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -71,11 +71,13 @@ void Foam::Function1Types::Scale<Type>::writeData(Ostream& os) const
{
Function1<Type>::writeData(os);
os << token::END_STATEMENT << nl;
- os << indent << word(this->name() + "Coeffs") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+ os.beginBlock(word(this->name() + "Coeffs"));
+
scale_->writeData(os);
value_->writeData(os);
- os << decrIndent << indent << token::END_BLOCK << endl;
+
+ os.endBlock();
}
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 0efcbcf1463..5a6e5104114 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -345,18 +345,19 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
template<class Type>
void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
{
- if (bounding_ != bounds::repeatableBounding::CLAMP)
- {
- os.writeEntry
- (
- "outOfBounds",
- bounds::repeatableBoundingNames[bounding_]
- );
- }
- if (interpolationScheme_ != "linear")
- {
- os.writeEntry("interpolationScheme", interpolationScheme_);
- }
+ os.writeEntryIfDifferent<word>
+ (
+ "outOfBounds",
+ bounds::repeatableBoundingNames[bounds::repeatableBounding::CLAMP],
+ bounds::repeatableBoundingNames[bounding_]
+ );
+
+ os.writeEntryIfDifferent<word>
+ (
+ "interpolationScheme",
+ "linear",
+ interpolationScheme_
+ );
}
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index 40645aa1910..773a072f2ef 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -58,11 +58,13 @@ void Foam::Function1Types::ramp::writeData(Ostream& os) const
{
Function1<scalar>::writeData(os);
os << token::END_STATEMENT << nl;
- os << indent << word(this->name() + "Coeffs") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
- os.writeKeyword("start") << start_ << token::END_STATEMENT << nl;
- os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
- os << decrIndent << indent << token::END_BLOCK << endl;
+
+ os.beginBlock(word(this->name() + "Coeffs"));
+
+ os.writeEntry("start", start_);
+ os.writeEntry("duration", duration_);
+
+ os.endBlock();
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 3819066c887..6ba0630240d 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -161,7 +161,7 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs()
void convectiveHeatTransferFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("L") << L_ << token::END_STATEMENT << nl;
+ os.writeEntry("L", L_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
index 52de5b816bb..fefc7a9409c 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
@@ -190,9 +190,8 @@ void Foam::lumpedMassWallTemperatureFvPatchScalarField::write
mixedFvPatchScalarField::write(os);
temperatureCoupledBase::write(os);
- os.writeKeyword("Cp")<< Cp_ << token::END_STATEMENT << nl;
- os.writeKeyword("mass")<< mass_
- << token::END_STATEMENT << nl;
+ os.writeEntry("Cp", Cp_);
+ os.writeEntry("mass", mass_);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index d495bdbb8cf..3cf2ce56d61 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -189,12 +189,11 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("outletPatch")
- << outletPatchName_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- os.writeKeyword("Q") << Q_ << token::END_STATEMENT << nl;
- os.writeKeyword("TMin") << TMin_ << token::END_STATEMENT << nl;
- os.writeKeyword("TMax") << TMax_ << token::END_STATEMENT << nl;
+ os.writeEntry("outletPatch", outletPatchName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntry("Q", Q_);
+ os.writeEntry("TMin", TMin_);
+ os.writeEntry("TMax", TMax_);
this->writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 4221ad93de1..00883665e82 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -436,9 +436,8 @@ void thermalBaffle1DFvPatchScalarField<solidType>::write(Ostream& os) const
}
qrPrevious_.writeEntry("qrPrevious", os);
- os.writeKeyword("qr")<< qrName_ << token::END_STATEMENT << nl;
- os.writeKeyword("relaxation")<< qrRelaxation_
- << token::END_STATEMENT << nl;
+ os.writeEntry("qr", qrName_);
+ os.writeEntry("relaxation", qrRelaxation_);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index f870ed2abaf..eba0fea41f7 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -202,10 +202,9 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::
write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
- os.writeKeyword("massFluxFraction") << massFluxFraction_
- << token::END_STATEMENT << nl;
+ os.writeEntry("phi", phiName_);
+ os.writeEntry("rho", rhoName_);
+ os.writeEntry("massFluxFraction", massFluxFraction_);
this->writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 1548c37e626..ff02c97357b 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -260,8 +260,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- os.writeKeyword("Tnbr")<< TnbrName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("Tnbr", TnbrName_);
thicknessLayers_.writeEntry("thicknessLayers", os);
kappaLayers_.writeEntry("kappaLayers", os);
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index e232b8198f4..edcdabfa3b0 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -343,12 +343,11 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- os.writeKeyword("Tnbr")<< TnbrName_ << token::END_STATEMENT << nl;
+ os.writeEntry("Tnbr", TnbrName_);
- os.writeKeyword("qrNbr")<< qrNbrName_ << token::END_STATEMENT << nl;
- os.writeKeyword("qr")<< qrName_ << token::END_STATEMENT << nl;
- os.writeKeyword("thermalInertia")<< thermalInertia_
- << token::END_STATEMENT << nl;
+ os.writeEntry("qrNbr", qrNbrName_);
+ os.writeEntry("qr", qrName_);
+ os.writeEntry("thermalInertia", thermalInertia_);
thicknessLayers_.writeEntry("thicknessLayers", os);
kappaLayers_.writeEntry("kappaLayers", os);
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 3840262bd21..4aee2a4da74 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -300,10 +300,10 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Prt", Prt_);
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index 127f58e9fa4..e8c910680d7 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -129,7 +129,7 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
+ os.writeEntry("Prt", Prt_);
writeEntry("value", os);
}
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 8677d5f8642..c1cb91df3fe 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -268,10 +268,10 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Prt", Prt_);
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index 1f95e729cd8..aabf2bab690 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -154,18 +154,12 @@ tmp<scalarField> atmBoundaryLayer::epsilon(const vectorField& p) const
void atmBoundaryLayer::write(Ostream& os) const
{
z0_.writeEntry("z0", os) ;
- os.writeKeyword("flowDir")
- << flowDir_ << token::END_STATEMENT << nl;
- os.writeKeyword("zDir")
- << zDir_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa")
- << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("Cmu")
- << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("Uref")
- << Uref_ << token::END_STATEMENT << nl;
- os.writeKeyword("Zref")
- << Zref_ << token::END_STATEMENT << nl;
+ os.writeEntry("flowDir", flowDir_);
+ os.writeEntry("zDir", zDir_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("Uref", Uref_);
+ os.writeEntry("Zref", Zref_);
zGround_.writeEntry("zGround", os) ;
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index cd362bfd3b5..5da68948f99 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -159,10 +159,9 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("mixingLength")
- << mixingLength_ << token::END_STATEMENT << nl;
- os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
- os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
+ os.writeEntry("mixingLength", mixingLength_);
+ os.writeEntry("phi", this->phiName_);
+ os.writeEntry("k", kName_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 548c7db7388..7107217c858 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -155,10 +155,9 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("mixingLength")
- << mixingLength_ << token::END_STATEMENT << nl;
- os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
- os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
+ os.writeEntry("mixingLength", mixingLength_);
+ os.writeEntry("phi", this->phiName_);
+ os.writeEntry("k", kName_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 0a4ae1c7fee..1f2caddd510 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -126,7 +126,7 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
void Foam::fixedShearStressFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("tau") << tau0_ << token::END_STATEMENT << nl;
+ os.writeEntry("tau", tau0_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index df4557580f5..486581871a9 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -190,13 +190,12 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
void Foam::porousBafflePressureFvPatchField::write(Ostream& os) const
{
fixedJumpFvPatchField<scalar>::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
D_->writeData(os);
I_->writeData(os);
- os.writeKeyword("length") << length_ << token::END_STATEMENT << nl;
- os.writeKeyword("uniformJump") << uniformJump_
- << token::END_STATEMENT << nl;
+ os.writeEntry("length", length_);
+ os.writeEntry("uniformJump", uniformJump_);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 1d8e807045c..c3cf3c22a99 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -57,9 +57,9 @@ void Foam::epsilonWallFunctionFvPatchScalarField::writeLocalEntries
Ostream& os
) const
{
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
index 862f7e647b6..967b4f4ef94 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
@@ -55,9 +55,9 @@ void fWallFunctionFvPatchScalarField::checkType()
void fWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index 11873820e05..36d171f8619 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -233,10 +233,10 @@ void kLowReWallFunctionFvPatchScalarField::evaluate
void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
{
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
- os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
+ os.writeEntry("Ceps2", Ceps2_);
fixedValueFvPatchField<scalar>::write(os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 02844be1a81..cef7574691d 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -294,12 +294,9 @@ void nutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
writeLocalEntries(os);
- os.writeKeyword("roughnessHeight")
- << roughnessHeight_ << token::END_STATEMENT << nl;
- os.writeKeyword("roughnessConstant")
- << roughnessConstant_ << token::END_STATEMENT << nl;
- os.writeKeyword("roughnessFactor")
- << roughnessFactor_ << token::END_STATEMENT << nl;
+ os.writeEntry("roughnessHeight", roughnessHeight_);
+ os.writeEntry("roughnessConstant", roughnessConstant_);
+ os.writeEntry("roughnessFactor", roughnessFactor_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index ee322ce34be..b40581055c0 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -204,8 +204,7 @@ tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const
void nutUTabulatedWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("uPlusTable") << uPlusTableName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("uPlusTable", uPlusTableName_);
writeEntry("value", os);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index 04c5d767465..e2a8006ccf6 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -57,9 +57,9 @@ void Foam::nutWallFunctionFvPatchScalarField::writeLocalEntries
Ostream& os
) const
{
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 59145dc9881..2bcc382090f 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -59,11 +59,11 @@ void omegaWallFunctionFvPatchScalarField::checkType()
void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
- os.writeKeyword("beta1") << beta1_ << token::END_STATEMENT << nl;
- os.writeKeyword("blended") << blended_ << token::END_STATEMENT << nl;
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
+ os.writeEntry("beta1", beta1_);
+ os.writeEntry("blended", blended_);
}
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
index e3704f287c5..0546d6a6105 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
@@ -55,9 +55,9 @@ void v2WallFunctionFvPatchScalarField::checkType()
void v2WallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("E", E_);
}
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 8ce76a11c35..aa8f22f8437 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -463,22 +463,18 @@ void Foam::attachDetach::write(Ostream& os) const
void Foam::attachDetach::writeDict(Ostream& os) const
{
- os << nl << name() << nl << token::BEGIN_BLOCK << nl
- << " type " << type()
- << token::END_STATEMENT << nl
- << " faceZoneName " << faceZoneID_.name()
- << token::END_STATEMENT << nl
- << " masterPatchName " << masterPatchID_.name()
- << token::END_STATEMENT << nl
- << " slavePatchName " << slavePatchID_.name()
- << token::END_STATEMENT << nl
- << " triggerTimes " << triggerTimes_
- << token::END_STATEMENT << nl
- << " manualTrigger " << manualTrigger()
- << token::END_STATEMENT << nl
- << " active " << active()
- << token::END_STATEMENT << nl
- << token::END_BLOCK << endl;
+ os << nl;
+ os.beginBlock(name());
+
+ os.writeEntry("type", type());
+ os.writeEntry("faceZoneName", faceZoneID_.name());
+ os.writeEntry("masterPatchName", masterPatchID_.name());
+ os.writeEntry("slavePatchName", slavePatchID_.name());
+ os.writeEntry("triggerTimes", triggerTimes_);
+ os.writeEntry("manualTrigger", manualTrigger());
+ os.writeEntry("active", active());
+
+ os.endBlock();
}
diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.C b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
index fe2f9796e4c..38c1d6b91ee 100644
--- a/src/dynamicMesh/boundaryPatch/boundaryPatch.C
+++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
@@ -90,8 +90,8 @@ Foam::boundaryPatch::~boundaryPatch()
void Foam::boundaryPatch::write(Ostream& os) const
{
patchIdentifier::write(os);
- os.writeKeyword("nFaces") << size_ << token::END_STATEMENT << nl;
- os.writeKeyword("startFace") << start_ << token::END_STATEMENT << nl;
+ os.writeEntry("nFaces", size_);
+ os.writeEntry("startFace", start_);
}
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 7f3b08d1e96..86043002269 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -174,8 +174,8 @@ write(Ostream& os) const
// Note: write value
fixedValuePointPatchVectorField::write(os);
- os.writeKeyword(solidBodyMotionFunction::typeName) << SBMFPtr_->type()
- << token::END_STATEMENT << nl;
+ os.writeEntry(solidBodyMotionFunction::typeName, SBMFPtr_->type());
+
os << indent << word(SBMFPtr_->type() + "Coeffs");
SBMFPtr_->writeData(os);
}
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 5aa0b5ed993..1b2475dc479 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -506,34 +506,16 @@ void Foam::perfectInterface::write(Ostream& os) const
void Foam::perfectInterface::writeDict(Ostream& os) const
{
- os << nl << name() << nl << token::BEGIN_BLOCK << nl
-
- << " type " << type()
- << token::END_STATEMENT << nl
-
- << " active " << active()
- << token::END_STATEMENT << nl
-
- << " faceZoneName " << faceZoneID_.name()
- << token::END_STATEMENT << nl
-
- << " masterPatchName " << masterPatchID_.name()
- << token::END_STATEMENT << nl
-
- << " slavePatchName " << slavePatchID_.name()
- << token::END_STATEMENT << nl
-
- << token::END_BLOCK << endl;
+ os << nl;
+
+ os.beginBlock(name());
+ os.writeEntry("type", type());
+ os.writeEntry("active", active());
+ os.writeEntry("faceZoneName", faceZoneID_.name());
+ os.writeEntry("masterPatchName", masterPatchID_.name());
+ os.writeEntry("slavePatchName", slavePatchID_.name());
+ os.endBlock();
}
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/src/dynamicMesh/setUpdater/setUpdater.C b/src/dynamicMesh/setUpdater/setUpdater.C
index c121af2a846..f7c4f8edc16 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.C
+++ b/src/dynamicMesh/setUpdater/setUpdater.C
@@ -45,14 +45,8 @@ namespace Foam
);
}
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
Foam::setUpdater::setUpdater
(
const word& name,
@@ -111,22 +105,13 @@ void Foam::setUpdater::write(Ostream& os) const
void Foam::setUpdater::writeDict(Ostream& os) const
{
- os << nl << name() << nl << token::BEGIN_BLOCK << nl
- << " type " << type()
- << token::END_STATEMENT << nl
- << " active " << active()
- << token::END_STATEMENT << nl
- << token::END_BLOCK << endl;
-}
-
+ os << nl;
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+ os.beginBlock(name());
+ os.writeEntry("type", type());
+ os.writeEntry("active", active());
+ os.endBlock();
+}
// ************************************************************************* //
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 7048a5713ab..84caf4901b3 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -765,30 +765,22 @@ void Foam::slidingInterface::write(Ostream& os) const
void Foam::slidingInterface::writeDict(Ostream& os) const
{
- os << nl << name() << nl << token::BEGIN_BLOCK << nl
- << " type " << type() << token::END_STATEMENT << nl
- << " masterFaceZoneName " << masterFaceZoneID_.name()
- << token::END_STATEMENT << nl
- << " slaveFaceZoneName " << slaveFaceZoneID_.name()
- << token::END_STATEMENT << nl
- << " cutPointZoneName " << cutPointZoneID_.name()
- << token::END_STATEMENT << nl
- << " cutFaceZoneName " << cutFaceZoneID_.name()
- << token::END_STATEMENT << nl
- << " masterPatchName " << masterPatchID_.name()
- << token::END_STATEMENT << nl
- << " slavePatchName " << slavePatchID_.name()
- << token::END_STATEMENT << nl
- << " typeOfMatch " << typeOfMatchNames_[matchType_]
- << token::END_STATEMENT << nl
- << " coupleDecouple " << coupleDecouple_
- << token::END_STATEMENT << nl
- << " projection " << intersection::algorithmNames_[projectionAlgo_]
- << token::END_STATEMENT << nl
- << " attached " << attached_
- << token::END_STATEMENT << nl
- << " active " << active()
- << token::END_STATEMENT << nl;
+ os << nl;
+
+ os.beginBlock(name());
+
+ os.writeEntry("type", type());
+ os.writeEntry("masterFaceZoneName", masterFaceZoneID_.name());
+ os.writeEntry("slaveFaceZoneName", slaveFaceZoneID_.name());
+ os.writeEntry("cutPointZoneName", cutPointZoneID_.name());
+ os.writeEntry("cutFaceZoneName", cutFaceZoneID_.name());
+ os.writeEntry("masterPatchName", masterPatchID_.name());
+ os.writeEntry("slavePatchName", slavePatchID_.name());
+ os.writeEntry("typeOfMatch", typeOfMatchNames_[matchType_]);
+ os.writeEntry("coupleDecouple", coupleDecouple_);
+ os.writeEntry("projection", intersection::algorithmNames_[projectionAlgo_]);
+ os.writeEntry("attached", attached_);
+ os.writeEntry("active", active());
if (attached_)
{
@@ -797,10 +789,8 @@ void Foam::slidingInterface::writeDict(Ostream& os) const
masterStickOutFacesPtr_->writeEntry("masterStickOutFaces", os);
slaveStickOutFacesPtr_->writeEntry("slaveStickOutFaces", os);
- os << " retiredPointMap " << retiredPointMap()
- << token::END_STATEMENT << nl
- << " cutPointEdgePairMap " << cutPointEdgePairMap()
- << token::END_STATEMENT << nl;
+ os.writeEntry("retiredPointMap", retiredPointMap());
+ os.writeEntry("cutPointEdgePairMap", cutPointEdgePairMap());
}
WRITE_NON_DEFAULT(pointMergeTol)
@@ -812,7 +802,7 @@ void Foam::slidingInterface::writeDict(Ostream& os) const
WRITE_NON_DEFAULT(edgeCoPlanarTol)
WRITE_NON_DEFAULT(edgeEndCutoffTol)
- os << token::END_BLOCK << endl;
+ os.endBlock();
}
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index b1f64847c58..541b9b0d29c 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -571,21 +571,20 @@ void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
void Foam::MRFZone::writeData(Ostream& os) const
{
os << nl;
- os.write(name_) << nl;
- os << token::BEGIN_BLOCK << incrIndent << nl;
- os.writeKeyword("active") << active_ << token::END_STATEMENT << nl;
- os.writeKeyword("cellZone") << cellZoneName_ << token::END_STATEMENT << nl;
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("axis") << axis_ << token::END_STATEMENT << nl;
+ os.beginBlock(name_);
+
+ os.writeEntry("active", active_);
+ os.writeEntry("cellZone", cellZoneName_);
+ os.writeEntry("origin", origin_);
+ os.writeEntry("axis", axis_);
omega_->writeData(os);
if (excludedPatchNames_.size())
{
- os.writeKeyword("nonRotatingPatches") << excludedPatchNames_
- << token::END_STATEMENT << nl;
+ os.writeEntry("nonRotatingPatches", excludedPatchNames_);
}
- os << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index 6749dfb7494..8f33573a0ff 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -158,9 +158,9 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
void Foam::SRFFreestreamVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("relative") << relative_ << token::END_STATEMENT << nl;
- os.writeKeyword("UInf") << UInf_ << token::END_STATEMENT << nl;
- os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
+ os.writeEntry("relative", relative_);
+ os.writeEntry("UInf", UInf_);
+ os.writeEntry("phi", this->phiName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
index ba3a0457269..590c5390088 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
@@ -153,7 +153,7 @@ void Foam::SRFVelocityFvPatchVectorField::updateCoeffs()
void Foam::SRFVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("relative") << relative_ << token::END_STATEMENT << nl;
+ os.writeEntry("relative", relative_);
inletValue_.writeEntry("inletValue", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C
index 88730167b86..36a87ffec42 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C
@@ -29,24 +29,23 @@ License
void Foam::fv::option::writeHeader(Ostream& os) const
{
- os << indent << name_ << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(name_);
}
void Foam::fv::option::writeFooter(Ostream& os) const
{
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
void Foam::fv::option::writeData(Ostream& os) const
{
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
- os.writeKeyword("active") << active_ << token::END_STATEMENT << nl << nl;
+ os.writeEntry("type", type());
+ os.writeEntry("active", active_);
- os << indent << word(type() + "Coeffs");
- coeffs_.write(os);
+ os << nl;
+ coeffs_.writeEntry(word(type() + "Coeffs"), os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 18213659c76..4761e61da7e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -292,18 +292,12 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
void Foam::activeBaffleVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
- os.writeKeyword("cyclicPatch")
- << cyclicPatchName_ << token::END_STATEMENT << nl;
- os.writeKeyword("orientation")
- << orientation_ << token::END_STATEMENT << nl;
- os.writeKeyword("openingTime")
- << openingTime_ << token::END_STATEMENT << nl;
- os.writeKeyword("maxOpenFractionDelta")
- << maxOpenFractionDelta_ << token::END_STATEMENT << nl;
- os.writeKeyword("openFraction")
- << openFraction_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
+ os.writeEntry("cyclicPatch", cyclicPatchName_);
+ os.writeEntry("orientation", orientation_);
+ os.writeEntry("openingTime", openingTime_);
+ os.writeEntry("maxOpenFractionDelta", maxOpenFractionDelta_);
+ os.writeEntry("openFraction", openFraction_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 438d135ff8d..a0f66f5739c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -377,21 +377,14 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::
write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
- os.writeKeyword("cyclicPatch")
- << cyclicPatchName_ << token::END_STATEMENT << nl;
- os.writeKeyword("openingTime")
- << openingTime_ << token::END_STATEMENT << nl;
- os.writeKeyword("maxOpenFractionDelta")
- << maxOpenFractionDelta_ << token::END_STATEMENT << nl;
- os.writeKeyword("openFraction")
- << openFraction_ << token::END_STATEMENT << nl;
- os.writeKeyword("minThresholdValue")
- << minThresholdValue_ << token::END_STATEMENT << nl;
- os.writeKeyword("forceBased")
- << fBased_ << token::END_STATEMENT << nl;
- os.writeKeyword("opening")
- << opening_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
+ os.writeEntry("cyclicPatch", cyclicPatchName_);
+ os.writeEntry("openingTime", openingTime_);
+ os.writeEntry("maxOpenFractionDelta", maxOpenFractionDelta_);
+ os.writeEntry("openFraction", openFraction_);
+ os.writeEntry("minThresholdValue", minThresholdValue_);
+ os.writeEntry("forceBased", fBased_);
+ os.writeEntry("opening", opening_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index aa86f9936c0..fe7567c9afe 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -339,13 +339,13 @@ void Foam::advectiveFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->template writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- this->template writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
if (lInf_ > 0)
{
- os.writeKeyword("fieldInf") << fieldInf_ << token::END_STATEMENT << nl;
- os.writeKeyword("lInf") << lInf_ << token::END_STATEMENT << nl;
+ os.writeEntry("fieldInf", fieldInf_);
+ os.writeEntry("lInf", lInf_);
}
this->writeEntry("value", os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 12ab0338479..2081404eac3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -268,8 +268,7 @@ Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
// Make sure to construct the patchfield with up-to-date value
OStringStream os;
- os.writeKeyword("type") << name_ << token::END_STATEMENT
- << nl;
+ os.writeEntry("type", name_);
static_cast<const Field<Type>&>(*this).writeEntry("value", os);
IStringStream is(os.str());
dictionary dict(is);
@@ -331,8 +330,7 @@ template<class Type>
void Foam::codedFixedValueFvPatchField<Type>::write(Ostream& os) const
{
fixedValueFvPatchField<Type>::write(os);
- os.writeKeyword("name") << name_
- << token::END_STATEMENT << nl;
+ os.writeEntry("name", name_);
codedBase::writeCodeDict(os, dict_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
index 0dd3600e585..6bbdb3c5a47 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
@@ -343,8 +343,7 @@ template<class Type>
void Foam::codedMixedFvPatchField<Type>::write(Ostream& os) const
{
mixedFvPatchField<Type>::write(os);
- os.writeKeyword("name") << name_
- << token::END_STATEMENT << nl;
+ os.writeEntry("name", name_);
codedBase::writeCodeDict(os, dict_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index d6223500e0d..31a67024a51 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -147,8 +147,8 @@ void Foam::cylindricalInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::cylindricalInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
- os.writeKeyword("centre") << centre_ << token::END_STATEMENT << nl;
- os.writeKeyword("axis") << axis_ << token::END_STATEMENT << nl;
+ os.writeEntry("centre", centre_);
+ os.writeEntry("axis", axis_);
axialVelocity_->writeData(os);
radialVelocity_->writeData(os);
rpm_->writeData(os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index e22d979213d..6e116998906 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -132,12 +132,9 @@ template<class Type>
void Foam::fanFvPatchField<Type>::write(Ostream& os) const
{
uniformJumpFvPatchField<Type>::write(os);
- this->template writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- this->template writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- this->template writeEntryIfDifferent<bool>
- (
- os, "uniformJump", false, uniformJump_
- );
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<bool>("uniformJump", false, uniformJump_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 52764fc6a3d..726084c732a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -155,8 +155,7 @@ template<class Type>
void Foam::fixedJumpFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- os.writeKeyword("patchType") << this->interfaceFieldType()
- << token::END_STATEMENT << nl;
+ os.writeEntry("patchType", this->interfaceFieldType());
if (this->cyclicPatch().owner())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index 2229069a14d..d043e573c31 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -169,8 +169,7 @@ template<class Type>
void Foam::fixedJumpAMIFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- os.writeKeyword("patchType") << this->interfaceFieldType()
- << token::END_STATEMENT << nl;
+ os.writeEntry("patchType", this->interfaceFieldType());
if (this->cyclicAMIPatch().owner())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index e2c2669d2e0..1155c5d022f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -181,13 +181,13 @@ void Foam::fixedNormalInletOutletVelocityFvPatchVectorField::write
const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- os.writeKeyword("fixTangentialInflow")
- << fixTangentialInflow_ << token::END_STATEMENT << nl;
- os.writeKeyword("normalVelocity")
- << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntry("fixTangentialInflow", fixTangentialInflow_);
+
+ os.beginBlock("normalVelocity");
normalVelocity_->write(os);
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
+
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
index 6190926fc8c..cc1b0f4ff93 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
@@ -128,7 +128,7 @@ void Foam::fixedPressureCompressibleDensityFvPatchScalarField::write
) const
{
fvPatchField<scalar>::write(os);
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index be523343383..1deba5890f7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -158,8 +158,8 @@ void Foam::fixedProfileFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
profile_->writeData(os);
- os.writeKeyword("direction") << dir_ << token::END_STATEMENT << nl;
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
+ os.writeEntry("direction", dir_);
+ os.writeEntry("origin", origin_);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 2f14a7d2152..f40f399ad34 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -243,11 +243,10 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
flowRate_->writeData(os);
if (!volumetric_)
{
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<scalar>(os, "rhoInlet", -VGREAT, rhoInlet_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<scalar>("rhoInlet", -VGREAT, rhoInlet_);
}
- os.writeKeyword("extrapolateProfile")
- << extrapolateProfile_ << token::END_STATEMENT << nl;
+ os.writeEntry("extrapolateProfile", extrapolateProfile_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index cd06d768953..ed9d095a2a1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -228,8 +228,8 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::write(Ostream& os) const
flowRate_->writeData(os);
if (!volumetric_)
{
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<scalar>(os, "rhoOutlet", -VGREAT, rhoOutlet_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<scalar>("rhoOutlet", -VGREAT, rhoOutlet_);
}
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index 10124ec9f83..217b6734604 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -138,8 +138,8 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
void Foam::fluxCorrectedVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 49ae3f5b27a..eac0fe4feb0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -108,11 +108,7 @@ template<class Type>
void Foam::freestreamFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- if (this->phiName_ != "phi")
- {
- os.writeKeyword("phi")
- << this->phiName_ << token::END_STATEMENT << nl;
- }
+ os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
freestreamValue().writeEntry("freestreamValue", os);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index 1c8787e5e46..1986bc40d68 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -156,9 +156,9 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
void Foam::freestreamPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 49aa47efad4..59654abb923 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -138,10 +138,7 @@ template<class Type>
void Foam::inletOutletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- if (phiName_ != "phi")
- {
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- }
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->refValue().writeEntry("inletValue", os);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 5735ee62229..679cb120552 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -189,10 +189,10 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::write(Ostream& os)
const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", this->phiName_);
- writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
- os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
+ os.writeEntryIfDifferent<word>("psi", "psi", psiName_);
+ os.writeEntry("gamma", gamma_);
T0_.writeEntry("T0", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index 00f2a8307ef..057be9e9213 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -143,7 +143,7 @@ void Foam::interstitialInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::interstitialInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
- writeEntryIfDifferent<word>(os, "alpha", "alpha", alphaName_);
+ os.writeEntryIfDifferent<word>("alpha", "alpha", alphaName_);
inletVelocity_.writeEntry("inletVelocity", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index 52072044ccf..11349a08ca6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -314,11 +314,10 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
template<class Type>
void mappedPatchFieldBase<Type>::write(Ostream& os) const
{
- os.writeKeyword("field") << fieldName_ << token::END_STATEMENT << nl;
- os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
- os.writeKeyword("average") << average_ << token::END_STATEMENT << nl;
- os.writeKeyword("interpolationScheme") << interpolationScheme_
- << token::END_STATEMENT << nl;
+ os.writeEntry("field", fieldName_);
+ os.writeEntry("setAverage", setAverage_);
+ os.writeEntry("average", average_);
+ os.writeEntry("interpolationScheme", interpolationScheme_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
index 81cce9b1b52..27d67c67974 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
@@ -186,9 +186,9 @@ void Foam::mappedFlowRateFvPatchVectorField::write
) const
{
fvPatchField<vector>::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- os.writeKeyword("nbrPhi") << nbrPhiName_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntry("nbrPhi", nbrPhiName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
index 89c0c11bf7c..e35b556c480 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
@@ -233,7 +233,7 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::write
) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
index 4ea359ee5b2..30987e05dbb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
@@ -244,13 +244,11 @@ void Foam::matchedFlowRateOutletVelocityFvPatchVectorField::write
) const
{
fvPatchField<vector>::write(os);
- os.writeKeyword("inletPatch")
- << inletPatchName_ << token::END_STATEMENT << nl;
+ os.writeEntry("inletPatch", inletPatchName_);
if (!volumetric_)
{
- os.writeKeyword("volumetric")
- << volumetric_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntry("volumetric", volumetric_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
}
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 408b40686b5..80b94c53839 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -138,10 +138,7 @@ template<class Type>
void Foam::outletInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- if (phiName_ != "phi")
- {
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- }
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->refValue().writeEntry("outletValue", os);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 6cb337ff099..5490a8a930f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -168,12 +168,8 @@ template<class Type>
void Foam::outletMappedUniformInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- os.writeKeyword("outletPatch")
- << outletPatchName_ << token::END_STATEMENT << nl;
- if (phiName_ != "phi")
- {
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- }
+ os.writeEntry("outletPatch", outletPatchName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index f92a4bf136d..b1fef5b04be 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -167,10 +167,8 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::write
{
fvPatchField<vector>::write(os);
- os.writeKeyword("Umean") << Umean_
- << token::END_STATEMENT << nl;
- os.writeKeyword("alpha") << alphaName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("Umean", Umean_);
+ os.writeEntry("alpha", alphaName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 0dd82e8c443..a585876bd4a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -163,14 +163,10 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
void Foam::phaseHydrostaticPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- if (phaseFraction_ != "alpha")
- {
- os.writeKeyword("phaseFraction")
- << phaseFraction_ << token::END_STATEMENT << nl;
- }
- os.writeKeyword("rho") << rho_ << token::END_STATEMENT << nl;
- os.writeKeyword("pRefValue") << pRefValue_ << token::END_STATEMENT << nl;
- os.writeKeyword("pRefPoint") << pRefPoint_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("phaseFraction", "alpha", phaseFraction_);
+ os.writeEntry("rho", rho_);
+ os.writeEntry("pRefValue", pRefValue_);
+ os.writeEntry("pRefPoint", pRefPoint_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index f1dbf71611c..8464d32d0d5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -300,32 +300,22 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
void Foam::plenumPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("gamma") << gamma_
- << token::END_STATEMENT << nl;
- os.writeKeyword("R") << R_
- << token::END_STATEMENT << nl;
- os.writeKeyword("supplyMassFlowRate") << supplyMassFlowRate_
- << token::END_STATEMENT << nl;
- os.writeKeyword("supplyTotalTemperature") << supplyTotalTemperature_
- << token::END_STATEMENT << nl;
- os.writeKeyword("plenumVolume") << plenumVolume_
- << token::END_STATEMENT << nl;
- os.writeKeyword("plenumDensity") << plenumDensity_
- << token::END_STATEMENT << nl;
- os.writeKeyword("plenumTemperature") << plenumTemperature_
- << token::END_STATEMENT << nl;
+ os.writeEntry("gamma", gamma_);
+ os.writeEntry("R", R_);
+ os.writeEntry("supplyMassFlowRate", supplyMassFlowRate_);
+ os.writeEntry("supplyTotalTemperature", supplyTotalTemperature_);
+ os.writeEntry("plenumVolume", plenumVolume_);
+ os.writeEntry("plenumDensity", plenumDensity_);
+ os.writeEntry("plenumTemperature", plenumTemperature_);
if (hasRho_)
{
- os.writeKeyword("rho") << rho_
- << token::END_STATEMENT << nl;
+ os.writeEntry("rho", rho_);
}
- os.writeKeyword("inletAreaRatio") << inletAreaRatio_
- << token::END_STATEMENT << nl;
- os.writeKeyword("inletDischargeCoefficient") << inletDischargeCoefficient_
- << token::END_STATEMENT << nl;
- writeEntryIfDifferent<scalar>(os, "timeScale", 0.0, timeScale_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
+ os.writeEntry("inletAreaRatio", inletAreaRatio_);
+ os.writeEntry("inletDischargeCoefficient", inletDischargeCoefficient_);
+ os.writeEntryIfDifferent<scalar>("timeScale", 0.0, timeScale_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index c472c754eb8..d7b72b17bab 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -190,8 +190,8 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
inletDir_.writeEntry("inletDirection", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index 9ab1bc87ef4..2d42d60d522 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -178,8 +178,8 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
inletDir_.writeEntry("inletDirection", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 84abe77c3f0..2ddaa235cf7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -164,8 +164,8 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 32f8aa2cfb2..84aab726fad 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -188,7 +188,7 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::write
const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
if (tangentialVelocity_.size())
{
tangentialVelocity_.writeEntry("tangentialVelocity", os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index 06e58e73bb7..e1a24d4ba0f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -143,8 +143,8 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::pressureInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 84689bf1e96..08b71bf468d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -160,8 +160,8 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
+ os.writeEntry("phi", phiName_);
+ os.writeEntry("rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index 9b5e347fbd2..68c6e78cb36 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -365,20 +365,17 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::write
{
fvPatchField<vector>::write(os);
- os.writeKeyword("deltaP") << deltaP_ << token::END_STATEMENT << nl;
- os.writeKeyword("upstream") << upstreamName_ << token::END_STATEMENT << nl;
- os.writeKeyword("downstream")
- << downstreamName_ << token::END_STATEMENT << nl;
- os.writeKeyword("shapeFactor") << shapeFactor_
- << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
- writeEntryIfDifferent<word>(os, "rho", "none", rhoName_);
- os.writeKeyword("P") << P_ << token::END_STATEMENT << nl;
- os.writeKeyword("I") << I_ << token::END_STATEMENT << nl;
- os.writeKeyword("D") << D_ << token::END_STATEMENT << nl;
- os.writeKeyword("error") << error_ << token::END_STATEMENT << nl;
- os.writeKeyword("errorIntegral")
- << errorIntegral_ << token::END_STATEMENT << nl;
+ os.writeEntry("deltaP", deltaP_);
+ os.writeEntry("upstream", upstreamName_);
+ os.writeEntry("downstream", downstreamName_);
+ os.writeEntry("shapeFactor", shapeFactor_);
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
+ os.writeEntryIfDifferent<word>("rho", "none", rhoName_);
+ os.writeEntry("P", P_);
+ os.writeEntry("I", I_);
+ os.writeEntry("D", D_);
+ os.writeEntry("error", error_);
+ os.writeEntry("errorIntegral", errorIntegral_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index c266d27f856..e365010fa15 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -171,7 +171,7 @@ void Foam::prghPressureFvPatchScalarField::updateCoeffs()
void Foam::prghPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
p_.writeEntry("p", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
index e1705e24bcd..9558a893ee5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
@@ -146,10 +146,10 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<word>(os, "ph_rgh", "ph_rgh", ph_rghName_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("ph_rgh", "ph_rgh", ph_rghName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 9a4f9b15721..feeed484333 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -191,9 +191,9 @@ void Foam::prghTotalPressureFvPatchScalarField::updateCoeffs()
void Foam::prghTotalPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
p0_.writeEntry("p0", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 4f22a43edad..edaca467e2e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -128,7 +128,7 @@ void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("phi") << phiName() << token::END_STATEMENT << nl;
+ os.writeEntry("phi", phiName());
omega_->writeData(os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index ebc32b0790c..d322862f4a6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -145,8 +145,8 @@ void Foam::rotatingWallVelocityFvPatchVectorField::updateCoeffs()
void Foam::rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("axis") << axis_ << token::END_STATEMENT << nl;
+ os.writeEntry("origin", origin_);
+ os.writeEntry("axis", axis_);
omega_->writeData(os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index ddfb7c790c2..39c06df42c9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -297,13 +297,13 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "T", "T", TName_);
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
- writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
- os.writeKeyword("UInf") << UInf_ << token::END_STATEMENT << nl;
- os.writeKeyword("pInf") << pInf_ << token::END_STATEMENT << nl;
- os.writeKeyword("TInf") << TInf_ << token::END_STATEMENT << nl;
- os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("T", "T", TName_);
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
+ os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
+ os.writeEntry("UInf", UInf_);
+ os.writeEntry("pInf", pInf_);
+ os.writeEntry("TInf", TInf_);
+ os.writeEntry("gamma", gamma_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 861bac7f9b1..44ddaa37ddb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -199,10 +199,10 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
) const
{
fvPatchField<vector>::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("axis") << axis_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntry("origin", origin_);
+ os.writeEntry("axis", axis_);
flowRate_->writeData(os);
rpm_->writeData(os);
writeEntry("value", os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
index 79ee1cb2c96..4b76142d9f6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
@@ -145,8 +145,8 @@ void Foam::swirlInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::swirlInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("axis") << axis_ << token::END_STATEMENT << nl;
+ os.writeEntry("origin", origin_);
+ os.writeEntry("axis", axis_);
axialVelocity_->writeData(os);
radialVelocity_->writeData(os);
tangentialVelocity_->writeData(os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index c33db45ca26..a086f891608 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -233,17 +233,17 @@ void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("Ap") << Ap_ << token::END_STATEMENT << nl;
- os.writeKeyword("Sp") << Sp_ << token::END_STATEMENT << nl;
- os.writeKeyword("VsI") << VsI_ << token::END_STATEMENT << nl;
- os.writeKeyword("tas") << tas_ << token::END_STATEMENT << nl;
- os.writeKeyword("tae") << tae_ << token::END_STATEMENT << nl;
- os.writeKeyword("tds") << tds_ << token::END_STATEMENT << nl;
- os.writeKeyword("tde") << tde_ << token::END_STATEMENT << nl;
- os.writeKeyword("psI") << psI_ << token::END_STATEMENT << nl;
- os.writeKeyword("psi") << psi_ << token::END_STATEMENT << nl;
- os.writeKeyword("ams") << ams_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ os.writeEntry("Ap", Ap_);
+ os.writeEntry("Sp", Sp_);
+ os.writeEntry("VsI", VsI_);
+ os.writeEntry("tas", tas_);
+ os.writeEntry("tae", tae_);
+ os.writeEntry("tds", tds_);
+ os.writeEntry("tde", tde_);
+ os.writeEntry("psI", psI_);
+ os.writeEntry("psi", psi_);
+ os.writeEntry("ams", ams_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 5ba985a24e2..af626c2c5e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -568,23 +568,20 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
{
fvPatchField<Type>::write(os);
- this->writeEntryIfDifferent(os, "setAverage", Switch(false), setAverage_);
+ os.writeEntryIfDifferent("setAverage", Switch(false), setAverage_);
+ os.writeEntryIfDifferent<scalar>("perturb", 1e-5, perturb_);
- this->writeEntryIfDifferent(os, "perturb", scalar(1e-5), perturb_);
-
- this->writeEntryIfDifferent
+ os.writeEntryIfDifferent
(
- os,
"fieldTable",
this->internalField().name(),
fieldTableName_
);
- this->writeEntryIfDifferent
+ os.writeEntryIfDifferent<word>
(
- os,
"mapMethod",
- word("planarInterpolation"),
+ "planarInterpolation",
mapMethod_
);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index de94aeeffe3..65461cc9c49 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -243,11 +243,11 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs()
void Foam::totalPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
- os.writeKeyword("psi") << psiName_ << token::END_STATEMENT << nl;
- os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntry("rho", rhoName_);
+ os.writeEntry("psi", psiName_);
+ os.writeEntry("gamma", gamma_);
p0_.writeEntry("p0", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index df7d20629c5..771ebb53d84 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -177,10 +177,10 @@ void Foam::totalTemperatureFvPatchScalarField::updateCoeffs()
void Foam::totalTemperatureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
- os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
+ os.writeEntry("gamma", gamma_);
T0_.writeEntry("T0", os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 5d1bce06740..5dda8366392 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -1103,12 +1103,12 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
writeEntry("value", os);
- os.writeKeyword("delta") << delta_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<scalar>(os, "d", 1.0, d_);
- writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_);
- writeEntryIfDifferent<scalar>(os, "perturb", 1e-5, perturb_);
- writeEntryIfDifferent<label>(os, "nCellPerEddy", 5, nCellPerEddy_);
- writeEntryIfDifferent(os, "writeEddies", false, writeEddies_);
+ os.writeEntry("delta", delta_);
+ os.writeEntryIfDifferent<scalar>("d", 1.0, d_);
+ os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
+ os.writeEntryIfDifferent<scalar>("perturb", 1e-5, perturb_);
+ os.writeEntryIfDifferent<label>("nCellPerEddy", 5, nCellPerEddy_);
+ os.writeEntryIfDifferent("writeEddies", false, writeEddies_);
if (!interpolateR_)
{
@@ -1125,14 +1125,14 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
U_.writeEntry("U", os);
}
- if
- (
- !mapMethod_.empty()
- && mapMethod_ != "planarInterpolation"
- )
+ if (!mapMethod_.empty())
{
- os.writeKeyword("mapMethod") << mapMethod_
- << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>
+ (
+ "mapMethod",
+ "planarInterpolation",
+ mapMethod_
+ );
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index b457ecd85a3..57032e53c0f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -196,10 +196,9 @@ template<class Type>
void Foam::turbulentInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- os.writeKeyword("fluctuationScale")
- << fluctuationScale_ << token::END_STATEMENT << nl;
+ os.writeEntry("fluctuationScale", fluctuationScale_);
referenceField_.writeEntry("referenceField", os);
- os.writeKeyword("alpha") << alpha_ << token::END_STATEMENT << nl;
+ os.writeEntry("alpha", alpha_);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 20369fe63c3..14ec2d187ff 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -149,9 +149,9 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("intensity") << intensity_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", this->phiName_);
+ os.writeEntry("intensity", intensity_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index ba14325c6a3..fb6367a51a6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -144,9 +144,9 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("rho") << rho_ << token::END_STATEMENT << nl;
- os.writeKeyword("pRefValue") << pRefValue_ << token::END_STATEMENT << nl;
- os.writeKeyword("pRefPoint") << pRefPoint_ << token::END_STATEMENT << nl;
+ os.writeEntry("rho", rho_);
+ os.writeEntry("pRefValue", pRefValue_);
+ os.writeEntry("pRefPoint", pRefPoint_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 011b8552fd4..647398f4b05 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -160,10 +160,7 @@ template<class Type>
void Foam::uniformInletOutletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- if (phiName_ != "phi")
- {
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- }
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
this->uniformInletValue_->writeData(os);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 152a74937c7..ea3c1705c6c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -227,11 +227,11 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs()
void Foam::uniformTotalPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
- os.writeKeyword("psi") << psiName_ << token::END_STATEMENT << nl;
- os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntry("rho", rhoName_);
+ os.writeEntry("psi", psiName_);
+ os.writeEntry("gamma", gamma_);
p0_->writeData(os);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index 341d6134325..9f9f89865ac 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -173,12 +173,9 @@ void Foam::variableHeightFlowRateFvPatchScalarField::updateCoeffs()
void Foam::variableHeightFlowRateFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- if (phiName_ != "phi")
- {
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- }
- os.writeKeyword("lowerBound") << lowerBound_ << token::END_STATEMENT << nl;
- os.writeKeyword("upperBound") << upperBound_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntry("lowerBound", lowerBound_);
+ os.writeEntry("upperBound", upperBound_);
this->writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index f0f3802339c..40a7ce65d96 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -133,7 +133,7 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
{
fvPatchField<vector>::write(os);
flowRate_->writeData(os);
- os.writeKeyword("alpha") << alphaName_ << token::END_STATEMENT << nl;
+ os.writeEntry("alpha", alphaName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 4d986bd2914..440c1e28595 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -229,9 +229,9 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
void Foam::waveSurfacePressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "zeta", "zeta", zetaName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("zeta", "zeta", zetaName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index eb80ace5c9c..863ede5a135 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -139,21 +139,16 @@ void Foam::waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- this->template
- writeEntryIfDifferent<word>(os, "phi", "phi", this->phiName_);
- this->template
- writeEntryIfDifferent<word>(os, "rho", "rho", this->rhoName_);
- this->template
- writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", this->rhoName_);
+ os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
- os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+ os.writeEntry("gamma", gamma_);
if (this->lInf_ > SMALL)
{
- os.writeKeyword("fieldInf") << this->fieldInf_
- << token::END_STATEMENT << nl;
- os.writeKeyword("lInf") << this->lInf_
- << token::END_STATEMENT << nl;
+ os.writeEntry("fieldInf", this->fieldInf_);
+ os.writeEntry("lInf", this->lInf_);
}
this->writeEntry("value", os);
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 52bd26e8095..764a266517e 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -362,29 +362,11 @@ void Foam::fvPatchField<Type>::manipulateMatrix
template<class Type>
void Foam::fvPatchField<Type>::write(Ostream& os) const
{
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
if (patchType_.size())
{
- os.writeKeyword("patchType") << patchType_
- << token::END_STATEMENT << nl;
- }
-}
-
-
-template<class Type>
-template<class EntryType>
-void Foam::fvPatchField<Type>::writeEntryIfDifferent
-(
- Ostream& os,
- const word& entryName,
- const EntryType& value1,
- const EntryType& value2
-) const
-{
- if (value1 != value2)
- {
- os.writeKeyword(entryName) << value2 << token::END_STATEMENT << nl;
+ os.writeEntry("patchType", patchType_);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index da0953aeba9..71d4a8ffd6f 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -530,17 +530,6 @@ public:
//- Write
virtual void write(Ostream&) const;
- //- Helper function to write the keyword and entry only if the
- // values are not equal. The value is then output as value2
- template<class EntryType>
- void writeEntryIfDifferent
- (
- Ostream& os,
- const word& entryName,
- const EntryType& value1,
- const EntryType& value2
- ) const;
-
// Check
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 8a8c96244c3..61db751a549 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -166,7 +166,7 @@ void Foam::fvsPatchField<Type>::rmap
template<class Type>
void Foam::fvsPatchField<Type>::write(Ostream& os) const
{
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
this->writeEntry("value", os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index e19f500b16c..843b115d07e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -179,16 +179,11 @@ void angularOscillatingDisplacementPointPatchVectorField::write
) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("axis")
- << axis_ << token::END_STATEMENT << nl;
- os.writeKeyword("origin")
- << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("angle0")
- << angle0_ << token::END_STATEMENT << nl;
- os.writeKeyword("amplitude")
- << amplitude_ << token::END_STATEMENT << nl;
- os.writeKeyword("omega")
- << omega_ << token::END_STATEMENT << nl;
+ os.writeEntry("axis", axis_);
+ os.writeEntry("origin", origin_);
+ os.writeEntry("angle0", angle0_);
+ os.writeEntry("amplitude", amplitude_);
+ os.writeEntry("omega", omega_);
p0_.writeEntry("p0", os);
writeEntry("value", os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 5932d8402c3..3f64821dd71 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -184,16 +184,11 @@ void angularOscillatingVelocityPointPatchVectorField::write
) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("axis")
- << axis_ << token::END_STATEMENT << nl;
- os.writeKeyword("origin")
- << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("angle0")
- << angle0_ << token::END_STATEMENT << nl;
- os.writeKeyword("amplitude")
- << amplitude_ << token::END_STATEMENT << nl;
- os.writeKeyword("omega")
- << omega_ << token::END_STATEMENT << nl;
+ os.writeEntry("axis", axis_);
+ os.writeEntry("origin", origin_);
+ os.writeEntry("angle0", angle0_);
+ os.writeEntry("amplitude", amplitude_);
+ os.writeEntry("omega", omega_);
p0_.writeEntry("p0", os);
writeEntry("value", os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index 9e36b8cefbe..98e83d7b88b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -117,10 +117,8 @@ void oscillatingDisplacementPointPatchVectorField::updateCoeffs()
void oscillatingDisplacementPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("amplitude")
- << amplitude_ << token::END_STATEMENT << nl;
- os.writeKeyword("omega")
- << omega_ << token::END_STATEMENT << nl;
+ os.writeEntry("amplitude", amplitude_);
+ os.writeEntry("omega", omega_);
writeEntry("value", os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index f75b568ecaf..f99d5385284 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -160,10 +160,8 @@ void oscillatingVelocityPointPatchVectorField::updateCoeffs()
void oscillatingVelocityPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("amplitude")
- << amplitude_ << token::END_STATEMENT << nl;
- os.writeKeyword("omega")
- << omega_ << token::END_STATEMENT << nl;
+ os.writeEntry("amplitude", amplitude_);
+ os.writeEntry("omega", omega_);
p0_.writeEntry("p0", os);
writeEntry("value", os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 85d3cd19fd8..5e2053ef990 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -470,10 +470,12 @@ void Foam::surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
os.writeEntry("projectDirection", projectDir_);
os.writeEntry("wedgePlane", wedgePlane_);
- if (frozenPointsZone_ != word::null)
- {
- os.writeEntry("frozenPointsZone", frozenPointsZone_);
- }
+ os.writeEntryIfDifferent<word>
+ (
+ "frozenPointsZone",
+ word::null,
+ frozenPointsZone_
+ );
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index a85df2a8637..469cebfb79b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -431,10 +431,13 @@ void Foam::surfaceSlipDisplacementPointPatchVectorField::write
os.writeEntry("projectMode", projectModeNames_[projectMode_]);
os.writeEntry("projectDirection", projectDir_);
os.writeEntry("wedgePlane", wedgePlane_);
- if (frozenPointsZone_ != word::null)
- {
- os.writeEntry("frozenPointsZone", frozenPointsZone_);
- }
+
+ os.writeEntryIfDifferent<word>
+ (
+ "frozenPointsZone",
+ word::null,
+ frozenPointsZone_
+ );
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index 886f9440e98..1fbcb49f96b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -596,23 +596,20 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::write
{
fixedValuePointPatchField<Type>::write(os);
- this->writeEntryIfDifferent(os, "setAverage", Switch(false), setAverage_);
+ os.writeEntryIfDifferent("setAverage", Switch(false), setAverage_);
+ os.writeEntryIfDifferent<scalar>("perturb", 1e-5, perturb_);
- this->writeEntryIfDifferent(os, "perturb", scalar(1e-5), perturb_);
-
- this->writeEntryIfDifferent
+ os.writeEntryIfDifferent
(
- os,
"fieldTable",
this->internalField().name(),
fieldTableName_
);
- this->writeEntryIfDifferent
+ os.writeEntryIfDifferent<word>
(
- os,
"mapMethod",
- word("planarInterpolation"),
+ "planarInterpolation",
mapMethod_
);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index ca1193bb432..82eee2cddca 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -260,10 +260,8 @@ void uniformInterpolatedDisplacementPointPatchVectorField::write(Ostream& os)
const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("field")
- << fieldName_ << token::END_STATEMENT << nl;
- os.writeKeyword("interpolationScheme")
- << interpolationScheme_ << token::END_STATEMENT << nl;
+ os.writeEntry("field", fieldName_);
+ os.writeEntry("interpolationScheme", interpolationScheme_);
writeEntry("value", os);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index 34976e9827e..e5196ceab99 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -121,12 +121,9 @@ void Foam::waveDisplacementPointPatchVectorField::updateCoeffs()
void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("amplitude")
- << amplitude_ << token::END_STATEMENT << nl;
- os.writeKeyword("omega")
- << omega_ << token::END_STATEMENT << nl;
- os.writeKeyword("waveNumber")
- << waveNumber_ << token::END_STATEMENT << nl;
+ os.writeEntry("amplitude", amplitude_);
+ os.writeEntry("omega", omega_);
+ os.writeEntry("waveNumber", waveNumber_);
writeEntry("value", os);
}
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 24ccdccae6a..d0a7f439d20 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -774,7 +774,7 @@ const Foam::word& Foam::genericFvPatchField<Type>::actualType() const
template<class Type>
void Foam::genericFvPatchField<Type>::write(Ostream& os) const
{
- os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
+ os.writeEntry("type", actualTypeName_);
forAllConstIter(dictionary, dict_, iter)
{
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 815d7af99b0..52744cdf3cd 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -567,7 +567,7 @@ const Foam::word& Foam::genericPointPatchField<Type>::actualType() const
template<class Type>
void Foam::genericPointPatchField<Type>::write(Ostream& os) const
{
- os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
+ os.writeEntry("type", actualTypeName_);
forAllConstIter(dictionary, dict_, iter)
{
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index e981fc903b9..00ccbe77390 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -43,9 +43,9 @@ Foam::phaseProperties::phaseProperties(Istream& is)
phase_ = phaseTypeNames[phaseInfo.keyword()];
stateLabel_ = phaseToStateLabel(phase_);
- if (phaseInfo.size() > 0)
+ const label nComponents = phaseInfo.size();
+ if (nComponents)
{
- label nComponents = phaseInfo.size();
names_.setSize(nComponents, "unknownSpecie");
Y_.setSize(nComponents, 0.0);
carrierIds_.setSize(nComponents, -1);
@@ -74,10 +74,9 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
pp.phase_ = pp.phaseTypeNames[phaseInfo.keyword()];
pp.stateLabel_ = pp.phaseToStateLabel(pp.phase_);
- if (phaseInfo.size() > 0)
+ const label nComponents = phaseInfo.size();
+ if (nComponents)
{
- label nComponents = phaseInfo.size();
-
pp.names_.setSize(nComponents, "unknownSpecie");
pp.Y_.setSize(nComponents, 0.0);
pp.carrierIds_.setSize(nComponents, -1);
@@ -101,16 +100,14 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
{
os.check(FUNCTION_NAME);
- os << pp.phaseTypeNames[pp.phase_] << nl << token::BEGIN_BLOCK << nl
- << incrIndent;
+ os.beginBlock(pp.phaseTypeNames[pp.phase_]);
forAll(pp.names_, cmptI)
{
- os.writeKeyword(pp.names_[cmptI]) << pp.Y_[cmptI]
- << token::END_STATEMENT << nl;
+ os.writeEntry(pp.names_[cmptI], pp.Y_[cmptI]);
}
- os << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
os.check(FUNCTION_NAME);
return os;
diff --git a/src/lagrangian/intermediate/submodels/CloudSubModelBase.C b/src/lagrangian/intermediate/submodels/CloudSubModelBase.C
index 39bcb8da2f2..807fd4e6cec 100644
--- a/src/lagrangian/intermediate/submodels/CloudSubModelBase.C
+++ b/src/lagrangian/intermediate/submodels/CloudSubModelBase.C
@@ -126,8 +126,7 @@ bool Foam::CloudSubModelBase<CloudType>::writeTime() const
template<class CloudType>
void Foam::CloudSubModelBase<CloudType>::write(Ostream& os) const
{
- os.writeKeyword("owner") << owner_.name() << token::END_STATEMENT
- << nl;
+ os.writeEntry("owner", owner_.name());
subModelBase::write(os);
}
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 1ed66474989..87bf0d84acb 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -184,9 +184,8 @@ void Foam::DispersionRASModel<CloudType>::write(Ostream& os) const
{
DispersionModel<CloudType>::write(os);
- os.writeKeyword("ownK") << ownK_ << token::END_STATEMENT << endl;
- os.writeKeyword("ownEpsilon") << ownEpsilon_ << token::END_STATEMENT
- << endl;
+ os.writeEntry("ownK", ownK_);
+ os.writeEntry("ownEpsilon", ownEpsilon_);
}
diff --git a/src/lumpedPointMotion/lumpedPointState.C b/src/lumpedPointMotion/lumpedPointState.C
index 0ef9f5a48fd..e15e3371c1c 100644
--- a/src/lumpedPointMotion/lumpedPointState.C
+++ b/src/lumpedPointMotion/lumpedPointState.C
@@ -254,7 +254,7 @@ void Foam::lumpedPointState::writeDict(Ostream& os) const
os.writeEntry("angles", angles_);
if (degrees_)
{
- os.writeKeyword("degrees") << "true;" << nl;
+ os.writeEntry("degrees", word("true"));
}
}
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
index d801ec591eb..4fbd6e39c94 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
@@ -592,8 +592,7 @@ void Foam::cyclicACMIPolyPatch::write(Ostream& os) const
{
cyclicAMIPolyPatch::write(os);
- os.writeKeyword("nonOverlapPatch") << nonOverlapPatchName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("nonOverlapPatch", nonOverlapPatchName_);
}
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 74015e3ece1..12f9546fcab 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -1058,8 +1058,7 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
coupledPolyPatch::write(os);
if (!nbrPatchName_.empty())
{
- os.writeKeyword("neighbourPatch") << nbrPatchName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("neighbourPatch", nbrPatchName_);
}
coupleGroup_.write(os);
@@ -1067,23 +1066,19 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
{
case ROTATIONAL:
{
- os.writeKeyword("rotationAxis") << rotationAxis_
- << token::END_STATEMENT << nl;
- os.writeKeyword("rotationCentre") << rotationCentre_
- << token::END_STATEMENT << nl;
+ os.writeEntry("rotationAxis", rotationAxis_);
+ os.writeEntry("rotationCentre", rotationCentre_);
if (rotationAngleDefined_)
{
- os.writeKeyword("rotationAngle") << radToDeg(rotationAngle_)
- << token::END_STATEMENT << nl;
+ os.writeEntry("rotationAngle", radToDeg(rotationAngle_));
}
break;
}
case TRANSLATIONAL:
{
- os.writeKeyword("separationVector") << separationVector_
- << token::END_STATEMENT << nl;
+ os.writeEntry("separationVector", separationVector_);
break;
}
case NOORDERING:
@@ -1098,30 +1093,29 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
if (AMIMethod_ != AMIPatchToPatchInterpolation::imFaceAreaWeight)
{
- os.writeKeyword("method")
- << AMIPatchToPatchInterpolation::interpolationMethodToWord
- (
- AMIMethod_
- )
- << token::END_STATEMENT << nl;
+ os.writeEntry
+ (
+ "method",
+ AMIPatchToPatchInterpolation::interpolationMethodToWord
+ (
+ AMIMethod_
+ )
+ );
}
if (AMIReverse_)
{
- os.writeKeyword("flipNormals") << AMIReverse_
- << token::END_STATEMENT << nl;
+ os.writeEntry("flipNormals", AMIReverse_);
}
if (AMILowWeightCorrection_ > 0)
{
- os.writeKeyword("lowWeightCorrection") << AMILowWeightCorrection_
- << token::END_STATEMENT << nl;
+ os.writeEntry("lowWeightCorrection", AMILowWeightCorrection_);
}
if (!surfDict_.empty())
{
- os.writeKeyword(surfDict_.dictName());
- os << surfDict_;
+ surfDict_.writeEntry(surfDict_.dictName(), os);
}
}
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
index fcbf9dd6ab0..46aad8db985 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
@@ -709,25 +709,10 @@ void Foam::cyclicPeriodicAMIPolyPatch::write(Ostream& os) const
{
cyclicAMIPolyPatch::write(os);
- os.writeKeyword("periodicPatch") << periodicPatchName_
- << token::END_STATEMENT << nl;
-
- if (nTransforms_ != 0)
- {
- os.writeKeyword("nTransforms") << nTransforms_ <<
- token::END_STATEMENT << nl;
- }
-
- if (nSectors_ != 0)
- {
- os.writeKeyword("nSectors") << nSectors_ <<
- token::END_STATEMENT << nl;
- }
-
- if (maxIter_ != 36)
- {
- os.writeKeyword("maxIter") << maxIter_ << token::END_STATEMENT << nl;
- }
+ os.writeEntry("periodicPatch", periodicPatchName_);
+ os.writeEntryIfDifferent<label>("nTransforms", 0, nTransforms_);
+ os.writeEntryIfDifferent<label>("nSectors", 0, nSectors_);
+ os.writeEntryIfDifferent<label>("maxIter", 36, maxIter_);
}
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index e8c507a7f84..b4a9e788200 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -297,25 +297,23 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
{
if (subDict)
{
- os << indent << name_ << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(name_);
}
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
-
- // The note entry is optional
if (note_.size())
{
- os.writeKeyword("note") << note_ << token::END_STATEMENT << nl;
+ // note is optional
+ os.writeEntry("note", note_);
}
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
+ os.writeEntry("origin", origin_);
R_->write(os);
if (subDict)
{
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 6f114e545b3..bf2a0801932 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -1432,8 +1432,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
if (!surfDict_.empty())
{
- os.writeKeyword(surfDict_.dictName());
- os << surfDict_;
+ surfDict_.writeEntry(surfDict_.dictName(), os);
}
}
}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
index 6248dce6506..2a40a4695d6 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
@@ -167,7 +167,7 @@ Foam::mappedVariableThicknessWallPolyPatch::
void Foam::mappedVariableThicknessWallPolyPatch::
write(Foam::Ostream& os) const
{
- os.writeKeyword("thickness") << thickness_ << token::END_STATEMENT << nl;
+ os.writeEntry("thickness", thickness_);
}
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
index bbdb866f94f..9defb4090bd 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@@ -331,21 +331,17 @@ bool Foam::regionCoupledBase::order
void Foam::regionCoupledBase::write(Ostream& os) const
{
- os.writeKeyword("neighbourPatch") << nbrPatchName_
- << token::END_STATEMENT << nl;
- os.writeKeyword("neighbourRegion") << nbrRegionName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("neighbourPatch", nbrPatchName_);
+ os.writeEntry("neighbourRegion", nbrRegionName_);
if (AMIReverse_)
{
- os.writeKeyword("flipNormals") << AMIReverse_
- << token::END_STATEMENT << nl;
+ os.writeEntry("flipNormals", AMIReverse_);
}
if (!surfDict_.empty())
{
- os.writeKeyword(surfDict_.dictName());
- os << surfDict_;
+ surfDict_.writeEntry(surfDict_.dictName(), os);
}
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index dac63860b81..86680da8d99 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -384,28 +384,23 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"pyrolysisRegion",
"pyrolysisProperties",
pyrolysisRegionName_
);
- os.writeKeyword("Tnbr")<< TnbrName_ << token::END_STATEMENT << nl;
- os.writeKeyword("qr")<< qrName_ << token::END_STATEMENT << nl;
- os.writeKeyword("convectiveScaling") << convectiveScaling_
- << token::END_STATEMENT << nl;
- os.writeKeyword("filmDeltaDry") << filmDeltaDry_
- << token::END_STATEMENT << nl;
- os.writeKeyword("filmDeltaWet") << filmDeltaWet_
- << token::END_STATEMENT << endl;
+ os.writeEntry("Tnbr", TnbrName_);
+ os.writeEntry("qr", qrName_);
+ os.writeEntry("convectiveScaling", convectiveScaling_);
+ os.writeEntry("filmDeltaDry", filmDeltaDry_);
+ os.writeEntry("filmDeltaWet", filmDeltaWet_);
temperatureCoupledBase::write(os);
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 3616268333e..6b1aee17452 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -186,22 +186,20 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write
) const
{
fvPatchScalarField::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"pyrolysisRegion",
"pyrolysisProperties",
pyrolysisRegionName_
);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index c5507e06a22..f4b4d445552 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -212,22 +212,20 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"pyrolysisRegion",
"pyrolysisProperties",
pyrolysisRegionName_
);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
index 18a0bc751eb..a4c48dfb133 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
@@ -132,9 +132,9 @@ void Foam::filmHeightInletVelocityFvPatchVectorField::updateCoeffs()
void Foam::filmHeightInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<word>(os, "deltaf", "deltaf", deltafName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("deltaf", "deltaf", deltafName_);
writeEntry("value", os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index e34296a1079..c2f1c552a5b 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -192,9 +192,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write
) const
{
fixedValueFvPatchScalarField::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 3bbc164e0af..084e4ad6dfd 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -191,9 +191,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write
) const
{
fvPatchVectorField::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index 09e76db86e9..f468aff4c6b 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -237,18 +237,17 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
void alphatFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
);
- os.writeKeyword("B") << B_ << token::END_STATEMENT << nl;
- os.writeKeyword("yPlusCrit") << yPlusCrit_ << token::END_STATEMENT << nl;
- os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
- os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
+ os.writeEntry("B", B_);
+ os.writeEntry("yPlusCrit", yPlusCrit_);
+ os.writeEntry("Cmu", Cmu_);
+ os.writeEntry("kappa", kappa_);
+ os.writeEntry("Prt", Prt_);
writeEntry("value", os);
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index b35804673e4..4b733d82680 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -247,16 +247,15 @@ tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::yPlus() const
void nutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- writeEntryIfDifferent<word>
+ os.writeEntryIfDifferent<word>
(
- os,
"filmRegion",
"surfaceFilmProperties",
filmRegionName_
);
writeLocalEntries(os);
- os.writeKeyword("B") << B_ << token::END_STATEMENT << nl;
- os.writeKeyword("yPlusCrit") << yPlusCrit_ << token::END_STATEMENT << nl;
+ os.writeEntry("B", B_);
+ os.writeEntry("yPlusCrit", yPlusCrit_);
writeEntry("value", os);
}
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 58f78403985..9895f146bc1 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -285,11 +285,10 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
os << dict_.subDict(extrudeModel) << nl;
word regionName = dict_.lookup("region");
- os.writeKeyword("region") << regionName << token::END_STATEMENT << nl;
+ os.writeEntry("region", regionName);
bool active = readBool(dict_.lookup("active"));
- os.writeKeyword("active") << active
- << token::END_STATEMENT << nl;
+ os.writeEntry("active", active);
os.writeKeyword("thermoType");
os << dict_.subDict("thermoType") << nl;
diff --git a/src/rigidBodyDynamics/bodies/cuboid/cuboid.C b/src/rigidBodyDynamics/bodies/cuboid/cuboid.C
index 5309ae50b48..36f4cc4c1b1 100644
--- a/src/rigidBodyDynamics/bodies/cuboid/cuboid.C
+++ b/src/rigidBodyDynamics/bodies/cuboid/cuboid.C
@@ -62,14 +62,9 @@ Foam::RBD::cuboid::~cuboid()
void Foam::RBD::cuboid::write(Ostream& os) const
{
- os.writeKeyword("type")
- << type() << token::END_STATEMENT << nl;
-
- os.writeKeyword("mass")
- << m() << token::END_STATEMENT << nl;
-
- os.writeKeyword("L")
- << L() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
+ os.writeEntry("mass", m());
+ os.writeEntry("L", L());
}
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
index 61e5b4bc757..ad5c7ed99a1 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
@@ -68,8 +68,7 @@ bool Foam::RBD::masslessBody::massless() const
void Foam::RBD::masslessBody::write(Ostream& os) const
{
- os.writeKeyword("type")
- << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
}
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index d13772c1000..51831470059 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -118,17 +118,10 @@ void Foam::RBD::rigidBody::merge(const subBody& subBody)
void Foam::RBD::rigidBody::write(Ostream& os) const
{
- os.writeKeyword("type")
- << type() << token::END_STATEMENT << nl;
-
- os.writeKeyword("mass")
- << m() << token::END_STATEMENT << nl;
-
- os.writeKeyword("centreOfMass")
- << c() << token::END_STATEMENT << nl;
-
- os.writeKeyword("inertia")
- << Ic() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
+ os.writeEntry("mass", m());
+ os.writeEntry("centreOfMass", c());
+ os.writeEntry("inertia", Ic());
}
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.C b/src/rigidBodyDynamics/bodies/sphere/sphere.C
index ea4d13653e7..6e1c6b9b310 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.C
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.C
@@ -62,14 +62,9 @@ Foam::RBD::sphere::~sphere()
void Foam::RBD::sphere::write(Ostream& os) const
{
- os.writeKeyword("type")
- << type() << token::END_STATEMENT << nl;
-
- os.writeKeyword("mass")
- << m() << token::END_STATEMENT << nl;
-
- os.writeKeyword("radius")
- << r() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
+ os.writeEntry("mass", m());
+ os.writeEntry("radius", r());
}
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.C b/src/rigidBodyDynamics/bodies/subBody/subBody.C
index 96924506beb..06586248ac8 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.C
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.C
@@ -29,11 +29,8 @@ License
void Foam::RBD::subBody::write(Ostream& os) const
{
- os.writeKeyword("master")
- << masterName_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("transform")
- << masterXT_ << token::END_STATEMENT << nl;
+ os.writeEntry("master", masterName_);
+ os.writeEntry("transform", masterXT_);
}
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.C b/src/rigidBodyDynamics/joints/Pa/Pa.C
index b30997acadf..30cc3711e30 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.C
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.C
@@ -98,8 +98,7 @@ void Foam::RBD::joints::Pa::jcalc
void Foam::RBD::joints::Pa::write(Ostream& os) const
{
joint::write(os);
- os.writeKeyword("axis")
- << S_[0].l() << token::END_STATEMENT << nl;
+ os.writeEntry("axis", S_[0].l());
}
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.C b/src/rigidBodyDynamics/joints/Ra/Ra.C
index 468985ea67c..df4f9048d65 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.C
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.C
@@ -98,8 +98,7 @@ void Foam::RBD::joints::Ra::jcalc
void Foam::RBD::joints::Ra::write(Ostream& os) const
{
joint::write(os);
- os.writeKeyword("axis")
- << S_[0].w() << token::END_STATEMENT << nl;
+ os.writeEntry("axis", S_[0].w());
}
diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C
index 92204ffebd8..6448bb6f8b8 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.C
+++ b/src/rigidBodyDynamics/joints/joint/joint.C
@@ -79,7 +79,7 @@ Foam::RBD::joint::~joint()
void Foam::RBD::joint::write(Ostream& os) const
{
- os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
}
diff --git a/src/rigidBodyDynamics/joints/joint/jointI.H b/src/rigidBodyDynamics/joints/joint/jointI.H
index eb6e36a2ca8..de655ff6c55 100644
--- a/src/rigidBodyDynamics/joints/joint/jointI.H
+++ b/src/rigidBodyDynamics/joints/joint/jointI.H
@@ -112,9 +112,9 @@ Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joint::iNew::operator()
inline Foam::Ostream& Foam::RBD::operator<<(Ostream& os, const joint& j)
{
- os << indent << token::BEGIN_BLOCK << incrIndent << endl;
+ os.beginBlock();
j.write(os);
- os << decrIndent << indent << token::END_BLOCK;
+ os.endBlock();
return os;
}
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 8f0b6143e5c..379a69c4f4e 100644
--- a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -184,17 +184,10 @@ void Foam::RBD::restraints::linearAxialAngularSpring::write
{
restraint::write(os);
- os.writeKeyword("referenceOrientation")
- << refQ_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("axis")
- << axis_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("stiffness")
- << stiffness_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("damping")
- << damping_ << token::END_STATEMENT << nl;
+ os.writeEntry("referenceOrientation", refQ_);
+ os.writeEntry("axis", axis_);
+ os.writeEntry("stiffness", stiffness_);
+ os.writeEntry("damping", damping_);
}
diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
index d3e4e063da4..b15c39cb4dc 100644
--- a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
@@ -109,8 +109,7 @@ void Foam::RBD::restraints::linearDamper::write
{
restraint::write(os);
- os.writeKeyword("coeff")
- << coeff_ << token::END_STATEMENT << nl;
+ os.writeEntry("coeff", coeff_);
}
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
index 9449d60042d..189a7e9a9b4 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
@@ -134,20 +134,11 @@ void Foam::RBD::restraints::linearSpring::write
{
restraint::write(os);
- os.writeKeyword("anchor")
- << anchor_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("refAttachmentPt")
- << refAttachmentPt_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("stiffness")
- << stiffness_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("damping")
- << damping_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("restLength")
- << restLength_ << token::END_STATEMENT << nl;
+ os.writeEntry("anchor", anchor_);
+ os.writeEntry("refAttachmentPt", refAttachmentPt_);
+ os.writeEntry("stiffness", stiffness_);
+ os.writeEntry("damping", damping_);
+ os.writeEntry("restLength", restLength_);
}
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
index be56e7b0842..229e64ae3f5 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
@@ -78,10 +78,8 @@ bool Foam::RBD::restraint::read(const dictionary& dict)
void Foam::RBD::restraint::write(Ostream& os) const
{
- os.writeKeyword("type")
- << type() << token::END_STATEMENT << nl;
- os.writeKeyword("body")
- << model_.name(bodyID_) << token::END_STATEMENT << nl;
+ os.writeEntry("type", type());
+ os.writeEntry("body", model_.name(bodyID_));
}
diff --git a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
index 8ef17486b78..441bfafc1f9 100644
--- a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
+++ b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
@@ -109,7 +109,7 @@ void Foam::RBD::restraints::sphericalAngularDamper::write
{
restraint::write(os);
- os.writeKeyword("coeff") << coeff_ << token::END_STATEMENT << nl;
+ os.writeEntry("coeff", coeff_);
}
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 4a8de4eac4d..1fbe3fc60e9 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -377,17 +377,14 @@ Foam::spatialTransform Foam::RBD::rigidBodyModel::X0
const subBody& mBody = mergedBody(bodyId);
return mBody.masterXT() & X0_[mBody.masterID()];
}
- else
- {
- return X0_[bodyId];
- }
+
+ return X0_[bodyId];
}
void Foam::RBD::rigidBodyModel::write(Ostream& os) const
{
- os << indent << "bodies" << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("bodies");
// Write the moving bodies
for (label i=1; i<nBodies(); i++)
@@ -396,61 +393,52 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
// of composite joints
if (!isType<jointBody>(bodies_[i]))
{
- os << indent << bodies_[i].name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << endl;
+ os.beginBlock(bodies_[i].name());
bodies_[i].write(os);
- os.writeKeyword("parent")
- << bodies_[lambda_[i]].name() << token::END_STATEMENT << nl;
-
- os.writeKeyword("transform")
- << XT_[i] << token::END_STATEMENT << nl;
+ os.writeEntry("parent", bodies_[lambda_[i]].name());
+ os.writeEntry("transform", XT_[i]);
- os << indent << "joint" << nl << joints_[i] << endl;
+ os << indent << "joint" << nl
+ << joints_[i] << endl;
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
}
// Write the bodies merged into the parent bodies for efficiency
forAll(mergedBodies_, i)
{
- os << indent << mergedBodies_[i].name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << endl;
+ os.beginBlock(mergedBodies_[i].name());
mergedBodies_[i].body().write(os);
- os.writeKeyword("transform")
- << mergedBodies_[i].masterXT() << token::END_STATEMENT << nl;
-
- os.writeKeyword("mergeWith")
- << mergedBodies_[i].masterName() << token::END_STATEMENT << nl;
+ os.writeEntry("transform", mergedBodies_[i].masterXT());
+ os.writeEntry("mergeWith", mergedBodies_[i].masterName());
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
if (!restraints_.empty())
{
- os << indent << "restraints" << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("restraints");
forAll(restraints_, ri)
{
- word restraintType = restraints_[ri].type();
+ const word& restraintType(restraints_[ri].type());
- os << indent << restraints_[ri].name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << endl;
+ os.beginBlock(restraints_[ri].name());
restraints_[ri].write(os);
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
}
}
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
index 038d42a31a0..66a7418cd51 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
@@ -39,10 +39,10 @@ void Foam::RBD::rigidBodyModelState::write(dictionary& dict) const
void Foam::RBD::rigidBodyModelState::write(Ostream& os) const
{
- os.writeKeyword("q") << q_ << token::END_STATEMENT << nl;
- os.writeKeyword("qDot") << qDot_ << token::END_STATEMENT << nl;
- os.writeKeyword("qDdot") << qDdot_ << token::END_STATEMENT << nl;
- os.writeKeyword("deltaT") << deltaT_ << token::END_STATEMENT << nl;
+ os.writeEntry("q", q_);
+ os.writeEntry("qDot", qDot_);
+ os.writeEntry("qDdot", qDdot_);
+ os.writeEntry("deltaT", deltaT_);
}
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
index 915af7f56f1..eed9c95b468 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
@@ -44,12 +44,9 @@ void Foam::RBD::rigidBodyMotion::write(Ostream& os) const
{
rigidBodyModel::write(os);
- os.writeKeyword("accelerationRelaxation")
- << aRelax_ << token::END_STATEMENT << nl;
- os.writeKeyword("accelerationDamping")
- << aDamp_ << token::END_STATEMENT << nl;
- os.writeKeyword("report")
- << report_ << token::END_STATEMENT << nl;
+ os.writeEntry("accelerationRelaxation", aRelax_);
+ os.writeEntry("accelerationDamping", aDamp_);
+ os.writeEntry("report", report_);
}
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index daeb9adf8d9..e1508439b6e 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -255,16 +255,16 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
+ os.writeEntry("rho", rhoName_);
if (rhoName_ == "rhoInf")
{
- os.writeKeyword("rhoInf") << rhoInf_ << token::END_STATEMENT << nl;
+ os.writeEntry("rhoInf", rhoInf_);
}
if (lookupGravity_ == 0 || lookupGravity_ == -2)
{
- os.writeKeyword("g") << g_ << token::END_STATEMENT << nl;
+ os.writeEntry("g", g_);
}
motion_.write(os);
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
index 985d7ae4caa..0650986bfd2 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
@@ -116,8 +116,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::write
Ostream& os
) const
{
- os.writeKeyword("axis")
- << axis_ << token::END_STATEMENT << nl;
+ os.writeEntry("axis", axis_);
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
index 7e7189b0d1d..6da64ea471b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
@@ -130,10 +130,8 @@ void Foam::sixDoFRigidBodyMotionConstraints::line::write
Ostream& os
) const
{
- os.writeKeyword("centreOfRotation")
- << centreOfRotation_ << token::END_STATEMENT << nl;
- os.writeKeyword("direction")
- << direction_ << token::END_STATEMENT << nl;
+ os.writeEntry("centreOfRotation", centreOfRotation_);
+ os.writeEntry("direction", direction_);
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
index 7c291dee64c..90190f2c63f 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
@@ -117,10 +117,8 @@ void Foam::sixDoFRigidBodyMotionConstraints::plane::write
Ostream& os
) const
{
- os.writeKeyword("centreOfRotation")
- << centreOfRotation_ << token::END_STATEMENT << nl;
- os.writeKeyword("normal")
- << normal_ << token::END_STATEMENT << nl;
+ os.writeEntry("centreOfRotation", centreOfRotation_);
+ os.writeEntry("normal", normal_);
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
index 32021c07476..5fc63648f20 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
@@ -116,8 +116,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::point::write
Ostream& os
) const
{
- os.writeKeyword("centreOfRotation")
- << centreOfRotation_ << token::END_STATEMENT << nl;
+ os.writeEntry("centreOfRotation", centreOfRotation_);
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 2237bf6963c..8575a52e774 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -186,17 +186,10 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::write
Ostream& os
) const
{
- os.writeKeyword("referenceOrientation")
- << refQ_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("axis")
- << axis_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("stiffness")
- << stiffness_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("damping")
- << damping_ << token::END_STATEMENT << nl;
+ os.writeEntry("referenceOrientation", refQ_);
+ os.writeEntry("axis", axis_);
+ os.writeEntry("stiffness", stiffness_);
+ os.writeEntry("damping", damping_);
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
index 5d70d4db112..1e6d31ce8ea 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
@@ -105,8 +105,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::write
Ostream& os
) const
{
- os.writeKeyword("coeff")
- << coeff_ << token::END_STATEMENT << nl;
+ os.writeEntry("coeff", coeff_);
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
index 40b19b2006c..c993c4d8143 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
@@ -125,20 +125,11 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::write
Ostream& os
) const
{
- os.writeKeyword("anchor")
- << anchor_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("refAttachmentPt")
- << refAttachmentPt_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("stiffness")
- << stiffness_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("damping")
- << damping_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("restLength")
- << restLength_ << token::END_STATEMENT << nl;
+ os.writeEntry("anchor", anchor_);
+ os.writeEntry("refAttachmentPt", refAttachmentPt_);
+ os.writeEntry("stiffness", stiffness_);
+ os.writeEntry("damping", damping_);
+ os.writeEntry("restLength", restLength_);
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
index f0731256666..27f890590a0 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
@@ -107,7 +107,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::write
Ostream& os
) const
{
- os.writeKeyword("coeff") << coeff_ << token::END_STATEMENT << nl;
+ os.writeEntry("coeff", coeff_);
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
index aa012153ce9..35db712d8f4 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
@@ -145,12 +145,9 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::write
Ostream& os
) const
{
- os.writeKeyword("referenceOrientation")
- << refQ_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("stiffness") << stiffness_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("damping") << damping_ << token::END_STATEMENT << nl;
+ os.writeEntry("referenceOrientation", refQ_);
+ os.writeEntry("stiffness", stiffness_);
+ os.writeEntry("damping", damping_);
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index 000ca2618f3..601184e0a5d 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -205,27 +205,21 @@ void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::write
Ostream& os
) const
{
- os.writeKeyword("referenceOrientation")
- << refQ_ << token::END_STATEMENT << nl;
-
- os.writeKeyword("axis")
- << axis_ << token::END_STATEMENT << nl;
+ os.writeEntry("referenceOrientation", refQ_);
+ os.writeEntry("axis", axis_);
moment_.write(os);
- os.writeKeyword("angleFormat");
-
if (convertToDegrees_)
{
- os << "degrees" << token::END_STATEMENT << nl;
+ os.writeEntry("angleFormat", "degrees");
}
else
{
- os << "radians" << token::END_STATEMENT << nl;
+ os.writeEntry("angleFormat", "radians");
}
- os.writeKeyword("damping")
- << damping_ << token::END_STATEMENT << nl;
+ os.writeEntry("damping", damping_);
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
index e04a11d4788..4b54e45b175 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
@@ -51,67 +51,54 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
{
motionState_.write(os);
- os.writeKeyword("centreOfMass")
- << initialCentreOfMass_ << token::END_STATEMENT << nl;
- os.writeKeyword("initialOrientation")
- << initialQ_ << token::END_STATEMENT << nl;
- os.writeKeyword("mass")
- << mass_ << token::END_STATEMENT << nl;
- os.writeKeyword("momentOfInertia")
- << momentOfInertia_ << token::END_STATEMENT << nl;
- os.writeKeyword("accelerationRelaxation")
- << aRelax_ << token::END_STATEMENT << nl;
- os.writeKeyword("accelerationDamping")
- << aDamp_ << token::END_STATEMENT << nl;
- os.writeKeyword("report")
- << report_ << token::END_STATEMENT << nl;
+ os.writeEntry("centreOfMass", initialCentreOfMass_);
+ os.writeEntry("initialOrientation", initialQ_);
+ os.writeEntry("mass", mass_);
+ os.writeEntry("momentOfInertia", momentOfInertia_);
+ os.writeEntry("accelerationRelaxation", aRelax_);
+ os.writeEntry("accelerationDamping", aDamp_);
+ os.writeEntry("report", report_);
if (!restraints_.empty())
{
- os << indent << "restraints" << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("restraints");
forAll(restraints_, rI)
{
- word restraintType = restraints_[rI].type();
+ const word& restraintType(restraints_[rI].type());
- os << indent << restraints_[rI].name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << endl;
+ os.beginBlock(restraints_[rI].name());
- os.writeKeyword("sixDoFRigidBodyMotionRestraint")
- << restraintType << token::END_STATEMENT << nl;
+ os.writeEntry("sixDoFRigidBodyMotionRestraint", restraintType);
restraints_[rI].write(os);
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
}
if (!constraints_.empty())
{
- os << indent << "constraints" << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("constraints");
forAll(constraints_, rI)
{
- word constraintType = constraints_[rI].type();
+ const word& constraintType(constraints_[rI].type());
- os << indent << constraints_[rI].name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << endl;
+ os.beginBlock(constraints_[rI].name());
- os.writeKeyword("sixDoFRigidBodyMotionConstraint")
- << constraintType << token::END_STATEMENT << nl;
+ os.writeEntry("sixDoFRigidBodyMotionConstraint", constraintType);
constraints_[rI].sixDoFRigidBodyMotionConstraint::write(os);
constraints_[rI].write(os);
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
- os << decrIndent << indent << token::END_BLOCK << nl;
+ os.endBlock();
}
if (!solver_.empty())
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C
index e24f81f448c..3924adde78c 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C
@@ -41,18 +41,12 @@ void Foam::sixDoFRigidBodyMotionState::write(dictionary& dict) const
void Foam::sixDoFRigidBodyMotionState::write(Ostream& os) const
{
- os.writeKeyword("centreOfRotation")
- << centreOfRotation_ << token::END_STATEMENT << nl;
- os.writeKeyword("orientation")
- << Q_ << token::END_STATEMENT << nl;
- os.writeKeyword("velocity")
- << v_ << token::END_STATEMENT << nl;
- os.writeKeyword("acceleration")
- << a_ << token::END_STATEMENT << nl;
- os.writeKeyword("angularMomentum")
- << pi_ << token::END_STATEMENT << nl;
- os.writeKeyword("torque")
- << tau_ << token::END_STATEMENT << nl;
+ os.writeEntry("centreOfRotation", centreOfRotation_);
+ os.writeEntry("orientation", Q_);
+ os.writeEntry("velocity", v_);
+ os.writeEntry("acceleration", a_);
+ os.writeEntry("angularMomentum", pi_);
+ os.writeEntry("torque", tau_);
}
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C
index e2699243b5c..b51cdcf60bf 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.C
+++ b/src/surfMesh/surfZone/surfZone/surfZone.C
@@ -112,14 +112,13 @@ void Foam::surfZone::write(Ostream& os) const
void Foam::surfZone::writeDict(Ostream& os) const
{
- os << indent << name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(name());
surfZoneIdentifier::write(os);
- os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
- os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
+ os.writeEntry("nFaces", size());
+ os.writeEntry("startFace", start());
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
index 751e1ece9e5..f6935495813 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
@@ -187,7 +187,7 @@ void Foam::radiation::MarshakRadiationFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "T", "T", TName_);
+ os.writeEntryIfDifferent<word>("T", "T", TName_);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index 70423f1a722..ca42809813e 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -248,8 +248,8 @@ void Foam::radiation::greyDiffusiveRadiationMixedFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "T", "T", TName_);
- os.writeKeyword("solarLoad") << solarLoad_ << token::END_STATEMENT << nl;
+ os.writeEntryIfDifferent<word>("T", "T", TName_);
+ os.writeEntry("solarLoad", solarLoad_);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 44e347f28c9..f7adff2068e 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -192,7 +192,7 @@ write
{
fixedValueFvPatchScalarField::write(os);
qro_.writeEntry("qro", os);
- os.writeKeyword("solarLoad") << solarLoad_ << token::END_STATEMENT << nl;
+ os.writeEntry("solarLoad", solarLoad_);
}
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
index 18d2a9367c8..da945226ce3 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
@@ -112,8 +112,7 @@ template<class ReactionThermo>
void Foam::solidReaction<ReactionThermo>::write(Ostream& os) const
{
OStringStream reaction;
- os.writeKeyword("reaction") << solidReactionStr(reaction)
- << token::END_STATEMENT << nl;
+ os.writeEntry("reaction", solidReactionStr(reaction));
}
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H
index 9bad3ba7784..897904f5073 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H
@@ -40,7 +40,7 @@ inline Ostream& operator<<
)
{
OStringStream reaction;
- os << r.solidReactionStr(reaction)<< token::END_STATEMENT <<nl;
+ os << r.solidReactionStr(reaction) << token::END_STATEMENT <<nl;
return os;
}
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
index 1ab4bcb50dd..b9e86890473 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
@@ -77,9 +77,9 @@ inline Foam::scalar Foam::solidArrheniusReactionRate::operator()
inline void Foam::solidArrheniusReactionRate::write(Ostream& os) const
{
- os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
- os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
- os.writeKeyword("Tcrit") << Tcrit_ << token::END_STATEMENT << nl;
+ os.writeEntry("A", A_);
+ os.writeEntry("Ta", Ta_);
+ os.writeEntry("Tcrit", Tcrit_);
}
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index 255cf2b93fd..2911baca562 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -196,19 +196,13 @@ void Foam::NonEquilibriumReversibleReaction
{
ReactionType<ReactionThermo>::write(os);
- os << indent << "forward" << nl;
- os << indent << token::BEGIN_BLOCK << nl;
- os << incrIndent;
+ os.beginBlock("forward");
fk_.write(os);
- os << decrIndent;
- os << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os << indent << "reverse" << nl;
- os << indent << token::BEGIN_BLOCK << nl;
- os << incrIndent;
+ os.beginBlock("reverse");
rk_.write(os);
- os << decrIndent;
- os << indent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 5da2f878c4b..913f11a712b 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -386,8 +386,7 @@ template<class ReactionThermo>
void Foam::Reaction<ReactionThermo>::write(Ostream& os) const
{
OStringStream reaction;
- os.writeKeyword("reaction") << reactionStr(reaction)
- << token::END_STATEMENT << nl;
+ os.writeEntry("reaction", reactionStr(reaction));
}
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
index 6d3f2539fc3..f2a1e0c698d 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
@@ -106,20 +106,21 @@ bool Foam::ReactionList<ThermoType>::readReactionDict()
template<class ThermoType>
void Foam::ReactionList<ThermoType>::write(Ostream& os) const
{
- os << "reactions" << nl;
- os << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock("reactions");
forAllConstIter(typename SLPtrList<Reaction<ThermoType>>, *this, iter)
{
const Reaction<ThermoType>& r = iter();
- os << indent << r.name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
- os.writeKeyword("type") << r.type() << token::END_STATEMENT << nl;
+
+ os.beginBlock(r.name());
+
+ os.writeEntry("type", r.type());
r.write(os);
- os << decrIndent << indent << token::END_BLOCK << nl;
+
+ os.endBlock();
}
- os << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 49ec48c71e4..75bed82ef27 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -77,9 +77,9 @@ inline Foam::scalar Foam::ArrheniusReactionRate::operator()
inline void Foam::ArrheniusReactionRate::write(Ostream& os) const
{
- os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
- os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl;
- os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
+ os.writeEntry("A", A_);
+ os.writeEntry("beta", beta_);
+ os.writeEntry("Ta", Ta_);
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
index fff348d4810..1ff54cd5f43 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
@@ -68,10 +68,10 @@ Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::operator()
const scalarField& c
) const
{
- scalar k0 = k0_(p, T, c);
- scalar kInf = kInf_(p, T, c);
+ const scalar k0 = k0_(p, T, c);
+ const scalar kInf = kInf_(p, T, c);
- scalar Pr = k0*thirdBodyEfficiencies_.M(c)/kInf;
+ const scalar Pr = k0*thirdBodyEfficiencies_.M(c)/kInf;
return kInf*(Pr/(1 + Pr))*F_(T, Pr);
}
@@ -83,33 +83,21 @@ inline void Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::write
Ostream& os
) const
{
- os << indent << "k0" << nl;
- os << indent << token::BEGIN_BLOCK << nl;
- os << incrIndent;
+ os.beginBlock("k0");
k0_.write(os);
- os << decrIndent;
- os << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os << indent << "kInf" << nl;
- os << indent << token::BEGIN_BLOCK << nl;
- os << incrIndent;
+ os.beginBlock("kInf");
kInf_.write(os);
- os << decrIndent;
- os << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os << indent << "F" << nl;
- os << indent << token::BEGIN_BLOCK << nl;
- os << incrIndent;
+ os.beginBlock("F");
F_.write(os);
- os << decrIndent;
- os << indent << token::END_BLOCK << nl;
+ os.endBlock();
- os << indent << "thirdBodyEfficiencies" << nl;
- os << indent << token::BEGIN_BLOCK << nl;
- os << incrIndent;
+ os.beginBlock("thirdBodyEfficiencies");
thirdBodyEfficiencies_.write(os);
- os << decrIndent;
- os << indent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index 7d2c9ecd791..992b3d9ea42 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -100,11 +100,11 @@ inline Foam::scalar Foam::LandauTellerReactionRate::operator()
inline void Foam::LandauTellerReactionRate::write(Ostream& os) const
{
- os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
- os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl;
- os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
- os.writeKeyword("B") << B_ << token::END_STATEMENT << nl;
- os.writeKeyword("C") << C_ << token::END_STATEMENT << nl;
+ os.writeEntry("A", A_);
+ os.writeEntry("beta", beta_);
+ os.writeEntry("Ta", Ta_);
+ os.writeEntry("B", B_);
+ os.writeEntry("C", C_);
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index 68cce0350da..58975727b4e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -67,11 +67,11 @@ inline Foam::scalar Foam::SRIFallOffFunction::operator()
inline void Foam::SRIFallOffFunction::write(Ostream& os) const
{
- os.writeKeyword("a") << a_ << token::END_STATEMENT << nl;
- os.writeKeyword("b") << b_ << token::END_STATEMENT << nl;
- os.writeKeyword("c") << c_ << token::END_STATEMENT << nl;
- os.writeKeyword("d") << d_ << token::END_STATEMENT << nl;
- os.writeKeyword("e") << e_ << token::END_STATEMENT << nl;
+ os.writeEntry("a", a_);
+ os.writeEntry("b", b_);
+ os.writeEntry("c", c_);
+ os.writeEntry("d", d_);
+ os.writeEntry("e", e_);
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index 1913985c18d..ab654e2103e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -77,10 +77,10 @@ inline Foam::scalar Foam::TroeFallOffFunction::operator()
inline void Foam::TroeFallOffFunction::write(Ostream& os) const
{
- os.writeKeyword("alpha") << alpha_ << token::END_STATEMENT << nl;
- os.writeKeyword("Tsss") << Tsss_ << token::END_STATEMENT << nl;
- os.writeKeyword("Ts") << Ts_ << token::END_STATEMENT << nl;
- os.writeKeyword("Tss") << Tss_ << token::END_STATEMENT << nl;
+ os.writeEntry("alpha", alpha_);
+ os.writeEntry("Tsss", Tsss_);
+ os.writeEntry("Ts", Ts_);
+ os.writeEntry("Tss", Tss_);
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index fcf9b808c3b..40dd2680032 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -84,10 +84,10 @@ inline Foam::scalar Foam::powerSeriesReactionRate::operator()
inline void Foam::powerSeriesReactionRate::write(Ostream& os) const
{
- os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
- os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl;
- os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
- os.writeKeyword("coeffs") << coeffs_ << token::END_STATEMENT << nl;
+ os.writeEntry("A", A_);
+ os.writeEntry("beta", beta_);
+ os.writeEntry("Ta", Ta_);
+ os.writeEntry("coeffs", coeffs_);
}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 97a0e8eeed9..bcec76284b9 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -102,7 +102,7 @@ inline void Foam::thirdBodyEfficiencies::write(Ostream& os) const
coeffs[i].second() = operator[](i);
}
- os.writeKeyword("coeffs") << coeffs << token::END_STATEMENT << nl;
+ os.writeEntry("coeffs", coeffs);
}
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index 8b709c9c821..2408dfb9cc6 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -42,17 +42,19 @@ Foam::constTransport<Thermo>::constTransport(const dictionary& dict)
template<class Thermo>
void Foam::constTransport<Thermo>::constTransport::write(Ostream& os) const
{
- os << this->name() << endl;
- os << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(this->name());
Thermo::write(os);
- dictionary dict("transport");
- dict.add("mu", mu_);
- dict.add("Pr", 1.0/rPr_);
- os << indent << dict.dictName() << dict;
+ // Entries in dictionary format
+ {
+ os.beginBlock("transport");
+ os.writeEntry("mu", mu_);
+ os.writeEntry("Pr", scalar(1.0/rPr_));
+ os.endBlock();
+ }
- os << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
index 27366f28931..b35e2003df6 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
@@ -57,25 +57,27 @@ Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
template<class Thermo, int PolySize>
void Foam::logPolynomialTransport<Thermo, PolySize>::write(Ostream& os) const
{
- os << this->name() << endl;
- os << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(this->name());
Thermo::write(os);
- dictionary dict("transport");
- dict.add
- (
- word("muLogCoeffs<" + Foam::name(PolySize) + '>'),
- muCoeffs_
- );
- dict.add
- (
- word("kappaLogCoeffs<" + Foam::name(PolySize) + '>'),
- kappaCoeffs_
- );
- os << indent << dict.dictName() << dict;
+ // Entries in dictionary format
+ {
+ os.beginBlock("transport");
+ os.writeEntry
+ (
+ word("muLogCoeffs<" + Foam::name(PolySize) + '>'),
+ muCoeffs_
+ );
+ os.writeEntry
+ (
+ word("kappaLogCoeffs<" + Foam::name(PolySize) + '>'),
+ kappaCoeffs_
+ );
+ os.endBlock();
+ }
- os << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
index cb907dd01d5..88331a715ca 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
@@ -57,25 +57,27 @@ Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
template<class Thermo, int PolySize>
void Foam::polynomialTransport<Thermo, PolySize>::write(Ostream& os) const
{
- os << this->name() << endl;
- os << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(this->name());
Thermo::write(os);
- dictionary dict("transport");
- dict.add
- (
- word("muCoeffs<" + Foam::name(PolySize) + '>'),
- muCoeffs_
- );
- dict.add
- (
- word("kappaCoeffs<" + Foam::name(PolySize) + '>'),
- kappaCoeffs_
- );
- os << indent << dict.dictName() << dict;
+ // Entries in dictionary format
+ {
+ os.beginBlock("transport");
+ os.writeEntry
+ (
+ word("muCoeffs<" + Foam::name(PolySize) + '>'),
+ muCoeffs_
+ );
+ os.writeEntry
+ (
+ word("kappaCoeffs<" + Foam::name(PolySize) + '>'),
+ kappaCoeffs_
+ );
+ os.endBlock();
+ }
- os << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index 1fa07890149..d3576c52ee3 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -68,17 +68,19 @@ Foam::sutherlandTransport<Thermo>::sutherlandTransport
template<class Thermo>
void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const
{
- os << this->specie::name() << endl
- << token::BEGIN_BLOCK << incrIndent << nl;
+ os.beginBlock(this->specie::name());
Thermo::write(os);
- dictionary dict("transport");
- dict.add("As", As_);
- dict.add("Ts", Ts_);
+ // Entries in dictionary format
+ {
+ os.beginBlock("transport");
+ os.writeEntry("As", As_);
+ os.writeEntry("Ts", Ts_);
+ os.endBlock();
+ }
- os << indent << dict.dictName() << dict
- << decrIndent << token::END_BLOCK << nl;
+ os.endBlock();
}
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index e12b63b7253..3f7bf842d0d 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -727,19 +727,19 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "p", "p", pName_);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_);
- writeEntryIfDifferent<word>(os, "Tnbr", "T", TnbrName_);
- writeEntryIfDifferent<word>(os, "qrNbr", "none", qrNbrName_);
- writeEntryIfDifferent<word>(os, "qr", "none", qrName_);
+ os.writeEntryIfDifferent<word>("p", "p", pName_);
+ os.writeEntryIfDifferent<word>("U", "U", UName_);
+ os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
+ os.writeEntryIfDifferent<word>("mu", "thermo:mu", muName_);
+ os.writeEntryIfDifferent<word>("Tnbr", "T", TnbrName_);
+ os.writeEntryIfDifferent<word>("qrNbr", "none", qrNbrName_);
+ os.writeEntryIfDifferent<word>("qr", "none", qrName_);
if (fluid_)
{
os.writeEntry("mode", massModeTypeNames_[mode_]);
- writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
+ os.writeEntryIfDifferent<word>("specie", "none", specieName_);
os.writeEntry("carrierMolWeight", Mcomp_);
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
index 9a19092e046..58593465835 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
@@ -106,10 +106,8 @@ bool Foam::surfaceTensionModels::constant::writeData(Ostream& os) const
os << sigma_ << token::END_STATEMENT << nl;
return os.good();
}
- else
- {
- return false;
- }
+
+ return false;
}
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
index 03fb3a106c7..0cf8f63b8bf 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
@@ -128,10 +128,8 @@ bool Foam::surfaceTensionModels::temperatureDependent::writeData
os << sigma_() << token::END_STATEMENT << nl;
return os.good();
}
- else
- {
- return false;
- }
+
+ return false;
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index c94e36ce778..4594202d38c 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -113,7 +113,7 @@ void Foam::constantAlphaContactAngleFvPatchScalarField::write
) const
{
alphaContactAngleFvPatchScalarField::write(os);
- os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
+ os.writeEntry("theta0", theta0_);
writeEntry("value", os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index b4a9db0062a..e488fcd9ebb 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -146,10 +146,10 @@ Foam::dynamicAlphaContactAngleFvPatchScalarField::theta
void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
alphaContactAngleFvPatchScalarField::write(os);
- os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
- os.writeKeyword("uTheta") << uTheta_ << token::END_STATEMENT << nl;
- os.writeKeyword("thetaA") << thetaA_ << token::END_STATEMENT << nl;
- os.writeKeyword("thetaR") << thetaR_ << token::END_STATEMENT << nl;
+ os.writeEntry("theta0", theta0_);
+ os.writeEntry("uTheta", uTheta_);
+ os.writeEntry("thetaA", thetaA_);
+ os.writeEntry("thetaR", thetaR_);
writeEntry("value", os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index 5eba3cc0b6c..8dfa30a477c 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -121,7 +121,7 @@ void Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::write
) const
{
alphaContactAngleFvPatchScalarField::write(os);
- writeEntryIfDifferent<word>(os, "T", "T", TName_);
+ os.writeEntryIfDifferent<word>("T", "T", TName_);
theta0_->writeData(os);
writeEntry("value", os);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index d014b1c6fcd..3ed663eb687 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -131,10 +131,10 @@ void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
) const
{
alphaContactAngleFvPatchScalarField::write(os);
- os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
- os.writeKeyword("thetaT0") << thetaT0_ << token::END_STATEMENT << nl;
- os.writeKeyword("te") << te_ << token::END_STATEMENT << nl;
- os.writeKeyword("thetaTe") << thetaTe_ << token::END_STATEMENT << nl;
+ os.writeEntry("t0", t0_);
+ os.writeEntry("thetaT0", thetaT0_);
+ os.writeEntry("te", te_);
+ os.writeEntry("thetaTe", thetaTe_);
writeEntry("value", os);
}
diff --git a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 6117513bc99..4e57fcba84f 100644
--- a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -120,8 +120,7 @@ void Foam::waveAlphaFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("waveDictName") << waveDictName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("waveDictName", waveDictName_);
writeEntry("value", os);
}
diff --git a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index a237aabbc17..83fa6c64eae 100644
--- a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -120,8 +120,7 @@ void Foam::waveVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
- os.writeKeyword("waveDictName") << waveDictName_
- << token::END_STATEMENT << nl;
+ os.writeEntry("waveDictName", waveDictName_);
writeEntry("value", os);
}
--
GitLab