From 80fb4da9ca836c7e894468a847ac32a7dbe9d4b9 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 29 Jul 2019 11:22:57 +0200 Subject: [PATCH] STYLE: inconsistent use of readBeginList() - use readBegin() when the only delimiters are '()' and not '({})' --- .../containers/Bits/PackedList/PackedListIO.C | 9 +-------- src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H | 14 ++++---------- .../LduMatrix/LduMatrix/SolverPerformance.C | 4 ++-- .../meshes/meshShapes/labelledTri/labelledTriI.H | 2 -- .../vectorTensorTransform/vectorTensorTransform.C | 3 --- src/OpenFOAM/primitives/septernion/septernion.C | 2 -- .../SingleKineticRateDevolatilisation.H | 4 ++-- 7 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C b/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C index bd985d22a6..0e36d3aec1 100644 --- a/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C +++ b/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C @@ -101,7 +101,7 @@ Foam::Istream& Foam::PackedList::read(Istream& is) ); } } - else if (delimiter == token::BEGIN_BLOCK) + else { // Assign for all entries list = list.readValue(is); @@ -112,13 +112,6 @@ Foam::Istream& Foam::PackedList::read(Istream& is) "reading the single entry" ); } - else - { - FatalIOErrorInFunction(is) - << "incorrect list token, expected '(' or '{', found " - << firstTok.info() - << exit(FatalIOError); - } } // Read end of contents diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H index 56cfba2293..e0c23f4131 100644 --- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H +++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H @@ -116,14 +116,9 @@ Foam::Keyed::createList(const UList& lst, const labelUList& keys) template inline Foam::Istream& Foam::operator>>(Istream& is, Keyed& item) { - // Read beginning of Keyed item/key pair - is.readBegin("Keyed"); - - is >> static_cast(item); - is >> item.key_; - - // Read end of Keyed item/key pair - is.readEnd("Keyed"); + is.readBegin("Keyed"); + is >> static_cast(item) >> item.key_; + is.readEnd("Keyed"); is.check(FUNCTION_NAME); return is; @@ -134,8 +129,7 @@ template inline Foam::Ostream& Foam::operator<<(Ostream& os, const Keyed& item) { os << token::BEGIN_LIST - << static_cast(item) - << token::SPACE << item.key_ + << static_cast(item) << token::SPACE << item.key_ << token::END_LIST; return os; diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C index 85d2a7fa65..ce45b0c0e6 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C @@ -205,7 +205,7 @@ Foam::Istream& Foam::operator>> typename Foam::SolverPerformance& sp ) { - is.readBeginList("SolverPerformance"); + is.readBegin("SolverPerformance"); is >> sp.solverName_ >> sp.fieldName_ >> sp.initialResidual_ @@ -213,7 +213,7 @@ Foam::Istream& Foam::operator>> >> sp.nIterations_ >> sp.converged_ >> sp.singular_; - is.readEndList("SolverPerformance"); + is.readEnd("SolverPerformance"); return is; } diff --git a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H index 483e2b8198..75017a13bb 100644 --- a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H +++ b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H @@ -126,12 +126,10 @@ inline Foam::Istream& Foam::operator>>(Istream& is, labelledTri& t) { if (is.format() == IOstream::ASCII) { - // Read beginning of labelledTri point pair is.readBegin("labelledTri"); is >> static_cast(t) >> t.region_; - // Read end of labelledTri point pair is.readEnd("labelledTri"); } else diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C index 0bc12b347f..b794512ea6 100644 --- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C +++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C @@ -100,15 +100,12 @@ Foam::tmp> Foam::vectorTensorTransform::transform Foam::Istream& Foam::operator>>(Istream& is, vectorTensorTransform& tr) { - // Read beginning of vectorTensorTransform is.readBegin("vectorTensorTransform"); is >> tr.t_ >> tr.R_ >> tr.hasR_; - // Read end of vectorTensorTransform is.readEnd("vectorTensorTransform"); - // Check state of Istream is.check(FUNCTION_NAME); return is; diff --git a/src/OpenFOAM/primitives/septernion/septernion.C b/src/OpenFOAM/primitives/septernion/septernion.C index 3b0babd264..0f5e1101e7 100644 --- a/src/OpenFOAM/primitives/septernion/septernion.C +++ b/src/OpenFOAM/primitives/septernion/septernion.C @@ -105,12 +105,10 @@ Foam::septernion Foam::average Foam::Istream& Foam::operator>>(Istream& is, septernion& s) { - // Read beginning of septernion is.readBegin("septernion"); is >> s.t() >> s.r(); - // Read end of septernion is.readEnd("septernion"); is.check(FUNCTION_NAME); diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H index 5907a6cbdb..f02e1e7503 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H @@ -153,9 +153,9 @@ class SingleKineticRateDevolatilisation //- Read from Istream friend Istream& operator>>(Istream& is, volatileData& vd) { - is.readBeginList("volatileData"); + is.readBegin("volatileData"); is >> vd.name_ >> vd.A1_ >> vd.E_; - is.readEndList("volatileData"); + is.readEnd("volatileData"); return is; }