diff --git a/bin/Co b/bin/Co
deleted file mode 100755
index a340dbcc0baaa6a182d1495e152963b4376ead83..0000000000000000000000000000000000000000
--- a/bin/Co
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# Co
-#
-# Description
-# Script to suggest using the new "-postProcess" solver option.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the -postProcess solver option:"
-echo "<solverName> -func CourantNo"
-echo "e.g."
-echo "pimpleFoam -postProcess -func CourantNo"
-
-#------------------------------------------------------------------------------
diff --git a/bin/Co b/bin/Co
new file mode 120000
index 0000000000000000000000000000000000000000..e575b13fb589e1fd45abb5f7f48c3c63b76d5a3c
--- /dev/null
+++ b/bin/Co
@@ -0,0 +1 @@
+deprecated/Co
\ No newline at end of file
diff --git a/bin/Lambda2 b/bin/Lambda2
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..14361924c1decc04d9c9f8677f18115ec240153c 120000
--- a/bin/Lambda2
+++ b/bin/Lambda2
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/Lambda2
\ No newline at end of file
diff --git a/bin/Mach b/bin/Mach
deleted file mode 100755
index 85f5b2848aecb0d0adaac5f0e6d82c8afccc104a..0000000000000000000000000000000000000000
--- a/bin/Mach
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# Mach
-#
-# Description
-# Script to suggest using the new "-postProcess" solver option.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the -postProcess solver option:"
-echo "<solverName> -func MachNo"
-echo "e.g."
-echo "sonicFoam -postProcess -func MachNo"
-
-#------------------------------------------------------------------------------
diff --git a/bin/Mach b/bin/Mach
new file mode 120000
index 0000000000000000000000000000000000000000..a780ea0a91c41cc002e078f765be6cfc1ace2402
--- /dev/null
+++ b/bin/Mach
@@ -0,0 +1 @@
+deprecated/Mach
\ No newline at end of file
diff --git a/bin/Pe b/bin/Pe
deleted file mode 100755
index 6313220895cc3a1895d6ee66f937c1c4b9b604f7..0000000000000000000000000000000000000000
--- a/bin/Pe
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# Pe
-#
-# Description
-# Script to suggest using the new "-postProcess" solver option.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the -postProcess solver option:"
-echo "<solverName> -func PecletNo"
-echo "e.g."
-echo "pimpleFoam -postProcess -func PecletNo"
-
-#------------------------------------------------------------------------------
diff --git a/bin/Pe b/bin/Pe
new file mode 120000
index 0000000000000000000000000000000000000000..78e3ff2dc661b3dfba287f3ba21bf90b36a0f142
--- /dev/null
+++ b/bin/Pe
@@ -0,0 +1 @@
+deprecated/Pe
\ No newline at end of file
diff --git a/bin/Q b/bin/Q
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..a0ae7b33e18365fa90e43319457baff5b53b79a7 120000
--- a/bin/Q
+++ b/bin/Q
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/Q
\ No newline at end of file
diff --git a/bin/R b/bin/R
index ff6b4704c676ee88d208606b8f93dbb37e4fe62e..cde1a96978c5a80958591c6c8b7e2dfb4359be5e 120000
--- a/bin/R
+++ b/bin/R
@@ -1 +1 @@
-supercededByPostProcessOption
\ No newline at end of file
+deprecated/R
\ No newline at end of file
diff --git a/bin/createTurbulenceFields b/bin/createTurbulenceFields
deleted file mode 100755
index 0c0eaa9db66e00889feb99e459110327a0d05ff0..0000000000000000000000000000000000000000
--- a/bin/createTurbulenceFields
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# createTurbulenceFields
-#
-# Description
-# Replacement script to suggest using the new "-postProcess"
-# solver command-line option.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the \
-'-postProcess' solver command-line option, e.g."
-
-echo "simpleFoam -postProcess -func 'turbulenceFields(R, omega)'"
-
-#------------------------------------------------------------------------------
diff --git a/bin/createTurbulenceFields b/bin/createTurbulenceFields
new file mode 120000
index 0000000000000000000000000000000000000000..008ddca6e97c9daaf037ff0bf4f3b22b1846a13e
--- /dev/null
+++ b/bin/createTurbulenceFields
@@ -0,0 +1 @@
+deprecated/createTurbulenceFields
\ No newline at end of file
diff --git a/bin/deprecated/Co b/bin/deprecated/Co
new file mode 100755
index 0000000000000000000000000000000000000000..a340dbcc0baaa6a182d1495e152963b4376ead83
--- /dev/null
+++ b/bin/deprecated/Co
@@ -0,0 +1,39 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# Co
+#
+# Description
+# Script to suggest using the new "-postProcess" solver option.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the -postProcess solver option:"
+echo "<solverName> -func CourantNo"
+echo "e.g."
+echo "pimpleFoam -postProcess -func CourantNo"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/Lambda2 b/bin/deprecated/Lambda2
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/Lambda2
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/deprecated/Mach b/bin/deprecated/Mach
new file mode 100755
index 0000000000000000000000000000000000000000..85f5b2848aecb0d0adaac5f0e6d82c8afccc104a
--- /dev/null
+++ b/bin/deprecated/Mach
@@ -0,0 +1,39 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# Mach
+#
+# Description
+# Script to suggest using the new "-postProcess" solver option.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the -postProcess solver option:"
+echo "<solverName> -func MachNo"
+echo "e.g."
+echo "sonicFoam -postProcess -func MachNo"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/Pe b/bin/deprecated/Pe
new file mode 100755
index 0000000000000000000000000000000000000000..6313220895cc3a1895d6ee66f937c1c4b9b604f7
--- /dev/null
+++ b/bin/deprecated/Pe
@@ -0,0 +1,39 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# Pe
+#
+# Description
+# Script to suggest using the new "-postProcess" solver option.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the -postProcess solver option:"
+echo "<solverName> -func PecletNo"
+echo "e.g."
+echo "pimpleFoam -postProcess -func PecletNo"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/Q b/bin/deprecated/Q
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/Q
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/deprecated/R b/bin/deprecated/R
new file mode 120000
index 0000000000000000000000000000000000000000..ff6b4704c676ee88d208606b8f93dbb37e4fe62e
--- /dev/null
+++ b/bin/deprecated/R
@@ -0,0 +1 @@
+supercededByPostProcessOption
\ No newline at end of file
diff --git a/bin/deprecated/createTurbulenceFields b/bin/deprecated/createTurbulenceFields
new file mode 100755
index 0000000000000000000000000000000000000000..0c0eaa9db66e00889feb99e459110327a0d05ff0
--- /dev/null
+++ b/bin/deprecated/createTurbulenceFields
@@ -0,0 +1,40 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# createTurbulenceFields
+#
+# Description
+# Replacement script to suggest using the new "-postProcess"
+# solver command-line option.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the \
+'-postProcess' solver command-line option, e.g."
+
+echo "simpleFoam -postProcess -func 'turbulenceFields(R, omega)'"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/enstrophy b/bin/deprecated/enstrophy
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/enstrophy
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/deprecated/execFlowFunctionObjects b/bin/deprecated/execFlowFunctionObjects
new file mode 100755
index 0000000000000000000000000000000000000000..79e4117527794f5b7ac9e60a3d2b8a9d69ec5918
--- /dev/null
+++ b/bin/deprecated/execFlowFunctionObjects
@@ -0,0 +1,40 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# execFlowFunctionObjects
+#
+# Description
+# Replacement execFlowFunctionObjects to suggest using the "-postProcess"
+# solver command-line option.
+#
+#------------------------------------------------------------------------------
+
+echo "execFlowFunctionObjects has been superceded by the \
+'-postProcess' solver command-line option, e.g."
+
+echo "simpleFoam -help -postProcess"
+simpleFoam -help -postProcess
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/flowType b/bin/deprecated/flowType
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/flowType
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/deprecated/foamCalc b/bin/deprecated/foamCalc
new file mode 100755
index 0000000000000000000000000000000000000000..2eac41bce7d09c1cccc80e4d017aaec067be2221
--- /dev/null
+++ b/bin/deprecated/foamCalc
@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# foamCalc
+#
+# Description
+# Replacement foamCalc to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+
+echo "foamCalc has been superceded by the postProcess utility:"
+echo " postProcess -help"
+postProcess -help
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/foamDebugSwitches b/bin/deprecated/foamDebugSwitches
new file mode 100755
index 0000000000000000000000000000000000000000..a8b1a6f6706d47cbd06d647ca65fac71a6159819
--- /dev/null
+++ b/bin/deprecated/foamDebugSwitches
@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# foamDebugSwitches
+#
+# Description
+# Script to suggest using the new "foamList" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the foamList utility:"
+echo "foamList -debug"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/patchAverage b/bin/deprecated/patchAverage
new file mode 100755
index 0000000000000000000000000000000000000000..d8d4600a1a3ef64c6f9f25f33a6b1cb6a503d61e
--- /dev/null
+++ b/bin/deprecated/patchAverage
@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# patchAverage
+#
+# Description
+# Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the postProcess utility:"
+echo " postProcess -func '"$Script"(name=inlet,p)'"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/patchIntegrate b/bin/deprecated/patchIntegrate
new file mode 100755
index 0000000000000000000000000000000000000000..7ea9d142d5d33e2e77ad154c06a2a143e2e0223a
--- /dev/null
+++ b/bin/deprecated/patchIntegrate
@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# patchIntegrate
+#
+# Description
+# Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the postProcess utility:"
+echo " postProcess -func '"$Script"(name=inlet,p)'"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/probeLocations b/bin/deprecated/probeLocations
new file mode 100755
index 0000000000000000000000000000000000000000..352604ed28286ea9172617dde549866f8a97ad03
--- /dev/null
+++ b/bin/deprecated/probeLocations
@@ -0,0 +1,39 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# probeLocations
+#
+# Description
+# Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the postProcess utility:"
+echo " postProcess -func probes"
+echo "or"
+echo " postProcess -func 'probes(p, U)'"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/ptot b/bin/deprecated/ptot
new file mode 100755
index 0000000000000000000000000000000000000000..b76b3f4400a6c290cc0be10a9736aad420e41f91
--- /dev/null
+++ b/bin/deprecated/ptot
@@ -0,0 +1,39 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# ptot
+#
+# Description
+# Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the postProcess utility:"
+echo " postProcess -func 'totalPressureIncompressible(U,p)'"
+echo "or"
+echo " postProcess -func 'totalPressureCompressible(rho,U,p)'"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/sample b/bin/deprecated/sample
new file mode 100755
index 0000000000000000000000000000000000000000..e96d79a7f677c15f4765eaa610d07bfc68ee6c50
--- /dev/null
+++ b/bin/deprecated/sample
@@ -0,0 +1,43 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 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
+# probeLocations
+#
+# Description
+# Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superceded by the postProcess utility:"
+echo " postProcess -func $Script"
+echo
+echo "To re-use existing 'sampleDict' files simply add the following entries:"
+echo " type sets;"
+echo " libs (\"libsampling.so\");"
+echo "and run"
+echo " postProcess -func sampleDict"
+
+#------------------------------------------------------------------------------
diff --git a/bin/deprecated/streamFunction b/bin/deprecated/streamFunction
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/streamFunction
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/supercededByPostProcess b/bin/deprecated/supercededByPostProcess
similarity index 100%
rename from bin/supercededByPostProcess
rename to bin/deprecated/supercededByPostProcess
diff --git a/bin/supercededByPostProcessOption b/bin/deprecated/supercededByPostProcessOption
similarity index 100%
rename from bin/supercededByPostProcessOption
rename to bin/deprecated/supercededByPostProcessOption
diff --git a/bin/deprecated/vorticity b/bin/deprecated/vorticity
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/vorticity
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/deprecated/wallHeatFlux b/bin/deprecated/wallHeatFlux
new file mode 120000
index 0000000000000000000000000000000000000000..ff6b4704c676ee88d208606b8f93dbb37e4fe62e
--- /dev/null
+++ b/bin/deprecated/wallHeatFlux
@@ -0,0 +1 @@
+supercededByPostProcessOption
\ No newline at end of file
diff --git a/bin/deprecated/wallShearStress b/bin/deprecated/wallShearStress
new file mode 120000
index 0000000000000000000000000000000000000000..ff6b4704c676ee88d208606b8f93dbb37e4fe62e
--- /dev/null
+++ b/bin/deprecated/wallShearStress
@@ -0,0 +1 @@
+supercededByPostProcessOption
\ No newline at end of file
diff --git a/bin/deprecated/writeCellCentres b/bin/deprecated/writeCellCentres
new file mode 120000
index 0000000000000000000000000000000000000000..7b00da8e40ebd1030970ddd69f73d5a820da0dee
--- /dev/null
+++ b/bin/deprecated/writeCellCentres
@@ -0,0 +1 @@
+supercededByPostProcess
\ No newline at end of file
diff --git a/bin/deprecated/yPlus b/bin/deprecated/yPlus
new file mode 120000
index 0000000000000000000000000000000000000000..ff6b4704c676ee88d208606b8f93dbb37e4fe62e
--- /dev/null
+++ b/bin/deprecated/yPlus
@@ -0,0 +1 @@
+supercededByPostProcessOption
\ No newline at end of file
diff --git a/bin/enstrophy b/bin/enstrophy
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..3c4b1df251b8ae002c939e3c8e6be15b15624bcf 120000
--- a/bin/enstrophy
+++ b/bin/enstrophy
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/enstrophy
\ No newline at end of file
diff --git a/bin/execFlowFunctionObjects b/bin/execFlowFunctionObjects
deleted file mode 100755
index 79e4117527794f5b7ac9e60a3d2b8a9d69ec5918..0000000000000000000000000000000000000000
--- a/bin/execFlowFunctionObjects
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# execFlowFunctionObjects
-#
-# Description
-# Replacement execFlowFunctionObjects to suggest using the "-postProcess"
-# solver command-line option.
-#
-#------------------------------------------------------------------------------
-
-echo "execFlowFunctionObjects has been superceded by the \
-'-postProcess' solver command-line option, e.g."
-
-echo "simpleFoam -help -postProcess"
-simpleFoam -help -postProcess
-
-#------------------------------------------------------------------------------
diff --git a/bin/execFlowFunctionObjects b/bin/execFlowFunctionObjects
new file mode 120000
index 0000000000000000000000000000000000000000..ff820179432372c1a4f1b6bab9bbf888211387c6
--- /dev/null
+++ b/bin/execFlowFunctionObjects
@@ -0,0 +1 @@
+deprecated/execFlowFunctionObjects
\ No newline at end of file
diff --git a/bin/flowType b/bin/flowType
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..cf8bfb7d33cbe5c6c0f6dae60f3547b5ff9c8df6 120000
--- a/bin/flowType
+++ b/bin/flowType
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/flowType
\ No newline at end of file
diff --git a/bin/foamCalc b/bin/foamCalc
deleted file mode 100755
index 2eac41bce7d09c1cccc80e4d017aaec067be2221..0000000000000000000000000000000000000000
--- a/bin/foamCalc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# foamCalc
-#
-# Description
-# Replacement foamCalc to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-
-echo "foamCalc has been superceded by the postProcess utility:"
-echo " postProcess -help"
-postProcess -help
-
-#------------------------------------------------------------------------------
diff --git a/bin/foamCalc b/bin/foamCalc
new file mode 120000
index 0000000000000000000000000000000000000000..40110e155c0a219be33dbeab36729414b5d6bbac
--- /dev/null
+++ b/bin/foamCalc
@@ -0,0 +1 @@
+deprecated/foamCalc
\ No newline at end of file
diff --git a/bin/foamDebugSwitches b/bin/foamDebugSwitches
deleted file mode 100755
index a8b1a6f6706d47cbd06d647ca65fac71a6159819..0000000000000000000000000000000000000000
--- a/bin/foamDebugSwitches
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# foamDebugSwitches
-#
-# Description
-# Script to suggest using the new "foamList" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the foamList utility:"
-echo "foamList -debug"
-
-#------------------------------------------------------------------------------
diff --git a/bin/foamDebugSwitches b/bin/foamDebugSwitches
new file mode 120000
index 0000000000000000000000000000000000000000..998194fb7243b49016698b58ad6e8d8f55465f15
--- /dev/null
+++ b/bin/foamDebugSwitches
@@ -0,0 +1 @@
+deprecated/foamDebugSwitches
\ No newline at end of file
diff --git a/bin/foamSearch b/bin/foamSearch
index e458385db2ad4864091fd3e7727ef69f0e75fc7d..504670d74a80855388c2e6e5abf9c95aa833bb38 100755
--- a/bin/foamSearch
+++ b/bin/foamSearch
@@ -32,12 +32,11 @@
# Requires foamDictionary.
#
#------------------------------------------------------------------------------
-Script=${0##*/}
-
usage() {
+ exec 1>&2
while [ "$#" -ge 1 ]; do echo "$1"; shift; done
cat<<USAGE
-Usage: $Script [OPTIONS] <directory> <keyword> <file>
+Usage: ${0##*/} [OPTIONS] <directory> <keyword> <file>
Options:
-c | -count prefix lines by the number of occurrences
@@ -48,43 +47,58 @@ Options:
Examples:
* Default ddtSchemes entries in the fvSchemes files in all tutorials:
- foamSearch $FOAM_TUTORIALS ddtSchemes.default fvSchemes
+ foamSearch \$FOAM_TUTORIALS ddtSchemes.default fvSchemes
* Relaxations factors for U in fvSolutions files in all tutorials:
- foamSearch -c $FOAM_TUTORIALS relaxationFactors.equations.U fvSolution
+ foamSearch -c \$FOAM_TUTORIALS relaxationFactors.equations.U fvSolution
USAGE
exit 1
}
-case "$1" in
-(-c | -count)
- COUNT="-c"
- shift
- ;;
-(-h | -help)
- usage
- ;;
--*)
- usage "$1 is not a valid option/filename"
- ;;
-esac
+
+#------------------------------------------------------------------------------
+unset optCount
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+ case "$1" in
+ -h | -help)
+ usage
+ ;;
+ -c | -count)
+ optCount="-c"
+ shift
+ ;;
+ -*)
+ usage "unknown option: '$1'"
+ ;;
+ *)
+ break
+ ;;
+ esac
+done
[ "$#" -eq 3 ] || usage "Wrong number of arguments: expected 3, found $#"
[ -d "$1" ] || usage "$1 is not a directory"
-TEMP=temp.$$
-FILES=$(find $1 -name $3)
-[ -n "$FILES" ] || usage "No file $3 found in $1"
+dirName="$1"
+key="$2"
+fileName="$3"
-for F in $FILES
-do
- foamDictionary -entry $2 $F 2>/dev/null >> $TEMP
-done
+fileList=$(find $dirName -name $fileName -type f)
+[ -n "$fileList" ] || usage "No file $fileName found in $dir"
-[ -s "$TEMP" ] && \
- sort $TEMP | uniq $COUNT | sed '/^[\t 1-9]*$/d' || \
- echo "No keyword $2 found in $3 files"
+tmpFile=temp.$$
+trap "rm -f $tmpFile 2>/dev/null; exit 0" EXIT TERM INT
+
+for i in $fileList
+do
+ foamDictionary -entry "$key" $i 2>/dev/null
+done > $tmpFile
-rm $TEMP 2>/dev/null
+[ -s "$tmpFile" ] && \
+ sort $tmpFile | uniq $optCount | sed '/^[\t 1-9]*$/d' || \
+ echo "No keyword '$key' found in '$fileName' files" 1>&2
#------------------------------------------------------------------------------
diff --git a/bin/patchAverage b/bin/patchAverage
deleted file mode 100755
index d8d4600a1a3ef64c6f9f25f33a6b1cb6a503d61e..0000000000000000000000000000000000000000
--- a/bin/patchAverage
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# patchAverage
-#
-# Description
-# Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the postProcess utility:"
-echo " postProcess -func '"$Script"(name=inlet,p)'"
-
-#------------------------------------------------------------------------------
diff --git a/bin/patchAverage b/bin/patchAverage
new file mode 120000
index 0000000000000000000000000000000000000000..56f120034e1e8cad025936f2162256c854a8dd27
--- /dev/null
+++ b/bin/patchAverage
@@ -0,0 +1 @@
+deprecated/patchAverage
\ No newline at end of file
diff --git a/bin/patchIntegrate b/bin/patchIntegrate
deleted file mode 100755
index 7ea9d142d5d33e2e77ad154c06a2a143e2e0223a..0000000000000000000000000000000000000000
--- a/bin/patchIntegrate
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# patchIntegrate
-#
-# Description
-# Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the postProcess utility:"
-echo " postProcess -func '"$Script"(name=inlet,p)'"
-
-#------------------------------------------------------------------------------
diff --git a/bin/patchIntegrate b/bin/patchIntegrate
new file mode 120000
index 0000000000000000000000000000000000000000..86bf0e1807d6885fad98707fd9f57a6eba668df7
--- /dev/null
+++ b/bin/patchIntegrate
@@ -0,0 +1 @@
+deprecated/patchIntegrate
\ No newline at end of file
diff --git a/bin/probeLocations b/bin/probeLocations
deleted file mode 100755
index 352604ed28286ea9172617dde549866f8a97ad03..0000000000000000000000000000000000000000
--- a/bin/probeLocations
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# probeLocations
-#
-# Description
-# Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the postProcess utility:"
-echo " postProcess -func probes"
-echo "or"
-echo " postProcess -func 'probes(p, U)'"
-
-#------------------------------------------------------------------------------
diff --git a/bin/probeLocations b/bin/probeLocations
new file mode 120000
index 0000000000000000000000000000000000000000..b0ae936d8c919784bdd39ad18d951275085167fe
--- /dev/null
+++ b/bin/probeLocations
@@ -0,0 +1 @@
+deprecated/probeLocations
\ No newline at end of file
diff --git a/bin/ptot b/bin/ptot
deleted file mode 100755
index b76b3f4400a6c290cc0be10a9736aad420e41f91..0000000000000000000000000000000000000000
--- a/bin/ptot
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# ptot
-#
-# Description
-# Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the postProcess utility:"
-echo " postProcess -func 'totalPressureIncompressible(U,p)'"
-echo "or"
-echo " postProcess -func 'totalPressureCompressible(rho,U,p)'"
-
-#------------------------------------------------------------------------------
diff --git a/bin/ptot b/bin/ptot
new file mode 120000
index 0000000000000000000000000000000000000000..8d3449ff63d2674aa81dae9bcd425247a2a77af4
--- /dev/null
+++ b/bin/ptot
@@ -0,0 +1 @@
+deprecated/ptot
\ No newline at end of file
diff --git a/bin/sample b/bin/sample
deleted file mode 100755
index e96d79a7f677c15f4765eaa610d07bfc68ee6c50..0000000000000000000000000000000000000000
--- a/bin/sample
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# ========= |
-# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
-# \\ / O peration |
-# \\ / A nd | Copyright (C) 2016 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
-# probeLocations
-#
-# Description
-# Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superceded by the postProcess utility:"
-echo " postProcess -func $Script"
-echo
-echo "To re-use existing 'sampleDict' files simply add the following entries:"
-echo " type sets;"
-echo " libs (\"libsampling.so\");"
-echo "and run"
-echo " postProcess -func sampleDict"
-
-#------------------------------------------------------------------------------
diff --git a/bin/sample b/bin/sample
new file mode 120000
index 0000000000000000000000000000000000000000..3cf64426e386e375580b76bb58dd8786170f4751
--- /dev/null
+++ b/bin/sample
@@ -0,0 +1 @@
+deprecated/sample
\ No newline at end of file
diff --git a/bin/streamFunction b/bin/streamFunction
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..1670122cfd0fa100ac2da52d58146de683420eb3 120000
--- a/bin/streamFunction
+++ b/bin/streamFunction
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/streamFunction
\ No newline at end of file
diff --git a/bin/vorticity b/bin/vorticity
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..2a65ebaac6667155de7e5a9cf7fcdd568930e08c 120000
--- a/bin/vorticity
+++ b/bin/vorticity
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/vorticity
\ No newline at end of file
diff --git a/bin/wallHeatFlux b/bin/wallHeatFlux
index ff6b4704c676ee88d208606b8f93dbb37e4fe62e..f5445f1117aaa585e7bc5a619da7251d309fa9b6 120000
--- a/bin/wallHeatFlux
+++ b/bin/wallHeatFlux
@@ -1 +1 @@
-supercededByPostProcessOption
\ No newline at end of file
+deprecated/wallHeatFlux
\ No newline at end of file
diff --git a/bin/wallShearStress b/bin/wallShearStress
index ff6b4704c676ee88d208606b8f93dbb37e4fe62e..31456be8313e34f335a4d9892a021c07ad758752 120000
--- a/bin/wallShearStress
+++ b/bin/wallShearStress
@@ -1 +1 @@
-supercededByPostProcessOption
\ No newline at end of file
+deprecated/wallShearStress
\ No newline at end of file
diff --git a/bin/writeCellCentres b/bin/writeCellCentres
index 7b00da8e40ebd1030970ddd69f73d5a820da0dee..807b2c74fd29503998f48db02c3d305f2d84e39c 120000
--- a/bin/writeCellCentres
+++ b/bin/writeCellCentres
@@ -1 +1 @@
-supercededByPostProcess
\ No newline at end of file
+deprecated/writeCellCentres
\ No newline at end of file
diff --git a/bin/yPlus b/bin/yPlus
index ff6b4704c676ee88d208606b8f93dbb37e4fe62e..e002dec748cf04bfdab0163ff9e71676488d59e7 120000
--- a/bin/yPlus
+++ b/bin/yPlus
@@ -1 +1 @@
-supercededByPostProcessOption
\ No newline at end of file
+deprecated/yPlus
\ No newline at end of file