diff --git a/wmake/makefiles/files b/wmake/makefiles/files index 22c6a05f5ea8c8be898e99cbf82490a775dfe54d..521d9341ad30718b9deca408ab1361b8c42afb92 100644 --- a/wmake/makefiles/files +++ b/wmake/makefiles/files @@ -34,7 +34,7 @@ include $(GENERAL_RULES)/general #------------------------------------------------------------------------------ -# declare names of make system control files derived from file 'files' +# Declare names of make system control files derived from file 'files' #------------------------------------------------------------------------------ OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS) diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles index c5b99db9cf233674c115d1e82ae015c324897c19..62f21baf937f7e6395d72aff94d7417421339996 100755 --- a/wmake/scripts/makeFiles +++ b/wmake/scripts/makeFiles @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -47,7 +47,7 @@ for dir in `find . -type d -print` do case "$dir" in . | ./Make | ./lnInclude ) - # skip special directories + # Skip special directories ;; *) baseDir=`echo $dir | sed 's%^\./%%'` diff --git a/wmake/wmakeFilesAndOptions b/wmake/wmakeFilesAndOptions index 560f2c1ad687de6a588a86c9b0d2bbc2b8af598d..488c211ab4e5ba93725b6adb3388d4dc36e15ee0 100755 --- a/wmake/wmakeFilesAndOptions +++ b/wmake/wmakeFilesAndOptions @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -56,7 +56,7 @@ USAGE while [ "$#" -gt 0 ] do case "$1" in - -h | -help) # provide immediate help + -h | -help) # Provide immediate help usage ;; -*) diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude index 05d2b9f5169dfa55d3b6b54d374b578654930063..28f4276b9dd52e28c537c32ff02c0331a45e0b3d 100755 --- a/wmake/wmakeLnInclude +++ b/wmake/wmakeLnInclude @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -78,7 +78,7 @@ unset update silentOpt while [ "$#" -gt 0 ] do case "$1" in - -h | -help) # provide immediate help + -h | -help) # Provide immediate help usage ;; -u | -update) diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll index 2aa833c8d628d22194c5b659b7e9572b625359b0..7c4c3fa8ac8d120d029401ed214b9e598fed41ea 100755 --- a/wmake/wmakeLnIncludeAll +++ b/wmake/wmakeLnIncludeAll @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -58,7 +58,7 @@ findName=lnInclude while [ "$#" -gt 0 ] do case "$1" in - -h | -help) # provide immediate help + -h | -help) # Provide immediate help usage ;; -*) diff --git a/wmake/wmakeScheduler b/wmake/wmakeScheduler index 11a22009c408d38b1f77199e8fcbe2f550269748..a927af7a3780d8e02bfa3e436f638202e3c9467d 100755 --- a/wmake/wmakeScheduler +++ b/wmake/wmakeScheduler @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -108,8 +108,8 @@ fi # Construct test string for remote execution. # Source WM_PROJECT settings if WM_PROJECT environment not set. -# attempt to preserve the installation directory 'FOAM_INST_DIR' -# use FOAM_SETTINGS to pass command-line settings +# Attempt to preserve the installation directory 'FOAM_INST_DIR' +# Use FOAM_SETTINGS to pass command-line settings case $sourceFoam in */bashrc) if [ "$FOAM_INST_DIR" ] diff --git a/wmake/wmakeSchedulerUptime b/wmake/wmakeSchedulerUptime index 1ef11f97b3f9c324ab65494d306ea37036f41bcc..6239f9e65c42c9978da63803354a3708057eddf1 100755 --- a/wmake/wmakeSchedulerUptime +++ b/wmake/wmakeSchedulerUptime @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -64,7 +64,7 @@ then for slotGroup in $WM_HOSTS do n=${slotGroup##*:} - [ "$n" = "${slotGroup%%:*}" ] && n=1 # missing ':' + [ "$n" = "${slotGroup%%:*}" ] && n=1 # Missing ':' echo "+ ${n:-1}" done ) @@ -76,7 +76,7 @@ fi # !! Assumes remote computer running same shell and startup files # in same location -sourceFoam=false # fallback command +sourceFoam=false # Fallback command case $SHELL in */csh | */tcsh ) # [t]csh vs bash|ksh|sh shellRc=cshrc @@ -107,8 +107,8 @@ fi # Construct test string for remote execution. # Source WM_PROJECT settings if WM_PROJECT environment not set. -# attempt to preserve the installation directory 'FOAM_INST_DIR' -# use FOAM_SETTINGS to pass command-line settings +# Attempt to preserve the installation directory 'FOAM_INST_DIR' +# Use FOAM_SETTINGS to pass command-line settings case $sourceFoam in */bashrc) if [ "$FOAM_INST_DIR" ] @@ -125,9 +125,9 @@ case $sourceFoam in ;; esac -# quote double-quotes for remote command line +# Quote double-quotes for remote command line rcmd=$(echo $* | sed -e s/\"/\'\"\'/g) -## the same, without forking (not ksh, maybe not /bin/sh either) +# The same, without forking (not ksh, maybe not /bin/sh either) # rcmd=$(while [ "$#" -gt 0 ]; do echo "${1//\"/'\"'}"; shift; done) @@ -147,7 +147,7 @@ set -o pipefail # -# colour output by argument 1 +# Colour output by argument 1 # colourPipe() { @@ -168,7 +168,7 @@ colourPipe() -# parse options +# Parse options nprocs=1 while [ "$#" -gt 0 ] do @@ -194,10 +194,10 @@ while : do for slotGroup in $WM_HOSTS do - # split 'host:N', but catch 'host:' and 'host' too + # Split 'host:N', but catch 'host:' and 'host' too host=${slotGroup%%:*} n=${slotGroup##*:} - [ "$n" = "$host" ] && n=1 # missing ':' + [ "$n" = "$host" ] && n=1 # Missing ':' : ${n:=1} @@ -249,7 +249,6 @@ do done # Did not find any free machines. Rest a bit. - #echo "$Script: Too much load. Waiting" sleep 1 done