CONFIG: bump patch level

- the foamConfigurePaths script is quite simplistic and aggressive in
  what it changes. This was particularly evident when using it to
  change gcc/clang versions.

  Restructured the corresponding compiler settings to define default
  versions (eg, "default_gcc_version") that limits the scope of
  changes performed by foamConfigurePaths and makes it easier to
  understand if changing manually.

.gitmodules

@@ -4,13 +4,6 @@
 [submodule "avalanche"]
 	path = modules/avalanche
 	url = https://develop.openfoam.com/Community/avalanche.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 "catalyst"]
+	path = modules/catalyst
+	url = https://develop.openfoam.com/Community/catalyst.git

Allwmake

@@ -1,43 +1,31 @@
 #!/bin/sh
 # Run from OPENFOAM top-level directory only
-cd "${0%/*}" || exit
-wmake -check-dir "$WM_PROJECT_DIR" 2>/dev/null || {
+cd ${0%/*} && 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
-if [ -f "$WM_PROJECT_DIR"/wmake/scripts/list_tools ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/list_tools
-else
-    echo "mpirun=$(command -v mpirun || true)"
-fi
-echo
-# Report compiler information
-compiler="$(wmake -show-path-cxx 2>/dev/null || true)"
-if [ -x "$compiler" ]
-then
-    echo "compiler=$compiler"
-    "$compiler" --version 2>/dev/null | sed -ne '1p'
-else
-    echo "compiler=unknown"
-fi
+# Preamble. Report compiler version
+case "$WM_COMPILER" in
+    Gcc*)    gcc --version 2>/dev/null | sed -ne '1p' ;;
+    Clang*)  clang --version 2>/dev/null | sed -ne '1p' ;;
+esac
+# Preamble. Report mpirun location
+command -v mpirun 2>/dev/null || true
 
-echo
 echo "========================================"
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}"
-echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
+echo "  $WM_COMPILER $WM_COMPILER_TYPE compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo "========================================"
 echo
@@ -48,18 +36,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 "========================================"
@@ -77,19 +56,14 @@ if [ -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
-
-    (cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all)
+    (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
 }
 
@@ -98,13 +72,13 @@ echo
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "========================================"
 echo "  ${WM_PROJECT_DIR##*/}"
-echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
+echo "  $WM_COMPILER $WM_COMPILER_TYPE compiler"
 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 "  api   = $(foamEtcFile -show-api 2>/dev/null)"
+echo "  patch = $(foamEtcFile -show-patch 2>/dev/null)"
+echo "  bin   = $(_foamCountDirEntries $FOAM_APPBIN) entries"
+echo "  lib   = $(_foamCountDirEntries $FOAM_LIBBIN) entries"
 echo
 echo "========================================"
 

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,60 +1,59 @@
 # 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
 
 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
 
-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
 
 ### api
 
-Format: `date +%y%m`
-
 - 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`
-
 - 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
@@ -71,9 +70,9 @@ 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
@@ -83,4 +82,4 @@ contains more permanent information, whereas the `build-info` is more
 transient in nature.
 
 ----
-2020-05-05
+2019-01-23

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2004
-patch=200506
+api=1906
+patch=200312

README.md

@@ -12,36 +12,24 @@ individual and group contributors, integrations
 
 
 # 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
-Free Software Foundation, either version 3 of the License, or (at your
-option) any later version.  See the file COPYING in this directory or
-[http://www.gnu.org/licenses/](http://www.gnu.org/licenses), for a
-description of the GNU General Public License terms under which you
-may redistribute files.
+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.  See the file COPYING in this directory or [http://www.gnu.org/licenses/](http://www.gnu.org/licenses), for a description of the GNU General Public License terms under which you can copy the files.
 
 
 # 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 permitted to use the Name and agreed Domain Name. For information on trademark use, please refer to the [trademark policy guidelines](http://www.openfoam.com/legal/trademark-policy.php).
 
-OpenCFD Ltd grants use of its OpenFOAM trademark by Third Parties on a
-licence basis. ESI Group and OpenFOAM Foundation Ltd are currently
-permitted to use the Name and agreed Domain Name. For information on
-trademark use, please refer to the [trademark policy guidelines](http://www.openfoam.com/legal/trademark-policy.php).
+Please [contact OpenCFD](http://www.openfoam.com/contact) if you have any questions on the use of the OpenFOAM trademark.
 
-Please [contact OpenCFD](http://www.openfoam.com/contact) if you have
-any questions on the use of the OpenFOAM trademark.
-
-Violations of the Trademark are monitored, and will be duly prosecuted.
+Violations of the Trademark are continuously monitored, and will be duly prosecuted.
 
 
 # Using OpenFOAM
 
 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v1912 version:
+For example, for the OpenFOAM-v1906 version:
 ```
-source /installation/path/OpenFOAM-v1912/etc/bashrc
+source /installation/path/OpenFOAM-v1906/etc/bashrc
 ```
 
 # Compiling OpenFOAM
@@ -63,7 +51,7 @@ not guaranteed to have any correspondence to the OpenFOAM release
 information is embedded into each application. For example, as
 displayed from `blockMesh -help`:
 ```
-Using: OpenFOAM-v1812.local (1812) - visit www.openfoam.com
+Using: OpenFOAM-v1812.local (1812) (see www.OpenFOAM.com)
 Build: 65d6551ff7-20190530 (patch=190531)
 Arch:  LSB;label=32;scalar=64
 ```
@@ -85,10 +73,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
@@ -121,8 +109,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v1912
-\-- ThirdParty-v1912
+|-- OpenFOAM-v1906
+\-- ThirdParty-v1906
 ```
 There are, however, many cases where this simple convention is inadequate:
 
@@ -130,7 +118,7 @@ There are, however, many cases where this simple convention is inadequate:
   operating system or cluster installation provides it)
 
 * When we have changed the OpenFOAM directory name to some arbitrary
-  directory name, e.g. openfoam-sandbox1912, etc..
+  directory name, e.g. openfoam-sandbox1906, etc..
 
 * When we would like any additional 3rd party software to be located
   inside of the OpenFOAM directory to ensure that the installation is
@@ -142,38 +130,35 @@ There are, however, many cases where this simple convention is inadequate:
   developing various different features but wish to use or reuse the
   same 3rd party software for them all.
 
-The solution for these problems is a newer, more intelligent discovery
-when locating the ThirdParty directory with the following precedence:
+The solution for these problems is a newer, more intelligent discovery when locating the ThirdParty directory with the following precedence:
 
 1. PROJECT/ThirdParty
    * for single-directory installations
 2. PREFIX/ThirdParty-VERSION
    * this corresponds to the traditional approach
 3. PREFIX/ThirdParty-vAPI
-   * allows for an updated value of VERSION, *eg*, `v1912-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v1906-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `1912` and the original `ThirdParty-v1912/` would be found.
+     be `1906` and the original `ThirdParty-v1906/` would be found.
 4. PREFIX/ThirdParty-API
    * this is the same as the previous example, but using an unadorned
      API value. This also makes sense if the chosen version name also
      uses the unadorned API value in its naming, *eg*,
-     `1912-patch190131`, `1912.19W03`
+     `1906-patch190131`, `1906.19W03`
 5. PREFIX/ThirdParty-common
-   * permits maximum reuse for various versions, for experienced user
-     who are aware of potential version incompatibilities
+   * permits maximum reuse for various versions, but only for
+     experienced user who are aware of potential version
+     incompatibilities
 
-If none of these directories are found to be suitable, it reverts to
-using PROJECT/ThirdParty as a dummy location (even if the directory
-does not exist). This is a safe fallback value since it is within the
-OpenFOAM directory structure and can be trusted to have no negative
-side-effects. In the above, the following notation has been used:
+If none of these directories are found to be suitable, it reverts to using PROJECT/ThirdParty as a dummy location (even if the directory does not exist). This is a safe fallback value since it is within the OpenFOAM directory structure and can be trusted to have no negative side-effects.
+In the above, the following notation has been used:
 
 | name          | value         | meaning       |
 |---------------|---------------|---------------|
 | PROJECT       | `$WM_PROJECT_DIR`     | The OpenFOAM directory |
 | PREFIX        | `dirname $WM_PROJECT_DIR` | The OpenFOAM parent directory |
 | API           | `foamEtcFiles -show-api` |  The api or release version |
-| VERSION       | `$WM_PROJECT_VERSION` | The version we have chosen |
+| VERSION       | `$WM_PROJECT_VERSION` | The version we've chosen |
 
 To reduce the potential of false positive matches (perhaps some other
 software also uses ThirdParty-xxx for its naming), the directory test
@@ -198,13 +183,10 @@ ThirdParty directory will contain either an `Allwmake` file or a
 
 
 # Useful Links
-
-- Download [source](https://sourceforge.net/projects/openfoam/files/) and [download and installation instructions](http://www.openfoam.com/download/)
+- [Download and installation instructions](http://www.openfoam.com/download/)
 - [Documentation](http://www.openfoam.com/documentation)
 - [Reporting bugs/issues/feature requests](http://www.openfoam.com/code/bug-reporting.php)
-- [Issue tracker](https://develop.openfoam.com/Development/openfoam/issues)
-- [Wiki](http://wiki.openfoam.com/) and [code wiki](https://develop.openfoam.com/Development/openfoam/wikis/)
-- [Community](http://www.openfoam.com/community/), [Governance](http://www.openfoam.com/governance/)
+- [OpenFOAM Community](http://www.openfoam.com/community/)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)
 
-Copyright 2016-2020 OpenCFD Ltd
+Copyright 2016-2019 OpenCFD Ltd

applications/Allwmake

@@ -1,26 +1,21 @@
 #!/bin/sh
 # Run from OPENFOAM applications/ directory only
-cd "${0%/*}" || exit
-wmake -check-dir "$WM_PROJECT_DIR/applications" 2>/dev/null || {
+cd ${0%/*} && 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
 
 #------------------------------------------------------------------------------
 
 wmake -all $targetType solvers
 wmake -all $targetType utilities
 
-# Optional
-## wmake -all $targetType tools
-
 #------------------------------------------------------------------------------

applications/solvers/DNS/dnsFoam/Allwmake

@@ -1,7 +1,7 @@
 #!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-. ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw
+cd ${0%/*} || exit 1                         # Run from this directory
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+. $WM_PROJECT_DIR/wmake/scripts/have_fftw
 
 #------------------------------------------------------------------------------
 

applications/solvers/basic/laplacianFoam/createFields.H

@@ -14,36 +14,23 @@ volScalarField T
 );
 
 
-Info<< "Reading diffusivity DT\n" << endl;
+Info<< "Reading transportProperties\n" << endl;
 
-volScalarField DT
+IOdictionary transportProperties
 (
     IOobject
     (
-        "DT",
-        runTime.timeName(),
+        "transportProperties",
+        runTime.constant(),
         mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimViscosity, Zero)
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    )
 );
 
-if (!DT.headerOk())
-{
-    IOdictionary transportProperties
-    (
-        IOobject
-        (
-            "transportProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-    DT = dimensionedScalar("DT", dimViscosity, transportProperties);
-}
+
+Info<< "Reading diffusivity DT\n" << endl;
+
+dimensionedScalar DT("DT", dimViscosity, transportProperties);
 
 #include "createFvOptions.H"

applications/solvers/basic/laplacianFoam/laplacianFoam.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,8 +66,6 @@ int main(int argc, char *argv[])
         "Laplace equation solver for a scalar quantity."
     );
 
-    #include "postProcess.H"
-
     #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"

applications/solvers/basic/laplacianFoam/write.H

@@ -41,18 +41,6 @@
             gradT.component(vector::Z)
         );
 
-        volVectorField DTgradT
-        (
-            IOobject
-            (
-                "flux",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            DT*gradT
-        );
 
         runTime.write();
     }

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.opt<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.opt<word>("pName", "p");
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -84,7 +84,6 @@ Description
     \heading Options
     \plaintable
         -writep   | write the Euler pressure
-        -writephi | Write the final volumetric flux
         -writePhi | Write the final velocity potential
         -initialiseUBCs | Update the velocity boundaries before solving for Phi
     \endplaintable
@@ -116,12 +115,6 @@ int main(int argc, char *argv[])
         "Initialise U boundary conditions"
     );
 
-    argList::addBoolOption
-    (
-        "writephi",
-        "Write the final volumetric flux field"
-    );
-
     argList::addBoolOption
     (
         "writePhi",
@@ -193,16 +186,11 @@ int main(int argc, char *argv[])
         << (sqrt(sum(sqr(fvc::flux(U) - phi)))/sum(mesh.magSf())).value()
         << endl;
 
-    // Write U
+    // Write U and phi
     U.write();
+    phi.write();
 
-    // Optionally write the volumetric flux, phi
-    if (args.found("writephi"))
-    {
-        phi.write();
-    }
-
-    // Optionally write velocity potential, Phi
+    // Optionally write Phi
     if (args.found("writePhi"))
     {
         Phi.write();

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/dragModels/PDRDragModel/PDRDragModelNew.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,14 +31,14 @@ License
 
 Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
 (
-    const dictionary& dict,
+    const dictionary& PDRProperties,
     const compressible::RASModel& turbulence,
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi
 )
 {
-    const word modelType(dict.get<word>("PDRDragModel"));
+    const word modelType(PDRProperties.get<word>("PDRDragModel"));
 
     Info<< "Selecting drag model " << modelType << endl;
 
@@ -47,17 +46,16 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "PDRDragModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown PDRDragModel type "
+            << modelType << nl << nl
+            << "Valid PDRDragModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<PDRDragModel>
-        (cstrIter()(dict, turbulence, rho, U, phi));
+        (cstrIter()(PDRProperties, turbulence, rho, U, phi));
 }
 
 

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/XiEqModel/XiEqModelNew.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,13 +31,13 @@ License
 
 Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
 (
-    const dictionary& dict,
+    const dictionary& propDict,
     const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
 {
-    const word modelType(dict.get<word>("XiEqModel"));
+    const word modelType(propDict.get<word>("XiEqModel"));
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -46,16 +45,15 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "XiEqModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown XiEqModel type "
+            << modelType << nl << nl
+            << "Valid XiEqModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
-    return autoPtr<XiEqModel>(cstrIter()(dict, thermo, turbulence, Su));
+    return autoPtr<XiEqModel>(cstrIter()(propDict, thermo, turbulence, Su));
 }
 
 

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/XiModels/XiGModels/XiGModel/XiGModelNew.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,13 +31,13 @@ License
 
 Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
 (
-    const dictionary& dict,
+    const dictionary& propDict,
     const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
 {
-    const word modelType(dict.get<word>("XiGModel"));
+    const word modelType(propDict.get<word>("XiGModel"));
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -46,16 +45,15 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "XiGModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown XiGModel type "
+            << modelType << nl << nl
+            << "Valid XiGModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
-    return autoPtr<XiGModel>(cstrIter()(dict, thermo, turbulence, Su));
+    return autoPtr<XiGModel>(cstrIter()(propDict, thermo, turbulence, Su));
 }
 
 

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +31,7 @@ License
 
 Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
 (
-    const dictionary& dict,
+    const dictionary& propDict,
     const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
@@ -41,7 +40,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
     const surfaceScalarField& phi
 )
 {
-    const word modelType(dict.get<word>("XiModel"));
+    const word modelType(propDict.get<word>("XiModel"));
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -49,17 +48,16 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "XiModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown XiModel type "
+            << modelType << nl << nl
+            << "Valid XiModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<XiModel>
-        (cstrIter()(dict, thermo, turbulence, Su, rho, b, phi));
+        (cstrIter()(propDict, thermo, turbulence, Su, rho, b, phi));
 }
 
 

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/Allwclean

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 wclean libso BCs
 wclean

applications/solvers/compressible/rhoCentralFoam/Allwmake

@@ -1,6 +1,6 @@
 #!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 (wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)
 

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:
     //

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/rhoPimpleFoam.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,10 +36,6 @@ Description
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations.
 
-Note
-   The motion frequency of this solver can be influenced by the presence
-   of "updateControl" and "updateInterval" in the dynamicMeshDict.
-
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
@@ -136,7 +131,7 @@ int main(int argc, char *argv[])
                 }
 
                 // Do any mesh changes
-                mesh.controlledUpdate();
+                mesh.update();
 
                 if (mesh.changing())
                 {

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/createFields.H

@@ -82,5 +82,5 @@ dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 bool adjustFringe
 (
-    simple.dict().getOrDefault("oversetAdjustPhi", false)
+    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/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/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/chtMultiRegionFoam/Make/options

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

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,5 +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()))
     {
@@ -380,11 +380,8 @@ updateCoeffs()
         // TvNbr: vapour Tp
         scalarField c(TcNbr*KDeltaLiqNbr + TvNbr*KDeltaVapNbr);
 
-        //valueFraction() = KDeltaNbr/(KDeltaNbr + KDelta);
-        //refValue() = c/KDeltaNbr;
-        scalarField KDeltaLiqVapNbr(KDeltaLiqNbr + KDeltaVapNbr);
-        valueFraction() = KDeltaLiqVapNbr/(KDeltaLiqVapNbr + KDelta);
-        refValue() = c/KDeltaLiqVapNbr;
+        valueFraction() = KDeltaNbr/(KDeltaNbr + KDelta);
+        refValue() = c/KDeltaNbr;
         refGrad() = (qr + qrNbr)/kappa(Tp);
 
         if (debug)
@@ -398,7 +395,7 @@ updateCoeffs()
                     << " walltemperature "
                     << " min:" << gMin(Tp)
                     << " max:" << gMax(Tp)
-                    << " avg:" << gAverage(Tp) << nl
+                    << " avg:" << gAverage(Tp)
                     << endl;
         }
     }
@@ -495,8 +492,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/createFluidFields.H

@@ -21,178 +21,7 @@ const uniformDimensionedVectorField& g = meshObjects::gravity::New(runTime);
 
 PtrList<pimpleControl> pimpleFluid(fluidRegions.size());
 
-
-//Debug Fields
-/*
-PtrList<volScalarField> faceRegimesFluid(fluidRegions.size());
-PtrList<volScalarField> qcFluid(fluidRegions.size());
-PtrList<volScalarField> qFilmFluid(fluidRegions.size());
-PtrList<volScalarField> htcFilmBoilingFluid(fluidRegions.size());
-PtrList<volScalarField> qtbFluid(fluidRegions.size());
-PtrList<volScalarField> qSubCoolFluid(fluidRegions.size());
-PtrList<volScalarField> CHFtotalFluid(fluidRegions.size());
-PtrList<volScalarField> TdnbFluid(fluidRegions.size());
-PtrList<volScalarField> phiFluid(fluidRegions.size());
-
-forAll(fluidRegions, i)
-{
-    faceRegimesFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "faceRegimes",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-
-        )
-    );
-    qcFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "qc",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-    qFilmFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "qFilm",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-    htcFilmBoilingFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "htcFilmBoiling",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-    qtbFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "qtb",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-    qSubCoolFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "qSubCool",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-    CHFtotalFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "CHFtotal",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-     TdnbFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "Tdnb",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-     phiFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "phiTb",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i],
-            dimensionedScalar(dimless, Zero)
-        )
-    );
-}
-*/
-
+// Populate fluid field pointer lists
 forAll(fluidRegions, i)
 {
     Info<< "*** Reading fluid mesh thermophysical properties for region "

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/chtMultiRegionTwoPhaseEulerFoam/fluid/setRegionFluidFields.H

@@ -56,16 +56,3 @@
     pimpleControl& pimple = pimpleFluid[i];
 
     const dimensionedScalar& pMin = pMinFluid[i];
-
-    // Debug fields
-/*
-    volScalarField& faceRegimes = faceRegimesFluid[i];
-    volScalarField& qc = qcFluid[i];
-    volScalarField& qFilm = qFilmFluid[i];
-    volScalarField& htcFilmBoiling = htcFilmBoilingFluid[i];
-    volScalarField& qtb = qtbFluid[i];
-    volScalarField& qSubCool = qSubCoolFluid[i];
-    volScalarField& CHFtotal = CHFtotalFluid[i];
-    volScalarField& Tdnb = TdnbFluid[i];
-    volScalarField& phiTb = phiFluid[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/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/adjointOptimisationFoam/adjointOptimisationFoam.C

@@ -55,6 +55,10 @@ int main(int argc, char *argv[])
 
     for (om++; !om.end(); om++)
     {
+        Info<< "* * * * * * * * * * * * * * * * * * *" << endl;
+        Info<< "Time = " << runTime.timeName()         << endl;
+        Info<< "* * * * * * * * * * * * * * * * * * *" << endl;
+
         if (om.update())
         {
             // Update design variables and solve all primal equations

applications/solvers/incompressible/icoFoam/icoFoam.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,8 +75,6 @@ int main(int argc, char *argv[])
         " of Newtonian fluids."
     );
 
-    #include "postProcess.H"
-
     #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"

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/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/pimpleFoam.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,10 +67,6 @@ Description
         \<turbulence fields\> | As required by user selection
     \endplaintable
 
-Note
-   The motion frequency of this solver can be influenced by the presence
-   of "updateControl" and "updateInterval" in the dynamicMeshDict.
-
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
@@ -126,8 +121,7 @@ int main(int argc, char *argv[])
         {
             if (pimple.firstIter() || moveMeshOuterCorrectors)
             {
-                // Do any mesh changes
-                mesh.controlledUpdate();
+                mesh.update();
 
                 if (mesh.changing())
                 {

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/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/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/Allwclean

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 wclean libso DPMTurbulenceModels
 

applications/solvers/lagrangian/DPMFoam/Allwmake

@@ -1,6 +1,6 @@
 #!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 

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.opt<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;

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.opt<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,28 +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,5 +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.opt<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;

applications/solvers/multiphase/MPPICInterFoam/Allwclean

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 wclean libso CompressibleTwoPhaseMixtureTurbulenceModels
 wclean

applications/solvers/multiphase/MPPICInterFoam/Allwmake

@@ -1,6 +1,6 @@
 #!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+cd ${0%/*} || exit 1                            # Run from this directory
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 

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/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");