From d7f99e3db6917d64d8b5dfa4237cee1ab4ca8c30 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 12 Jan 2009 08:47:25 +0100 Subject: [PATCH] cosmetics --- .../SCOPEBlendXiEq/SCOPEBlendXiEq.H | 2 +- .../instabilityXiEq/instabilityXiEq.H | 4 +- bin/foamCopySettings | 59 ++++++++----------- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H index 6f60c3e8cb..b7285f92c0 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H @@ -28,7 +28,7 @@ Class Description Simple SCOPEBlendXiEq model for XiEq based on SCOPEXiEqs correlation with a linear correction function to give a plausible profile for XiEq. - See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE + See @link SCOPELaminarFlameSpeed.H @endlink for details on the SCOPE laminar flame speed model. SourceFiles diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H index 0f7f7e0557..ddc38bef30 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H @@ -27,8 +27,8 @@ Class Description This is the equilibrium level of the flame wrinkling generated by - inestability. It is a constant (default 2.5). It is used in - \link XiModel.H \endlink. + instability. It is a constant (default 2.5). It is used in + @link XiModel.H @endlink. SourceFiles instability.C diff --git a/bin/foamCopySettings b/bin/foamCopySettings index 7910b6924f..8f461a008b 100755 --- a/bin/foamCopySettings +++ b/bin/foamCopySettings @@ -35,7 +35,7 @@ #------------------------------------------------------------------------------ if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -ne 2 ] then - cat <&2 + cat <&2 Usage: ${0##*/} srcDir dstDir Copy OpenFOAM settings from one case to another, without copying @@ -46,30 +46,23 @@ USAGE exit 1 fi -srcDir=$1 -dstDir=$2 +srcDir=${1%/} +dstDir=${2%/} -if [ ! -d $srcDir ] -then - echo "Error: directory '$srcDir' does not exist" - exit 1 -fi - -if [ ! -d $dstDir ] -then - echo "Error: directory '$dstDir' does not exist" - exit 1 -fi +for i in $srcDir $dstDir +do + [ -d "$i" ] || { echo "Error: directory '$i' does not exist"; exit 1; } +done # check that the srcDir looks okay for i in $srcDir/constant $srcDir/system do - if [ ! -d $i ] - then - echo "Error: no '${i##*/}' directory in '$srcDir'" - echo " does not appear to be an OpenFOAM case" - exit 1 - fi + if [ ! -d "$i" ] + then + echo "Error: no '${i##*/}' directory in '$srcDir'" + echo " does not appear to be an OpenFOAM case" + exit 1 + fi done # files and directories to copy @@ -82,19 +75,19 @@ fileList=$(find -H $srcDir -mindepth 1 -maxdepth 1 -not -name "processor*") for i in $fileList do - name="${i##*/}" - # skip numerical (results) directories (except 0) - # and things that look like queuing system output or log files - case "$name" in - [1-9] | [0-9]?* | foam.[eo][1-9]* | log | *.log ) - echo "$i [skipped]" - continue - ;; - *) - echo "$i -> $dstDir/$name" - rsync --exclude polyMesh --exclude "processor*" -a $i $dstDir - ;; - esac + name="${i##*/}" + # skip numerical (results) directories (except 0) + # and things that look like log files or queuing system output + case "$name" in + [1-9] | [0-9]?* | log | *.log | foam.[eo][1-9]* ) + echo "$i [skipped]" + continue + ;; + *) + echo "$i -> $dstDir/$name" + rsync --exclude polyMesh --exclude "processor*" -a $i $dstDir + ;; + esac done # --------------------------------------------------------------- end-of-file