From 3b0af864484b7e67e22a36b51b35b0a2621cc81d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 17 Nov 2022 15:19:52 +0100 Subject: [PATCH] STYLE: add notes where files are added into global/globals.C ENH: use dictionary findDict() directly for debugSwitches - the isDict() method is just a wrapper around the pointer anyhow --- src/OpenFOAM/db/IOstreams/IOstreams.C | 2 +- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 3 +++ src/OpenFOAM/db/IOstreams/token/token.C | 3 +++ src/OpenFOAM/db/error/IOerror.C | 3 +++ src/OpenFOAM/db/error/error.C | 3 +++ src/OpenFOAM/db/error/messageStream.C | 3 +++ src/OpenFOAM/db/regIOobject/regIOobject.C | 3 +++ src/OpenFOAM/global/JobInfo/JobInfo.C | 3 +++ src/OpenFOAM/global/constants/constants.C | 3 +++ src/OpenFOAM/global/constants/dimensionedConstants.C | 5 ++++- src/OpenFOAM/global/debug/debug.C | 11 ++++++----- src/OpenFOAM/primitives/nullObject/nullObject.C | 3 +++ src/OpenFOAM/primitives/zero/zero.C | 3 +++ wmake/rules/General/version | 5 +++-- 14 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/OpenFOAM/db/IOstreams/IOstreams.C b/src/OpenFOAM/db/IOstreams/IOstreams.C index f3e73e1d40..b056bf4775 100644 --- a/src/OpenFOAM/db/IOstreams/IOstreams.C +++ b/src/OpenFOAM/db/IOstreams/IOstreams.C @@ -25,7 +25,7 @@ License along with OpenFOAM. If not, see . Note - File included by global/global.Cver + Included by global/globals.C \*---------------------------------------------------------------------------*/ diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C index dfd7309c39..e4db3ee022 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "UPstream.H" diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C index 5cfbdfb8fd..e1aa05b954 100644 --- a/src/OpenFOAM/db/IOstreams/token/token.C +++ b/src/OpenFOAM/db/IOstreams/token/token.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "token.H" diff --git a/src/OpenFOAM/db/error/IOerror.C b/src/OpenFOAM/db/error/IOerror.C index 7f1084498d..ebde730a09 100644 --- a/src/OpenFOAM/db/error/IOerror.C +++ b/src/OpenFOAM/db/error/IOerror.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "error.H" diff --git a/src/OpenFOAM/db/error/error.C b/src/OpenFOAM/db/error/error.C index c3acb23a03..4adfae5f42 100644 --- a/src/OpenFOAM/db/error/error.C +++ b/src/OpenFOAM/db/error/error.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "error.H" diff --git a/src/OpenFOAM/db/error/messageStream.C b/src/OpenFOAM/db/error/messageStream.C index b810fba54c..4511a4bafa 100644 --- a/src/OpenFOAM/db/error/messageStream.C +++ b/src/OpenFOAM/db/error/messageStream.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "error.H" diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C index 05c503b3fa..2d3294016a 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.C +++ b/src/OpenFOAM/db/regIOobject/regIOobject.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "regIOobject.H" diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.C b/src/OpenFOAM/global/JobInfo/JobInfo.C index d014befbae..b19f7f5b24 100644 --- a/src/OpenFOAM/global/JobInfo/JobInfo.C +++ b/src/OpenFOAM/global/JobInfo/JobInfo.C @@ -24,6 +24,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "JobInfo.H" diff --git a/src/OpenFOAM/global/constants/constants.C b/src/OpenFOAM/global/constants/constants.C index a014e02d98..ddf9787c22 100644 --- a/src/OpenFOAM/global/constants/constants.C +++ b/src/OpenFOAM/global/constants/constants.C @@ -23,6 +23,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ // Constants supplied in the main controlDict diff --git a/src/OpenFOAM/global/constants/dimensionedConstants.C b/src/OpenFOAM/global/constants/dimensionedConstants.C index f86fb42644..36142a7f9b 100644 --- a/src/OpenFOAM/global/constants/dimensionedConstants.C +++ b/src/OpenFOAM/global/constants/dimensionedConstants.C @@ -24,11 +24,14 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "dimensionedConstants.H" -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * File Static Data * * * * * * * * * * * * * // namespace Foam { diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C index d3e5c79f7a..455682a9b5 100644 --- a/src/OpenFOAM/global/debug/debug.C +++ b/src/OpenFOAM/global/debug/debug.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2018 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -27,6 +27,9 @@ License Description Class for handling debugging switches. +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "debug.H" @@ -184,9 +187,9 @@ Foam::dictionary& Foam::debug::switchSet { if (!subDictPtr) { - entry* eptr = controlDict().findEntry(subDictName, keyType::LITERAL); + subDictPtr = controlDict().findDict(subDictName, keyType::LITERAL); - if (!eptr || !eptr->isDict()) + if (!subDictPtr) { std::cerr << "debug::switchSet(const char*, dictionary*&):\n" @@ -196,8 +199,6 @@ Foam::dictionary& Foam::debug::switchSet std::exit(1); } - - subDictPtr = &(eptr->dict()); } return *subDictPtr; diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.C b/src/OpenFOAM/primitives/nullObject/nullObject.C index 5c82dc3173..7953f81c9a 100644 --- a/src/OpenFOAM/primitives/nullObject/nullObject.C +++ b/src/OpenFOAM/primitives/nullObject/nullObject.C @@ -23,6 +23,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "nullObject.H" diff --git a/src/OpenFOAM/primitives/zero/zero.C b/src/OpenFOAM/primitives/zero/zero.C index a55ffc3f72..b7c98c4280 100644 --- a/src/OpenFOAM/primitives/zero/zero.C +++ b/src/OpenFOAM/primitives/zero/zero.C @@ -23,6 +23,9 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Note + Included by global/globals.C + \*---------------------------------------------------------------------------*/ #include "zero.H" diff --git a/wmake/rules/General/version b/wmake/rules/General/version index 7dc486969f..a5a67ce272 100644 --- a/wmake/rules/General/version +++ b/wmake/rules/General/version @@ -3,8 +3,9 @@ SUFFIXES += .Cver # Update strings in C++ file and in META-INFO files +# place intermediate generated file into the build directory Cvertoo = \ - $(WM_SCRIPTS)/wmake-build-info -update -filter $< > $(@D)/$( $(@D)/$(