word, dictionary: Moved construction of static members to global.Cver

Author: Henry Weller

src/OpenFOAM/db/dictionary/dictionary.C

@@ -30,21 +30,6 @@ License
 #include "unitConversion.H"
 #include "stringOps.H"
 
-/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
-
-namespace Foam
-{
-    defineTypeNameAndDebug(dictionary, 0);
-}
-
-const Foam::dictionary Foam::dictionary::null;
-
-int Foam::dictionary::writeOptionalEntries
-(
-    Foam::debug::infoSwitch("writeOptionalEntries", 0)
-);
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 const Foam::entry* Foam::dictionary::lookupScopedSubEntryPtr

src/OpenFOAM/db/dictionary/dictionary.H

@@ -40,6 +40,7 @@ Description
     objectRegistry itself to work.
 
 SourceFiles
+    dictionaryStatics.C
     dictionary.C
     dictionaryIO.C
     dictionaryTemplates.C

src/OpenFOAM/db/dictionary/dictionaryStatics.C

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2025 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "dictionary.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+    defineTypeNameAndDebug(dictionary, 0);
+}
+
+const Foam::dictionary Foam::dictionary::null;
+
+int Foam::dictionary::writeOptionalEntries
+(
+    Foam::debug::infoSwitch("writeOptionalEntries", 0)
+);
+
+// ************************************************************************* //

src/OpenFOAM/global/constants/dimensionedConstants.C

@@ -122,7 +122,7 @@ Foam::dimensionedScalar Foam::dimensionedConstant
 
     if (!dict.found(group))
     {
-        dict.add(group, dictionary());
+        dict.add(group, dictionary::null);
     }
 
     dict.subDict(group).add(entryName, dimensionedValue);
@@ -163,7 +163,7 @@ Foam::dimensionedScalar Foam::dimensionedConstant
 
     if (!dict.found(group))
     {
-        dict.add(group, dictionary());
+        dict.add(group, dictionary::null);
     }
 
     dict.subDict(group).add(entryName, dimensionedValue);

src/OpenFOAM/global/global.Cver

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2025 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,6 +70,12 @@ bool Foam::jobInfo::constructed(false);
 
 #include "debug.C"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Initialise static members
+
+#include "wordStatics.C"
+#include "dictionaryStatics.C"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Read file modification checking switches
 

src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C

@@ -38,7 +38,7 @@ const Foam::wordList Foam::Function1s::Coded<Type>::codeKeys
 template<class Type>
 const Foam::wordList Foam::Function1s::Coded<Type>::codeDictVars
 (
-    {word(), word()}
+    {word::null, word::null}
 );
 
 

src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C

@@ -38,7 +38,7 @@ const Foam::wordList Foam::Function2s::Coded<Type>::codeKeys
 template<class Type>
 const Foam::wordList Foam::Function2s::Coded<Type>::codeDictVars
 (
-    {word(), word()}
+    {word::null, word::null}
 );
 
 

src/OpenFOAM/primitives/strings/word/word.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2025 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,14 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "word.H"
-#include "debug.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-const char* const Foam::word::typeName = "word";
-int Foam::word::debug(Foam::debug::debugSwitch(word::typeName, 0));
-const Foam::word Foam::word::null;
-
 
 // * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/strings/word/word.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2025 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ Description
     semicolons or brace brackets. Words are delimited by whitespace.
 
 SourceFiles
+    wordStatics.C
     word.C
     wordIO.C
 

src/OpenFOAM/primitives/strings/word/wordStatics.C

@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2025 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "word.H"
+#include "debug.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const char* const Foam::word::typeName = "word";
+int Foam::word::debug(Foam::debug::debugSwitch(word::typeName, 0));
+const Foam::word Foam::word::null;
+
+
+// ************************************************************************* //