COMP: g++11: suppress optimisation. See #3024

- freeCommmunicatorComponents needs an additional bounds check.
  When MPI is initialized outside of OpenFOAM, there are no
  UPstream communicator equivalents

.gitlab/issue_templates/bug.md

@@ -3,7 +3,7 @@
 
   Before opening a new issue, make sure to search for keywords in the issues
   filtered by the "bug" label and check to see if it has already been reported
-
+  
   You can see how your report will be rendered on the platform by using the
   "preview" tab above
 -->

.gitmodules

@@ -4,16 +4,9 @@
 [submodule "avalanche"]
 	path = modules/avalanche
 	url = https://develop.openfoam.com/Community/avalanche.git
+[submodule "catalyst"]
+	path = modules/catalyst
+	url = https://develop.openfoam.com/Community/catalyst.git
 [submodule "adios"]
 	path = modules/adios
 	url = https://develop.openfoam.com/Community/adiosfoam.git
-[submodule "OpenQBMM"]
-	path = modules/OpenQBMM
-	url = https://github.com/OpenQBMM/OpenQBMM.git
-	branch = openfoam.com
-[submodule "visualization"]
-	path = modules/visualization
-	url = https://develop.openfoam.com/modules/visualization.git
-[submodule "external-solver"]
-	path = modules/external-solver
-	url = https://develop.openfoam.com/Modules/external-solver.git

Allwmake

@@ -1,19 +1,18 @@
 #!/bin/sh
 # Run from OPENFOAM top-level directory only
 cd "${0%/*}" || exit
-wmake -check-dir "$WM_PROJECT_DIR" 2>/dev/null || {
+wmakeCheckPwd "$WM_PROJECT_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_PROJECT_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments || \
-    echo "Argument parse error";
-else
+[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
     echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
-fi
+}
+
+. "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 # Preamble. Report tools or at least the mpirun location
@@ -48,18 +47,9 @@ echo
 # Compile ThirdParty libraries and applications
 if [ -d "$WM_THIRD_PARTY_DIR" ]
 then
-    if [ -e "$WM_THIRD_PARTY_DIR"/Allwmake.override ]
-    then
-        if [ -x "$WM_THIRD_PARTY_DIR"/Allwmake.override ]
-        then    "$WM_THIRD_PARTY_DIR"/Allwmake.override
-        fi
-    elif [ -x "$WM_THIRD_PARTY_DIR"/Allwmake ]
-    then      "$WM_THIRD_PARTY_DIR"/Allwmake
-    else
-        echo "Skip ThirdParty (no Allwmake* files)"
-    fi
+    "$WM_THIRD_PARTY_DIR/Allwmake"
 else
-    echo "Skip ThirdParty (no directory)"
+    echo "No ThirdParty directory found - skipping"
 fi
 
 echo "========================================"
@@ -73,32 +63,21 @@ echo
 applications/Allwmake $targetType $*
 
 # Additional components/modules
-if [ "$FOAM_MODULE_PREFIX" = false ]
+if [ "$FOAM_MODULE_PREFIX" = false ] || [ "$FOAM_MODULE_PREFIX" = none ]
 then
     echo "========================================"
-    echo "OpenFOAM modules disabled (prefix=false)"
+    echo "OpenFOAM modules disabled (prefix=${FOAM_MODULE_PREFIX})"
     echo
 elif [ -d "$WM_PROJECT_DIR/modules" ]
 then
-    echo "========================================"
     echo "Compile OpenFOAM modules"
-    echo "    ignoring possible compilation errors"
-    echo "    make certain to check the output file"
-    echo
-    set +e
-    export WM_CONTINUE_ON_ERROR=true
-
-    # Default build into OpenFOAM project locations
-    : "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}"
-    export FOAM_MODULE_PREFIX
-
     (cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all)
 fi
 
 # Count files in given directory. Ignore "Test-*" binaries.
 _foamCountDirEntries()
 {
-    (cd "$1" 2>/dev/null && find . -mindepth 1 -maxdepth 1 -type f 2>/dev/null) |\
+    (cd "$1" 2>/dev/null && find -mindepth 1 -maxdepth 1 -type f 2>/dev/null) |\
         sed -e '\@/Test-@d' | wc -l
 }
 
@@ -112,8 +91,8 @@ echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo
 echo "  api   = $(etc/openfoam -show-api 2>/dev/null)"
 echo "  patch = $(etc/openfoam -show-patch 2>/dev/null)"
-echo "  bin   = $(_foamCountDirEntries "$FOAM_APPBIN") entries"
-echo "  lib   = $(_foamCountDirEntries "$FOAM_LIBBIN") entries"
+echo "  bin   = $(_foamCountDirEntries $FOAM_APPBIN) entries"
+echo "  lib   = $(_foamCountDirEntries $FOAM_LIBBIN) entries"
 echo
 echo "========================================"
 

CONTRIBUTORS.md

@@ -1,50 +0,0 @@
-# Contributors to OpenFOAM
-
-The following is an list of known contributors to OpenFOAM.
-It is likely incomplete...
-
-## Contributors (alphabetical by surname)
-
-- William Bainbridge
-- Gabriel Barajas
-- Kutalmis Bercin
-- Greg Collecutt
-- Jonathan Cranford
-- Sergio Ferraris
-- Matej Forman
-- Marian Fuchs
-- Pawan Ghildiyal
-- Chris Greenshields
-- Bernhard Gschaider
-- Andrew Heather
-- David Hill
-- Mattijs Janssens
-- Andrew Jackson
-- Hrvoje Jasak
-- Alexander Kabat vel Job
-- Thilo Knacke
-- Tommaso Lucchini
-- Graham Macpherson
-- Alexey Matveichev
-- Karl Meredith
-- Laurence McGlashan
-- Timo Niemi
-- Haakan Nilsson
-- Niklas Nordin
-- Mark Olesen
-- Vaggelis Papoutsis
-- Juho Peltola
-- Johan Roenby
-- Henrik Rusche
-- Bruno Santos
-- Henning Scheufler
-- Prashant Sonakar
-- Hilary Spencer
-- Gavin Tabor
-- Zeljko Tukovic
-- Eugene De Villiers
-- Yi Wang
-- Norbert Weber
-- Henry Weller
-- Niklas Wikstrom
-

META-INFO/.gitignore

@@ -5,6 +5,5 @@ build-info
 time-stamp
 
 # Do not track any manifest files
-*[Mm]anifest.txt
-
-####
+Manifest.txt
+manifest.txt

META-INFO/README.md

@@ -1,63 +1,62 @@
-## META-INFO
+# META-INFO
 
-Meta-information is generally for OpenFOAM internal use only.
+Meta-information is for OpenFOAM internal use only.
+
+Do not rely on any files or any file contents in this directory,
+or even the existence of this directory.
 
 The format, content and meaning may be changed at anytime without
-notice. If any of these are changed, these are some of places that
-will need to be updated accordingly:
+notice.
 
-  - bin/foamEtcFile
-  - bin/tools/foamConfigurePaths
-  - bin/tools/foamPackRelease
-  - etc/openfoam
-  - wmake/scripts/wmake-build-info
+The information is provided here for internal documentation purposes.
 
-### api-info
+## api-info
 
 This file and its contents are to be tracked by git.
 
-- File content (api) generated by `wmake -build-info` from the
-  `OPENFOAM` define in `wmake/rules/General/general`
+- File content (api) generated by wmakeBuildInfo from OPENFOAM define
+  in `wmake/rules/General/general`
+
 - File content (patch) is manually generated content.
 
 
-### build-info
+## build-info
 
-This file is ***never*** to be tracked by git, but may be present in
-shipped source archives.
+This file is *never* to be tracked by git, but may be present in shipped
+source archives.
 
-- File content (branch, build) generated by `wmake -build-info` from
-  git information and cached from previous wmake (api)
+- File content (branch, build) generated by wmakeBuildInfo from git
+  information and cached from previous wmake (api)
 
 
-### Content types
+## Content types
 
-#### api
-
-Format: `date +%y%m`
+### api
 
 - 4-digit year-month (YYMM) integer corresponding to the major
   release or in unusual cases an intermediate release.
-  Example, `1712` for the Dec-2017 release.
+
+- Format is year-month, as per `date +%y%m`.
+  Eg, `1712` for the Dec-2017 release.
 
 
-#### patch
-
-Format: `date +%y%m%d`
+### patch
 
 - 6-digit year-month-day (YYMMDD) integer corresponding to a patch-level
   for the given **released** API.
-- The first release can have a patch value of `0` or `1` which
-  indicates that it is unpatched or just released. Alternatively
-  it can have a patch value corresponding to the release date.
+
+- Format is year-month-day, as per `date +%y%m%d`.
+
+- The first release can have a patch value of `0` (unpatched = just
+  released) or a patch value corresponding to the release date.
 
 The patch value is only meaningful together with the api value.
 However, for *development* branches, the patch level should not be
-ascribed too much meaning, but will often correspond to the last
-merge with a *maintenance* (*eg*, `master`) branch.
+ascribed much meaning -- it can be `0` or have a value corresponding
+to the last merge with a *maintenance* (*eg*, `master`) branch.
 
 
-### Flow of information
+## Flow of information
 
 Changes in the build information must be reflected in information
 available in the final binaries. Conversely, it is necessary for later
@@ -71,16 +70,16 @@ distributions to have a record of the same information.
 | build     | git                       | build-info |
 
 
-The command `wmake -build-info -check` is used to determine if
+The command `wmakeBuildInfo -check` is used to determine if
 the saved information needs synchronization. The command
-`wmake -build-info -update` performs the synchronization.
+`wmakeBuildInfo -update` preforms the synchronitzation.
 
 
-### Notes
+## Notes
 
 The saved information is split into two separate files. The `api-info`
 contains more permanent information, whereas the `build-info` is more
 transient in nature.
 
 ----
-2020-06-23
+2019-01-23

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2006
-patch=0
+api=1912
+patch=220610

README.md

@@ -1,4 +1,4 @@
-## About OpenFOAM
+# About OpenFOAM
 OpenFOAM is a free, open source CFD software [released and developed by OpenCFD Ltd since 2004](http://www.openfoam.com/history/).
 It has a large user base across most areas of engineering and science, from both commercial and academic organisations.
 OpenFOAM has an extensive range of features to solve anything from complex fluid flows involving chemical reactions, turbulence and heat transfer, to acoustics, solid mechanics and electromagnetics.
@@ -11,7 +11,7 @@ individual and group contributors, integrations
 [governance guided activities](https://www.openfoam.com/governance/).
 
 
-## Copyright
+# Copyright
 
 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
@@ -22,7 +22,7 @@ description of the GNU General Public License terms under which you
 may redistribute files.
 
 
-## OpenFOAM Trademark
+# OpenFOAM Trademark
 
 OpenCFD Ltd grants use of its OpenFOAM trademark by Third Parties on a
 licence basis. ESI Group and OpenFOAM Foundation Ltd are currently
@@ -35,7 +35,7 @@ any questions on the use of the OpenFOAM trademark.
 Violations of the Trademark are monitored, and will be duly prosecuted.
 
 
-## Using OpenFOAM
+# Using OpenFOAM
 
 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
@@ -44,7 +44,7 @@ For example, for the OpenFOAM-v1912 version:
 source /installation/path/OpenFOAM-v1912/etc/bashrc
 ```
 
-## Compiling OpenFOAM
+# Compiling OpenFOAM
 
 If you are compiling OpenFOAM from source, please see the relevant
 guides:
@@ -55,7 +55,7 @@ guides:
 | [ThirdParty][repo third] | [readme][link third-readme] | [system requirements][link third-require] | [build][link third-build] |
 
 
-## How do I know which version I am currently using?
+# How do I know which version I am currently using?
 
 The value of the `$WM_PROJECT_DIR` or even `$WM_PROJECT_VERSION` are
 not guaranteed to have any correspondence to the OpenFOAM release
@@ -85,10 +85,10 @@ As can be seen in this example, the git build information is
 supplemented by the date when the last change was authored, which can
 be helpful when the repository contains local changes. If you simply
 wish to know the current API and patch levels directly, the
-`wmake -build-info` provides the relevant information even
+`wmakeBuildInfo` script provides the relevant information even
 when OpenFOAM has not yet been compiled:
 ```
-$ wmake -build-info
+$ wmakeBuildInfo
 make
     api = 1812
     patch = 190531
@@ -110,7 +110,7 @@ patching changes made within the currently active environment and
 should be used with caution.
 
 
-## ThirdParty directory
+# ThirdParty directory
 
 OpenFOAM normally ships with a directory of 3rd-party software and
 build scripts for some 3rd-party software that is either necessary or
@@ -197,7 +197,7 @@ ThirdParty directory will contain either an `Allwmake` file or a
 [link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
 
 
-## Useful Links
+# Useful Links
 
 - Download [source](https://sourceforge.net/projects/openfoam/files/) and [download and installation instructions](http://www.openfoam.com/download/)
 - [Documentation](http://www.openfoam.com/documentation)
@@ -207,4 +207,4 @@ ThirdParty directory will contain either an `Allwmake` file or a
 - [Community](http://www.openfoam.com/community/), [Governance](http://www.openfoam.com/governance/)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)
 
-Copyright 2016-2020 OpenCFD Ltd
+Copyright 2016-2019 OpenCFD Ltd

applications/Allwmake

@@ -1,19 +1,18 @@
 #!/bin/sh
 # Run from OPENFOAM applications/ directory only
 cd "${0%/*}" || exit
-wmake -check-dir "$WM_PROJECT_DIR/applications" 2>/dev/null || {
+wmakeCheckPwd "$WM_PROJECT_DIR/applications" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_PROJECT_DIR/applications"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments || \
-    echo "Argument parse error";
-else
+[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
     echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
-fi
+}
+
+. "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H

@@ -19,3 +19,4 @@
 
     Kmesh K(mesh);
     UOprocess forceGen(K, runTime.deltaTValue(), turbulenceProperties);
+

applications/solvers/basic/potentialFoam/createControls.H

@@ -5,5 +5,5 @@ const dictionary& potentialFlow
 
 const int nNonOrthCorr
 (
-    potentialFlow.getOrDefault<int>("nNonOrthogonalCorrectors", 0)
+    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
 );

applications/solvers/basic/potentialFoam/createFields.H

@@ -40,7 +40,7 @@ if (args.found("initialiseUBCs"))
 // converting fixed-value BCs to zero-gradient and vice versa.
 
 // Allow override from command-line -pName option
-const word pName = args.getOrDefault<word>("pName", "p");
+const word pName = args.get<word>("pName", "p");
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes

applications/solvers/basic/potentialFoam/overPotentialFoam/createControls.H

@@ -5,5 +5,5 @@ const dictionary& potentialFlow
 
 const int nNonOrthCorr
 (
-    potentialFlow.getOrDefault<int>("nNonOrthogonalCorrectors", 0)
+    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
 );

applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H

@@ -40,7 +40,7 @@ if (args.found("initialiseUBCs"))
 // converting fixed-value BCs to zero-gradient and vice versa.
 
 // Allow override from command-line -pName option
-const word pName = args.getOrDefault<word>("pName", "p");
+const word pName = args.get<word>("pName", "p");
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -35,7 +35,7 @@ Description
 
     Combusting RANS code using the b-Xi two-equation model.
     Xi may be obtained by either the solution of the Xi transport
-    equation or from an algebraic expression.  Both approaches are
+    equation or from an algebraic exression.  Both approaches are
     based on Gulder's flame speed correlation which has been shown
     to be appropriate by comparison with the results from the
     spectral model.
@@ -66,7 +66,7 @@ Description
     CR     | Drag tensor (1/m)
     CT     | Turbulence generation parameter (1/m)
     Nv     | Number of obstacles in cell per unit volume (m^-2)
-    nsv    | Tensor whose diagonal indicates the number to subtract from
+    nsv    | Tensor whose diagonal indicates the number to substract from
            | Nv to get the number of obstacles crossing the flow in each
            | direction.
     \endplaintable

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

@@ -32,7 +32,7 @@ Description
 
     Combusting RANS code using the b-Xi two-equation model.
     Xi may be obtained by either the solution of the Xi transport
-    equation or from an algebraic expression.  Both approaches are
+    equation or from an algebraic exression.  Both approaches are
     based on Gulder's flame speed correlation which has been shown
     to be appropriate by comparison with the results from the
     spectral model.

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,7 +72,7 @@ PDRkEpsilon::PDRkEpsilon
 
     C4_
     (
-        dimensioned<scalar>::getOrAddToDict
+        dimensioned<scalar>::lookupOrAddToDict
         (
             "C4",
             coeffDict_,

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H

@@ -31,7 +31,7 @@ Description
     corresponding to PDR basic drag model (\link basic.H \endlink)
 
     The default model coefficients correspond to the following:
-    \verbatim
+    @verbatim
         PDRkEpsilonCoeffs
         {
             Cmu         0.09;
@@ -43,7 +43,7 @@ Description
             sigmaEps    1.3;
             Prt         1.0;    // only for compressible
         }
-    \endverbatim
+    @endverbatim
 
     The turbulence source term \f$ G_{R} \f$ appears in the
     \f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H

@@ -29,7 +29,7 @@ Class
 Description
     Simple SCOPEBlendXiEq model for XiEq based on SCOPEXiEqs correlation
     with a linear correction function to give a plausible profile for XiEq.
-    See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE
+    See @link SCOPELaminarFlameSpeed.H @endlink for details on the SCOPE
     laminar flame speed model.
 
 SourceFiles

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H

@@ -29,7 +29,7 @@ Class
 Description
     This is the equilibrium level of the flame wrinkling generated by
     instability. It is a constant (default 2.5). It is used in
-    \link XiModel.H \endlink.
+    @link XiModel.H @endlink.
 
 SourceFiles
     instability.C

applications/solvers/combustion/PDRFoam/setDeltaT.H

@@ -28,7 +28,7 @@ Global
 
 Description
     Reset the timestep to maintain a constant maximum courant Number.
-    Reduction of time-step is immediate but increase is damped to avoid
+    Reduction of time-step is imediate but increase is damped to avoid
     unstable oscillations.
 
 \*---------------------------------------------------------------------------*/

applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C

@@ -36,7 +36,7 @@ Description
 
     Combusting RANS code using the b-Xi two-equation model.
     Xi may be obtained by either the solution of the Xi transport
-    equation or from an algebraic expression.  Both approaches are
+    equation or from an algebraic exression.  Both approaches are
     based on Gulder's flame speed correlation which has been shown
     to be appropriate by comparison with the results from the
     spectral model.

applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H

@@ -2,10 +2,10 @@
 
 bool correctPhi
 (
-    pimple.dict().getOrDefault("correctPhi", true)
+    pimple.dict().lookupOrDefault("correctPhi", true)
 );
 
 bool checkMeshCourantNo
 (
-    pimple.dict().getOrDefault("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );

applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H

@@ -1,6 +1,6 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().getOrDefault("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
 
 checkMeshCourantNo =
-    pimple.dict().getOrDefault("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C

@@ -31,7 +31,7 @@ Description
 
     Combusting RANS code using the b-Xi two-equation model.
     Xi may be obtained by either the solution of the Xi transport
-    equation or from an algebraic expression.  Both approaches are
+    equation or from an algebraic exression.  Both approaches are
     based on Gulder's flame speed correlation which has been shown
     to be appropriate by comparison with the results from the
     spectral model.

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -35,7 +35,7 @@ Description
 
     Combusting RANS code using the b-Xi two-equation model.
     Xi may be obtained by either the solution of the Xi transport
-    equation or from an algebraic expression.  Both approaches are
+    equation or from an algebraic exression.  Both approaches are
     based on Gulder's flame speed correlation which has been shown
     to be appropriate by comparison with the results from the
     spectral model.

applications/solvers/combustion/chemFoam/readInitialConditions.H

@@ -37,7 +37,11 @@
     {
         forAll(Y, i)
         {
-            fractions.readIfPresent(Y[i].name(), X0[i]);
+            const word& name = Y[i].name();
+            if (fractions.found(name))
+            {
+                X0[i] = fractions.get<scalar>(name);
+            }
         }
 
         scalar mw = 0.0;
@@ -57,7 +61,11 @@
     {
         forAll(Y, i)
         {
-            fractions.readIfPresent(Y[i].name(), Y0[i]);
+            const word& name = Y[i].name();
+            if (fractions.found(name))
+            {
+                Y0[i] = fractions.get<scalar>(name);
+            }
         }
 
         scalar invW = 0.0;

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../XiFoam/XiEngineFoam \
     -I../XiFoam \
     -I../../compressible/rhoPimpleFoam \

applications/solvers/combustion/fireFoam/createRegionControls.H

@@ -12,12 +12,12 @@ IOdictionary additionalControlsDict
 
 bool solvePrimaryRegion
 (
-    additionalControlsDict.getOrDefault("solvePrimaryRegion", true)
+    additionalControlsDict.lookupOrDefault("solvePrimaryRegion", true)
 );
 
 bool solvePyrolysisRegion
 (
-    additionalControlsDict.getOrDefault("solvePyrolysisRegion", true)
+    additionalControlsDict.lookupOrDefault("solvePyrolysisRegion", true)
 );
 
 scalar maxDi = pyrolysis.maxDiff();

applications/solvers/combustion/fireFoam/phrghEqn.H

@@ -1,4 +1,4 @@
-if (pimple.dict().getOrDefault("hydrostaticInitialization", false))
+if (pimple.dict().lookupOrDefault("hydrostaticInitialization", false))
 {
     volScalarField& ph_rgh = regIOobject::store
     (
@@ -24,7 +24,7 @@ if (pimple.dict().getOrDefault("hydrostaticInitialization", false))
 
         label nCorr
         (
-            pimple.dict().getOrDefault<label>("nHydrostaticCorrectors", 5)
+            pimple.dict().lookupOrDefault<label>("nHydrostaticCorrectors", 5)
         );
 
         for (label i=0; i<nCorr; i++)

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/combustion/reactingFoam/setRDeltaT.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,27 +34,27 @@ License
     scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
-    scalar maxDeltaT(pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT));
+    scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
 
     // Smoothing parameter (0-1) when smoothing iterations > 0
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     // Damping coefficient (1-0)
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     // Maximum change in cell temperature per iteration
     // (relative to previous value)
-    scalar alphaTemp(pimpleDict.getOrDefault<scalar>("alphaTemp", 0.05));
+    scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05));
 
     // Maximum change in cell concentration per iteration
     // (relative to reference value)
-    scalar alphaY(pimpleDict.getOrDefault<scalar>("alphaY", 1.0));
+    scalar alphaY(pimpleDict.lookupOrDefault("alphaY", 1.0));
 
     Info<< "Time scales min/max:" << endl;
 

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,13 +82,13 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(p, iF),
-    UName_(dict.getOrDefault<word>("U", "U")),
-    rhoName_(dict.getOrDefault<word>("rho", "rho")),
-    psiName_(dict.getOrDefault<word>("psi", "thermo:psi")),
-    muName_(dict.getOrDefault<word>("mu", "thermo:mu")),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
     accommodationCoeff_(dict.get<scalar>("accommodationCoeff")),
     Twall_("Twall", dict, p.size()),
-    gamma_(dict.getOrDefault<scalar>("gamma", 1.4))
+    gamma_(dict.lookupOrDefault<scalar>("gamma", 1.4))
 {
     if
     (

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,15 +82,15 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
 )
 :
     partialSlipFvPatchVectorField(p, iF),
-    TName_(dict.getOrDefault<word>("T", "T")),
-    rhoName_(dict.getOrDefault<word>("rho", "rho")),
-    psiName_(dict.getOrDefault<word>("psi", "thermo:psi")),
-    muName_(dict.getOrDefault<word>("mu", "thermo:mu")),
-    tauMCName_(dict.getOrDefault<word>("tauMC", "tauMC")),
+    TName_(dict.lookupOrDefault<word>("T", "T")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
+    tauMCName_(dict.lookupOrDefault<word>("tauMC", "tauMC")),
     accommodationCoeff_(dict.get<scalar>("accommodationCoeff")),
     Uwall_("Uwall", dict, p.size()),
-    thermalCreep_(dict.getOrDefault("thermalCreep", true)),
-    curvature_(dict.getOrDefault("curvature", true))
+    thermalCreep_(dict.lookupOrDefault("thermalCreep", true)),
+    curvature_(dict.lookupOrDefault("curvature", true))
 {
     if
     (

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2012 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,8 +66,8 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    pName_(dict.getOrDefault<word>("p", "p")),
-    psiName_(dict.getOrDefault<word>("psi", "thermo:psi"))
+    pName_(dict.lookupOrDefault<word>("p", "p")),
+    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi"))
 {}
 
 

applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H

@@ -3,7 +3,7 @@
 
     scalar rDeltaTSmoothingCoeff
     (
-        runTime.controlDict().getOrDefault<scalar>
+        runTime.controlDict().lookupOrDefault<scalar>
         (
             "rDeltaTSmoothingCoeff",
             0.02

applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H

@@ -17,7 +17,7 @@
 
     const dictionary& eosDict = thermoDict.subDict("equationOfState");
 
-    bool local = eosDict.getOrDefault("local", false);
+    bool local = eosDict.lookupOrDefault("local", false);
 
     // Evolve T as:
     //
@@ -47,3 +47,4 @@
 
     rho.writeMinMax(Info);
 }
+

applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C

@@ -41,7 +41,8 @@ Description
         airframe noise, VKI LS 2013-03.
     \endverbatim
 
-    Contact:      info@upstream-cfd.com
+
+    Contact:      info@cfd-berlin.com
 
 \*---------------------------------------------------------------------------*/
 

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/createControls.H

@@ -1,4 +1,4 @@
 bool ddtCorr
 (
-    pimple.dict().getOrDefault("ddtCorr", true)
+    pimple.dict().lookupOrDefault("ddtCorr", true)
 );

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/readControls.H

@@ -1,9 +1,9 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
 
 checkMeshCourantNo =
-    pimple.dict().getOrDefault("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
 
 
-ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);

applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H

@@ -5,22 +5,22 @@
 
     scalar maxCo
     (
-        pimpleDict.getOrDefault<scalar>("maxCo", 0.8)
+        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.8)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     scalar maxDeltaT
     (
-        pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFieldRefs.H

@@ -1,6 +1 @@
 const volScalarField& psi = thermo.psi();
-
-bool adjustFringe
-(
-    simple.dict().getOrDefault("oversetAdjustPhi", false)
-);

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFields.H

@@ -80,3 +80,7 @@ dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 #include "createInterpolatedCells.H"
 
+bool adjustFringe
+(
+    simple.dict().lookupOrDefault("oversetAdjustPhi", false)
+);

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H

@@ -1,3 +1,3 @@
     const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
 
-    const int nBcorr = Bpiso.getOrDefault<int>("nCorrectors", 1);
+    const int nBcorr = Bpiso.lookupOrDefault<int>("nCorrectors", 1);

applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H

@@ -63,3 +63,4 @@ edgeScalarField phis
     ),
     linearEdgeInterpolate(Us) & aMesh.Le()
 );
+

applications/solvers/finiteArea/surfactantFoam/createFaFields.H

@@ -57,3 +57,4 @@ edgeScalarField phis
     ),
     linearEdgeInterpolate(Us) & aMesh.Le()
 );
+

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../buoyantBoussinesqSimpleFoam \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/pEqn.H

@@ -1,3 +1,4 @@
+
 dimensionedScalar compressibility = fvc::domainIntegrate(psi);
 bool compressible = (compressibility.value() > SMALL);
 

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/readControls.H

@@ -1,9 +1,9 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
 
 checkMeshCourantNo =
-    pimple.dict().getOrDefault("checkMeshCourantNo", false);
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
 
 
-ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -1,3 +1,4 @@
+
 dimensionedScalar compressibility = fvc::domainIntegrate(psi);
 bool compressible = (compressibility.value() > SMALL);
 

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I./fluid \
     -I./solid \
     -I./porousFluid \

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/files

@@ -1,3 +1,4 @@
 chtMultiRegionSimpleFoam.C
 
 EXE = $(FOAM_APPBIN)/chtMultiRegionSimpleFoam
+

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options

@@ -1,7 +1,8 @@
 EXE_INC = \
+    -I. \
     -I.. \
-    -I./fluid \
-    -I./solid \
+    -Ifluid \
+    -Isolid \
     -I../solid \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H

@@ -1,7 +1,7 @@
     const dictionary& simple = fluidRegions[i].solutionDict().subDict("SIMPLE");
 
     const int nNonOrthCorr =
-        simple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);
+        simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
 
     const bool momentumPredictor =
-        simple.getOrDefault("momentumPredictor", true);
+        simple.lookupOrDefault("momentumPredictor", true);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H

@@ -1,4 +1,4 @@
 const dictionary& simple = mesh.solutionDict().subDict("SIMPLE");
 
 const int nNonOrthCorr =
-    simple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);
+    simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I.  \
     -I.. \
     -I$(FOAM_SOLVERS)/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam \
     -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \
@@ -37,4 +38,4 @@ EXE_LIBS = \
     -lregionModels \
     -lsampling \
     -lreactingTwoPhaseSystem \
-    -lreactingPhaseSystem
+

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd
+    Copyright (C) 2018 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -225,13 +225,13 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(p, iF),
-    regionType_(regionTypeNames_.get("region", dict)),
+    regionType_(regionTypeNames_.read(dict.lookup("region"))),
     method_(KMethodTypeNames_.get("kappaMethod", dict)),
-    kappaName_(dict.getOrDefault<word>("kappa", "none")),
-    otherPhaseName_(dict.get<word>("otherPhase")),
-    TnbrName_(dict.getOrDefault<word>("Tnbr", "T")),
-    qrNbrName_(dict.getOrDefault<word>("qrNbr", "none")),
-    qrName_(dict.getOrDefault<word>("qr", "none"))
+    kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
+    otherPhaseName_(dict.lookup("otherPhase")),
+    TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
+    qrNbrName_(dict.lookupOrDefault<word>("qrNbr", "none")),
+    qrName_(dict.lookupOrDefault<word>("qr", "none"))
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
@@ -495,8 +495,11 @@ void turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField::write
     os.writeEntryIfDifferent<word>("qrNbr", "none", qrNbrName_);
     os.writeEntryIfDifferent<word>("qr", "none", qrName_);
 
-    os.writeEntry("region", regionTypeNames_[regionType_]);
-    os.writeEntry("otherPhase", otherPhaseName_);
+    os.writeKeyword("region") << regionTypeNames_[regionType_]
+        << token::END_STATEMENT << nl;
+
+    os.writeKeyword("otherPhase") << otherPhaseName_ << token::END_STATEMENT
+    << nl;
 }
 
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H

@@ -148,7 +148,7 @@ private:
         //- Name of field on the neighbour region
         const word TnbrName_;
 
-        //- Name of the radiative heat flux in the neighbour region
+         //- Name of the radiative heat flux in the neighbour region
         const word qrNbrName_;
 
         //- Name of the radiative heat flux in local region

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/compressibleMultiRegionCourantNo.H

@@ -48,3 +48,4 @@
     }
 
     Info<< "Courant Number max: " << CoNum << endl;
+

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H

@@ -1,8 +1,7 @@
 PtrList<uniformDimensionedScalarField> cumulativeContErrIO(fluidRegions.size());
 forAll(cumulativeContErrIO, i)
 {
-    const fvMesh& mesh = fluidRegions[i];
-
+    #include "setRegionFluidFields.H"
     cumulativeContErrIO.set
     (
         i,

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/readFluidMultiRegionPIMPLEControls.H

@@ -2,10 +2,10 @@
 
     Switch faceMomentum
     (
-        pimpleDict.getOrDefault<Switch>("faceMomentum", false)
+        pimpleDict.lookupOrDefault<Switch>("faceMomentum", false)
     );
 
     int nEnergyCorrectors
     (
-        pimpleDict.getOrDefault<int>("nEnergyCorrectors", 1)
+        pimpleDict.lookupOrDefault<int>("nEnergyCorrectors", 1)
     );

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H

@@ -1,8 +1,7 @@
 PtrList<uniformDimensionedScalarField> cumulativeContErrIO(fluidRegions.size());
 forAll(cumulativeContErrIO, i)
 {
-    const fvMesh& mesh = fluidRegions[i];
-
+    #include "setRegionFluidFields.H"
     cumulativeContErrIO.set
     (
         i,

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H

@@ -1,10 +1,10 @@
     const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
 
     const int nCorr =
-        pimple.getOrDefault<int>("nCorrectors", 1);
+        pimple.lookupOrDefault<int>("nCorrectors", 1);
 
     const int nNonOrthCorr =
-        pimple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);
+        pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
 
     const bool momentumPredictor =
-        pimple.getOrDefault("momentumPredictor", true);
+        pimple.lookupOrDefault("momentumPredictor", true);

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H

@@ -65,3 +65,4 @@
     const dimensionedScalar rhoMin = rhoMinFluid[i];
 
     const pressureControl& pressureControl = pressureControls[i];
+

applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H

@@ -5,4 +5,4 @@
     const dictionary& pimple = solutionDict.subDict("PIMPLE");
 
     const int nOuterCorr =
-        pimple.getOrDefault<int>("nOuterCorrectors", 1);
+        pimple.lookupOrDefault<int>("nOuterCorrectors", 1);

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H

@@ -1,4 +1,4 @@
 const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
 
 int nNonOrthCorr =
-    pimple.getOrDefault<int>("nNonOrthogonalCorrectors", 0);
+    pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidTimeControls.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +31,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-scalar maxDi = runTime.controlDict().getOrDefault<scalar>("maxDi", 10);
+scalar maxDi = runTime.controlDict().lookupOrDefault<scalar>("maxDi", 10.0);
 
 // ************************************************************************* //

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/createControls.H

@@ -2,25 +2,25 @@
 
 bool correctPhi
 (
-    pimple.dict().getOrDefault("correctPhi", false)
+    pimple.dict().lookupOrDefault("correctPhi", false)
 );
 
 bool checkMeshCourantNo
 (
-    pimple.dict().getOrDefault("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );
 
 bool massFluxInterpolation
 (
-    pimple.dict().getOrDefault("massFluxInterpolation", false)
+    pimple.dict().lookupOrDefault("massFluxInterpolation", false)
 );
 
 bool adjustFringe
 (
-    pimple.dict().getOrDefault("oversetAdjustPhi", false)
+    pimple.dict().lookupOrDefault("oversetAdjustPhi", false)
 );
 
 bool ddtCorr
 (
-    pimple.dict().getOrDefault("ddtCorr", true)
+    pimple.dict().lookupOrDefault("ddtCorr", true)
 );

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/createFields.H

@@ -77,3 +77,4 @@ surfaceScalarField phiHbyA
     ),
     fvc::flux(U)
 );
+

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/readControls.H

@@ -1,10 +1,10 @@
 #include "readTimeControls.H"
 
-correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
 
-checkMeshCourantNo = pimple.dict().getOrDefault("checkMeshCourantNo", false);
+checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
 
 massFluxInterpolation =
-    pimple.dict().getOrDefault("massFluxInterpolation", false);
+    pimple.dict().lookupOrDefault("massFluxInterpolation", false);
 
-ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);
+ddtCorr = pimple.dict().lookupOrDefault("ddtCorr", true);

applications/solvers/incompressible/pimpleFoam/pEqn.H

@@ -1,15 +1,11 @@
 volScalarField rAU(1.0/UEqn.A());
 volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
-surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
-
-if (pimple.ddtCorr())
-{
-    phiHbyA += MRF.zeroFilter(fvc::interpolate(rAU)*fvc::ddtCorr(U, phi, Uf));
-}
-else
-{
-    phiHbyA += MRF.zeroFilter(fvc::interpolate(rAU));
-}
+surfaceScalarField phiHbyA
+(
+    "phiHbyA",
+    fvc::flux(HbyA)
+  + MRF.zeroFilter(fvc::interpolate(rAU)*fvc::ddtCorr(U, phi, Uf))
+);
 
 MRF.makeRelative(phiHbyA);
 

applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/incompressible/simpleFoam/overSimpleFoam/createFields.H

@@ -43,3 +43,4 @@ autoPtr<incompressible::turbulenceModel> turbulence
 );
 
 #include "createMRF.H"
+

applications/solvers/incompressible/simpleFoam/overSimpleFoam/createOversetFields.H

@@ -22,9 +22,9 @@
 
 bool adjustFringe
 (
-    simple.dict().getOrDefault("oversetAdjustPhi", false)
+    simple.dict().lookupOrDefault("oversetAdjustPhi", false)
 );
 bool massFluxInterpolation
 (
-    simple.dict().getOrDefault("massFluxInterpolation", false)
+    simple.dict().lookupOrDefault("massFluxInterpolation", false)
 );

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/createPorousZones.H

@@ -1 +1,2 @@
     IOporosityModelList pZones(mesh);
+

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/setPorosityTreatment.H

@@ -5,7 +5,7 @@ int nUCorr = 0;
 if (pZones.active())
 {
     // nUCorrectors for pressureImplicitPorosity
-    nUCorr = simple.dict().getOrDefault<int>("nUCorrectors", 0);
+    nUCorr = simple.dict().lookupOrDefault<int>("nUCorrectors", 0);
 
     if (nUCorr > 0)
     {

applications/solvers/lagrangian/DPMFoam/createFields.H

@@ -11,7 +11,7 @@ word continuousPhaseName
             mesh,
             IOobject::MUST_READ
         )
-    ).get<word>("continuousPhase")
+    ).lookup("continuousPhase")
 );
 
 Info<< "Reading field U\n" << endl;
@@ -121,7 +121,7 @@ volScalarField alphac
 
 const word kinematicCloudName
 (
-    args.getOrDefault<word>("cloud", "kinematicCloud")
+    args.get<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;

applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H

@@ -1,4 +1 @@
-const volScalarField& T = thermo.T();
-const volScalarField& psi = thermo.psi();
-
 const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -22,6 +22,8 @@ if (!composition.species().found(inertSpecie))
 }
 
 volScalarField& p = thermo.p();
+const volScalarField& T = thermo.T();
+const volScalarField& psi = thermo.psi();
 
 multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 

applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,23 +34,23 @@ License
     scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
-    scalar maxDeltaT(pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT));
+    scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
 
     // Smoothing parameter (0-1) when smoothing iterations > 0
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     // Damping coefficient (1-0)
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
     );
 
     // Maximum change in cell temperature per iteration
     // (relative to previous value)
-    scalar alphaTemp(pimpleDict.getOrDefault("alphaTemp", 0.05));
+    scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05));
 
 
     Info<< "Time scales min/max:" << endl;

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H

@@ -59,7 +59,7 @@ volScalarField mu
 
 const word kinematicCloudName
 (
-    args.getOrDefault<word>("cloud", "kinematicCloud")
+    args.get<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;

applications/solvers/lagrangian/reactingParcelFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \

applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H

@@ -1,27 +0,0 @@
-#include "createMesh.H"
-
-IOdictionary filmDict
-(
-    IOobject
-    (
-        "surfaceFilmProperties",
-        runTime.constant(),
-        runTime,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    )
-);
-
-const word filmRegionName = filmDict.get<word>("region");
-
-fvMesh filmMesh
-(
-    IOobject
-    (
-        filmRegionName,
-        runTime.timeName(),
-        runTime,
-        IOobject::MUST_READ
-    )
-);

applications/solvers/lagrangian/reactingParcelFoam/createRegionControls.H

@@ -1,4 +1,5 @@
 bool solvePrimaryRegion
 (
-    pimple.dict().getOrDefault("solvePrimaryRegion", true)
+    pimple.dict().lookupOrDefault("solvePrimaryRegion", true)
 );
+

applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -70,7 +70,6 @@ int main(int argc, char *argv[])
         " and surface film modelling."
     );
 
-    #define CREATE_MESH createMeshesPostProcess.H
     #include "postProcess.H"
 
     #include "addCheckCaseOptions.H"

applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,23 +34,23 @@ License
     scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
-    scalar maxDeltaT(pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT));
+    scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
 
     // Smoothing parameter (0-1) when smoothing iterations > 0
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     // Damping coefficient (1-0)
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 0.2)
     );
 
     // Maximum change in cell temperature per iteration
     // (relative to previous value)
-    scalar alphaTemp(pimpleDict.getOrDefault("alphaTemp", 0.05));
+    scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05));
 
 
     Info<< "Time scales min/max:" << endl;

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \

applications/solvers/lagrangian/sprayFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \

applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../sprayDyMFoam \
     -I.. \
     -I../../reactingParcelFoam \

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H

@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 const word kinematicCloudName
 (
-    args.getOrDefault<word>("cloud", "kinematicCloud")
+    args.get<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;

applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C

@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
         alphac = max(1.0 - kinematicCloud.theta(), alphacMin);
         alphac.correctBoundaryConditions();
 
-         Info<< "Continuous phase-1 volume fraction = "
+         Info<< "Continous phase-1 volume fraction = "
             << alphac.weightedAverage(mesh.Vsc()).value()
             << "  Min(alphac) = " << min(alphac).value()
             << "  Max(alphac) = " << max(alphac).value()

applications/solvers/multiphase/MPPICInterFoam/Make/options

@@ -1,6 +1,7 @@
 interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam
 
-EXE_INC = \
+EXE_INC =  \
+    -I. \
     -I../VoF \
     -I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \
     -I$(interFoamPath) \

applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H

@@ -40,3 +40,4 @@ else
 
 rho == alpha1*rho1 + alpha2*rho2;
 mu = mixture.mu();
+

applications/solvers/multiphase/VoF/setRDeltaT.H

@@ -5,52 +5,52 @@
 
     scalar maxCo
     (
-        pimpleDict.getOrDefault<scalar>("maxCo", 0.9)
+        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.9)
     );
 
     scalar maxAlphaCo
     (
-        pimpleDict.getOrDefault<scalar>("maxAlphaCo", 0.2)
+        pimpleDict.lookupOrDefault<scalar>("maxAlphaCo", 0.2)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
     );
 
     label nAlphaSpreadIter
     (
-        pimpleDict.getOrDefault<label>("nAlphaSpreadIter", 1)
+        pimpleDict.lookupOrDefault<label>("nAlphaSpreadIter", 1)
     );
 
     scalar alphaSpreadDiff
     (
-        pimpleDict.getOrDefault<scalar>("alphaSpreadDiff", 0.2)
+        pimpleDict.lookupOrDefault<scalar>("alphaSpreadDiff", 0.2)
     );
 
     scalar alphaSpreadMax
     (
-        pimpleDict.getOrDefault<scalar>("alphaSpreadMax", 0.99)
+        pimpleDict.lookupOrDefault<scalar>("alphaSpreadMax", 0.99)
     );
 
     scalar alphaSpreadMin
     (
-        pimpleDict.getOrDefault<scalar>("alphaSpreadMin", 0.01)
+        pimpleDict.lookupOrDefault<scalar>("alphaSpreadMin", 0.01)
     );
 
     label nAlphaSweepIter
     (
-        pimpleDict.getOrDefault<label>("nAlphaSweepIter", 5)
+        pimpleDict.lookupOrDefault<label>("nAlphaSweepIter", 5)
     );
 
     scalar rDeltaTDampingCoeff
     (
-        pimpleDict.getOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     scalar maxDeltaT
     (
-        pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H

@@ -1,4 +1,4 @@
 #include "readDyMControls.H"
 
-correctPhi = pimple.dict().getOrDefault("correctPhi", true);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
 maxAcousticCo = runTime.controlDict().get<scalar>("maxAcousticCo");

applications/solvers/multiphase/cavitatingFoam/setDeltaT.H

@@ -28,7 +28,7 @@ Global
 
 Description
     Reset the timestep to maintain a constant maximum courant Number.
-    Reduction of time-step is immediate but increase is damped to avoid
+    Reduction of time-step is imediate but increase is damped to avoid
     unstable oscillations.
 
 \*---------------------------------------------------------------------------*/