From f5a931d4b5d8370874c20f2e88e4929c69d79dd4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 22 Mar 2021 10:24:40 +0100
Subject: [PATCH] STYLE: avoid some implicit dictionary construct from Istream
---
src/OpenFOAM/db/dictionary/dictionary.H | 9 +++++----
.../dictionary/dictionaryEntry/dictionaryEntryIO.C | 4 ++--
src/OpenFOAM/expressions/exprResult/exprResult.C | 13 ++++++++++++-
src/OpenFOAM/expressions/exprResult/exprResult.H | 10 ++++++++--
.../directionalPressureGradientExplicitSource.C | 2 +-
.../derived/meanVelocityForce/meanVelocityForce.C | 4 ++--
6 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index c60eb8e463a..d60ada722bc 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
- Copyright (C) 2016-2020 OpenCFD Ltd.
+ Copyright (C) 2016-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -406,6 +406,7 @@ public:
//- Construct top-level dictionary from Istream,
//- reading entries until EOF. Discards the header.
+ // \note this constructor should be explicit
dictionary(Istream& is);
//- Construct top-level dictionary from Istream,
@@ -420,7 +421,7 @@ public:
//- Construct top-level dictionary as copy from pointer to dictionary.
// A null pointer is treated like an empty dictionary.
- dictionary(const dictionary* dict);
+ explicit dictionary(const dictionary* dict);
//- Move construct for given parent dictionary
dictionary(const dictionary& parentDict, dictionary&& dict);
@@ -928,7 +929,7 @@ public:
// Emits FatalIOError
void checkITstream(const ITstream& is, const word& keyword) const;
- //- Read dictionary from Istream
+ //- Read dictionary from Istream. Discards the header.
bool read(Istream& is);
//- Read dictionary from Istream, optionally keeping the header
@@ -944,7 +945,7 @@ public:
void writeEntry(const keyType& keyword, Ostream& os) const;
//- Write dictionary entries.
- // \param extraNewLine adds additional newline\n between entries
+ // \param extraNewLine adds additional newline between entries
// for "top-level" dictionaries
void writeEntries(Ostream& os, const bool extraNewLine=false) const;
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
index 633e9c216a3..383d0603df0 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
- Copyright (C) 2016 OpenCFD Ltd.
+ Copyright (C) 2016-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Foam::dictionaryEntry::dictionaryEntry
)
:
entry(keyType(is)),
- dictionary(parentDict, is)
+ dictionary(parentDict, dictionary(is))
{
is.fatalCheck(FUNCTION_NAME);
}
diff --git a/src/OpenFOAM/expressions/exprResult/exprResult.C b/src/OpenFOAM/expressions/exprResult/exprResult.C
index 06654035227..b1f93df8559 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResult.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResult.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2012-2018 Bernhard Gschaider <bgschaid@hfd-research.com>
+ Copyright (C) 2012-2018 Bernhard Gschaider
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@@ -354,6 +354,17 @@ Foam::expressions::exprResult::New
}
+Foam::autoPtr<Foam::expressions::exprResult>
+Foam::expressions::exprResult::New
+(
+ Istream& is
+)
+{
+ dictionary dict(is);
+ return New(dict);
+}
+
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::expressions::exprResult::~exprResult()
diff --git a/src/OpenFOAM/expressions/exprResult/exprResult.H b/src/OpenFOAM/expressions/exprResult/exprResult.H
index 495573c3948..3c6f9299dbf 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResult.H
+++ b/src/OpenFOAM/expressions/exprResult/exprResult.H
@@ -5,8 +5,8 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2012-2018 Bernhard Gschaider <bgschaid@hfd-research.com>
- Copyright (C) 2019-2020 OpenCFD Ltd.
+ Copyright (C) 2012-2018 Bernhard Gschaider
+ Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -323,6 +323,9 @@ public:
const bool needsValue = false
);
+ //- Construct from Istream as dictionary content
+ explicit exprResult(Istream& is);
+
//- Construct by copying a field
template<class Type>
explicit exprResult(const Field<Type>& fld);
@@ -362,6 +365,9 @@ public:
//- Return a reference to the selected value driver
static autoPtr<exprResult> New(const dictionary& dict);
+ //- Construct from Istream as dictionary content
+ static autoPtr<exprResult> New(Istream& is);
+
//- Clone
virtual autoPtr<exprResult> clone() const
{
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index d2fc33510fb..ef9866c4340 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -234,7 +234,7 @@ directionalPressureGradientExplicitSource
if (propsFile.good())
{
Info<< " Reading pressure gradient from file" << endl;
- dictionary propsDict(dictionary::null, propsFile);
+ dictionary propsDict(propsFile);
propsDict.readEntry("gradient", gradP0_);
}
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index 803602ffb77..00c9a8f1e12 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2018-2020 OpenCFD Ltd.
+ Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -109,7 +109,7 @@ Foam::fv::meanVelocityForce::meanVelocityForce
if (propsFile.good())
{
Info<< " Reading pressure gradient from file" << endl;
- dictionary propsDict(dictionary::null, propsFile);
+ dictionary propsDict(propsFile);
propsDict.readEntry("gradient", gradP0_);
}
--
GitLab