foamGet: added directory target for scalar field s

This resolves bug report https://bugs.openfoam.org/view.php?id=3105

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

@@ -146,7 +146,7 @@ void PDRkEpsilon::correct()
     volScalarField GR(drag.Gk());
 
     volScalarField LI
-        (C4_*(Lobs + dimensionedScalar("minLength", dimLength, vSmall)));
+        (C4_*(Lobs + dimensionedScalar("minLength", dimLength, rootVSmall)));
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn

applications/solvers/combustion/PDRFoam/pEqn.H

@@ -11,7 +11,7 @@ if (pimple.transonic())
         fvc::interpolate(psi)
        *(
             fvc::flux(HbyA)
-          + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
+          + fvc::interpolate(betav*rho*rAU)*fvc::ddtCorr(rho, U, phi)
            /fvc::interpolate(rho)
         )
     );
@@ -42,7 +42,7 @@ else
         "phiHbyA",
         (
             fvc::flux(rho*HbyA)
-          + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
+          + fvc::interpolate(betav*rho*rAU)*fvc::ddtCorr(rho, U, phi)
         )
     );
 

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

@@ -22,7 +22,7 @@ surfaceScalarField phiHbyA
 
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-const bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
+const bool closedVolume = mesh.steady() && adjustPhi(phiHbyA, U, p_rgh);
 const bool adjustMass = closedVolume && !thermo.incompressible();
 
 phiHbyA += phig;

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    pimpleDyMFoam.C
+    pimpleFoam
 
 Description
     Transient solver for incompressible, turbulent flow of Newtonian fluids,

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.C

@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    ansysToFoam
+
+Description
+    Converts an ANSYS input mesh file, exported from I-DEAS,
+    to OpenFOAM format.
+
+\*---------------------------------------------------------------------------*/

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

@@ -21,13 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Application
-    ansysToFoam
-
-Description
-    Converts an ANSYS input mesh file, exported from I-DEAS,
-    to OpenFOAM format.
-
 \*---------------------------------------------------------------------------*/
 
 %{

applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.C

@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    fluent3DMeshToFoam
+
+Description
+    Converts a Fluent mesh to OpenFOAM format.
+
+\*---------------------------------------------------------------------------*/

applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L

@@ -21,12 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Application
-    fluent3DMeshToFoam
-
-Description
-    Converts a Fluent mesh to OpenFOAM format.
-
 \*---------------------------------------------------------------------------*/
 
 %{

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.C

@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    fluentMeshToFoam
+
+Description
+    Converts a Fluent mesh to OpenFOAM format
+    including multiple region and region boundary handling.
+
+\*---------------------------------------------------------------------------*/

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

@@ -21,13 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Application
-    fluentMeshToFoam
-
-Description
-    Converts a Fluent mesh to OpenFOAM format
-    including multiple region and region boundary handling.
-
 \*---------------------------------------------------------------------------*/
 
 %{

applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.C

@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    gambitToFoam
+
+Description
+    Converts a GAMBIT mesh to OpenFOAM format.
+
+\*---------------------------------------------------------------------------*/

applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L

@@ -21,12 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Application
-    gambitToFoam
-
-Description
-    Converts a GAMBIT mesh to OpenFOAM format.
-
 \*---------------------------------------------------------------------------*/
 
 %{

bin/foamGet

@@ -146,7 +146,7 @@ searchDirs="\
     $FOAM_ETC/caseDicts"
 
 ext="ANY"
-tgt="system"
+tgt=""
 while [ "$#" -gt 0 ]
 do
    case "$1" in
@@ -185,6 +185,22 @@ done
 [ $# -eq 1 ] || error "missing argument: no file name/prefix <file> supplied"
 prefix="$1"
 
+[ "$tgt" ] || \
+    case "$prefix" in
+       All*)
+          tgt="."
+          ;;
+       *Properties|*Cloud)
+          tgt="constant"
+          ;;
+       s)
+          tgt="0"
+          ;;
+       *)
+          tgt="system"
+          ;;
+    esac
+
 [ -s "system/controlDict" ] || \
     echo "Warning: cannot find OpenFOAM case directory (no system/controlDict file)"
 [ -d "$tgt" ] || error "target directory does not exist: '$tgt'"

bin/foamUpdateCaseFileHeader

@@ -1,145 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     foamUpdateCaseFileHeader
-#
-# Description
-#     Updates the header of application files.
-#     By default, writes current version in the header.
-#     Alternatively version can be specified with -v option.
-#     Also removes consecutive blank lines from file.
-#
-#------------------------------------------------------------------------------
-error() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    usage
-    exit 1
-}
-
-usage() {
-    cat<<USAGE
-
-Usage: ${0##*/} [OPTION] <file1> ... <fileN>
-
-options:
-  -version <ver>    specifies the version to be written in the header
-  -help             print the usage
-
-  Updates the header of application files and removes consecutive blank lines.
-  By default, writes current OpenFOAM version in the header.
-  An alternative version can be specified with the -version option.
-
-USAGE
-}
-
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    -h | -help)
-        usage && exit 0
-        ;;
-    -v | -version)
-        [ "$#" -ge 2 ] || error "'$1' option requires an argument"
-        version="$2"
-        shift 2
-        ;;
-    -*)
-        error "unknown option: '$*'"
-        ;;
-    *)
-        break
-        ;;
-    esac
-done
-
-echo "$version" | grep -Eq '^([0-9]\.[0-9x]|dev)$' || \
-    error "The version number is \"${version}\"." \
-    "The format must be MAJOR.MINOR (e.g. \"$WM_PROJECT_VERSION\" or \"dev\")"
-
-# constant width for version - default to WM_PROJECT_VERSION
-version=$(printf %-36s "${version:-$WM_PROJECT_VERSION}")
-
-[ $# -ge 1 ] || error
-
-printHeader()
-{
-    cat<<HEADER
-/*--------------------------------*- C++ -*----------------------------------*\\
-  =========                 |
-| \\\\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\\\    /   O peration     | Version:  $version  |
-|   \\\\  /    A nd           | Website:  https://openfoam.org                  |
-|    \\\\/     M anipulation  |                                                 |
-\\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      $1;
-    class       $2;
-    object      $3;
-}
-HEADER
-}
-
-
-#
-# extract attribute '$1' from file '$2'
-#
-FoamFileAttribute()
-{
-    sed -n -e 's/[ ;]*$//' -e "s/^ *$1 *//p" "$2"
-}
-
-
-#
-# main
-#
-
-tmpFile=FoamFile.tmp$$
-for caseFile
-do
-    if grep FoamFile $caseFile >/dev/null 2>&1
-    then
-        echo "Updating case file: $caseFile"
-        sed -n '/FoamFile/,/}/p' $caseFile > $tmpFile
-
-        format=$(FoamFileAttribute format $tmpFile)
-        class=$(FoamFileAttribute  class  $tmpFile)
-        object=$(FoamFileAttribute object $tmpFile)
-
-        printHeader "$format" "$class" "$object" > $tmpFile
-
-        sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> $tmpFile
-
-        # use cat to avoid removing/replace soft-links
-        [ -s $tmpFile ] && cat $tmpFile >| $caseFile
-        rm -f $tmpFile 2>/dev/null
-    else
-        echo " Invalid case file: $caseFile" 1>&2
-    fi
-done
-
-#------------------------------------------------------------------------------

doc/Doxygen/Doxyfile

@@ -793,9 +793,7 @@ INPUT_ENCODING         = UTF-8
 # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
 # *.vhdl, *.ucf, *.qsf, *.as and *.js.
 
-FILE_PATTERNS          = *.H \
-                         *.C \
-                         *.dox
+FILE_PATTERNS          = *.H *.C
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -810,7 +808,11 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                =
+EXCLUDE                = \
+    $(WM_PROJECT_DIR)/src/mesh/blockMesh/blockMesh/blockMesh.C \
+    $(WM_PROJECT_DIR)/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C \
+    $(WM_PROJECT_DIR)/src/meshTools/sets/topoSets/topoSet.C \
+    $(WM_PROJECT_DIR)/src/conversion/polyDualMesh/polyDualMesh.C
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1422,7 +1424,7 @@ EXT_LINKS_IN_WINDOW    = NO
 # Minimum value: 8, maximum value: 50, default value: 10.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-FORMULA_FONTSIZE       = 10
+FORMULA_FONTSIZE       = 16
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
@@ -1632,7 +1634,8 @@ PAPER_TYPE             = a4wide
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = $(WM_PROJECT_DIR)/doc/Doxygen/Macros/tensorOperator
+EXTRA_PACKAGES         = $(WM_PROJECT_DIR)/doc/Doxygen/Macros/tensorOperator \
+                         amsmath
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
 # generated LaTeX document. The header should contain everything until the first

etc/caseDicts/general/workflow/Allclean

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source tutorial clean functions
+. "$WM_PROJECT_DIR/bin/tools/CleanFunctions"
+
+# Delete the following:
+# - time directories
+# - constant/polyMesh directory
+# - postProcessing and VTK directories
+# - log files
+# - field files with a ".orig" backup
+cleanCase
+
+#------------------------------------------------------------------------------

etc/caseDicts/general/workflow/Allmesh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source tutorial run functions
+. "$WM_PROJECT_DIR/bin/tools/RunFunctions"
+
+# Example workflow with meshing applications
+runApplication blockMesh
+runApplication topoSet
+runApplication refineMesh -overwrite
+runApplication transformPoints -scale "(0.01 0.01 0.01)"
+
+#------------------------------------------------------------------------------

etc/caseDicts/general/workflow/Allrun

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source tutorial run functions
+. "$WM_PROJECT_DIR/bin/tools/RunFunctions"
+
+# Example with runApplication:
+# - runs blockMesh in background
+# - redirecting standard output to log.blockMesh
+# - does *not* run in log file already exists
+runApplication blockMesh
+
+# Example running topoSet and refineMesh 3 times with multiple dictionaries
+# -a|-append option appends to log file
+i=0
+while [ "$i" -lt 3 ]
+do
+    runApplication -a topoSet -dict "topoSetDict.${i}"
+    runApplication -a refineMesh -dict "refineMeshDict.${i}"
+    i=$(( i + 1))
+done
+
+runApplication decomposePar
+
+# Example with runParallel to run in parallel
+# getApplication finds solver name from "application" entry in controlDict
+runParallel "$(getApplication)"
+
+runApplication reconstructPar
+
+#------------------------------------------------------------------------------

etc/config.sh/aliases

@@ -82,7 +82,7 @@ wmRefresh()
 {
     wmProjectDir=$WM_PROJECT_DIR
     foamSettings=$FOAM_SETTINGS
-    wmUnset
+    . $wmProjectDir/etc/config.sh/unset
     . $wmProjectDir/etc/bashrc $foamSettings
 }
 

etc/controlDict

@@ -24,7 +24,7 @@ Documentation
         "$WM_PROJECT_USER_DIR/html"
         "~OpenFOAM/html"
         "$WM_PROJECT_DIR/doc/Doxygen/html"
-        "http://cpp.openfoam.org/dev"
+        "http://cpp.openfoam.org/v6"
     );
     doxySourceFileExt "_8C.html";
 }

etc/templates/closedVolumeRotating/system/createBafflesDict

@@ -16,6 +16,8 @@ FoamFile
 
 internalFacesOnly true;
 
+fields true;
+
 baffles
 {
     baffleFaces

etc/templates/closedVolumeRotating/system/fvSolution

@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    p
+    "(p|pcorr)"
     {
         solver          GAMG;
         smoother        GaussSeidel;
@@ -32,7 +32,7 @@ solvers
         relTol          0.1;
     }
 
-    pFinal
+    "(p|pcorr)Final"
     {
         $p;
         relTol         0;

etc/templates/inflowOutflowRotating/system/createBafflesDict

@@ -16,6 +16,8 @@ FoamFile
 
 internalFacesOnly true;
 
+fields true;
+
 baffles
 {
     baffleFaces

etc/templates/inflowOutflowRotating/system/fvSolution

@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    p
+    "(p|pcorr)"
     {
         solver          GAMG;
         smoother        GaussSeidel;
@@ -32,7 +32,7 @@ solvers
         relTol          0.1;
     }
 
-    pFinal
+    "(p|pcorr)Final"
     {
         $p;
         relTol         0;

etc/templates/singleFluidCHT/templates/materials/water/thermophysicalProperties

@@ -20,7 +20,7 @@ thermoType
     mixture         pureMixture;
     transport       const;
     thermo          hConst;
-    equationOfState perfectGas;
+    equationOfState perfectFluid;
     specie          specie;
     energy          sensibleEnthalpy;
 }
@@ -32,6 +32,11 @@ mixture
         nMoles      1;
         molWeight   18.0;       // [g/mol]
     }
+    equationOfState
+    {
+        R           3000;      // [J/(kg K)]
+        rho0        1027;      // [kg/m^3]
+    }
     thermodynamics
     {
         Cp          4181;      // [J/(kg K)] at T = 293 K

src/finiteVolume/fields/fvPatchFields/doc/boundaryConditions.dox

@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\page pageBoundaryConditions Boundary Conditions
-\ref grpBoundaryConditions are required to 'close' the simulation problem.
-Careful attention should be applied to their selection so as to create a
-well-posed system of equations, which can be solved numerically.
-
-\section secBoundaryConditionsOverview Overview
-The set of available \ref grpBoundaryConditions comprise of basic, turbulent and
-thermophysical types.
-
-\subsection secBC1 Basic boundary conditions
-    - \ref grpConstraintBoundaryConditions
-    - \ref grpInletBoundaryConditions
-    - \ref grpOutletBoundaryConditions
-    - \ref grpGenericBoundaryConditions
-    - \ref grpCoupledBoundaryConditions
-    - \ref grpWallBoundaryConditions
-
-\subsection secBC2 Turbulent flow boundary conditions
-    - \ref grpRASBoundaryConditions
-
-\subsection secBC3 Thermophysical boundary conditions
-    - \ref grpThermoBoundaryConditions
-
-
-\section secWallFunctions Wall-functions
-Wall-functions in OpenFOAM are modelled as boundary conditions, applied to
-the viscosity for momentum, and thermal diffusivity for energy.
-
-Wall-functions
-    - \ref grpWallFunctions
-
-Thermal wall-functions for incompressible flow
-    - \ref grpIcoWallFunctions
-
-Thermal wall-functions for compressible flow
-    - \ref grpCmpWallFunctions
-
-
-\section secBoundaryConditions Typical usage for pressure-velocity systems
-The choice as to the most appropriate set of boundary conditions is dictated by
-the type of flow problem.  In many cases, multiple possible selections exist;
-the following tables offer suggestions for subsonic flow.
-
-subsonic inlet (flow specified):
-\table
-    Variable             | Symbol | Type
-    pressure             | p      | \link Foam::zeroGradientFvPatchField zeroGradient\endlink
-    velocity             | U      | \link Foam::fixedValueFvPatchField fixedValue\endlink
-    transported property | -      | \link Foam::fixedValueFvPatchField fixedValue\endlink
-    derived property     | -      | \link Foam::calculatedFvPatchField calculated\endlink or \link Foam::zeroGradientFvPatchField zeroGradient\endlink
-\endtable
-
-subsonic outlet:
-\table
-    Variable             | Symbol | Type
-    pressure             | p      | \link Foam::fixedValueFvPatchField fixedValue\endlink
-    velocity             | U      | \link Foam::inletOutletFvPatchField inletOutlet\endlink or \link Foam::pressureInletOutletVelocityFvPatchVectorField pressureInletOutletVelocity\endlink
-    transported property | -      | \link Foam::inletOutletFvPatchField inletOutlet\endlink
-    derived property     | -      | \link Foam::calculatedFvPatchField calculated\endlink or \link Foam::zeroGradientFvPatchField zeroGradient\endlink
-\endtable
-
-wall (impermeable, non-slip):
-\table
-    Variable             | Symbol | Type
-    pressure             | p      | \link Foam::zeroGradientFvPatchField zeroGradient\endlink
-    velocity             | U      | \link Foam::fixedValueFvPatchField fixedValue\endlink
-    transported property | -      | \link Foam::fixedValueFvPatchField fixedValue\endlink
-    derived property     | -      | \link Foam::calculatedFvPatchField calculated\endlink or \link Foam::zeroGradientFvPatchField zeroGradient\endlink
-\endtable
-
-
-\*---------------------------------------------------------------------------*/

src/functionObjects/field/CourantNo/CourantNo.C

@@ -73,48 +73,33 @@ bool Foam::functionObjects::CourantNo::calc()
         const surfaceScalarField& phi =
             lookupObject<surfaceScalarField>(fieldName_);
 
-        tmp<volScalarField::Internal> Coi
+        tmp<volScalarField> tCo
         (
+            new volScalarField
+            (
+                IOobject
+                (
+                    resultName_,
+                    mesh_.time().timeName(),
+                    mesh_
+                ),
+                mesh_,
+                dimensionedScalar("0", dimless, 0.0),
+                zeroGradientFvPatchScalarField::typeName
+            )
+        );
+
+        tCo->ref() =
             byRho
             (
                 (0.5*mesh_.time().deltaT())
                *fvc::surfaceSum(mag(phi))()()
                /mesh_.V()
-            )
-        );
-
-        if (foundObject<volScalarField>(resultName_))
-        {
-            volScalarField& Co = lookupObjectRef<volScalarField>(resultName_);
-
-            Co.ref() = Coi();
-            Co.correctBoundaryConditions();
-        }
-        else
-        {
-            tmp<volScalarField> tCo
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (
-                        resultName_,
-                        mesh_.time().timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    mesh_,
-                    dimensionedScalar("0", dimless, 0.0),
-                    zeroGradientFvPatchScalarField::typeName
-                )
             );
-            tCo.ref().ref() = Coi();
-            tCo.ref().correctBoundaryConditions();
-            mesh_.objectRegistry::store(tCo.ptr());
-        }
 
-        return true;
+        tCo->correctBoundaryConditions();
+
+        return store(resultName_, tCo);
     }
     else
     {

src/functionObjects/field/processorField/processorField.C

@@ -51,25 +51,6 @@ Foam::functionObjects::processorField::processorField
     fvMeshFunctionObject(name, runTime, dict)
 {
     read(dict);
-
-    volScalarField* procFieldPtr
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "processorID",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("0", dimless, 0.0)
-        )
-    );
-
-    mesh_.objectRegistry::store(procFieldPtr);
 }
 
 
@@ -91,10 +72,24 @@ bool Foam::functionObjects::processorField::read(const dictionary& dict)
 
 bool Foam::functionObjects::processorField::execute()
 {
-    mesh_.lookupObjectRef<volScalarField>("processorID") ==
-        dimensionedScalar("proci", dimless, Pstream::myProcNo());
+    word name("processorID");
 
-    return true;
+    tmp<volScalarField> tprocField
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                name,
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar(name, dimless, Pstream::myProcNo())
+        )
+    );
+
+    return store(name, tprocField);
 }
 
 

src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.C

@@ -71,25 +71,6 @@ Foam::functionObjects::turbulenceIntensity::turbulenceIntensity
     logFiles(obr_, name),
     writeLocalObjects(obr_, log)
 {
-    volScalarField* turbulenceIntensityPtr
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "I",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("0", dimless, 0.0)
-        )
-    );
-
-    mesh_.objectRegistry::store(turbulenceIntensityPtr);
-
     read(dict);
     resetName(typeName);
     resetLocalObjectName("I");
@@ -115,9 +96,6 @@ bool Foam::functionObjects::turbulenceIntensity::read(const dictionary& dict)
 
 bool Foam::functionObjects::turbulenceIntensity::execute()
 {
-    volScalarField& turbulenceIntensity =
-        mesh_.lookupObjectRef<volScalarField>("I");
-
     if (mesh_.foundObject<turbulenceModel>(turbulenceModel::propertiesName))
     {
         const turbulenceModel& turbModel = mesh_.lookupObject<turbulenceModel>
@@ -126,12 +104,19 @@ bool Foam::functionObjects::turbulenceIntensity::execute()
         );
 
         volScalarField uPrime(sqrt((2.0/3.0)*turbModel.k()));
-        turbulenceIntensity =
-            uPrime
-           /max
+
+        word name("I");
+
+        return
+            store
             (
-                max(uPrime, mag(turbModel.U())),
-                dimensionedScalar("small", dimVelocity, small)
+                name,
+                uPrime
+               /max
+                (
+                    max(uPrime, mag(turbModel.U())),
+                    dimensionedScalar("small", dimVelocity, small)
+                )
             );
     }
     else
@@ -139,9 +124,9 @@ bool Foam::functionObjects::turbulenceIntensity::execute()
         FatalErrorInFunction
             << "Unable to find turbulence model in the "
             << "database" << exit(FatalError);
-    }
 
-    return true;
+        return false;
+    }
 }
 
 

src/functionObjects/field/wallHeatFlux/wallHeatFlux.C

@@ -58,15 +58,30 @@ void Foam::functionObjects::wallHeatFlux::writeFileHeader(const label i)
 }
 
 
-void Foam::functionObjects::wallHeatFlux::calcHeatFlux
+Foam::tmp<Foam::volScalarField>
+Foam::functionObjects::wallHeatFlux::calcWallHeatFlux
 (
     const volScalarField& alpha,
-    const volScalarField& he,
-    volScalarField& wallHeatFlux
+    const volScalarField& he
 )
 {
+    tmp<volScalarField> twallHeatFlux
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                type(),
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar("0", dimMass/pow3(dimTime), 0)
+        )
+    );
+
     volScalarField::Boundary& wallHeatFluxBf =
-        wallHeatFlux.boundaryFieldRef();
+        twallHeatFlux.ref().boundaryFieldRef();
 
     const volScalarField::Boundary& heBf =
         he.boundaryField();
@@ -97,6 +112,8 @@ void Foam::functionObjects::wallHeatFlux::calcHeatFlux
             }
         }
     }
+
+    return twallHeatFlux;
 }
 
 
@@ -114,25 +131,6 @@ Foam::functionObjects::wallHeatFlux::wallHeatFlux
     writeLocalObjects(obr_, log),
     patchSet_()
 {
-    volScalarField* wallHeatFluxPtr
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                type(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("0", dimMass/pow3(dimTime), 0)
-        )
-    );
-
-    mesh_.objectRegistry::store(wallHeatFluxPtr);
-
     read(dict);
     resetName(typeName);
     resetLocalObjectName(typeName);
@@ -205,7 +203,7 @@ bool Foam::functionObjects::wallHeatFlux::read(const dictionary& dict)
 
 bool Foam::functionObjects::wallHeatFlux::execute()
 {
-    volScalarField& wallHeatFlux = lookupObjectRef<volScalarField>(type());
+    word name(type());
 
     if
     (
@@ -221,11 +219,10 @@ bool Foam::functionObjects::wallHeatFlux::execute()
                 turbulenceModel::propertiesName
             );
 
-        calcHeatFlux
+        return store
         (
-            turbModel.alphaEff(),
-            turbModel.transport().he(),
-            wallHeatFlux
+            name,
+            calcWallHeatFlux(turbModel.alphaEff(), turbModel.transport().he())
         );
     }
     else if (foundObject<solidThermo>(solidThermo::dictName))
@@ -233,7 +230,7 @@ bool Foam::functionObjects::wallHeatFlux::execute()
         const solidThermo& thermo =
             lookupObject<solidThermo>(solidThermo::dictName);
 
-        calcHeatFlux(thermo.alpha(), thermo.he(), wallHeatFlux);
+        return store(name, calcWallHeatFlux(thermo.alpha(), thermo.he()));
     }
     else
     {

src/functionObjects/field/wallHeatFlux/wallHeatFlux.H

@@ -108,11 +108,10 @@ protected:
         virtual void writeFileHeader(const label i);
 
         //- Calculate the heat-flux
-        void calcHeatFlux
+        tmp<volScalarField> calcWallHeatFlux
         (
             const volScalarField& alpha,
-            const volScalarField& he,
-            volScalarField& wallHeatFlux
+            const volScalarField& he
         );
 
 

src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C

@@ -63,15 +63,35 @@ void Foam::functionObjects::wallHeatTransferCoeff::writeFileHeader
 }
 
 
-void Foam::functionObjects::wallHeatTransferCoeff::calcHeatTransferCoeff
+Foam::tmp<Foam::volScalarField>
+Foam::functionObjects::wallHeatTransferCoeff::calcHeatTransferCoeff
 (
     const volScalarField& nu,
-    const volScalarField& nut,
-    volScalarField& wallHeatTransferCoeff
+    const volScalarField& nut
 )
 {
+    tmp<volScalarField> twallHeatTransferCoeff
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                type(),
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar
+            (
+                "0",
+                dimMass/pow3(dimTime)/(dimTemperature/dimLength),
+                0
+            )
+        )
+    );
+
     volScalarField::Boundary& wallHeatTransferCoeffBf =
-        wallHeatTransferCoeff.boundaryFieldRef();
+        twallHeatTransferCoeff.ref().boundaryFieldRef();
 
     const volScalarField::Boundary& nuBf = nu.boundaryField();
     const volScalarField::Boundary& nutBf = nut.boundaryField();
@@ -84,6 +104,8 @@ void Foam::functionObjects::wallHeatTransferCoeff::calcHeatTransferCoeff
                 rho_*Cp_*(nuBf[patchi]/Prl_ + nutBf[patchi]/Prt_);
         }
     }
+
+    return twallHeatTransferCoeff;
 }
 
 
@@ -101,30 +123,6 @@ Foam::functionObjects::wallHeatTransferCoeff::wallHeatTransferCoeff
     writeLocalObjects(obr_, log),
     patchSet_()
 {
-    volScalarField* wallHeatTransferCoeffPtr
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                type(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar
-            (
-                "0",
-                dimMass/pow3(dimTime)/(dimTemperature/dimLength),
-                0
-            )
-        )
-    );
-
-    mesh_.objectRegistry::store(wallHeatTransferCoeffPtr);
-
     read(dict);
     resetName(typeName);
     resetLocalObjectName(typeName);
@@ -202,8 +200,7 @@ bool Foam::functionObjects::wallHeatTransferCoeff::read(const dictionary& dict)
 
 bool Foam::functionObjects::wallHeatTransferCoeff::execute()
 {
-    volScalarField& wallHeatTransferCoeff =
-        lookupObjectRef<volScalarField>(type());
+    word name(type());
 
     if
     (
@@ -219,11 +216,10 @@ bool Foam::functionObjects::wallHeatTransferCoeff::execute()
                 turbulenceModel::propertiesName
             );
 
-        calcHeatTransferCoeff
+        return store
         (
-            turbModel.nu(),
-            turbModel.nut(),
-            wallHeatTransferCoeff
+            name,
+            calcHeatTransferCoeff(turbModel.nu(), turbModel.nut())
         );
     }
     else
@@ -231,9 +227,9 @@ bool Foam::functionObjects::wallHeatTransferCoeff::execute()
         FatalErrorInFunction
             << "Unable to find incompressible turbulence model in the "
             << "database" << exit(FatalError);
-    }
 
-    return true;
+        return false;
+    }
 }
 
 

src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.H

@@ -130,11 +130,10 @@ protected:
         virtual void writeFileHeader(const label i);
 
         //- Calculate the heat transfer coefficient
-        void calcHeatTransferCoeff
+        tmp<volScalarField> calcHeatTransferCoeff
         (
             const volScalarField& nu,
-            const volScalarField& nut,
-            volScalarField& wallHeatTransferCoeff
+            const volScalarField& nut
         );
 
 

src/functionObjects/field/wallShearStress/wallShearStress.C

@@ -57,25 +57,42 @@ void Foam::functionObjects::wallShearStress::writeFileHeader(const label i)
 }
 
 
-void Foam::functionObjects::wallShearStress::calcShearStress
+Foam::tmp<Foam::volVectorField>
+Foam::functionObjects::wallShearStress::calcShearStress
 (
-    const volSymmTensorField& Reff,
-    volVectorField& shearStress
+    const volSymmTensorField& Reff
 )
 {
-    shearStress.dimensions().reset(Reff.dimensions());
+    tmp<volVectorField> twallShearStress
+    (
+        new volVectorField
+        (
+            IOobject
+            (
+                type(),
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedVector("0", Reff.dimensions(), Zero)
+        )
+    );
+
+    volVectorField::Boundary& wallShearStressBf =
+        twallShearStress.ref().boundaryFieldRef();
 
     forAllConstIter(labelHashSet, patchSet_, iter)
     {
         label patchi = iter.key();
 
-        vectorField& ssp = shearStress.boundaryFieldRef()[patchi];
         const vectorField& Sfp = mesh_.Sf().boundaryField()[patchi];
         const scalarField& magSfp = mesh_.magSf().boundaryField()[patchi];
         const symmTensorField& Reffp = Reff.boundaryField()[patchi];
 
-        ssp = (-Sfp/magSfp) & Reffp;
+        wallShearStressBf[patchi] = (-Sfp/magSfp) & Reffp;
     }
+
+    return twallShearStress;
 }
 
 
@@ -93,30 +110,6 @@ Foam::functionObjects::wallShearStress::wallShearStress
     writeLocalObjects(obr_, log),
     patchSet_()
 {
-    volVectorField* wallShearStressPtr
-    (
-        new volVectorField
-        (
-            IOobject
-            (
-                type(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedVector
-            (
-                "0",
-                sqr(dimLength)/sqr(dimTime),
-                Zero
-            )
-        )
-    );
-
-    mesh_.objectRegistry::store(wallShearStressPtr);
-
     read(dict);
     resetName(typeName);
     resetLocalObjectName(typeName);
@@ -192,9 +185,6 @@ bool Foam::functionObjects::wallShearStress::execute()
     typedef compressible::turbulenceModel cmpModel;
     typedef incompressible::turbulenceModel icoModel;
 
-    volVectorField& wallShearStress =
-        mesh_.lookupObjectRef<volVectorField>(type());
-
     tmp<volSymmTensorField> Reff;
     if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
     {
@@ -217,9 +207,9 @@ bool Foam::functionObjects::wallShearStress::execute()
             << "database" << exit(FatalError);
     }
 
-    calcShearStress(Reff(), wallShearStress);
+    word name(type());
 
-    return true;
+    return store(name, calcShearStress(Reff));
 }
 
 

src/functionObjects/field/wallShearStress/wallShearStress.H

@@ -117,10 +117,9 @@ protected:
         virtual void writeFileHeader(const label i);
 
         //- Calculate the shear-stress
-        void calcShearStress
+        tmp<volVectorField> calcShearStress
         (
-            const volSymmTensorField& Reff,
-            volVectorField& shearStress
+            const volSymmTensorField& Reff
         );
 
 

src/functionObjects/field/yPlus/yPlus.C

@@ -62,12 +62,28 @@ void Foam::functionObjects::yPlus::writeFileHeader(const label i)
 }
 
 
-void Foam::functionObjects::yPlus::calcYPlus
+Foam::tmp<Foam::volScalarField> Foam::functionObjects::yPlus::calcYPlus
 (
-    const turbulenceModel& turbModel,
-    volScalarField& yPlus
+    const turbulenceModel& turbModel
 )
 {
+    tmp<volScalarField> tyPlus
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                type(),
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar("0", dimless, 0.0)
+        )
+    );
+
+    volScalarField::Boundary& yPlusBf = tyPlus.ref().boundaryFieldRef();
+
     volScalarField::Boundary d = nearWallDist(mesh_).y();
 
     const volScalarField::Boundary nutBf =
@@ -81,8 +97,6 @@ void Foam::functionObjects::yPlus::calcYPlus
 
     const fvPatchList& patches = mesh_.boundary();
 
-    volScalarField::Boundary& yPlusBf = yPlus.boundaryFieldRef();
-
     forAll(patches, patchi)
     {
         const fvPatch& patch = patches[patchi];
@@ -108,6 +122,8 @@ void Foam::functionObjects::yPlus::calcYPlus
                 )/nuBf[patchi];
         }
     }
+
+    return tyPlus;
 }
 
 
@@ -124,25 +140,6 @@ Foam::functionObjects::yPlus::yPlus
     logFiles(obr_, name),
     writeLocalObjects(obr_, log)
 {
-    volScalarField* yPlusPtr
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                type(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("0", dimless, 0.0)
-        )
-    );
-
-    mesh_.objectRegistry::store(yPlusPtr);
-
     read(dict);
     resetName(typeName);
     resetLocalObjectName(typeName);
@@ -168,9 +165,6 @@ bool Foam::functionObjects::yPlus::read(const dictionary& dict)
 
 bool Foam::functionObjects::yPlus::execute()
 {
-    volScalarField& yPlus =
-        mesh_.lookupObjectRef<volScalarField>(type());
-
     if (mesh_.foundObject<turbulenceModel>(turbulenceModel::propertiesName))
     {
         const turbulenceModel& model = mesh_.lookupObject<turbulenceModel>
@@ -178,7 +172,9 @@ bool Foam::functionObjects::yPlus::execute()
             turbulenceModel::propertiesName
         );
 
-        calcYPlus(model, yPlus);
+        word name(type());
+
+        return store(name, calcYPlus(model));
     }
     else
     {

src/functionObjects/field/yPlus/yPlus.H

@@ -95,10 +95,9 @@ class yPlus
         virtual void writeFileHeader(const label i);
 
         //- Calculate y+
-        void calcYPlus
+        tmp<volScalarField> calcYPlus
         (
-            const turbulenceModel& turbModel,
-            volScalarField& yPlus
+            const turbulenceModel& turbModel
         );
 
         //- Disallow default bitwise copy construct

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C

@@ -349,14 +349,14 @@ bool Foam::KinematicParcel<ParcelType>::move
 
         p.age() += dt;
 
-        if (p.onFace())
+        if (p.active() && p.onFace())
         {
             cloud.functions().postFace(p, ttd.keepParticle);
         }
 
         cloud.functions().postMove(p, dt, start, ttd.keepParticle);
 
-        if (p.onFace() && ttd.keepParticle)
+        if (p.active() && p.onFace() && ttd.keepParticle)
         {
             p.hitFace(s, cloud, ttd);
         }

src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C

@@ -67,7 +67,8 @@ greyDiffusiveRadiationMixedFvPatchScalarField
     (
         p,
         ptf.emissivityMethod(),
-        ptf.emissivity_
+        ptf.emissivity_,
+        mapper
     ),
     TName_(ptf.TName_)
 {}
@@ -143,6 +144,27 @@ greyDiffusiveRadiationMixedFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::radiation::greyDiffusiveRadiationMixedFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    mixedFvPatchScalarField::autoMap(m);
+    radiationCoupledBase::autoMap(m);
+}
+
+
+void Foam::radiation::greyDiffusiveRadiationMixedFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    mixedFvPatchScalarField::rmap(ptf, addr);
+    radiationCoupledBase::rmap(ptf, addr);
+}
+
+
 void Foam::radiation::greyDiffusiveRadiationMixedFvPatchScalarField::
 updateCoeffs()
 {

src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H

@@ -171,6 +171,21 @@ public:
                 return TName_;
             }
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
 
         // Evaluation functions
 

src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C

@@ -58,9 +58,10 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
     (
         patch(),
         ptf.emissivityMethod(),
-        ptf.emissivity_
+        ptf.emissivity_,
+        mapper
     ),
-    qro_(ptf.qro_)
+    qro_(ptf.qro_, mapper)
 {}
 
 
@@ -128,6 +129,32 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::radiation::greyDiffusiveViewFactorFixedValueFvPatchScalarField::
+autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    fixedValueFvPatchScalarField::autoMap(m);
+    radiationCoupledBase::autoMap(m);
+    qro_.autoMap(m);
+}
+
+
+void Foam::radiation::greyDiffusiveViewFactorFixedValueFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    fixedValueFvPatchScalarField::rmap(ptf, addr);
+    radiationCoupledBase::rmap(ptf, addr);
+    const greyDiffusiveViewFactorFixedValueFvPatchScalarField& mrptf =
+        refCast<const greyDiffusiveViewFactorFixedValueFvPatchScalarField>(ptf);
+
+    qro_.rmap(mrptf.qro_, addr);
+}
+
 void Foam::radiation::greyDiffusiveViewFactorFixedValueFvPatchScalarField::
 updateCoeffs()
 {

src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.H

@@ -168,6 +168,20 @@ public:
             }
 
 
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field

src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C

@@ -68,7 +68,8 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField
     (
         p,
         ptf.emissivityMethod(),
-        ptf.emissivity_
+        ptf.emissivity_,
+        mapper
     ),
     TName_(ptf.TName_)
 {}
@@ -147,6 +148,27 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::radiation::wideBandDiffusiveRadiationMixedFvPatchScalarField::
+autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    mixedFvPatchScalarField::autoMap(m);
+    radiationCoupledBase::autoMap(m);
+}
+
+
+void Foam::radiation::wideBandDiffusiveRadiationMixedFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    mixedFvPatchScalarField::rmap(ptf, addr);
+    radiationCoupledBase::rmap(ptf, addr);
+}
+
 void Foam::radiation::wideBandDiffusiveRadiationMixedFvPatchScalarField::
 updateCoeffs()
 {

src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H

@@ -165,6 +165,20 @@ public:
             }
 
 
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field

tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/thermophysicalProperties

@@ -20,7 +20,7 @@ thermoType
     mixture         pureMixture;
     transport       const;
     thermo          hConst;
-    equationOfState perfectGas;
+    equationOfState perfectFluid;
     specie          specie;
     energy          sensibleEnthalpy;
 }
@@ -32,6 +32,11 @@ mixture
         nMoles      1;
         molWeight   18.0;       // [g/mol]
     }
+    equationOfState
+    {
+        R           3000;      // [J/(kg K)]
+        rho0        1027;      // [kg/m^3]
+    }
     thermodynamics
     {
         Cp          4181;      // [J/(kg K)] at T = 293 K

tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict

@@ -33,7 +33,7 @@ writeInterval   1e-2;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  10;
 

tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/U

@@ -34,7 +34,8 @@ boundaryField
 
     wing
     {
-        type            noSlip;
+        type            movingWallVelocity;
+        value           uniform (0 0 0);
     }
 
     #include "include/frontBackTopBottomPatches"

tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict

@@ -33,7 +33,7 @@ writeInterval   100;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  6;
 

tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allmesh

@@ -18,7 +18,7 @@ runApplication -s collapseFaces \
 
 runApplication checkMesh -allTopology -allGeometry -latestTime
 
-latestTime=`foamListTimes -latestTime`
+latestTime="$(foamListTimes -latestTime)"
 
 # Move the mesh into polyMesh
 rm -rf constant/polyMesh

tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
+    \\  /    A nd           | Version:  6
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
 

tutorials/mesh/foamyHexMesh/mixerVessel/Allmesh

@@ -16,9 +16,6 @@ intersectSurfaces()
         surfaceBooleanFeatures "$@" intersection
 }
 
-# Set application name
-application=$(getApplication)
-
 # Run the surface preparation script
 ./constant/triSurface/surfaceProcess.sh > log.surfaceProcess 2>&1
 

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allmesh

@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 # Meshing
 runApplication blockMesh
 runApplication surfaceFeatures

tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh

@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=$(getApplication)
-
 runApplication blockMesh
 
 echo "Creating channel"
@@ -14,7 +12,7 @@ while [ "$i" -lt 3 ] ; do
     cp system/extrudeMeshDict.${i} system/extrudeMeshDict
     echo "Running extrudeMesh, instance" ${i}
     extrudeMesh > log.extrudeMesh.${i}
-    i=`expr $i + 1`
+    i=$((i + 1))
 done
 
 #------------------------------------------------------------------------------