Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
c0ba7bf0
Commit
c0ba7bf0
authored
Nov 06, 2017
by
Mark OLESEN
Browse files
STYLE: use Ostream writeEntry when writing key/value entries
- makes for clearer code ENH: make writeIfDifferent part of Ostream
parent
0ca0a626
Changes
232
Hide whitespace changes
Inline
Side-by-side
applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
View file @
c0ba7bf0
...
...
@@ -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
);
...
...
applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -138,9 +138,9 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
)
const
{
fvPatchField
<
scalar
>::
write
(
os
);
os
.
write
Keyword
(
"relax"
)
<<
relax_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"fixedDmdt"
)
<<
fixedDmdt_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"L"
)
<<
L_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"relax"
,
relax_
)
;
os
.
write
Entry
(
"fixedDmdt"
,
fixedDmdt_
)
;
os
.
write
Entry
(
"L"
,
L_
)
;
dmdt_
.
writeEntry
(
"dmdt"
,
os
);
writeEntry
(
"value"
,
os
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -334,10 +334,10 @@ void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::write
)
const
{
fvPatchField
<
scalar
>::
write
(
os
);
os
.
write
Keyword
(
"Prt"
)
<<
Prt_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"Cmu"
)
<<
Cmu_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"kappa"
)
<<
kappa_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"E"
)
<<
E_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"Prt"
,
Prt_
)
;
os
.
write
Entry
(
"Cmu"
,
Cmu_
)
;
os
.
write
Entry
(
"kappa"
,
kappa_
)
;
os
.
write
Entry
(
"E"
,
E_
)
;
dmdt_
.
writeEntry
(
"dmdt"
,
os
);
writeEntry
(
"value"
,
os
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
.
write
Keyword
(
"relax"
)
<<
relax_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"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
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -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
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
View file @
c0ba7bf0
...
...
@@ -183,7 +183,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs()
void
Foam
::
fixedMultiPhaseHeatFluxFvPatchScalarField
::
write
(
Ostream
&
os
)
const
{
fvPatchField
<
scalar
>::
write
(
os
);
os
.
write
Keyword
(
"relax"
)
<<
relax_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"relax"
,
relax_
)
;
q_
.
writeEntry
(
"q"
,
os
);
writeEntry
(
"value"
,
os
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
View file @
c0ba7bf0
...
...
@@ -114,7 +114,7 @@ void Foam::wallBoilingModels::departureDiameterModels::
KocamustafaogullariIshii
::
write
(
Ostream
&
os
)
const
{
departureDiameterModel
::
write
(
os
);
os
.
write
Keyword
(
"phi"
)
<<
phi_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"phi"
,
phi_
)
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
View file @
c0ba7bf0
...
...
@@ -90,9 +90,9 @@ void Foam::wallBoilingModels::departureDiameterModels::
TolubinskiKostanchuk
::
write
(
Ostream
&
os
)
const
{
departureDiameterModel
::
write
(
os
);
os
.
write
Keyword
(
"dRef"
)
<<
dRef_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"dMax"
)
<<
dMax_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Keyword
(
"dMin"
)
<<
dMin_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"dRef"
,
dRef_
)
;
os
.
write
Entry
(
"dMax"
,
dMax_
)
;
os
.
write
Entry
(
"dMin"
,
dMin_
)
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
View file @
c0ba7bf0
...
...
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::departureDiameterModel::~departureDiameterModel()
void
Foam
::
wallBoilingModels
::
departureDiameterModel
::
write
(
Ostream
&
os
)
const
{
os
.
write
Keyword
(
"type"
)
<<
this
->
type
()
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"type"
,
this
->
type
()
)
;
}
// ************************************************************************* //
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
View file @
c0ba7bf0
...
...
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::departureFrequencyModel::~departureFrequencyModel()
void
Foam
::
wallBoilingModels
::
departureFrequencyModel
::
write
(
Ostream
&
os
)
const
{
os
.
write
Keyword
(
"type"
)
<<
this
->
type
()
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"type"
,
this
->
type
()
)
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
View file @
c0ba7bf0
...
...
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::nucleationSiteModel::~nucleationSiteModel()
void
Foam
::
wallBoilingModels
::
nucleationSiteModel
::
write
(
Ostream
&
os
)
const
{
os
.
write
Keyword
(
"type"
)
<<
this
->
type
()
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"type"
,
this
->
type
()
)
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
View file @
c0ba7bf0
...
...
@@ -88,7 +88,7 @@ void Foam::wallBoilingModels::partitioningModels::
Lavieville
::
write
(
Ostream
&
os
)
const
{
partitioningModel
::
write
(
os
);
os
.
write
Keyword
(
"alphaCrit"
)
<<
alphaCrit_
<<
token
::
END_STATEMENT
<<
nl
;
os
.
write
Entry
(
"alphaCrit"
,
alphaCrit_
)
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
View file @
c0ba7bf0
...
...
@@ -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_
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
View file @
c0ba7bf0
...
...
@@ -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_
);
}
...
...
Prev
1
2
3
4
5
…
12
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment