BUG: noise did not set num of output fields (VTK legacy) [fixes #2133]

ENH: limit output to 25 cell types per line for readability

- makes it easier to trace potential format errors etc

STYLE: downgrade warning about polyhedrals to a simple info message

- can assume that polyhedral support is widespread enough to not
  warrant a warning.

.gitmodules

@@ -7,6 +7,3 @@
 [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

Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 # Run from OPENFOAM top-level directory only
-cd "${0%/*}" || exit
-wmakeCheckPwd "$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
@@ -12,7 +11,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR" 2>/dev/null || {
     exit 1
 }
 
-. "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 # Preamble. Report compiler version
@@ -20,19 +19,13 @@ 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
 
-# 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
 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 compiler"
+echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo "========================================"
 echo
@@ -43,9 +36,18 @@ echo
 # Compile ThirdParty libraries and applications
 if [ -d "$WM_THIRD_PARTY_DIR" ]
 then
-    "$WM_THIRD_PARTY_DIR/Allwmake"
+    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
 else
-    echo "No ThirdParty directory found - skipping"
+    echo "Skip ThirdParty (no directory)"
 fi
 
 echo "========================================"
@@ -70,7 +72,7 @@ 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
 }
 
@@ -79,13 +81,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 compiler"
+echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo
-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 "  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
 echo "========================================"
 

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=1912
-patch=0
+api=1906
+patch=200727

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
 ```
@@ -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-2019 OpenCFD Ltd

applications/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 # Run from OPENFOAM applications/ directory only
-cd "${0%/*}" || exit
-wmakeCheckPwd "$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
@@ -12,7 +11,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" 2>/dev/null || {
     exit 1
 }
 
-. "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 

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/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.get<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/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.get<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/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/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/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/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/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/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C

@@ -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;
         }
     }

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

@@ -121,7 +121,7 @@ volScalarField alphac
 
 const word kinematicCloudName
 (
-    args.get<word>("cloud", "kinematicCloud")
+    args.opt<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H

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

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H

@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 const word kinematicCloudName
 (
-    args.get<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/compressibleInterFoam/Allwclean

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

applications/solvers/multiphase/compressibleInterFoam/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/compressibleMultiphaseInterFoam/Allwclean

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

applications/solvers/multiphase/compressibleMultiphaseInterFoam/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/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -193,7 +192,8 @@ public:
 
 
     //- Destructor
-    virtual ~multiphaseMixtureThermo() = default;
+    virtual ~multiphaseMixtureThermo()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/driftFluxFoam/Allwclean

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

applications/solvers/multiphase/driftFluxFoam/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/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -100,7 +99,8 @@ public:
 
 
     //- Destructor
-    virtual ~incompressibleTwoPhaseInteractingMixture() = default;
+    virtual ~incompressibleTwoPhaseInteractingMixture()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,7 +130,8 @@ public:
 
 
     //- Destructor
-    virtual ~mixtureViscosityModel() = default;
+    virtual ~mixtureViscosityModel()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,12 +34,12 @@ License
 Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
 (
     const word& name,
-    const dictionary& dict,
+    const dictionary& viscosityProperties,
     const volVectorField& U,
     const surfaceScalarField& phi
 )
 {
-    const word modelType(dict.get<word>("transportModel"));
+    const word modelType(viscosityProperties.get<word>("transportModel"));
 
     Info<< "Selecting incompressible transport model " << modelType << endl;
 
@@ -48,17 +47,16 @@ Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "mixtureViscosityModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown mixtureViscosityModel type "
+            << modelType << nl << nl
+            << "Valid mixtureViscosityModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<mixtureViscosityModel>
-        (cstrIter()(name, dict, U, phi));
+        (cstrIter()(name, viscosityProperties, U, phi));
 }
 
 

applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -115,13 +114,12 @@ Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "relative velocity",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown time scale model type "
+            << modelType << nl << nl
+            << "Valid time scale model types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << abort(FatalError);
     }
 
     return

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwclean

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

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/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/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd
+    Copyright (C) 2017 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,6 +66,9 @@ class DTRMParticle
 {
     // Private data
 
+        //- Size in bytes of the fields
+        static const std::size_t sizeofFields_;
+
         //- Initial position
         point p0_;
 
@@ -143,12 +146,7 @@ public:
             inline scalar& Q(label celli);
     };
 
-
-    // Static Data Members
-
-        //- Size in bytes of the fields
-        static const std::size_t sizeofFields_;
-
+     // Static data members
 
         //- String representation of properties
         AddToPropertyList
@@ -162,9 +160,22 @@ public:
           + " transmissiveId";
         );
 
+        //- String representation of property types
+        AddToPropertyTypes
+        (
+            particle,
+            "{point"
+          + " point"
+          + " scalar"
+          + " scalar"
+          + " scalar"
+          + " label}"
+        );
+
 
     // Constructors
 
+
         //- Construct from components, with searching for tetFace and
         //  tetPt unless disabled by doCellFacePt = false.
         DTRMParticle
@@ -294,18 +305,6 @@ public:
         );
 
 
-        // I-O
-
-            //- Write individual parcel properties to stream
-            void writeProperties
-            (
-                Ostream& os,
-                const wordRes& filters,
-                const word& delim,
-                const bool namesOnly = false
-            ) const;
-
-
     // Ostream Operator
 
         friend Ostream& operator<<(Ostream& os, const DTRMParticle& p);

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticleIO.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,21 +63,6 @@ Foam::DTRMParticle::DTRMParticle
         {
             is >> p0_ >> p1_ >> I0_ >> I_ >> dA_ >> transmissiveId_;
         }
-        else if (!is.checkLabelSize<>() || !is.checkScalarSize<>())
-        {
-            // Non-native label or scalar size
-
-            is.beginRawRead();
-
-            readRawScalar(is, p0_.data(), vector::nComponents);
-            readRawScalar(is, p1_.data(), vector::nComponents);
-            readRawScalar(is, &I0_);
-            readRawScalar(is, &I_);
-            readRawScalar(is, &dA_);
-            readRawLabel(is, &transmissiveId_);
-
-            is.endRawRead();
-        }
         else
         {
             is.read(reinterpret_cast<char*>(&p0_), sizeofFields_);
@@ -88,31 +73,6 @@ Foam::DTRMParticle::DTRMParticle
 }
 
 
-void Foam::DTRMParticle::writeProperties
-(
-    Ostream& os,
-    const wordRes& filters,
-    const word& delim,
-    const bool namesOnly
-) const
-{
-    particle::writeProperties(os, filters, delim, namesOnly);
-
-    #undef  writeProp
-    #define writeProp(Name, Value)                                            \
-        particle::writeProperty(os, Name, Value, namesOnly, delim, filters)
-
-    writeProp("p0", p0_);
-    writeProp("p1", p1_);
-    writeProp("I0", I0_);
-    writeProp("I", I_);
-    writeProp("dA", dA_);
-    writeProp("transmissiveId", transmissiveId_);
-
-    #undef writeProp
-}
-
-
 Foam::Ostream& Foam::operator<<(Ostream& os, const DTRMParticle& p)
 {
     if (os.format() == IOstream::ASCII)

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/reflectionModel/reflectionModel/reflectionModelNew.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,13 +45,11 @@ Foam::radiation::reflectionModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "reflectionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalIOErrorInFunction(dict)
+            << "Unknown reflectionModel type " << modelType << nl << nl
+            << "Valid types :" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalIOError);
     }
 
     return autoPtr<reflectionModel>(cstrIter()(dict, mesh));

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +38,7 @@ Foam::interfaceCompositionModel::New
     const phasePair& pair
 )
 {
-    const word modelType
+    word interfaceCompositionModelType
     (
         dict.get<word>("type")
       + "<"
@@ -50,19 +49,19 @@ Foam::interfaceCompositionModel::New
     );
 
     Info<< "Selecting interfaceCompositionModel for "
-        << pair << ": " << modelType << endl;
+        << pair << ": " << interfaceCompositionModelType << endl;
 
-    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    const auto cstrIter =
+        dictionaryConstructorTablePtr_->cfind(interfaceCompositionModelType);
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "interfaceCompositionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown interfaceCompositionModelType type "
+            << interfaceCompositionModelType << nl << nl
+            << "Valid interfaceCompositionModel types are : " << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,13 +45,12 @@ Foam::autoPtr<Foam::porousModel> Foam::porousModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "porousModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown modelType type "
+            << modelType << endl << endl
+            << "Valid porousModel types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, mesh);

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,13 +45,12 @@ Foam::autoPtr<Foam::surfaceTensionModel> Foam::surfaceTensionModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "surfaceTensionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalIOErrorInFunction(dict)
+            << "Unknown surfaceTensionModel type "
+            << surfaceTensionModelType << endl << endl
+            << "Valid modelType types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalIOError);
     }
 
     return cstrIter()(dict, pair, true);

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,9 +36,7 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
     const word& phaseName
 )
 {
-    const dictionary& dict = fluid.subDict(phaseName);
-
-    const word modelType(dict.get<word>("type"));
+    const word modelType(fluid.subDict(phaseName).get<word>("type"));
 
     Info<< "Selecting phaseModel for "
         << phaseName << ": " << modelType << endl;
@@ -47,13 +45,12 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "phaseModel",
-            modelType,
-            *phaseSystemConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown phaseModel type "
+            << modelType << endl << endl
+            << "Valid phaseModel types are : " << endl
+            << phaseSystemConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(fluid, phaseName);

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,37 +34,38 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
     const fvMesh& mesh
 )
 {
-    const IOdictionary dict
+    const word multiphaseSystemType
     (
-        IOobject
+        IOdictionary
         (
-            phasePropertiesName,
-            mesh.time().constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE,
-            false // Do not register
-        )
+            IOobject
+            (
+                phasePropertiesName,
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE,
+                false
+            )
+        ).get<word>("type")
     );
 
-    const word systemType(dict.get<word>("type"));
+    Info<< "Selecting multiphaseSystem " << multiphaseSystemType << endl;
 
-    Info<< "Selecting multiphaseSystem " << systemType << endl;
-
-    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(systemType);
+    const auto cstrIter =
+        dictionaryConstructorTablePtr_->cfind(multiphaseSystemType);
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "multiphaseSystem",
-            systemType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown multiphaseSystemType type "
+            << multiphaseSystemType << endl
+            << "Valid multiphaseSystem types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
-    return autoPtr<multiphaseSystem>(cstrIter()(mesh));
+    return autoPtr<multiphaseSystem> (cstrIter()(mesh));
 }
 
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H

@@ -526,7 +526,7 @@ public:
         //- Return the name of the thermo physics
         virtual word thermoName() const
         {
-            NotImplemented;
+            NotImplemented
             return word();
         }
 

applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean

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

applications/solvers/multiphase/interCondensatingEvaporatingFoam/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/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,7 +81,8 @@ public:
 
 
     //- Destructor
-    virtual ~constant() = default;
+    virtual ~constant()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
     const fvMesh& mesh
 )
 {
-    const IOdictionary dict
+    IOdictionary phaseChangePropertiesDict
     (
         IOobject
         (
@@ -46,11 +46,14 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            false
         )
     );
 
-    const word modelType(dict.get<word>("phaseChangeTwoPhaseModel"));
+    const word modelType
+    (
+        phaseChangePropertiesDict.get<word>("phaseChangeTwoPhaseModel")
+    );
 
     Info<< "Selecting phaseChange model " << modelType << endl;
 
@@ -58,20 +61,16 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "temperaturePhaseChangeTwoPhaseMixture",
-            modelType,
-            *componentsConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown temperaturePhaseChangeTwoPhaseMixture type "
+            << modelType << nl << nl
+            << "Valid temperaturePhaseChangeTwoPhaseMixture types :" << endl
+            << componentsConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
-    return
-        autoPtr<temperaturePhaseChangeTwoPhaseMixture>
-        (
-            cstrIter()(thermo, mesh)
-        );
+    return autoPtr<temperaturePhaseChangeTwoPhaseMixture>
+        (cstrIter()(thermo, mesh));
 }
 
 

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,7 +122,8 @@ public:
 
 
     //- Destructor
-    virtual ~temperaturePhaseChangeTwoPhaseMixture() = default;
+    virtual ~temperaturePhaseChangeTwoPhaseMixture()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,7 +87,8 @@ public:
 
 
     //- Destructor
-    virtual ~thermoIncompressibleTwoPhaseMixture() = default;
+    virtual ~thermoIncompressibleTwoPhaseMixture()
+    {}
 
 
     // Access function

applications/solvers/multiphase/interFoam/interMixingFoam/immiscibleIncompressibleThreePhaseMixture/immiscibleIncompressibleThreePhaseMixture.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,7 +68,8 @@ public:
 
 
     //- Destructor
-    virtual ~immiscibleIncompressibleThreePhaseMixture() = default;
+    virtual ~immiscibleIncompressibleThreePhaseMixture()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/interFoam/overInterDyMFoam/pEqn.H

@@ -17,6 +17,13 @@
         #include "interpolatedFaces.H"
     }
 
+    if (runTime.outputTime())
+    {
+        H.write();
+        rAU.write();
+        HbyA.write();
+    }
+
     surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
 
     if (ddtCorr)

applications/solvers/multiphase/interPhaseChangeFoam/Allwclean

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

applications/solvers/multiphase/interPhaseChangeFoam/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/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -99,7 +98,8 @@ public:
 
 
     //- Destructor
-    virtual ~Kunz() = default;
+    virtual ~Kunz()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -93,7 +92,8 @@ public:
 
 
     //- Destructor
-    virtual ~Merkle() = default;
+    virtual ~Merkle()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -106,7 +105,8 @@ public:
 
 
     //- Destructor
-    virtual ~SchnerrSauer() = default;
+    virtual ~SchnerrSauer()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.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.
@@ -38,7 +37,7 @@ Foam::phaseChangeTwoPhaseMixture::New
     const surfaceScalarField& phi
 )
 {
-    const IOdictionary dict
+    IOdictionary transportPropertiesDict
     (
         IOobject
         (
@@ -47,11 +46,14 @@ Foam::phaseChangeTwoPhaseMixture::New
             U.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            false
         )
     );
 
-    const word modelType(dict.get<word>("phaseChangeTwoPhaseMixture"));
+    const word modelType
+    (
+        transportPropertiesDict.lookup("phaseChangeTwoPhaseMixture")
+    );
 
     Info<< "Selecting phaseChange model " << modelType << endl;
 
@@ -59,13 +61,12 @@ Foam::phaseChangeTwoPhaseMixture::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "phaseChangeTwoPhaseMixture",
-            modelType,
-            *componentsConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown phaseChangeTwoPhaseMixture type "
+            << modelType << nl << nl
+            << "Valid phaseChangeTwoPhaseMixture types :" << endl
+            << componentsConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<phaseChangeTwoPhaseMixture>(cstrIter()(U, phi));

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,7 +121,8 @@ public:
 
 
     //- Destructor
-    virtual ~phaseChangeTwoPhaseMixture() = default;
+    virtual ~phaseChangeTwoPhaseMixture()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/multiphaseEulerFoam/Allwclean

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

applications/solvers/multiphase/multiphaseEulerFoam/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/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.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.
@@ -48,13 +47,12 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            interfaceDict,
-            "dragModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown dragModel type "
+            << modelType << nl << nl
+            << "Valid dragModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(interfaceDict, phase1, phase2);

applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.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.
@@ -40,7 +39,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 {
     const word modelType
     (
-        interfaceDict.get<word>("heatTransferModel" + phase1.name())
+        interfaceDict.lookup("heatTransferModel" + phase1.name())
     );
 
     Info<< "Selecting heatTransferModel for phase "
@@ -52,13 +51,12 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            interfaceDict,
-            "heatTransferModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown heatTransferModel type "
+            << modelType << nl << nl
+            << "Valid heatTransferModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(interfaceDict, alpha1, phase1, phase2);

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.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.
@@ -47,13 +46,12 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "diameterModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+           << "Unknown diameterModel type "
+           << modelType << nl << nl
+           << "Valid diameterModel types :" << endl
+           << dictionaryConstructorTablePtr_->sortedToc()
+           << exit(FatalError);
     }
 
     return cstrIter()

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C

@@ -831,7 +831,7 @@ void Foam::multiphaseSystem::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
 
     if (nAlphaSubCycles > 1)
     {

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -239,7 +238,8 @@ public:
 
 
     //- Destructor
-    virtual ~multiphaseSystem() = default;
+    virtual ~multiphaseSystem()
+    {}
 
 
     // Member Functions

applications/solvers/multiphase/multiphaseInterFoam/Allwclean

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

applications/solvers/multiphase/multiphaseInterFoam/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/reactingEulerFoam/Allwclean

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

applications/solvers/multiphase/reactingEulerFoam/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/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2019 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -109,13 +108,9 @@ void Foam::functionObjects::sizeDistribution::initialise
 
         default:
         {
-            FatalIOErrorInLookup
-            (
-                dict,
-                "functionType",
-                word::null,
-                functionTypeNames_
-            ) << exit(FatalIOError);
+            FatalIOErrorInFunction(dict)
+               << "Unknown functionType. Valid types are:"
+                << functionTypeNames_ << nl << exit(FatalIOError);
         }
     }
 
@@ -133,13 +128,9 @@ void Foam::functionObjects::sizeDistribution::initialise
 
         default:
         {
-            FatalIOErrorInLookup
-            (
-                dict,
-                "abszissaType",
-                word::null,
-                abszissaTypeNames_
-            ) << exit(FatalIOError);
+            FatalIOErrorInFunction(dict)
+                << "Unknown abszissaType. Valid types are:"
+                << abszissaTypeNames_ << nl << exit(FatalIOError);
         }
     }
 
@@ -150,7 +141,7 @@ void Foam::functionObjects::sizeDistribution::initialise
         FatalIOErrorInFunction(dict)
             << type() << " " << name() << ": "
             << selectionModeTypeNames_[selectionModeType_]
-            << '(' << selectionModeTypeName_ << "):" << nl
+            << "(" << selectionModeTypeName_ << "):" << nl
             << "    Selection has no cells" << exit(FatalIOError);
     }
 
@@ -158,7 +149,7 @@ void Foam::functionObjects::sizeDistribution::initialise
 
     Info<< type() << " " << name() << ":"
         << selectionModeTypeNames_[selectionModeType_]
-        << '(' << selectionModeTypeName_ << "):" << nl
+        << "(" << selectionModeTypeName_ << "):" << nl
         << "    total cells  = " << nCells_ << nl
         << "    total volume = " << volume_
         << nl << endl;
@@ -171,7 +162,7 @@ void Foam::functionObjects::sizeDistribution::setCellZoneCells()
     {
         case rtCellZone:
         {
-            dict().readEntry("cellZone", selectionModeTypeName_);
+            dict().lookup("cellZone") >> selectionModeTypeName_;
 
             label zoneId =
                 mesh().cellZones().findZoneID(selectionModeTypeName_);
@@ -199,13 +190,9 @@ void Foam::functionObjects::sizeDistribution::setCellZoneCells()
 
         default:
         {
-            FatalIOErrorInLookup
-            (
-                dict_,
-                "selectionMode",
-                word::null,
-                selectionModeTypeNames_
-            ) << exit(FatalIOError);
+            FatalIOErrorInFunction(dict_)
+               << "Unknown selectionMode type. Valid selectionMode types are:"
+                << selectionModeTypeNames_ << nl << exit(FatalIOError);
         }
     }
 }
@@ -415,7 +402,7 @@ bool Foam::functionObjects::sizeDistribution::execute()
 bool Foam::functionObjects::sizeDistribution::write()
 {
     writeFileHeader();
-    writeCurrentTime(file());
+    writeTime(file());
 
     Log << type() << " " << name() << " write" << nl;
 

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean

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

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/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/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C

@@ -31,7 +31,7 @@ Description
     common pressure, but otherwise separate properties. The type of phase model
     is run time selectable and can optionally represent multiple species and
     in-phase reactions. The phase system is also run time selectable and can
-    optionally represent different types of momentum, heat and mass transfer.
+    optionally represent different types of momentun, heat and mass transfer.
 
 \*---------------------------------------------------------------------------*/
 

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean

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

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/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/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C

@@ -34,7 +34,7 @@ Description
     but otherwise separate properties. The type of phase model is run time
     selectable and can optionally represent multiple species and in-phase
     reactions. The phase system is also run time selectable and can optionally
-    represent different types of momentum, heat and mass transfer.
+    represent different types of momentun, heat and mass transfer.
 
 \*---------------------------------------------------------------------------*/
 

applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean

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

applications/solvers/multiphase/twoPhaseEulerFoam/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/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,13 +46,12 @@ Foam::aspectRatioModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "aspectRatioModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown aspectRatioModel type "
+            << modelType << nl << nl
+            << "Valid aspectRatioModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.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.
@@ -46,13 +45,12 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "dragModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown dragModel type "
+            << modelType << nl << nl
+            << "Valid dragModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair, true);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.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.
@@ -46,13 +45,12 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "heatTransferModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown heatTransferModel type "
+            << modelType << nl << nl
+            << "Valid heatTransferModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,13 +45,12 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "liftModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown liftModel type "
+            << modelType << nl << nl
+            << "Valid liftModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,13 +46,12 @@ Foam::swarmCorrection::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "swarmCorrection",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown swarmCorrection type "
+            << modelType << nl << nl
+            << "Valid swarmCorrection types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,13 +46,12 @@ Foam::turbulentDispersionModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "turbulentDispersionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown turbulentDispersionModel type "
+            << modelType << nl << nl
+            << "Valid turbulentDispersionModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,13 +45,12 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "virtualMassModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown virtualMassModel type "
+            << modelType << nl << nl
+            << "Valid virtualMassModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair, true);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,13 +45,12 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "wallLubricationModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown wallLubricationModel type "
+            << modelType << nl << nl
+            << "Valid wallLubricationModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return cstrIter()(dict, pair);

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.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.
@@ -44,13 +43,12 @@ Foam::kineticTheoryModels::conductivityModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "conductivityModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown conductivityModel type "
+            << modelType << nl << nl
+            << "Valid conductivityModel types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<conductivityModel>(cstrIter()(dict));

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.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.
@@ -44,13 +43,12 @@ Foam::kineticTheoryModels::frictionalStressModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "frictionalStressModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown frictionalStressModel type "
+            << modelType << nl << nl
+            << "Valid frictionalStressModelType types :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<frictionalStressModel>(cstrIter()(dict));

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.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.
@@ -44,13 +43,12 @@ Foam::kineticTheoryModels::granularPressureModel::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "granularPressureModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
+        FatalErrorInFunction
+            << "Unknown granularPressureModel type "
+            << modelType << nl << nl
+            << "Valid granularPressureModel types :" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<granularPressureModel>(cstrIter()(dict));