diff --git a/bin/Co b/bin/Co index 1941e269d..6f1ce2c1b 100755 --- a/bin/Co +++ b/bin/Co @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the -postProcess solver option:" +echo "$Script has been superseded by the -postProcess solver option:" echo " -func CourantNo" echo "e.g." echo "pimpleFoam -postProcess -func CourantNo" diff --git a/bin/Mach b/bin/Mach index 63b608f20..ffe613bd6 100755 --- a/bin/Mach +++ b/bin/Mach @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the -postProcess solver option:" +echo "$Script has been superseded by the -postProcess solver option:" echo " -func MachNo" echo "e.g." echo "sonicFoam -postProcess -func MachNo" diff --git a/bin/Pe b/bin/Pe index 898147907..b3c3e7de6 100755 --- a/bin/Pe +++ b/bin/Pe @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the -postProcess solver option:" +echo "$Script" "has been superseded by the -postProcess solver option:" echo " -func PecletNo" echo "e.g." echo "pimpleFoam -postProcess -func PecletNo" diff --git a/bin/createTurbulenceFields b/bin/createTurbulenceFields index 432fd6977..0963ec803 100755 --- a/bin/createTurbulenceFields +++ b/bin/createTurbulenceFields @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the \ +echo "$Script has been superseded by the \ '-postProcess' solver command-line option, e.g." echo "simpleFoam -postProcess -func 'turbulenceFields(R, omega)'" diff --git a/bin/foamEtcFile b/bin/foamEtcFile deleted file mode 100755 index 3d3d01864..000000000 --- a/bin/foamEtcFile +++ /dev/null @@ -1,293 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2011-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 . -# -# Script -# foamEtcFile -# -# Description -# Locate user/group/shipped file with semantics similar to the -# ~OpenFOAM/fileName expansion. -# -# The -mode option can be used to allow chaining from -# personal settings to site-wide settings. -# -# For example, within the user ~/.OpenFOAM//prefs.sh: -# \code -# foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh` \ -# && _foamSource $foamPrefs -# \endcode -# -# Note -# This script must exist in $FOAM_INST_DIR/OpenFOAM-/bin/ -# or $FOAM_INST_DIR/openfoam/bin/ (for the debian version) -# -#------------------------------------------------------------------------------- -usage() { - [ "${optQuiet:-$optSilent}" = true ] && exit 1 - - exec 1>&2 - while [ "$#" -ge 1 ]; do echo "$1"; shift; done - cat< any combination of u(user), g(group), o(other) - -prefix specify an alternative installation prefix - -quiet suppress all normal output - -silent suppress all stderr output - -version specify an alternative OpenFOAM version - in the form Maj.Min.Rev (eg, 1.7.0) - -help print the usage - - Locate user/group/shipped file with semantics similar to the - ~OpenFOAM/fileName expansion. - - The options can also be specified as a single character - (eg, '-q' instead of '-quiet'), but must not be grouped. - - Exit status - 0 when the file is found. Print resolved path to stdout. - 1 for miscellaneous errors. - 2 when the file is not found. - -USAGE - exit 1 -} - -#------------------------------------------------------------------------------- - -# the bin dir: -binDir="${0%/*}" - -# the project dir: -projectDir="${binDir%/bin}" - -# the prefix dir (same as $FOAM_INST_DIR): -prefixDir="${projectDir%/*}" - -# the name used for the project directory -projectDirName="${projectDir##*/}" - -# version number used for debian packaging -unset versionNum - -# -# handle standard and debian naming convention -# -case "$projectDirName" in -OpenFOAM-*) # standard naming convention OpenFOAM- - version="${projectDirName##OpenFOAM-}" - ;; - -openfoam[0-9]* | openfoam-dev) # debian naming convention 'openfoam' - versionNum="${projectDirName##openfoam}" - case "$versionNum" in - ??) # convert 2 digit version number to decimal delineated - version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)@\1.\2@') - ;; - ???) # convert 3 digit version number to decimal delineated - version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)@\1.\2.\3@') - ;; - ????) # convert 4 digit version number to decimal delineated - version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)\(.\)@\1.\2.\3.\4@') - ;; - *) # failback - use current environment setting - version="$WM_PROJECT_VERSION" - ;; - esac - ;; - -*) - echo "Error : unknown/unsupported naming convention" - exit 1 - ;; -esac - - -# default mode is 'ugo' -mode=ugo -unset optAll optList optQuiet optSilent - -# parse options -while [ "$#" -gt 0 ] -do - case "$1" in - -h | -help) - usage - ;; - -a | -all) - optAll=true - ;; - -l | -list) - optList=true - ;; - -m | -mode) - [ "$#" -ge 2 ] || usage "'$1' option requires an argument" - mode="$2" - - # sanity check: - case "$mode" in - *u* | *g* | *o* ) - ;; - *) - usage "'$1' option with invalid mode '$mode'" - ;; - esac - shift - ;; - -p | -prefix) - [ "$#" -ge 2 ] || usage "'$1' option requires an argument" - prefixDir="$2" - shift - ;; - -q | -quiet) - optQuiet=true - ;; - -s | -silent) - optSilent=true - ;; - -v | -version) - [ "$#" -ge 2 ] || usage "'$1' option requires an argument" - version="$2" - # convert x.y.z -> xyz version (if installation looked like debian) - if [ -n "$versionNum" ] - then - versionNum=$(echo "$version" | sed -e 's@\.@@g') - fi - shift - ;; - --) - shift - break - ;; - -*) - usage "unknown option: '$*'" - ;; - *) - break - ;; - esac - shift -done - - -# debugging: -# echo "Installed locations:" -# for i in projectDir prefixDir projectDirName version versionNum -# do -# eval echo "$i=\$$i" -# done - - -# Save the essential bits of information -# silently remove leading ~OpenFOAM/ (used in Foam::findEtcFile) -nArgs=$# -fileName="${1#~OpenFOAM/}" - -# Define the various places to be searched: -unset dirList -case "$mode" in -*u*) # user - userDir="$HOME/.${WM_PROJECT:-OpenFOAM}" - dirList="$dirList $userDir/$version $userDir" - ;; -esac - -case "$mode" in -*g*) # group (site) - siteDir="${WM_PROJECT_SITE:-$prefixDir/site}" - dirList="$dirList $siteDir/$version $siteDir" - ;; -esac - -case "$mode" in -*o*) # other (shipped) - if [ -n "$versionNum" ] - then - # debian packaging - dirList="$dirList $prefixDir/openfoam$versionNum/etc" - else - # standard packaging - dirList="$dirList $prefixDir/${WM_PROJECT:-OpenFOAM}-$version/etc" - fi - ;; -esac -set -- $dirList - - -# -# The main routine -# - -exitCode=0 -if [ "$optList" = true ] -then - - # list directories, or potential file locations - [ "$nArgs" -le 1 ] || usage - - # a silly combination, but -quiet does have precedence - [ "$optQuiet" = true ] && exit 0 - - for dir - do - if [ "$nArgs" -eq 1 ] - then - echo "$dir/$fileName" - else - echo "$dir" - fi - done - -else - - [ "$nArgs" -eq 1 ] || usage - - # general error, eg file not found - exitCode=2 - - for dir - do - if [ -f "$dir/$fileName" ] - then - exitCode=0 - if [ "$optQuiet" = true ] - then - break - else - echo "$dir/$fileName" - [ "$optAll" = true ] || break - fi - fi - done - -fi - - -exit $exitCode - -#------------------------------------------------------------------------------ diff --git a/bin/patchAverage b/bin/patchAverage index 784186dac..41aeae28c 100755 --- a/bin/patchAverage +++ b/bin/patchAverage @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" -echo " postProcess -func '"$Script"(name=inlet,p)'" +echo "$Script has been superseded by the postProcess utility:" +echo " postProcess -func '$Script(name=inlet,p)'" #------------------------------------------------------------------------------ diff --git a/bin/patchIntegrate b/bin/patchIntegrate index 10f3842ce..0d51738e6 100755 --- a/bin/patchIntegrate +++ b/bin/patchIntegrate @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" -echo " postProcess -func '"$Script"(name=inlet,p)'" +echo "$Script has been superseded by the postProcess utility:" +echo " postProcess -func '$Script(name=inlet,p)'" #------------------------------------------------------------------------------ diff --git a/bin/probeLocations b/bin/probeLocations index 858604ad4..d6a98e54a 100755 --- a/bin/probeLocations +++ b/bin/probeLocations @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" +echo "$Script has been superseded by the postProcess utility:" echo " postProcess -func probes" echo "or" echo " postProcess -func 'probes(p, U)'" diff --git a/bin/ptot b/bin/ptot index 2dad53c0d..35aaa9cf8 100755 --- a/bin/ptot +++ b/bin/ptot @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" +echo "$Script has been superseded by the postProcess utility:" echo " postProcess -func 'totalPressureIncompressible(U,p)'" echo "or" echo " postProcess -func 'totalPressureCompressible(rho,U,p)'" diff --git a/bin/sample b/bin/sample index cb868992e..ba914f9b7 100755 --- a/bin/sample +++ b/bin/sample @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" +echo "$Script has been superseded by the postProcess utility:" echo " postProcess -func $Script" echo echo "To re-use existing 'sampleDict' files simply add the following entries:" diff --git a/bin/stressComponents b/bin/stressComponents index 45888e256..6612ebf85 100755 --- a/bin/stressComponents +++ b/bin/stressComponents @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the -postProcess solver option:" +echo "$Script has been superseded by the -postProcess solver option:" echo " -funcs '(R components(turbulenceProperties:R))'" echo "e.g." echo "simpleFoam -postProcess -funcs '(R components(turbulenceProperties:R))'" diff --git a/bin/supersededByPostProcess b/bin/supersededByPostProcess index 193c5163f..38ec1a5ad 100755 --- a/bin/supersededByPostProcess +++ b/bin/supersededByPostProcess @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" -echo " postProcess -func" $Script +echo "$Script has been superseded by the postProcess utility:" +echo " postProcess -func $Script" #------------------------------------------------------------------------------ diff --git a/bin/wallGradU b/bin/wallGradU index c44ed73ff..95537be1c 100755 --- a/bin/wallGradU +++ b/bin/wallGradU @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" +echo "$Script has been superseded by the postProcess utility:" echo " postProcess -func 'grad(U)'" #------------------------------------------------------------------------------ diff --git a/bin/wdot b/bin/wdot index d569cbfe6..fe8acdd68 100755 --- a/bin/wdot +++ b/bin/wdot @@ -31,7 +31,7 @@ #------------------------------------------------------------------------------ Script=${0##*/} -echo $Script "has been superseded by the postProcess utility:" +echo "$Script has been superseded by the postProcess utility:" echo "postProcess -func XiReactionRate" #------------------------------------------------------------------------------