zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wmake: Update comments

Browse Source
This commit is contained in:
Henry Weller
2016-01-24 14:37:39 +00:00
parent d138d0b949
commit 8446f25f1f
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wmake/makefiles/files
View File

@ -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) OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS)

4
wmake/scripts/makeFiles
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -47,7 +47,7 @@ for dir in `find . -type d -print`
do do
case "$dir" in case "$dir" in
. | ./Make | ./lnInclude ) . | ./Make | ./lnInclude )
# skip special directories # Skip special directories
;; ;;
*) *)
baseDir=`echo $dir | sed 's%^\./%%'` baseDir=`echo $dir | sed 's%^\./%%'`

4
wmake/wmakeFilesAndOptions
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -56,7 +56,7 @@ USAGE
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
case "$1" in case "$1" in
-h | -help) # provide immediate help -h | -help) # Provide immediate help
usage usage
;; ;;
-*) -*)

4
wmake/wmakeLnInclude
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -78,7 +78,7 @@ unset update silentOpt
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
case "$1" in case "$1" in
-h | -help) # provide immediate help -h | -help) # Provide immediate help
usage usage
;; ;;
-u | -update) -u | -update)

4
wmake/wmakeLnIncludeAll
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -58,7 +58,7 @@ findName=lnInclude
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
case "$1" in case "$1" in
-h | -help) # provide immediate help -h | -help) # Provide immediate help
usage usage
;; ;;
-*) -*)

6
wmake/wmakeScheduler
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -108,8 +108,8 @@ fi
# Construct test string for remote execution. # Construct test string for remote execution.
# Source WM_PROJECT settings if WM_PROJECT environment not set. # Source WM_PROJECT settings if WM_PROJECT environment not set.
# attempt to preserve the installation directory 'FOAM_INST_DIR' # Attempt to preserve the installation directory 'FOAM_INST_DIR'
# use FOAM_SETTINGS to pass command-line settings # Use FOAM_SETTINGS to pass command-line settings
case $sourceFoam in case $sourceFoam in
*/bashrc) */bashrc)
if [ "$FOAM_INST_DIR" ] if [ "$FOAM_INST_DIR" ]

23
wmake/wmakeSchedulerUptime
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -64,7 +64,7 @@ then
for slotGroup in $WM_HOSTS for slotGroup in $WM_HOSTS
do do
n=${slotGroup##*:} n=${slotGroup##*:}
[ "$n" = "${slotGroup%%:*}" ] && n=1 # missing ':' [ "$n" = "${slotGroup%%:*}" ] && n=1 # Missing ':'
echo "+ ${n:-1}" echo "+ ${n:-1}"
done done
) )
@ -76,7 +76,7 @@ fi
# !! Assumes remote computer running same shell and startup files # !! Assumes remote computer running same shell and startup files
# in same location # in same location
sourceFoam=false # fallback command sourceFoam=false # Fallback command
case $SHELL in case $SHELL in
*/csh | */tcsh ) # [t]csh vs bash|ksh|sh */csh | */tcsh ) # [t]csh vs bash|ksh|sh
shellRc=cshrc shellRc=cshrc
@ -107,8 +107,8 @@ fi
# Construct test string for remote execution. # Construct test string for remote execution.
# Source WM_PROJECT settings if WM_PROJECT environment not set. # Source WM_PROJECT settings if WM_PROJECT environment not set.
# attempt to preserve the installation directory 'FOAM_INST_DIR' # Attempt to preserve the installation directory 'FOAM_INST_DIR'
# use FOAM_SETTINGS to pass command-line settings # Use FOAM_SETTINGS to pass command-line settings
case $sourceFoam in case $sourceFoam in
*/bashrc) */bashrc)
if [ "$FOAM_INST_DIR" ] if [ "$FOAM_INST_DIR" ]
@ -125,9 +125,9 @@ case $sourceFoam in
;; ;;
esac esac
# quote double-quotes for remote command line # Quote double-quotes for remote command line
rcmd=$(echo $* | sed -e s/\"/\'\"\'/g) 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) # 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() colourPipe()
{ {
@ -168,7 +168,7 @@ colourPipe()
# parse options # Parse options
nprocs=1 nprocs=1
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
@ -194,10 +194,10 @@ while :
do do
for slotGroup in $WM_HOSTS for slotGroup in $WM_HOSTS
do do
# split 'host:N', but catch 'host:' and 'host' too # Split 'host:N', but catch 'host:' and 'host' too
host=${slotGroup%%:*} host=${slotGroup%%:*}
n=${slotGroup##*:} n=${slotGroup##*:}
[ "$n" = "$host" ] && n=1 # missing ':' [ "$n" = "$host" ] && n=1 # Missing ':'
: ${n:=1} : ${n:=1}
@ -249,7 +249,6 @@ do
done done
# Did not find any free machines. Rest a bit. # Did not find any free machines. Rest a bit.
#echo "$Script: Too much load. Waiting"
sleep 1 sleep 1
done done