zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed writeKeyword to the new simpler writeEntry form where appropriate

Browse Source
This commit is contained in:
Henry Weller
2019-01-29 22:32:42 +00:00
parent 15b1d6e7ec
commit e5532ff568
104 changed files with 407 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,7 +53,7 @@ Foam::wallBoilingModels::departureDiameterModel::~departureDiameterModel()
void Foam::wallBoilingModels::departureDiameterModel::write(Ostream& os) const void Foam::wallBoilingModels::departureDiameterModel::write(Ostream& os) const
{ {
os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl; writeEntry(os, "type", this->type());
} }
// ************************************************************************* // // ************************************************************************* //

4
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,7 +53,7 @@ Foam::wallBoilingModels::departureFrequencyModel::~departureFrequencyModel()
void Foam::wallBoilingModels::departureFrequencyModel::write(Ostream& os) const void Foam::wallBoilingModels::departureFrequencyModel::write(Ostream& os) const
{ {
os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl; writeEntry(os, "type", this->type());
} }

4
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,7 +53,7 @@ Foam::wallBoilingModels::nucleationSiteModel::~nucleationSiteModel()
void Foam::wallBoilingModels::nucleationSiteModel::write(Ostream& os) const void Foam::wallBoilingModels::nucleationSiteModel::write(Ostream& os) const
{ {
os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl; writeEntry(os, "type", this->type());
} }

4
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,7 +53,7 @@ Foam::wallBoilingModels::partitioningModel::~partitioningModel()
void Foam::wallBoilingModels::partitioningModel::write(Ostream& os) const void Foam::wallBoilingModels::partitioningModel::write(Ostream& os) const
{ {
os.writeKeyword("type") << this->type() << token::END_STATEMENT << nl; writeEntry(os, "type", this->type());
} }

28
applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -68,10 +68,10 @@ int main(int argc, char *argv[])
chemkinReader cr(species, args[1], args[3], args[2], newFormat); chemkinReader cr(species, args[1], args[3], args[2], newFormat);
OFstream reactionsFile(args[4]); OFstream reactionsFile(args[4]);
reactionsFile.writeKeyword("elements") writeEntry(reactionsFile, "elements", cr.elementNames());
<< cr.elementNames() << token::END_STATEMENT << nl << nl; reactionsFile << nl;
reactionsFile.writeKeyword("species") writeEntry(reactionsFile, "species", cr.species());
<< cr.species() << token::END_STATEMENT << nl << nl; reactionsFile << nl;
cr.reactions().write(reactionsFile); cr.reactions().write(reactionsFile);
// Temporary hack to splice the specie composition data into the thermo file // Temporary hack to splice the specie composition data into the thermo file
@ -103,12 +103,18 @@ int main(int argc, char *argv[])
reactionsFile << nl; reactionsFile << nl;
reactionsFile.writeKeyword("Tlow") writeEntry
<< Reaction<gasHThermoPhysics>::TlowDefault (
<< token::END_STATEMENT << nl; reactionsFile,
reactionsFile.writeKeyword("Thigh") "Tlow",
<< Reaction<gasHThermoPhysics>::ThighDefault Reaction<gasHThermoPhysics>::TlowDefault
<< token::END_STATEMENT << nl << nl; );
writeEntry
(
reactionsFile,
"Thigh",
Reaction<gasHThermoPhysics>::ThighDefault
);
Info<< "End\n" << endl; Info<< "End\n" << endl;

6
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -107,8 +107,8 @@ bool Foam::DimensionedField<Type, GeoMesh>::writeData
const word& fieldDictEntry const word& fieldDictEntry
) const ) const
{ {
os.writeKeyword("dimensions") << dimensions() << token::END_STATEMENT writeEntry(os, "dimensions", dimensions());
<< nl << nl; os << nl;
Field<Type>::writeEntry(fieldDictEntry, os); Field<Type>::writeEntry(fieldDictEntry, os);

9
src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -98,10 +98,9 @@ bool Foam::UniformDimensionedField<Type>::writeData(Ostream& os) const
{ {
scalar multiplier; scalar multiplier;
os.writeKeyword("dimensions"); os.writeKeyword("dimensions");
this->dimensions().write(os, multiplier) << token::END_STATEMENT this->dimensions().write(os, multiplier) << token::END_STATEMENT << nl;
<< nl; writeEntry(os, "value", this->value()/multiplier);
os.writeKeyword("value") << this->value()/multiplier << token::END_STATEMENT os << nl;
<< nl << nl;
return (os.good()); return (os.good());
} }

6
src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
View File

@ -269,8 +269,7 @@ Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
// Make sure to construct the patchfield with up-to-date value // Make sure to construct the patchfield with up-to-date value
OStringStream os; OStringStream os;
os.writeKeyword("type") << name_ << token::END_STATEMENT writeEntry(os, "type", name_);
<< nl;
static_cast<const Field<Type>&>(*this).writeEntry("value", os); static_cast<const Field<Type>&>(*this).writeEntry("value", os);
IStringStream is(os.str()); IStringStream is(os.str());
dictionary dict(is); dictionary dict(is);
@ -332,8 +331,7 @@ template<class Type>
void Foam::codedFixedValuePointPatchField<Type>::write(Ostream& os) const void Foam::codedFixedValuePointPatchField<Type>::write(Ostream& os) const
{ {
fixedValuePointPatchField<Type>::write(os); fixedValuePointPatchField<Type>::write(os);
os.writeKeyword("name") << name_ writeEntry(os, "name", name_);
<< token::END_STATEMENT << nl;
if (dict_.found("codeInclude")) if (dict_.found("codeInclude"))
{ {

9
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -113,12 +113,11 @@ const Foam::objectRegistry& Foam::pointPatchField<Type>::db() const
template<class Type> template<class Type>
void Foam::pointPatchField<Type>::write(Ostream& os) const void Foam::pointPatchField<Type>::write(Ostream& os) const
{ {
os.writeKeyword("type") << type() << token::END_STATEMENT << nl; writeEntry(os, "type", type());
if (patchType_.size()) if (patchType_.size())
{ {
os.writeKeyword("patchType") << patchType_ writeEntry(os, "patchType", patchType_);
<< token::END_STATEMENT << nl;
} }
} }
@ -135,7 +134,7 @@ void Foam::pointPatchField<Type>::writeEntryIfDifferent
{ {
if (value1 != value2) if (value1 != value2)
{ {
os.writeKeyword(entryName) << value2 << token::END_STATEMENT << nl; writeEntry(os, entryName, value2);
} }
} }

8
src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -448,10 +448,8 @@ void Foam::interpolation2DTable<Type>::checkOrder() const
template<class Type> template<class Type>
void Foam::interpolation2DTable<Type>::write(Ostream& os) const void Foam::interpolation2DTable<Type>::write(Ostream& os) const
{ {
os.writeKeyword("file") writeEntry(os, "file", fileName_);
<< fileName_ << token::END_STATEMENT << nl; writeEntry(os, "outOfBounds", boundsHandlingToWord(boundsHandling_));
os.writeKeyword("outOfBounds")
<< boundsHandlingToWord(boundsHandling_) << token::END_STATEMENT << nl;
*this >> os; *this >> os;
} }

11
src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -354,19 +354,16 @@ void Foam::interpolationLookUpTable<Type>::write
control.writeHeader(os); control.writeHeader(os);
os.writeKeyword("fields") Foam::writeEntry(os, "fields", entries_);
<< entries_ << token::END_STATEMENT << nl;
os.writeKeyword("output") Foam::writeEntry(os, "output", output_);
<< output_ << token::END_STATEMENT << nl;
if (this->size() == 0) if (this->size() == 0)
{ {
FatalErrorInFunction FatalErrorInFunction
<< "table is empty" << nl << exit(FatalError); << "table is empty" << nl << exit(FatalError);
} }
os.writeKeyword("values") Foam::writeEntry(os, "values", *this);
<< *this << token::END_STATEMENT << nl;
} }

8
src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -228,10 +228,8 @@ void Foam::interpolationTable<Type>::check() const
template<class Type> template<class Type>
void Foam::interpolationTable<Type>::write(Ostream& os) const void Foam::interpolationTable<Type>::write(Ostream& os) const
{ {
os.writeKeyword("file") writeEntry(os, "file", fileName_);
<< fileName_ << token::END_STATEMENT << nl; writeEntry(os, "outOfBounds", boundsHandlingToWord(boundsHandling_));
os.writeKeyword("outOfBounds")
<< boundsHandlingToWord(boundsHandling_) << token::END_STATEMENT << nl;
if (reader_.valid()) if (reader_.valid())
{ {
reader_->write(os); reader_->write(os);

11
src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -176,10 +176,8 @@ void Foam::csvTableReader<Type>::write(Ostream& os) const
{ {
tableReader<Type>::write(os); tableReader<Type>::write(os);
os.writeKeyword("hasHeaderLine") writeEntry(os, "hasHeaderLine", headerLine_);
<< headerLine_ << token::END_STATEMENT << nl; writeEntry(os, "timeColumn", timeColumn_);
os.writeKeyword("timeColumn")
<< timeColumn_ << token::END_STATEMENT << nl;
// Force writing labelList in ascii // Force writing labelList in ascii
os.writeKeyword("valueColumns"); os.writeKeyword("valueColumns");
@ -191,8 +189,7 @@ void Foam::csvTableReader<Type>::write(Ostream& os) const
} }
os << token::END_STATEMENT << nl; os << token::END_STATEMENT << nl;
os.writeKeyword("separator") writeEntry(os, "separator", string(separator_));
<< string(separator_) << token::END_STATEMENT << nl;
} }

5
src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -78,8 +78,7 @@ void Foam::tableReader<Type>::write(Ostream& os) const
{ {
if (this->type() != "openFoam") if (this->type() != "openFoam")
{ {
os.writeKeyword("readerType") writeEntry(os, "readerType", this->type());
<< this->type() << token::END_STATEMENT << nl;
} }
} }

4
src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -222,7 +222,7 @@ void Foam::coupleGroupIdentifier::write(Ostream& os) const
{ {
if (valid()) if (valid())
{ {
os.writeKeyword("coupleGroup") << name() << token::END_STATEMENT << nl; writeEntry(os, "coupleGroup", name());
} }
} }

8
src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -90,13 +90,11 @@ void Foam::patchIdentifier::write(Ostream& os) const
{ {
if (physicalType_.size()) if (physicalType_.size())
{ {
os.writeKeyword("physicalType") << physicalType_ writeEntry(os, "physicalType", physicalType_);
<< token::END_STATEMENT << nl;
} }
if (inGroups_.size()) if (inGroups_.size())
{ {
os.writeKeyword("inGroups") << inGroups_ writeEntry(os, "inGroups", inGroups_);
<< token::END_STATEMENT << nl;
} }
} }

8
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -563,10 +563,8 @@ void Foam::coupledPolyPatch::write(Ostream& os) const
polyPatch::write(os); polyPatch::write(os);
// if (matchTolerance_ != defaultMatchTol_) // if (matchTolerance_ != defaultMatchTol_)
{ {
os.writeKeyword("matchTolerance") << matchTolerance_ Foam::writeEntry(os, "matchTolerance", matchTolerance_);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "transform", transformTypeNames[transform_]);
os.writeKeyword("transform") << transformTypeNames[transform_]
<< token::END_STATEMENT << nl;
} }
} }

8
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -120,10 +120,10 @@ Foam::genericPolyPatch::~genericPolyPatch()
void Foam::genericPolyPatch::write(Ostream& os) const void Foam::genericPolyPatch::write(Ostream& os) const
{ {
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "type", actualTypeName_);
patchIdentifier::write(os); patchIdentifier::write(os);
os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl; Foam::writeEntry(os, "nFaces", size());
os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl; Foam::writeEntry(os, "startFace", start());
forAllConstIter(dictionary, dict_, iter) forAllConstIter(dictionary, dict_, iter)
{ {

14
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1446,24 +1446,20 @@ void Foam::cyclicPolyPatch::write(Ostream& os) const
coupledPolyPatch::write(os); coupledPolyPatch::write(os);
if (!neighbPatchName_.empty()) if (!neighbPatchName_.empty())
{ {
os.writeKeyword("neighbourPatch") << neighbPatchName_ Foam::writeEntry(os, "neighbourPatch", neighbPatchName_);
<< token::END_STATEMENT << nl;
} }
coupleGroup_.write(os); coupleGroup_.write(os);
switch (transform()) switch (transform())
{ {
case ROTATIONAL: case ROTATIONAL:
{ {
os.writeKeyword("rotationAxis") << rotationAxis_ Foam::writeEntry(os, "rotationAxis", rotationAxis_);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "rotationCentre", rotationCentre_);
os.writeKeyword("rotationCentre") << rotationCentre_
<< token::END_STATEMENT << nl;
break; break;
} }
case TRANSLATIONAL: case TRANSLATIONAL:
{ {
os.writeKeyword("separationVector") << separationVector_ Foam::writeEntry(os, "separationVector", separationVector_);
<< token::END_STATEMENT << nl;
break; break;
} }
case NOORDERING: case NOORDERING:

20
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1219,28 +1219,24 @@ bool Foam::oldCyclicPolyPatch::order
void Foam::oldCyclicPolyPatch::write(Ostream& os) const void Foam::oldCyclicPolyPatch::write(Ostream& os) const
{ {
// Replacement of polyPatch::write to write 'cyclic' instead of type(): // Replacement of polyPatch::write to write 'cyclic' instead of type():
os.writeKeyword("type") << cyclicPolyPatch::typeName Foam::writeEntry(os, "type", cyclicPolyPatch::typeName);
<< token::END_STATEMENT << nl;
patchIdentifier::write(os); patchIdentifier::write(os);
os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl; Foam::writeEntry(os, "nFaces", size());
os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl; Foam::writeEntry(os, "startFace", start());
os.writeKeyword("featureCos") << featureCos_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "featureCos", featureCos_);
switch (transform()) switch (transform())
{ {
case ROTATIONAL: case ROTATIONAL:
{ {
os.writeKeyword("rotationAxis") << rotationAxis_ Foam::writeEntry(os, "rotationAxis", rotationAxis_);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "rotationCentre", rotationCentre_);
os.writeKeyword("rotationCentre") << rotationCentre_
<< token::END_STATEMENT << nl;
break; break;
} }
case TRANSLATIONAL: case TRANSLATIONAL:
{ {
os.writeKeyword("separationVector") << separationVector_ Foam::writeEntry(os, "separationVector", separationVector_);
<< token::END_STATEMENT << nl;
break; break;
} }
default: default:

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1112,10 +1112,8 @@ bool Foam::processorPolyPatch::order
void Foam::processorPolyPatch::write(Ostream& os) const void Foam::processorPolyPatch::write(Ostream& os) const
{ {
coupledPolyPatch::write(os); coupledPolyPatch::write(os);
os.writeKeyword("myProcNo") << myProcNo_ Foam::writeEntry(os, "myProcNo", myProcNo_);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "neighbProcNo", neighbProcNo_);
os.writeKeyword("neighbProcNo") << neighbProcNo_
<< token::END_STATEMENT << nl;
} }

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -337,12 +337,10 @@ bool Foam::processorCyclicPolyPatch::order
void Foam::processorCyclicPolyPatch::write(Ostream& os) const void Foam::processorCyclicPolyPatch::write(Ostream& os) const
{ {
processorPolyPatch::write(os); processorPolyPatch::write(os);
os.writeKeyword("referPatch") << referPatchName_ Foam::writeEntry(os, "referPatch", referPatchName_);
<< token::END_STATEMENT << nl;
if (tag_ != -1) if (tag_ != -1)
{ {
os.writeKeyword("tag") << tag_ Foam::writeEntry(os, "tag", tag_);
<< token::END_STATEMENT << nl;
} }
} }

8
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -356,10 +356,10 @@ void Foam::polyPatch::clearAddressing()
void Foam::polyPatch::write(Ostream& os) const void Foam::polyPatch::write(Ostream& os) const
{ {
os.writeKeyword("type") << type() << token::END_STATEMENT << nl; Foam::writeEntry(os, "type", type());
patchIdentifier::write(os); patchIdentifier::write(os);
os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl; Foam::writeEntry(os, "nFaces", size());
os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl; Foam::writeEntry(os, "startFace", start());
} }

10
src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -496,13 +496,11 @@ Foam::point Foam::plane::mirror(const point& p) const
void Foam::plane::writeDict(Ostream& os) const void Foam::plane::writeDict(Ostream& os) const
{ {
os.writeKeyword("planeType") << "pointAndNormal" writeEntry(os, "planeType", "pointAndNormal");
<< token::END_STATEMENT << nl;
os << indent << "pointAndNormalDict" << nl os << indent << "pointAndNormalDict" << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("point") << point_ << token::END_STATEMENT << nl; writeEntry(os, "point", point_);
os.writeKeyword("normal") << normal_ << token::END_STATEMENT writeEntry(os, "normal", normal_);
<< nl;
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

20
src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -269,20 +269,12 @@ void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
// the values themselves // the values themselves
TableBase<Type>::writeEntries(os); TableBase<Type>::writeEntries(os);
os.writeKeyword("nHeaderLine") << nHeaderLine_ << token::END_STATEMENT writeEntry(os, "nHeaderLine", nHeaderLine_);
<< nl; writeEntry(os, "refColumn", refColumn_);
os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
componentColumns_.writeEntry("componentColumns", os); componentColumns_.writeEntry("componentColumns", os);
writeEntry(os, "separator", string(separator_));
os.writeKeyword("separator") << string(separator_) writeEntry(os, "mergeSeparators", mergeSeparators_);
<< token::END_STATEMENT << nl; writeEntry(os, "file", fName_);
os.writeKeyword("mergeSeparators") << mergeSeparators_
<< token::END_STATEMENT << nl;
os.writeKeyword("file") << fName_ << token::END_STATEMENT << nl;
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

4
src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,7 +79,7 @@ void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
os << token::END_STATEMENT << nl; os << token::END_STATEMENT << nl;
os << indent << word(this->name() + "Coeffs") << nl; os << indent << word(this->name() + "Coeffs") << nl;
os << indent << token::BEGIN_BLOCK << incrIndent << nl; os << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl; writeEntry(os, "t0", t0_);
amplitude_->writeData(os); amplitude_->writeData(os);
frequency_->writeData(os); frequency_->writeData(os);
scale_->writeData(os); scale_->writeData(os);

6
src/OpenFOAM/primitives/functions/Function1/Square/Square.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,8 +81,8 @@ void Foam::Function1Types::Square<Type>::writeData(Ostream& os) const
os << token::END_STATEMENT << nl; os << token::END_STATEMENT << nl;
os << indent << word(this->name() + "Coeffs") << nl; os << indent << word(this->name() + "Coeffs") << nl;
os << indent << token::BEGIN_BLOCK << incrIndent << nl; os << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl; writeEntry(os, "t0", t0_);
os.writeKeyword("markSpace") << markSpace_ << token::END_STATEMENT << nl; writeEntry(os, "markSpace", markSpace_);
amplitude_->writeData(os); amplitude_->writeData(os);
frequency_->writeData(os); frequency_->writeData(os);
scale_->writeData(os); scale_->writeData(os);

8
src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -413,13 +413,11 @@ void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
{ {
if (boundsHandling_ != CLAMP) if (boundsHandling_ != CLAMP)
{ {
os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_) writeEntry(os, "outOfBounds", boundsHandlingToWord(boundsHandling_));
<< token::END_STATEMENT << nl;
} }
if (interpolationScheme_ != "linear") if (interpolationScheme_ != "linear")
{ {
os.writeKeyword("interpolationScheme") << interpolationScheme_ writeEntry(os, "interpolationScheme", interpolationScheme_);
<< token::END_STATEMENT << nl;
} }
} }

4
src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,7 +88,7 @@ void Foam::Function1Types::TableFile<Type>::writeData(Ostream& os) const
// the values themselves // the values themselves
TableBase<Type>::writeEntries(os); TableBase<Type>::writeEntries(os);
os.writeKeyword("file")<< fName_ << token::END_STATEMENT << nl; writeEntry(os, "file", fName_);
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

6
src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,8 +60,8 @@ void Foam::Function1Types::ramp::writeData(Ostream& os) const
os << token::END_STATEMENT << nl; os << token::END_STATEMENT << nl;
os << indent << word(this->name() + "Coeffs") << nl; os << indent << word(this->name() + "Coeffs") << nl;
os << indent << token::BEGIN_BLOCK << incrIndent << nl; os << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("start") << start_ << token::END_STATEMENT << nl; writeEntry(os, "start", start_);
os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl; writeEntry(os, "duration", duration_);
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

16
src/conversion/ensight/part/ensightPartIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -130,10 +130,10 @@ bool Foam::ensightPart::writeSummary(Ostream& os) const
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
// Ensight starts with 1 // Ensight starts with 1
os.writeKeyword("id") << (number() + 1) << token::END_STATEMENT << nl; writeEntry(os, "id", (number() + 1));
os.writeKeyword("name") << name() << token::END_STATEMENT << nl; writeEntry(os, "name", name());
os.writeKeyword("offset") << offset() << token::END_STATEMENT << nl; writeEntry(os, "offset", offset());
os.writeKeyword("size") << size() << token::END_STATEMENT << nl; writeEntry(os, "size", size());
os << decrIndent << indent << token::END_BLOCK << nl << endl; os << decrIndent << indent << token::END_BLOCK << nl << endl;
@ -146,9 +146,9 @@ bool Foam::ensightPart::writeData(Ostream& os) const
os << indent << type() << nl os << indent << type() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("id") << number() << token::END_STATEMENT << nl; writeEntry(os, "id", number());
os.writeKeyword("name") << name() << token::END_STATEMENT << nl; writeEntry(os, "name", name());
os.writeKeyword("offset") << offset() << token::END_STATEMENT << nl; writeEntry(os, "offset", offset());
forAll(elementTypes(), typeI) forAll(elementTypes(), typeI)
{ {

6
src/dynamicMesh/boundaryPatch/boundaryPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -90,8 +90,8 @@ Foam::boundaryPatch::~boundaryPatch()
void Foam::boundaryPatch::write(Ostream& os) const void Foam::boundaryPatch::write(Ostream& os) const
{ {
patchIdentifier::write(os); patchIdentifier::write(os);
os.writeKeyword("nFaces") << size_ << token::END_STATEMENT << nl; writeEntry(os, "nFaces", size_);
os.writeKeyword("startFace") << start_ << token::END_STATEMENT << nl; writeEntry(os, "startFace", start_);
} }

5
src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -174,8 +174,7 @@ write(Ostream& os) const
// Note: write value // Note: write value
fixedValuePointPatchVectorField::write(os); fixedValuePointPatchVectorField::write(os);
os.writeKeyword(solidBodyMotionFunction::typeName) << SBMFPtr_->type() Foam::writeEntry(os, solidBodyMotionFunction::typeName, SBMFPtr_->type());
<< token::END_STATEMENT << nl;
os << indent << word(SBMFPtr_->type() + "Coeffs"); os << indent << word(SBMFPtr_->type() + "Coeffs");
SBMFPtr_->writeData(os); SBMFPtr_->writeData(os);
} }

8
src/dynamicMesh/pointInterpolator/dynamicMeshPointInterpolator.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -186,10 +186,8 @@ Foam::dynamicMeshPointInterpolator::curPointField() const
void Foam::dynamicMeshPointInterpolator::write(Ostream& os) const void Foam::dynamicMeshPointInterpolator::write(Ostream& os) const
{ {
os.writeKeyword("field") writeEntry(os, "field", fieldName_);
<< fieldName_ << token::END_STATEMENT << nl; writeEntry(os, "interpolationScheme", interpolationScheme_);
os.writeKeyword("interpolationScheme")
<< interpolationScheme_ << token::END_STATEMENT << nl;
} }

5
src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -268,8 +268,7 @@ Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
// Make sure to construct the patchfield with up-to-date value // Make sure to construct the patchfield with up-to-date value
OStringStream os; OStringStream os;
os.writeKeyword("type") << name_ << token::END_STATEMENT writeEntry(os, "type", name_);
<< nl;
static_cast<const Field<Type>&>(*this).writeEntry("value", os); static_cast<const Field<Type>&>(*this).writeEntry("value", os);
IStringStream is(os.str()); IStringStream is(os.str());
dictionary dict(is); dictionary dict(is);

19
src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -117,24 +117,17 @@ Foam::Ostream& Foam::functionObjects::operator<<
os << faItem.fieldName_ << nl << token::BEGIN_BLOCK << nl; os << faItem.fieldName_ << nl << token::BEGIN_BLOCK << nl;
os.writeKeyword("mean") writeEntry(os, "mean", faItem.mean_);
<< faItem.mean_ << token::END_STATEMENT << nl; writeEntry(os, "prime2Mean", faItem.prime2Mean_);
writeEntry(os, "base", faItem.baseTypeNames_[faItem.base_]);
os.writeKeyword("prime2Mean")
<< faItem.prime2Mean_ << token::END_STATEMENT << nl;
os.writeKeyword("base")
<< faItem.baseTypeNames_[faItem.base_] << token::END_STATEMENT << nl;
if (faItem.window_ > 0) if (faItem.window_ > 0)
{ {
os.writeKeyword("window") writeEntry(os, "window", faItem.window_);
<< faItem.window_ << token::END_STATEMENT << nl;
if (faItem.windowName_ != "") if (faItem.windowName_ != "")
{ {
os.writeKeyword("windowName") writeEntry(os, "windowName", faItem.windowName_);
<< faItem.windowName_ << token::END_STATEMENT << nl;
} }
} }

17
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -179,16 +179,11 @@ void angularOscillatingDisplacementPointPatchVectorField::write
) const ) const
{ {
pointPatchField<vector>::write(os); pointPatchField<vector>::write(os);
os.writeKeyword("axis") Foam::writeEntry(os, "axis", axis_);
<< axis_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "origin", origin_);
os.writeKeyword("origin") Foam::writeEntry(os, "angle0", angle0_);
<< origin_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "amplitude", amplitude_);
os.writeKeyword("angle0") Foam::writeEntry(os, "omega", omega_);
<< angle0_ << token::END_STATEMENT << nl;
os.writeKeyword("amplitude")
<< amplitude_ << token::END_STATEMENT << nl;
os.writeKeyword("omega")
<< omega_ << token::END_STATEMENT << nl;
p0_.writeEntry("p0", os); p0_.writeEntry("p0", os);
writeEntry("value", os); writeEntry("value", os);
} }

17
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -184,16 +184,11 @@ void angularOscillatingVelocityPointPatchVectorField::write
) const ) const
{ {
pointPatchField<vector>::write(os); pointPatchField<vector>::write(os);
os.writeKeyword("axis") Foam::writeEntry(os, "axis", axis_);
<< axis_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "origin", origin_);
os.writeKeyword("origin") Foam::writeEntry(os, "angle0", angle0_);
<< origin_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "amplitude", amplitude_);
os.writeKeyword("angle0") Foam::writeEntry(os, "omega", omega_);
<< angle0_ << token::END_STATEMENT << nl;
os.writeKeyword("amplitude")
<< amplitude_ << token::END_STATEMENT << nl;
os.writeKeyword("omega")
<< omega_ << token::END_STATEMENT << nl;
p0_.writeEntry("p0", os); p0_.writeEntry("p0", os);
writeEntry("value", os); writeEntry("value", os);
} }

8
src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -117,10 +117,8 @@ void oscillatingDisplacementPointPatchVectorField::updateCoeffs()
void oscillatingDisplacementPointPatchVectorField::write(Ostream& os) const void oscillatingDisplacementPointPatchVectorField::write(Ostream& os) const
{ {
pointPatchField<vector>::write(os); pointPatchField<vector>::write(os);
os.writeKeyword("amplitude") Foam::writeEntry(os, "amplitude", amplitude_);
<< amplitude_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "omega", omega_);
os.writeKeyword("omega")
<< omega_ << token::END_STATEMENT << nl;
writeEntry("value", os); writeEntry("value", os);
} }

8
src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -160,10 +160,8 @@ void oscillatingVelocityPointPatchVectorField::updateCoeffs()
void oscillatingVelocityPointPatchVectorField::write(Ostream& os) const void oscillatingVelocityPointPatchVectorField::write(Ostream& os) const
{ {
pointPatchField<vector>::write(os); pointPatchField<vector>::write(os);
os.writeKeyword("amplitude") Foam::writeEntry(os, "amplitude", amplitude_);
<< amplitude_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "omega", omega_);
os.writeKeyword("omega")
<< omega_ << token::END_STATEMENT << nl;
p0_.writeEntry("p0", os); p0_.writeEntry("p0", os);
writeEntry("value", os); writeEntry("value", os);
} }

20
src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -472,20 +472,14 @@ void surfaceDisplacementPointPatchVectorField::updateCoeffs()
void surfaceDisplacementPointPatchVectorField::write(Ostream& os) const void surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
{ {
fixedValuePointPatchVectorField::write(os); fixedValuePointPatchVectorField::write(os);
os.writeKeyword("velocity") << velocity_ Foam::writeEntry(os, "velocity", velocity_);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "geometry", surfacesDict_);
os.writeKeyword("geometry") << surfacesDict_ Foam::writeEntry(os, "projectMode", projectModeNames_[projectMode_]);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "projectDirection", projectDir_);
os.writeKeyword("projectMode") << projectModeNames_[projectMode_] Foam::writeEntry(os, "wedgePlane", wedgePlane_);
<< token::END_STATEMENT << nl;
os.writeKeyword("projectDirection") << projectDir_
<< token::END_STATEMENT << nl;
os.writeKeyword("wedgePlane") << wedgePlane_
<< token::END_STATEMENT << nl;
if (frozenPointsZone_ != word::null) if (frozenPointsZone_ != word::null)
{ {
os.writeKeyword("frozenPointsZone") << frozenPointsZone_ Foam::writeEntry(os, "frozenPointsZone", frozenPointsZone_);
<< token::END_STATEMENT << nl;
} }
} }

17
src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -431,18 +431,13 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
void surfaceSlipDisplacementPointPatchVectorField::write(Ostream& os) const void surfaceSlipDisplacementPointPatchVectorField::write(Ostream& os) const
{ {
pointPatchVectorField::write(os); pointPatchVectorField::write(os);
os.writeKeyword("geometry") << surfacesDict_ writeEntry(os, "geometry", surfacesDict_);
<< token::END_STATEMENT << nl; writeEntry(os, "projectMode", projectModeNames_[projectMode_]);
os.writeKeyword("projectMode") << projectModeNames_[projectMode_] writeEntry(os, "projectDirection", projectDir_);
<< token::END_STATEMENT << nl; writeEntry(os, "wedgePlane", wedgePlane_);
os.writeKeyword("projectDirection") << projectDir_
<< token::END_STATEMENT << nl;
os.writeKeyword("wedgePlane") << wedgePlane_
<< token::END_STATEMENT << nl;
if (frozenPointsZone_ != word::null) if (frozenPointsZone_ != word::null)
{ {
os.writeKeyword("frozenPointsZone") << frozenPointsZone_ writeEntry(os, "frozenPointsZone", frozenPointsZone_);
<< token::END_STATEMENT << nl;
} }
} }

11
src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -121,12 +121,9 @@ void Foam::waveDisplacementPointPatchVectorField::updateCoeffs()
void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
{ {
pointPatchField<vector>::write(os); pointPatchField<vector>::write(os);
os.writeKeyword("amplitude") Foam::writeEntry(os, "amplitude", amplitude_);
<< amplitude_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "omega", omega_);
os.writeKeyword("omega") Foam::writeEntry(os, "waveNumber", waveNumber_);
<< omega_ << token::END_STATEMENT << nl;
os.writeKeyword("waveNumber")
<< waveNumber_ << token::END_STATEMENT << nl;
writeEntry("value", os); writeEntry("value", os);
} }

4
src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -560,7 +560,7 @@ void Foam::genericPointPatchField<Type>::rmap
template<class Type> template<class Type>
void Foam::genericPointPatchField<Type>::write(Ostream& os) const void Foam::genericPointPatchField<Type>::write(Ostream& os) const
{ {
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl; writeEntry(os, "type", actualTypeName_);
forAllConstIter(dictionary, dict_, iter) forAllConstIter(dictionary, dict_, iter)
{ {

5
src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -112,8 +112,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
forAll(pp.names_, cmptI) forAll(pp.names_, cmptI)
{ {
os.writeKeyword(pp.names_[cmptI]) << pp.Y_[cmptI] writeEntry(os, pp.names_[cmptI], pp.Y_[cmptI]);
<< token::END_STATEMENT << nl;
} }
os << decrIndent << token::END_BLOCK << nl; os << decrIndent << token::END_BLOCK << nl;

6
src/lagrangian/intermediate/submodels/CloudSubModelBase.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -126,9 +126,7 @@ bool Foam::CloudSubModelBase<CloudType>::writeTime() const
template<class CloudType> template<class CloudType>
void Foam::CloudSubModelBase<CloudType>::write(Ostream& os) const void Foam::CloudSubModelBase<CloudType>::write(Ostream& os) const
{ {
os.writeKeyword("owner") << owner_.name() << token::END_STATEMENT writeEntry(os, "owner", owner_.name());
<< nl;
subModelBase::write(os); subModelBase::write(os);
} }

8
src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -183,10 +183,8 @@ template<class CloudType>
void Foam::DispersionRASModel<CloudType>::write(Ostream& os) const void Foam::DispersionRASModel<CloudType>::write(Ostream& os) const
{ {
DispersionModel<CloudType>::write(os); DispersionModel<CloudType>::write(os);
writeEntry(os, "ownK", ownK_);
os.writeKeyword("ownK") << ownK_ << token::END_STATEMENT << endl; writeEntry(os, "ownEpsilon", ownEpsilon_);
os.writeKeyword("ownEpsilon") << ownEpsilon_ << token::END_STATEMENT
<< endl;
} }

6
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -471,9 +471,7 @@ bool Foam::cyclicACMIPolyPatch::order
void Foam::cyclicACMIPolyPatch::write(Ostream& os) const void Foam::cyclicACMIPolyPatch::write(Ostream& os) const
{ {
cyclicAMIPolyPatch::write(os); cyclicAMIPolyPatch::write(os);
Foam::writeEntry(os, "nonOverlapPatch", nonOverlapPatchName_);
os.writeKeyword("nonOverlapPatch") << nonOverlapPatchName_
<< token::END_STATEMENT << nl;
} }

32
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1201,8 +1201,7 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
coupledPolyPatch::write(os); coupledPolyPatch::write(os);
if (!nbrPatchName_.empty()) if (!nbrPatchName_.empty())
{ {
os.writeKeyword("neighbourPatch") << nbrPatchName_ Foam::writeEntry(os, "neighbourPatch", nbrPatchName_);
<< token::END_STATEMENT << nl;
} }
coupleGroup_.write(os); coupleGroup_.write(os);
@ -1210,23 +1209,19 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
{ {
case ROTATIONAL: case ROTATIONAL:
{ {
os.writeKeyword("rotationAxis") << rotationAxis_ Foam::writeEntry(os, "rotationAxis", rotationAxis_);
<< token::END_STATEMENT << nl; Foam::writeEntry(os, "rotationCentre", rotationCentre_);
os.writeKeyword("rotationCentre") << rotationCentre_
<< token::END_STATEMENT << nl;
if (rotationAngleDefined_) if (rotationAngleDefined_)
{ {
os.writeKeyword("rotationAngle") << radToDeg(rotationAngle_) Foam::writeEntry(os, "rotationAngle", radToDeg(rotationAngle_));
<< token::END_STATEMENT << nl;
} }
break; break;
} }
case TRANSLATIONAL: case TRANSLATIONAL:
{ {
os.writeKeyword("separationVector") << separationVector_ Foam::writeEntry(os, "separationVector", separationVector_);
<< token::END_STATEMENT << nl;
break; break;
} }
case NOORDERING: case NOORDERING:
@ -1241,19 +1236,20 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
if (AMIReverse_) if (AMIReverse_)
{ {
os.writeKeyword("flipNormals") << AMIReverse_ Foam::writeEntry(os, "flipNormals", AMIReverse_);
<< token::END_STATEMENT << nl;
} }
if (AMILowWeightCorrection_ > 0) if (AMILowWeightCorrection_ > 0)
{ {
os.writeKeyword("lowWeightCorrection") << AMILowWeightCorrection_ Foam::writeEntry(os, "lowWeightCorrection", AMILowWeightCorrection_);
<< token::END_STATEMENT << nl;
} }
os.writeKeyword("method") Foam::writeEntry
<< AMIInterpolation::interpolationMethodToWord(AMIMethod_) (
<< token::END_STATEMENT << nl; os,
"method",
AMIInterpolation::interpolationMethodToWord(AMIMethod_)
);
if (!surfDict_.empty()) if (!surfDict_.empty())
{ {

6
src/meshTools/AMIInterpolation/patches/cyclicRepeatAMI/cyclicRepeatAMIPolyPatch/cyclicRepeatAMIPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -488,9 +488,7 @@ Foam::cyclicRepeatAMIPolyPatch::neighbWeightsSum() const
void Foam::cyclicRepeatAMIPolyPatch::write(Ostream& os) const void Foam::cyclicRepeatAMIPolyPatch::write(Ostream& os) const
{ {
cyclicAMIPolyPatch::write(os); cyclicAMIPolyPatch::write(os);
Foam::writeEntry(os, "transformPatch", transformPatchName_);
os.writeKeyword("transformPatch") << transformPatchName_
<< token::END_STATEMENT << nl;
} }

8
src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -276,9 +276,9 @@ Foam::EulerCoordinateRotation::EulerCoordinateRotation
void Foam::EulerCoordinateRotation::write(Ostream& os) const void Foam::EulerCoordinateRotation::write(Ostream& os) const
{ {
os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl; writeEntry(os, "e1", e1());
os.writeKeyword("e2") << e2() << token::END_STATEMENT << nl; writeEntry(os, "e2", e2());
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl; writeEntry(os, "e3", e3());
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -273,9 +273,9 @@ Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
void Foam::STARCDCoordinateRotation::write(Ostream& os) const void Foam::STARCDCoordinateRotation::write(Ostream& os) const
{ {
os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl; writeEntry(os, "e1", e1());
os.writeKeyword("e2") << e2() << token::END_STATEMENT << nl; writeEntry(os, "e2", e2());
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl; writeEntry(os, "e3", e3());
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -298,9 +298,9 @@ void Foam::axesRotation::operator=(const dictionary& dict)
void Foam::axesRotation::write(Ostream& os) const void Foam::axesRotation::write(Ostream& os) const
{ {
os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl; writeEntry(os, "e1", e1());
os.writeKeyword("e2") << e2() << token::END_STATEMENT << nl; writeEntry(os, "e2", e2());
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl; writeEntry(os, "e3", e3());
} }

4
src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -351,7 +351,7 @@ Foam::symmTensor Foam::cylindrical::transformVector
void Foam::cylindrical::write(Ostream& os) const void Foam::cylindrical::write(Ostream& os) const
{ {
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl; writeEntry(os, "e3", e3());
} }

8
src/meshTools/coordinateSystems/coordinateSystem.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -301,16 +301,16 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
} }
os.writeKeyword("type") << type() << token::END_STATEMENT << nl; writeEntry(os, "type", type());
// The note entry is optional // The note entry is optional
if (note_.size()) if (note_.size())
{ {
os.writeKeyword("note") << note_ << token::END_STATEMENT << nl; writeEntry(os, "note", note_);
} }
os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl; writeEntry(os, "origin", origin_);
R_->write(os); R_->write(os);
if (subDict) if (subDict)

23
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1390,17 +1390,14 @@ Foam::pointIndexHit Foam::mappedPatchBase::facePoint
void Foam::mappedPatchBase::write(Ostream& os) const void Foam::mappedPatchBase::write(Ostream& os) const
{ {
os.writeKeyword("sampleMode") << sampleModeNames_[mode_] writeEntry(os, "sampleMode", sampleModeNames_[mode_]);
<< token::END_STATEMENT << nl;
if (!sampleRegion_.empty()) if (!sampleRegion_.empty())
{ {
os.writeKeyword("sampleRegion") << sampleRegion_ writeEntry(os, "sampleRegion", sampleRegion_);
<< token::END_STATEMENT << nl;
} }
if (!samplePatch_.empty()) if (!samplePatch_.empty())
{ {
os.writeKeyword("samplePatch") << samplePatch_ writeEntry(os, "samplePatch", samplePatch_);
<< token::END_STATEMENT << nl;
} }
coupleGroup_.write(os); coupleGroup_.write(os);
@ -1415,15 +1412,13 @@ void Foam::mappedPatchBase::write(Ostream& os) const
} }
else else
{ {
os.writeKeyword("offsetMode") << offsetModeNames_[offsetMode_] writeEntry(os, "offsetMode", offsetModeNames_[offsetMode_]);
<< token::END_STATEMENT << nl;
switch (offsetMode_) switch (offsetMode_)
{ {
case UNIFORM: case UNIFORM:
{ {
os.writeKeyword("offset") << offset_ << token::END_STATEMENT writeEntry(os, "offset", offset_);
<< nl;
break; break;
} }
case NONUNIFORM: case NONUNIFORM:
@ -1433,8 +1428,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
} }
case NORMAL: case NORMAL:
{ {
os.writeKeyword("distance") << distance_ << token::END_STATEMENT writeEntry(os, "distance", distance_);
<< nl;
break; break;
} }
} }
@ -1443,8 +1437,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
{ {
if (AMIReverse_) if (AMIReverse_)
{ {
os.writeKeyword("flipNormals") << AMIReverse_ writeEntry(os, "flipNormals", AMIReverse_);
<< token::END_STATEMENT << nl;
} }
if (!surfDict_.empty()) if (!surfDict_.empty())

4
src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -167,7 +167,7 @@ Foam::mappedVariableThicknessWallPolyPatch::
void Foam::mappedVariableThicknessWallPolyPatch:: void Foam::mappedVariableThicknessWallPolyPatch::
write(Foam::Ostream& os) const write(Foam::Ostream& os) const
{ {
os.writeKeyword("thickness") << thickness_ << token::END_STATEMENT << nl; Foam::writeEntry(os, "thickness", thickness_);
} }

11
src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -331,15 +331,12 @@ bool Foam::regionCoupledBase::order
void Foam::regionCoupledBase::write(Ostream& os) const void Foam::regionCoupledBase::write(Ostream& os) const
{ {
os.writeKeyword("neighbourPatch") << nbrPatchName_ writeEntry(os, "neighbourPatch", nbrPatchName_);
<< token::END_STATEMENT << nl; writeEntry(os, "neighbourRegion", nbrRegionName_);
os.writeKeyword("neighbourRegion") << nbrRegionName_
<< token::END_STATEMENT << nl;
if (AMIReverse_) if (AMIReverse_)
{ {
os.writeKeyword("flipNormals") << AMIReverse_ writeEntry(os, "flipNormals", AMIReverse_);
<< token::END_STATEMENT << nl;
} }
if (!surfDict_.empty()) if (!surfDict_.empty())

11
src/rigidBodyDynamics/bodies/cuboid/cuboid.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,14 +62,11 @@ Foam::RBD::cuboid::~cuboid()
void Foam::RBD::cuboid::write(Ostream& os) const void Foam::RBD::cuboid::write(Ostream& os) const
{ {
os.writeKeyword("type") writeEntry(os, "type", type());
<< type() << token::END_STATEMENT << nl;
os.writeKeyword("mass") writeEntry(os, "mass", m());
<< m() << token::END_STATEMENT << nl;
os.writeKeyword("L") writeEntry(os, "L", L());
<< L() << token::END_STATEMENT << nl;
} }

5
src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -68,8 +68,7 @@ bool Foam::RBD::masslessBody::massless() const
void Foam::RBD::masslessBody::write(Ostream& os) const void Foam::RBD::masslessBody::write(Ostream& os) const
{ {
os.writeKeyword("type") writeEntry(os, "type", type());
<< type() << token::END_STATEMENT << nl;
} }

14
src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,17 +119,13 @@ void Foam::RBD::rigidBody::merge(const subBody& subBody)
void Foam::RBD::rigidBody::write(Ostream& os) const void Foam::RBD::rigidBody::write(Ostream& os) const
{ {
os.writeKeyword("type") writeEntry(os, "type", type());
<< type() << token::END_STATEMENT << nl;
os.writeKeyword("mass") writeEntry(os, "mass", m());
<< m() << token::END_STATEMENT << nl;
os.writeKeyword("centreOfMass") writeEntry(os, "centreOfMass", c());
<< c() << token::END_STATEMENT << nl;
os.writeKeyword("inertia") writeEntry(os, "inertia", Ic());
<< Ic() << token::END_STATEMENT << nl;
} }

11
src/rigidBodyDynamics/bodies/sphere/sphere.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,14 +62,11 @@ Foam::RBD::sphere::~sphere()
void Foam::RBD::sphere::write(Ostream& os) const void Foam::RBD::sphere::write(Ostream& os) const
{ {
os.writeKeyword("type") writeEntry(os, "type", type());
<< type() << token::END_STATEMENT << nl;
os.writeKeyword("mass") writeEntry(os, "mass", m());
<< m() << token::END_STATEMENT << nl;
os.writeKeyword("radius") writeEntry(os, "radius", r());
<< r() << token::END_STATEMENT << nl;
} }

8
src/rigidBodyDynamics/bodies/subBody/subBody.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,11 +29,9 @@ License
void Foam::RBD::subBody::write(Ostream& os) const void Foam::RBD::subBody::write(Ostream& os) const
{ {
os.writeKeyword("master") writeEntry(os, "master", masterName_);
<< masterName_ << token::END_STATEMENT << nl;
os.writeKeyword("transform") writeEntry(os, "transform", masterXT_);
<< masterXT_ << token::END_STATEMENT << nl;
} }

5
src/rigidBodyDynamics/joints/Pa/Pa.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -97,8 +97,7 @@ void Foam::RBD::joints::Pa::jcalc
void Foam::RBD::joints::Pa::write(Ostream& os) const void Foam::RBD::joints::Pa::write(Ostream& os) const
{ {
joint::write(os); joint::write(os);
os.writeKeyword("axis") writeEntry(os, "axis", S_[0].l());
<< S_[0].l() << token::END_STATEMENT << nl;
} }

5
src/rigidBodyDynamics/joints/Ra/Ra.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -97,8 +97,7 @@ void Foam::RBD::joints::Ra::jcalc
void Foam::RBD::joints::Ra::write(Ostream& os) const void Foam::RBD::joints::Ra::write(Ostream& os) const
{ {
joint::write(os); joint::write(os);
os.writeKeyword("axis") writeEntry(os, "axis", S_[0].w());
<< S_[0].w() << token::END_STATEMENT << nl;
} }

4
src/rigidBodyDynamics/joints/joint/joint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,7 +81,7 @@ Foam::RBD::joint::~joint()
void Foam::RBD::joint::write(Ostream& os) const void Foam::RBD::joint::write(Ostream& os) const
{ {
os.writeKeyword("type") << type() << token::END_STATEMENT << nl; writeEntry(os, "type", type());
} }

14
src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -184,17 +184,13 @@ void Foam::RBD::restraints::linearAxialAngularSpring::write
{ {
restraint::write(os); restraint::write(os);
os.writeKeyword("referenceOrientation") writeEntry(os, "referenceOrientation", refQ_);
<< refQ_ << token::END_STATEMENT << nl;
os.writeKeyword("axis") writeEntry(os, "axis", axis_);
<< axis_ << token::END_STATEMENT << nl;
os.writeKeyword("stiffness") writeEntry(os, "stiffness", stiffness_);
<< stiffness_ << token::END_STATEMENT << nl;
os.writeKeyword("damping") writeEntry(os, "damping", damping_);
<< damping_ << token::END_STATEMENT << nl;
} }

5
src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -109,8 +109,7 @@ void Foam::RBD::restraints::linearDamper::write
{ {
restraint::write(os); restraint::write(os);
os.writeKeyword("coeff") writeEntry(os, "coeff", coeff_);
<< coeff_ << token::END_STATEMENT << nl;
} }

17
src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -134,20 +134,15 @@ void Foam::RBD::restraints::linearSpring::write
{ {
restraint::write(os); restraint::write(os);
os.writeKeyword("anchor") writeEntry(os, "anchor", anchor_);
<< anchor_ << token::END_STATEMENT << nl;
os.writeKeyword("refAttachmentPt") writeEntry(os, "refAttachmentPt", refAttachmentPt_);
<< refAttachmentPt_ << token::END_STATEMENT << nl;
os.writeKeyword("stiffness") writeEntry(os, "stiffness", stiffness_);
<< stiffness_ << token::END_STATEMENT << nl;
os.writeKeyword("damping") writeEntry(os, "damping", damping_);
<< damping_ << token::END_STATEMENT << nl;
os.writeKeyword("restLength") writeEntry(os, "restLength", restLength_);
<< restLength_ << token::END_STATEMENT << nl;
} }

8
src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -78,10 +78,8 @@ bool Foam::RBD::restraint::read(const dictionary& dict)
void Foam::RBD::restraint::write(Ostream& os) const void Foam::RBD::restraint::write(Ostream& os) const
{ {
os.writeKeyword("type") writeEntry(os, "type", type());
<< type() << token::END_STATEMENT << nl; writeEntry(os, "body", model_.name(bodyID_));
os.writeKeyword("body")
<< model_.name(bodyID_) << token::END_STATEMENT << nl;
} }

4
src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -109,7 +109,7 @@ void Foam::RBD::restraints::sphericalAngularDamper::write
{ {
restraint::write(os); restraint::write(os);
os.writeKeyword("coeff") << coeff_ << token::END_STATEMENT << nl; writeEntry(os, "coeff", coeff_);
} }

16
src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -401,14 +401,10 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
bodies_[i].write(os); bodies_[i].write(os);
os.writeKeyword("parent") writeEntry(os, "parent", bodies_[lambda_[i]].name());
<< bodies_[lambda_[i]].name() << token::END_STATEMENT << nl; writeEntry(os, "transform", XT_[i]);
os.writeKeyword("transform")
<< XT_[i] << token::END_STATEMENT << nl;
os << indent << "joint" << nl << joints_[i] << endl; os << indent << "joint" << nl << joints_[i] << endl;
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }
} }
@ -421,11 +417,9 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
mergedBodies_[i].body().write(os); mergedBodies_[i].body().write(os);
os.writeKeyword("transform") writeEntry(os, "transform", mergedBodies_[i].masterXT());
<< mergedBodies_[i].masterXT() << token::END_STATEMENT << nl;
os.writeKeyword("mergeWith") writeEntry(os, "mergeWith", mergedBodies_[i].masterName());
<< mergedBodies_[i].masterName() << token::END_STATEMENT << nl;
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

12
src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,11 +40,11 @@ void Foam::RBD::rigidBodyModelState::write(dictionary& dict) const
void Foam::RBD::rigidBodyModelState::write(Ostream& os) const void Foam::RBD::rigidBodyModelState::write(Ostream& os) const
{ {
os.writeKeyword("q") << q_ << token::END_STATEMENT << nl; writeEntry(os, "q", q_);
os.writeKeyword("qDot") << qDot_ << token::END_STATEMENT << nl; writeEntry(os, "qDot", qDot_);
os.writeKeyword("qDdot") << qDdot_ << token::END_STATEMENT << nl; writeEntry(os, "qDdot", qDdot_);
os.writeKeyword("t") << t_ << token::END_STATEMENT << nl; writeEntry(os, "t", t_);
os.writeKeyword("deltaT") << deltaT_ << token::END_STATEMENT << nl; writeEntry(os, "deltaT", deltaT_);
} }

11
src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,12 +44,9 @@ void Foam::RBD::rigidBodyMotion::write(Ostream& os) const
{ {
rigidBodyModel::write(os); rigidBodyModel::write(os);
os.writeKeyword("accelerationRelaxation") writeEntry(os, "accelerationRelaxation", aRelax_);
<< aRelax_ << token::END_STATEMENT << nl; writeEntry(os, "accelerationDamping", aDamp_);
os.writeKeyword("accelerationDamping") writeEntry(os, "report", report_);
<< aDamp_ << token::END_STATEMENT << nl;
os.writeKeyword("report")
<< report_ << token::END_STATEMENT << nl;
} }

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -116,8 +116,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("axis") writeEntry(os, "axis", axis_);
<< axis_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

8
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -130,10 +130,8 @@ void Foam::sixDoFRigidBodyMotionConstraints::line::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("centreOfRotation") writeEntry(os, "centreOfRotation", centreOfRotation_);
<< centreOfRotation_ << token::END_STATEMENT << nl; writeEntry(os, "direction", direction_);
os.writeKeyword("direction")
<< direction_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

8
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -117,10 +117,8 @@ void Foam::sixDoFRigidBodyMotionConstraints::plane::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("centreOfRotation") writeEntry(os, "centreOfRotation", centreOfRotation_);
<< centreOfRotation_ << token::END_STATEMENT << nl; writeEntry(os, "normal", normal_);
os.writeKeyword("normal")
<< normal_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -116,8 +116,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::point::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("centreOfRotation") writeEntry(os, "centreOfRotation", centreOfRotation_);
<< centreOfRotation_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

14
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -186,17 +186,13 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("referenceOrientation") writeEntry(os, "referenceOrientation", refQ_);
<< refQ_ << token::END_STATEMENT << nl;
os.writeKeyword("axis") writeEntry(os, "axis", axis_);
<< axis_ << token::END_STATEMENT << nl;
os.writeKeyword("stiffness") writeEntry(os, "stiffness", stiffness_);
<< stiffness_ << token::END_STATEMENT << nl;
os.writeKeyword("damping") writeEntry(os, "damping", damping_);
<< damping_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -105,8 +105,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("coeff") writeEntry(os, "coeff", coeff_);
<< coeff_ << token::END_STATEMENT << nl;
} }

17
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -125,20 +125,15 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("anchor") writeEntry(os, "anchor", anchor_);
<< anchor_ << token::END_STATEMENT << nl;
os.writeKeyword("refAttachmentPt") writeEntry(os, "refAttachmentPt", refAttachmentPt_);
<< refAttachmentPt_ << token::END_STATEMENT << nl;
os.writeKeyword("stiffness") writeEntry(os, "stiffness", stiffness_);
<< stiffness_ << token::END_STATEMENT << nl;
os.writeKeyword("damping") writeEntry(os, "damping", damping_);
<< damping_ << token::END_STATEMENT << nl;
os.writeKeyword("restLength") writeEntry(os, "restLength", restLength_);
<< restLength_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

4
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -107,7 +107,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("coeff") << coeff_ << token::END_STATEMENT << nl; writeEntry(os, "coeff", coeff_);
} }

9
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -145,12 +145,11 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("referenceOrientation") writeEntry(os, "referenceOrientation", refQ_);
<< refQ_ << token::END_STATEMENT << nl;
os.writeKeyword("stiffness") << stiffness_ << token::END_STATEMENT << nl; writeEntry(os, "stiffness", stiffness_);
os.writeKeyword("damping") << damping_ << token::END_STATEMENT << nl; writeEntry(os, "damping", damping_);
} }

11
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -205,11 +205,9 @@ void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::write
Ostream& os Ostream& os
) const ) const
{ {
os.writeKeyword("referenceOrientation") writeEntry(os, "referenceOrientation", refQ_);
<< refQ_ << token::END_STATEMENT << nl;
os.writeKeyword("axis") writeEntry(os, "axis", axis_);
<< axis_ << token::END_STATEMENT << nl;
moment_.write(os); moment_.write(os);
@ -224,8 +222,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::write
os << "radians" << token::END_STATEMENT << nl; os << "radians" << token::END_STATEMENT << nl;
} }
os.writeKeyword("damping") writeEntry(os, "damping", damping_);
<< damping_ << token::END_STATEMENT << nl;
} }

29
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -50,20 +50,13 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
{ {
motionState_.write(os); motionState_.write(os);
os.writeKeyword("centreOfMass") writeEntry(os, "centreOfMass", initialCentreOfMass_);
<< initialCentreOfMass_ << token::END_STATEMENT << nl; writeEntry(os, "initialOrientation", initialQ_);
os.writeKeyword("initialOrientation") writeEntry(os, "mass", mass_);
<< initialQ_ << token::END_STATEMENT << nl; writeEntry(os, "momentOfInertia", momentOfInertia_);
os.writeKeyword("mass") writeEntry(os, "accelerationRelaxation", aRelax_);
<< mass_ << token::END_STATEMENT << nl; writeEntry(os, "accelerationDamping", aDamp_);
os.writeKeyword("momentOfInertia") writeEntry(os, "report", report_);
<< 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;
if (!restraints_.empty()) if (!restraints_.empty())
{ {
@ -77,8 +70,7 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
os << indent << restraints_[rI].name() << nl os << indent << restraints_[rI].name() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << endl; << indent << token::BEGIN_BLOCK << incrIndent << endl;
os.writeKeyword("sixDoFRigidBodyMotionRestraint") writeEntry(os, "sixDoFRigidBodyMotionRestraint", restraintType);
<< restraintType << token::END_STATEMENT << nl;
restraints_[rI].write(os); restraints_[rI].write(os);
@ -100,8 +92,7 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
os << indent << constraints_[rI].name() << nl os << indent << constraints_[rI].name() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << endl; << indent << token::BEGIN_BLOCK << incrIndent << endl;
os.writeKeyword("sixDoFRigidBodyMotionConstraint") writeEntry(os, "sixDoFRigidBodyMotionConstraint", constraintType);
<< constraintType << token::END_STATEMENT << nl;
constraints_[rI].sixDoFRigidBodyMotionConstraint::write(os); constraints_[rI].sixDoFRigidBodyMotionConstraint::write(os);

20
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,18 +41,12 @@ void Foam::sixDoFRigidBodyMotionState::write(dictionary& dict) const
void Foam::sixDoFRigidBodyMotionState::write(Ostream& os) const void Foam::sixDoFRigidBodyMotionState::write(Ostream& os) const
{ {
os.writeKeyword("centreOfRotation") writeEntry(os, "centreOfRotation", centreOfRotation_);
<< centreOfRotation_ << token::END_STATEMENT << nl; writeEntry(os, "orientation", Q_);
os.writeKeyword("orientation") writeEntry(os, "velocity", v_);
<< Q_ << token::END_STATEMENT << nl; writeEntry(os, "acceleration", a_);
os.writeKeyword("velocity") writeEntry(os, "angularMomentum", pi_);
<< v_ << token::END_STATEMENT << nl; writeEntry(os, "torque", tau_);
os.writeKeyword("acceleration")
<< a_ << token::END_STATEMENT << nl;
os.writeKeyword("angularMomentum")
<< pi_ << token::END_STATEMENT << nl;
os.writeKeyword("torque")
<< tau_ << token::END_STATEMENT << nl;
} }

6
src/surfMesh/surfZone/surfZone/surfZone.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -116,8 +116,8 @@ void Foam::surfZone::writeDict(Ostream& os) const
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
surfZoneIdentifier::write(os); surfZoneIdentifier::write(os);
os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl; writeEntry(os, "nFaces", size());
os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl; writeEntry(os, "startFace", start());
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

5
src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,8 +88,7 @@ void Foam::surfZoneIdentifier::write(Ostream& os) const
{ {
if (geometricType_.size()) if (geometricType_.size())
{ {
os.writeKeyword("geometricType") << geometricType_ writeEntry(os, "geometricType", geometricType_);
<< token::END_STATEMENT << nl;
} }
} }

5
src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -111,8 +111,7 @@ template<class ReactionThermo>
void Foam::SolidReaction<ReactionThermo>::write(Ostream& os) const void Foam::SolidReaction<ReactionThermo>::write(Ostream& os) const
{ {
OStringStream reaction; OStringStream reaction;
os.writeKeyword("reaction") << solidReactionStr(reaction) writeEntry(os, "reaction", solidReactionStr(reaction));
<< token::END_STATEMENT << nl;
} }

8
src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,9 +119,9 @@ inline Foam::scalar Foam::solidArrheniusReactionRate::dcidT
inline void Foam::solidArrheniusReactionRate::write(Ostream& os) const inline void Foam::solidArrheniusReactionRate::write(Ostream& os) const
{ {
os.writeKeyword("A") << A_ << token::END_STATEMENT << nl; writeEntry(os, "A", A_);
os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl; writeEntry(os, "Ta", Ta_);
os.writeKeyword("Tcrit") << Tcrit_ << token::END_STATEMENT << nl; writeEntry(os, "Tcrit", Tcrit_);
} }

5
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -394,8 +394,7 @@ template<class ReactionThermo>
void Foam::Reaction<ReactionThermo>::write(Ostream& os) const void Foam::Reaction<ReactionThermo>::write(Ostream& os) const
{ {
OStringStream reaction; OStringStream reaction;
os.writeKeyword("reaction") << reactionStr(reaction) writeEntry(os, "reaction", reactionStr(reaction));
<< token::END_STATEMENT << nl;
} }

4
src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -121,7 +121,7 @@ void Foam::ReactionList<ThermoType>::write(Ostream& os) const
const Reaction<ThermoType>& r = iter(); const Reaction<ThermoType>& r = iter();
os << indent << r.name() << nl os << indent << r.name() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("type") << r.type() << token::END_STATEMENT << nl; writeEntry(os, "type", r.type());
r.write(os); r.write(os);
os << decrIndent << indent << token::END_BLOCK << nl; os << decrIndent << indent << token::END_BLOCK << nl;
} }

8
src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -128,9 +128,9 @@ inline Foam::scalar Foam::ArrheniusReactionRate::dcidT
inline void Foam::ArrheniusReactionRate::write(Ostream& os) const inline void Foam::ArrheniusReactionRate::write(Ostream& os) const
{ {
os.writeKeyword("A") << A_ << token::END_STATEMENT << nl; writeEntry(os, "A", A_);
os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl; writeEntry(os, "beta", beta_);
os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl; writeEntry(os, "Ta", Ta_);
} }

12
src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -175,11 +175,11 @@ inline Foam::scalar Foam::LandauTellerReactionRate::dcidT
inline void Foam::LandauTellerReactionRate::write(Ostream& os) const inline void Foam::LandauTellerReactionRate::write(Ostream& os) const
{ {
os.writeKeyword("A") << A_ << token::END_STATEMENT << nl; writeEntry(os, "A", A_);
os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl; writeEntry(os, "beta", beta_);
os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl; writeEntry(os, "Ta", Ta_);
os.writeKeyword("B") << B_ << token::END_STATEMENT << nl; writeEntry(os, "B", B_);
os.writeKeyword("C") << C_ << token::END_STATEMENT << nl; writeEntry(os, "C", C_);
} }

15
src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -144,13 +144,12 @@ inline Foam::scalar Foam::LangmuirHinshelwoodReactionRate::dcidT
inline void Foam::LangmuirHinshelwoodReactionRate::write(Ostream& os) const inline void Foam::LangmuirHinshelwoodReactionRate::write(Ostream& os) const
{ {
os.writeKeyword("reactants") writeEntry(os, "reactants", reactantNames_);
<< reactantNames_ << token::END_STATEMENT << nl; writeEntry(os, "a", a_);
os.writeKeyword("a") << a_ << token::END_STATEMENT << nl; writeEntry(os, "A", A_);
os.writeKeyword("A") << A_ << token::END_STATEMENT << nl; writeEntry(os, "Ta", Ta_);
os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl; writeEntry(os, "beta", beta_);
os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl; writeEntry(os, "m", m_);
os.writeKeyword("m") << m_ << token::END_STATEMENT << nl;
} }

8
src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRateI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -96,9 +96,9 @@ inline Foam::scalar Foam::MichaelisMentenReactionRate::dcidT
inline void Foam::MichaelisMentenReactionRate::write(Ostream& os) const inline void Foam::MichaelisMentenReactionRate::write(Ostream& os) const
{ {
os.writeKeyword("Vmax") << Vmax_ << token::END_STATEMENT << nl; writeEntry(os, "Vmax", Vmax_);
os.writeKeyword("Km") << Km_ << token::END_STATEMENT << nl; writeEntry(os, "Km", Km_);
os.writeKeyword("S") << species_[s_] << token::END_STATEMENT << nl; writeEntry(os, "S", species_[s_]);
} }

12
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,11 +104,11 @@ inline Foam::scalar Foam::SRIFallOffFunction::ddc
inline void Foam::SRIFallOffFunction::write(Ostream& os) const inline void Foam::SRIFallOffFunction::write(Ostream& os) const
{ {
os.writeKeyword("a") << a_ << token::END_STATEMENT << nl; writeEntry(os, "a", a_);
os.writeKeyword("b") << b_ << token::END_STATEMENT << nl; writeEntry(os, "b", b_);
os.writeKeyword("c") << c_ << token::END_STATEMENT << nl; writeEntry(os, "c", c_);
os.writeKeyword("d") << d_ << token::END_STATEMENT << nl; writeEntry(os, "d", d_);
os.writeKeyword("e") << e_ << token::END_STATEMENT << nl; writeEntry(os, "e", e_);
} }

10
src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -172,10 +172,10 @@ inline Foam::scalar Foam::TroeFallOffFunction::ddc
inline void Foam::TroeFallOffFunction::write(Ostream& os) const inline void Foam::TroeFallOffFunction::write(Ostream& os) const
{ {
os.writeKeyword("alpha") << alpha_ << token::END_STATEMENT << nl; writeEntry(os, "alpha", alpha_);
os.writeKeyword("Tsss") << Tsss_ << token::END_STATEMENT << nl; writeEntry(os, "Tsss", Tsss_);
os.writeKeyword("Ts") << Ts_ << token::END_STATEMENT << nl; writeEntry(os, "Ts", Ts_);
os.writeKeyword("Tss") << Tss_ << token::END_STATEMENT << nl; writeEntry(os, "Tss", Tss_);
} }

10
src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -142,10 +142,10 @@ inline Foam::scalar Foam::powerSeriesReactionRate::dcidT
inline void Foam::powerSeriesReactionRate::write(Ostream& os) const inline void Foam::powerSeriesReactionRate::write(Ostream& os) const
{ {
os.writeKeyword("A") << A_ << token::END_STATEMENT << nl; writeEntry(os, "A", A_);
os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl; writeEntry(os, "beta", beta_);
os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl; writeEntry(os, "Ta", Ta_);
os.writeKeyword("coeffs") << coeffs_ << token::END_STATEMENT << nl; writeEntry(os, "coeffs", coeffs_);
} }

4
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -102,7 +102,7 @@ inline void Foam::thirdBodyEfficiencies::write(Ostream& os) const
coeffs[i].second() = operator[](i); coeffs[i].second() = operator[](i);
} }
os.writeKeyword("coeffs") << coeffs << token::END_STATEMENT << nl; Foam::writeEntry(os, "coeffs", coeffs);
} }

Some files were not shown because too many files have changed in this diff Show More