mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
STYLE: avoid old-style shell backticks in various places
This commit is contained in:
@ -34,7 +34,7 @@
|
|||||||
#
|
#
|
||||||
# For example, within the user ~/.OpenFOAM/<VER>/prefs.sh:
|
# For example, within the user ~/.OpenFOAM/<VER>/prefs.sh:
|
||||||
# \code
|
# \code
|
||||||
# foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh` \
|
# foamPrefs=$($WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh) \
|
||||||
# && _foamSource $foamPrefs
|
# && _foamSource $foamPrefs
|
||||||
# \endcode
|
# \endcode
|
||||||
#
|
#
|
||||||
|
|||||||
@ -119,7 +119,7 @@ else
|
|||||||
( cd $packDir && git archive --format=tar --prefix=$packDir/ HEAD) > $packBase.tar &&
|
( cd $packDir && git archive --format=tar --prefix=$packDir/ HEAD) > $packBase.tar &&
|
||||||
|
|
||||||
echo "add in time-stamp and lnInclude directories" 1>&2 &&
|
echo "add in time-stamp and lnInclude directories" 1>&2 &&
|
||||||
tar cf $packBase.tar2 $packDir/.timeStamp $packDir/.build `find -H $packDir -type d -name lnInclude` &&
|
tar cf $packBase.tar2 $packDir/.timeStamp $packDir/.build $(find -H $packDir -type d -name lnInclude) &&
|
||||||
tar Af $packBase.tar $packBase.tar2 &&
|
tar Af $packBase.tar $packBase.tar2 &&
|
||||||
|
|
||||||
echo "gzip tar file" 1>&2 &&
|
echo "gzip tar file" 1>&2 &&
|
||||||
|
|||||||
@ -71,8 +71,8 @@ then
|
|||||||
elif [ -d system ]
|
elif [ -d system ]
|
||||||
then
|
then
|
||||||
# Run normal case.
|
# Run normal case.
|
||||||
parentDir=`dirname $PWD`
|
parentDir=$(dirname $PWD)
|
||||||
application=`getApplication`
|
application=$(getApplication)
|
||||||
runApplication blockMesh
|
runApplication blockMesh
|
||||||
runApplication $application
|
runApplication $application
|
||||||
else
|
else
|
||||||
|
|||||||
36
etc/bashrc
36
etc/bashrc
@ -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-2016 OpenFOAM Foundation
|
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
# \\/ M anipulation |
|
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# License
|
# License
|
||||||
# This file is part of OpenFOAM.
|
# This file is part of OpenFOAM.
|
||||||
@ -136,7 +136,7 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
|
|||||||
. $WM_PROJECT_DIR/etc/config.sh/functions
|
. $WM_PROJECT_DIR/etc/config.sh/functions
|
||||||
|
|
||||||
# Add in preset user or site preferences:
|
# Add in preset user or site preferences:
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile prefs.sh)
|
||||||
|
|
||||||
# Evaluate command-line parameters and record settings for later
|
# Evaluate command-line parameters and record settings for later
|
||||||
# these can be used to set/unset values, or specify alternative pref files
|
# these can be used to set/unset values, or specify alternative pref files
|
||||||
@ -148,14 +148,14 @@ _foamEval $@
|
|||||||
foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
|
foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
|
||||||
|
|
||||||
#- Clean PATH
|
#- Clean PATH
|
||||||
cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
|
cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
|
||||||
|
|
||||||
#- Clean LD_LIBRARY_PATH
|
#- Clean LD_LIBRARY_PATH
|
||||||
cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` \
|
cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \
|
||||||
&& LD_LIBRARY_PATH="$cleaned"
|
&& LD_LIBRARY_PATH="$cleaned"
|
||||||
|
|
||||||
#- Clean MANPATH
|
#- Clean MANPATH
|
||||||
cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
|
cleaned=$($foamClean "$MANPATH" "$foamOldDirs") && MANPATH="$cleaned"
|
||||||
|
|
||||||
export PATH LD_LIBRARY_PATH MANPATH
|
export PATH LD_LIBRARY_PATH MANPATH
|
||||||
|
|
||||||
@ -168,35 +168,35 @@ _foamSource $WM_PROJECT_DIR/etc/config.sh/aliases
|
|||||||
|
|
||||||
# Source user setup files for optional packages
|
# Source user setup files for optional packages
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/vtk`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/vtk)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools)
|
||||||
|
|
||||||
##_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ADIOS`
|
##_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/ADIOS)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch)
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/FFTW`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/FFTW)
|
||||||
|
|
||||||
|
|
||||||
# Clean environment paths again. Only remove duplicates
|
# Clean environment paths again. Only remove duplicates
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
#- Clean PATH
|
#- Clean PATH
|
||||||
cleaned=`$foamClean "$PATH"` && PATH="$cleaned"
|
cleaned=$($foamClean "$PATH") && PATH="$cleaned"
|
||||||
|
|
||||||
#- Clean LD_LIBRARY_PATH
|
#- Clean LD_LIBRARY_PATH
|
||||||
cleaned=`$foamClean "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleaned"
|
cleaned=$($foamClean "$LD_LIBRARY_PATH") && LD_LIBRARY_PATH="$cleaned"
|
||||||
|
|
||||||
#- Clean MANPATH (trailing ':' to find system pages)
|
#- Clean MANPATH (trailing ':' to find system pages)
|
||||||
cleaned=`$foamClean "$MANPATH"`: && MANPATH="$cleaned"
|
cleaned=$($foamClean "$MANPATH") && MANPATH="${cleaned}:"
|
||||||
|
|
||||||
export PATH LD_LIBRARY_PATH MANPATH
|
export PATH LD_LIBRARY_PATH MANPATH
|
||||||
|
|
||||||
#- Clean LD_PRELOAD
|
#- Clean LD_PRELOAD
|
||||||
if [ -n "$LD_PRELOAD" ]
|
if [ -n "$LD_PRELOAD" ]
|
||||||
then
|
then
|
||||||
cleaned=`$foamClean "$LD_PRELOAD"` && LD_PRELOAD="$cleaned"
|
cleaned=$($foamClean "$LD_PRELOAD") && LD_PRELOAD="$cleaned"
|
||||||
export LD_PRELOAD
|
export LD_PRELOAD
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -38,9 +38,7 @@ endif
|
|||||||
if ( -r $CEI_HOME ) then
|
if ( -r $CEI_HOME ) then
|
||||||
|
|
||||||
# Special treatment for 32bit OpenFOAM and 64bit Ensight
|
# Special treatment for 32bit OpenFOAM and 64bit Ensight
|
||||||
if ($WM_ARCH == linux && `uname -m` == x86_64) then
|
if ($WM_ARCH-`uname -m` == linux-x86_64) setenv CEI_ARCH linux_2.6_32
|
||||||
setenv CEI_ARCH linux_2.6_32
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Add to path
|
# Add to path
|
||||||
setenv PATH ${CEI_HOME}/bin:${PATH}
|
setenv PATH ${CEI_HOME}/bin:${PATH}
|
||||||
|
|||||||
@ -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-2016 OpenFOAM Foundation
|
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# License
|
# License
|
||||||
# This file is part of OpenFOAM.
|
# This file is part of OpenFOAM.
|
||||||
@ -75,7 +75,7 @@ case Linux:
|
|||||||
breaksw
|
breaksw
|
||||||
|
|
||||||
default:
|
default:
|
||||||
echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64"
|
echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32|64"
|
||||||
breaksw
|
breaksw
|
||||||
|
|
||||||
endsw
|
endsw
|
||||||
@ -124,11 +124,13 @@ case SunOS:
|
|||||||
setenv WM_LDFLAGS '-mabi=64 -G0'
|
setenv WM_LDFLAGS '-mabi=64 -G0'
|
||||||
breaksw
|
breaksw
|
||||||
|
|
||||||
default:
|
default: # An unsupported operating system
|
||||||
echo
|
/bin/cat <<USAGE
|
||||||
echo "Your '$WM_ARCH' operating system is not supported by this release"
|
|
||||||
echo "of OpenFOAM. For further assistance, please contact www.OpenFOAM.com"
|
Your "$WM_ARCH" operating system is unsupported by this OpenFOAM release.
|
||||||
echo
|
For further assistance, please contact www.OpenFOAM.com
|
||||||
|
|
||||||
|
USAGE
|
||||||
breaksw
|
breaksw
|
||||||
|
|
||||||
endsw
|
endsw
|
||||||
@ -230,7 +232,7 @@ case ThirdParty:
|
|||||||
|
|
||||||
# Check that the compiler directory can be found
|
# Check that the compiler directory can be found
|
||||||
if ( ! -d "$gccDir" ) then
|
if ( ! -d "$gccDir" ) then
|
||||||
cat << GCC_NOT_FOUND
|
/bin/cat << GCC_NOT_FOUND
|
||||||
===============================================================================
|
===============================================================================
|
||||||
Warning in $WM_PROJECT_DIR/etc/config.csh/settings:
|
Warning in $WM_PROJECT_DIR/etc/config.csh/settings:
|
||||||
Cannot find '$WM_COMPILER' compiler installation
|
Cannot find '$WM_COMPILER' compiler installation
|
||||||
@ -272,7 +274,7 @@ GCC_NOT_FOUND
|
|||||||
|
|
||||||
# Check that the compiler directory can be found
|
# Check that the compiler directory can be found
|
||||||
if ( ! -d "$clangDir" ) then
|
if ( ! -d "$clangDir" ) then
|
||||||
cat << CLANG_NOT_FOUND
|
/bin/cat << CLANG_NOT_FOUND
|
||||||
===============================================================================
|
===============================================================================
|
||||||
Warning in $WM_PROJECT_DIR/etc/config.csh/settings:
|
Warning in $WM_PROJECT_DIR/etc/config.csh/settings:
|
||||||
Cannot find '$WM_COMPILER' compiler installation
|
Cannot find '$WM_COMPILER' compiler installation
|
||||||
|
|||||||
@ -31,22 +31,16 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Fallback value
|
# Fallback value
|
||||||
if [ ! -d "$CEI_HOME" ]
|
[ -d "$CEI_HOME" ] || export CEI_HOME=/usr/local/ensight/CEI
|
||||||
then
|
|
||||||
export CEI_HOME=/usr/local/ensight/CEI
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -r $CEI_HOME ]
|
if [ -r $CEI_HOME ]
|
||||||
then
|
then
|
||||||
|
|
||||||
# Special treatment for 32bit OpenFOAM and 64bit Ensight
|
# Special treatment for 32bit OpenFOAM and 64bit Ensight
|
||||||
if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]
|
[ "$WM_ARCH-$(uname -m)" = linux-x86_64 ] && export CEI_ARCH=linux_2.6_32
|
||||||
then
|
|
||||||
export CEI_ARCH=linux_2.6_32
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Add to path if required
|
# Add to path if required
|
||||||
if [ "$CEI_HOME/bin/ensight" != "`which ensight 2>/dev/null`" ]
|
if [ "$CEI_HOME/bin/ensight" != "$(command -v ensight)" ]
|
||||||
then
|
then
|
||||||
export PATH=$CEI_HOME/bin:$PATH
|
export PATH=$CEI_HOME/bin:$PATH
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -73,7 +73,7 @@ then
|
|||||||
then
|
then
|
||||||
_foamSource "$1"
|
_foamSource "$1"
|
||||||
else
|
else
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -silent "$1"`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile -silent "$1")
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@ -43,7 +43,7 @@ SYSTEMOPENMPI)
|
|||||||
unset OPAL_PREFIX
|
unset OPAL_PREFIX
|
||||||
fi
|
fi
|
||||||
|
|
||||||
libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
|
libDir=$(mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/')
|
||||||
|
|
||||||
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi
|
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi
|
||||||
# include files and libraries.
|
# include files and libraries.
|
||||||
@ -56,7 +56,7 @@ SYSTEMOPENMPI)
|
|||||||
OPENMPI)
|
OPENMPI)
|
||||||
export FOAM_MPI=openmpi-1.10.4
|
export FOAM_MPI=openmpi-1.10.4
|
||||||
# Optional configuration tweaks:
|
# Optional configuration tweaks:
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi)
|
||||||
|
|
||||||
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
|
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
|
||||||
|
|
||||||
@ -159,7 +159,7 @@ HPMPI)
|
|||||||
|
|
||||||
_foamAddPath $MPI_ARCH_PATH/bin
|
_foamAddPath $MPI_ARCH_PATH/bin
|
||||||
|
|
||||||
case `uname -m` in
|
case $(uname -m) in
|
||||||
i686)
|
i686)
|
||||||
_foamAddLib $MPI_ARCH_PATH/lib/linux_ia32
|
_foamAddLib $MPI_ARCH_PATH/lib/linux_ia32
|
||||||
;;
|
;;
|
||||||
@ -171,7 +171,7 @@ HPMPI)
|
|||||||
_foamAddLib $MPI_ARCH_PATH/lib/linux_ia64
|
_foamAddLib $MPI_ARCH_PATH/lib/linux_ia64
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo Unknown processor type `uname -m` 1>&2
|
echo Unknown processor type $(uname -m) 1>&2
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|||||||
@ -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-2016 OpenFOAM Foundation
|
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# License
|
# License
|
||||||
# This file is part of OpenFOAM.
|
# This file is part of OpenFOAM.
|
||||||
@ -31,14 +31,14 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Set environment variables according to system type
|
# Set environment variables according to system type
|
||||||
export WM_ARCH=`uname -s`
|
export WM_ARCH=$(uname -s)
|
||||||
|
|
||||||
case "$WM_ARCH" in
|
case "$WM_ARCH" in
|
||||||
Linux)
|
Linux)
|
||||||
WM_ARCH=linux
|
WM_ARCH=linux
|
||||||
|
|
||||||
# Compiler specifics
|
# Compiler specifics
|
||||||
case `uname -m` in
|
case $(uname -m) in
|
||||||
i686)
|
i686)
|
||||||
export WM_ARCH_OPTION=32
|
export WM_ARCH_OPTION=32
|
||||||
export WM_CC='gcc'
|
export WM_CC='gcc'
|
||||||
@ -68,8 +68,7 @@ Linux)
|
|||||||
export WM_LDFLAGS='-m64'
|
export WM_LDFLAGS='-m64'
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64"\
|
echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32|64" 1>&2
|
||||||
1>&2
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
@ -111,7 +110,7 @@ Linux)
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo Unknown processor type `uname -m` for Linux 1>&2
|
echo Unknown processor type $(uname -m) for Linux 1>&2
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
@ -130,8 +129,8 @@ SunOS)
|
|||||||
*) # An unsupported operating system
|
*) # An unsupported operating system
|
||||||
/bin/cat <<USAGE 1>&2
|
/bin/cat <<USAGE 1>&2
|
||||||
|
|
||||||
Your "$WM_ARCH" operating system is not supported by this release
|
Your "$WM_ARCH" operating system is unsupported by this OpenFOAM release.
|
||||||
of OpenFOAM. For further assistance, please contact www.OpenFOAM.com
|
For further assistance, please contact www.OpenFOAM.com
|
||||||
|
|
||||||
USAGE
|
USAGE
|
||||||
;;
|
;;
|
||||||
@ -212,7 +211,7 @@ unset GMP_ARCH_PATH MPFR_ARCH_PATH
|
|||||||
|
|
||||||
# Load configured compiler versions, regardless of the compiler type
|
# Load configured compiler versions, regardless of the compiler type
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler`
|
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
|
||||||
|
|
||||||
case "$WM_COMPILER_TYPE" in
|
case "$WM_COMPILER_TYPE" in
|
||||||
system)
|
system)
|
||||||
@ -227,7 +226,7 @@ OpenFOAM | ThirdParty)
|
|||||||
mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/${mpc_version:-mpc-system}
|
mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/${mpc_version:-mpc-system}
|
||||||
|
|
||||||
# Check that the compiler directory can be found
|
# Check that the compiler directory can be found
|
||||||
[ -d "$gccDir" ] || cat << GCC_NOT_FOUND 1>&2
|
[ -d "$gccDir" ] || /bin/cat << GCC_NOT_FOUND 1>&2
|
||||||
===============================================================================
|
===============================================================================
|
||||||
Warning in $WM_PROJECT_DIR/etc/config.sh/settings:
|
Warning in $WM_PROJECT_DIR/etc/config.sh/settings:
|
||||||
Cannot find '$WM_COMPILER' compiler installation
|
Cannot find '$WM_COMPILER' compiler installation
|
||||||
@ -272,7 +271,7 @@ GCC_NOT_FOUND
|
|||||||
clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
|
clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
|
||||||
|
|
||||||
# Check that the compiler directory can be found
|
# Check that the compiler directory can be found
|
||||||
[ -d "$clangDir" ] || cat << CLANG_NOT_FOUND 1>&2
|
[ -d "$clangDir" ] || /bin/cat << CLANG_NOT_FOUND 1>&2
|
||||||
===============================================================================
|
===============================================================================
|
||||||
Warning in $WM_PROJECT_DIR/etc/config.sh/settings:
|
Warning in $WM_PROJECT_DIR/etc/config.sh/settings:
|
||||||
Cannot find '$WM_COMPILER' compiler installation
|
Cannot find '$WM_COMPILER' compiler installation
|
||||||
|
|||||||
@ -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-2016 OpenFOAM Foundation
|
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# License
|
# License
|
||||||
# This file is part of OpenFOAM.
|
# This file is part of OpenFOAM.
|
||||||
@ -143,9 +143,9 @@ unset SCOTCH_ARCH_PATH
|
|||||||
|
|
||||||
if [ -n "$foamClean" ]
|
if [ -n "$foamClean" ]
|
||||||
then
|
then
|
||||||
cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
|
cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
|
||||||
cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleaned"
|
cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") && LD_LIBRARY_PATH="$cleaned"
|
||||||
cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
|
cleaned=$($foamClean "$MANPATH" "$foamOldDirs") && MANPATH="$cleaned"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -153,7 +153,6 @@ fi
|
|||||||
[ -n "$MANPATH" ] || unset MANPATH
|
[ -n "$MANPATH" ] || unset MANPATH
|
||||||
[ -n "$LD_PRELOAD" ] || unset LD_PRELOAD
|
[ -n "$LD_PRELOAD" ] || unset LD_PRELOAD
|
||||||
|
|
||||||
|
|
||||||
unset cleaned foamClean foamOldDirs
|
unset cleaned foamClean foamOldDirs
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -234,8 +234,8 @@ set cleaned=`$foamClean "$LD_LIBRARY_PATH"`
|
|||||||
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
|
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
|
||||||
|
|
||||||
#- Clean MANPATH (trailing ':' to find system pages)
|
#- Clean MANPATH (trailing ':' to find system pages)
|
||||||
set cleaned=`$foamClean "$MANPATH"`:
|
set cleaned=`$foamClean "$MANPATH"`
|
||||||
if ( $status == 0 ) setenv MANPATH "$cleaned"
|
if ( $status == 0 ) setenv MANPATH "${cleaned}:"
|
||||||
|
|
||||||
#- Clean LD_PRELOAD
|
#- Clean LD_PRELOAD
|
||||||
if ( $?LD_PRELOAD ) then
|
if ( $?LD_PRELOAD ) then
|
||||||
|
|||||||
@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # run from this directory
|
|||||||
# Source tutorial run functions
|
# Source tutorial run functions
|
||||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||||
|
|
||||||
application=`getApplication`
|
|
||||||
|
|
||||||
runApplication blockMesh
|
runApplication blockMesh
|
||||||
runApplication extrudeMesh
|
runApplication extrudeMesh
|
||||||
|
|
||||||
runApplication $application
|
runApplication $(getApplication)
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|||||||
@ -44,9 +44,9 @@ done
|
|||||||
|
|
||||||
sample $timeOpt
|
sample $timeOpt
|
||||||
SDIR=sets
|
SDIR=sets
|
||||||
LSDIR=`ls $SDIR | head -1`
|
LSDIR=$(ls $SDIR | head -1)
|
||||||
EXAMPLE_FILE=`ls -1 $SDIR/${LSDIR}/* | head -1`
|
EXAMPLE_FILE=$(ls -1 $SDIR/${LSDIR}/* | head -1)
|
||||||
FS=`basename $EXAMPLE_FILE | cut -d_ -f2-`
|
FS=$(basename $EXAMPLE_FILE | cut -d_ -f2-)
|
||||||
|
|
||||||
for d in $SDIR/*
|
for d in $SDIR/*
|
||||||
do
|
do
|
||||||
|
|||||||
@ -95,7 +95,7 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# paths to data
|
# paths to data
|
||||||
LATESTTIME=`ls $SETSDIR`
|
LATESTTIME=$(ls $SETSDIR)
|
||||||
OFDATAROOT=$SETSDIR/$LATESTTIME
|
OFDATAROOT=$SETSDIR/$LATESTTIME
|
||||||
|
|
||||||
EXPTDATAROOT=./exptData
|
EXPTDATAROOT=./exptData
|
||||||
|
|||||||
@ -82,7 +82,7 @@ do
|
|||||||
break
|
break
|
||||||
elif [ -s $lockFile ]
|
elif [ -s $lockFile ]
|
||||||
then
|
then
|
||||||
log "found lock file ${lockFile} containing '$(cat $lockFile)' - waiting"
|
log "found lock file ${lockFile} containing '$(< $lockFile)' - waiting"
|
||||||
else
|
else
|
||||||
log "found lock file ${lockFile} - waiting"
|
log "found lock file ${lockFile} - waiting"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -25,8 +25,8 @@ do
|
|||||||
|
|
||||||
if [ -e logs/yPlus_0 ]
|
if [ -e logs/yPlus_0 ]
|
||||||
then
|
then
|
||||||
yPlus=`awk < logs/yPlus_0 'END{print $2}'`
|
yPlus=$(awk < logs/yPlus_0 'END{print $2}')
|
||||||
uPlus=`awk < logs/uPlus_0 'END{print $2}'`
|
uPlus=$(awk < logs/uPlus_0 'END{print $2}')
|
||||||
|
|
||||||
echo "$yPlus $uPlus" >> yPlus_vs_uPlus
|
echo "$yPlus $uPlus" >> yPlus_vs_uPlus
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#--------------------------------*- C++ -*------------------------------------#
|
#-----------------------------------------------------------------------------#
|
||||||
# ========= | #
|
# ========= | #
|
||||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox #
|
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox #
|
||||||
# \\ / O peration | Version: plus #
|
# \\ / O peration | Version: plus #
|
||||||
@ -77,80 +77,80 @@ for xi in $(seq 1 1 $nx); do
|
|||||||
|
|
||||||
# side 1
|
# side 1
|
||||||
side=1
|
side=1
|
||||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
z1=`echo $z $l $tol | awk '{print $1 + $2 - $3}'`
|
z1=$(echo $z $l $tol | awk '{print $1 + $2 - $3}')
|
||||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||||
|
|
||||||
# side 2
|
# side 2
|
||||||
side=2
|
side=2
|
||||||
x1=`echo $x $l $tol | awk '{print $1 + $2 - $3}'`
|
x1=$(echo $x $l $tol | awk '{print $1 + $2 - $3}')
|
||||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||||
|
|
||||||
# side 3
|
# side 3
|
||||||
side=3
|
side=3
|
||||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||||
z2=`echo $z $tol | awk '{print $1 + $2}'`
|
z2=$(echo $z $tol | awk '{print $1 + $2}')
|
||||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||||
|
|
||||||
# side 4
|
# side 4
|
||||||
side=4
|
side=4
|
||||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||||
x2=`echo $x $tol | awk '{print $1 + $2}'`
|
x2=$(echo $x $tol | awk '{print $1 + $2}')
|
||||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||||
|
|
||||||
# side 5
|
# side 5
|
||||||
side=5
|
side=5
|
||||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
y1=`echo $y $l $tol | awk '{print $1 + $2 - $3}'`
|
y1=$(echo $y $l $tol | awk '{print $1 + $2 - $3}')
|
||||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||||
|
|
||||||
# side 6
|
# side 6
|
||||||
side=6
|
side=6
|
||||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||||
y2=`echo $y $tol | awk '{print $1 + $2}'`
|
y2=$(echo $y $tol | awk '{print $1 + $2}')
|
||||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||||
|
|
||||||
n=$((n+1))
|
n=$((n+1))
|
||||||
|
|
||||||
z=`echo $z $offset | awk '{print $1 + $2}'`
|
z=$(echo $z $offset | awk '{print $1 + $2}')
|
||||||
done
|
done
|
||||||
|
|
||||||
y=`echo $y $offset | awk '{print $1 + $2}'`
|
y=$(echo $y $offset | awk '{print $1 + $2}')
|
||||||
done
|
done
|
||||||
|
|
||||||
x=`echo $x $offset | awk '{print $1 + $2}'`
|
x=$(echo $x $offset | awk '{print $1 + $2}')
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "cellSet cubeFacesCells new faceToCell cubeFaceSet owner" >> $tmpSetSet
|
echo "cellSet cubeFacesCells new faceToCell cubeFaceSet owner" >> $tmpSetSet
|
||||||
echo "faceZoneSet cubeFaces new setsToFaceZone cubeFaceSet cubeFacesCells" >> $tmpSetSet
|
echo "faceZoneSet cubeFaces new setsToFaceZone cubeFaceSet cubeFacesCells" >> $tmpSetSet
|
||||||
|
|
||||||
echo "processing floor"
|
echo "processing floor"
|
||||||
floorMax=`echo 1 $tol | awk '{print $1 + $2}'`
|
floorMax=$(echo 1 $tol | awk '{print $1 + $2}')
|
||||||
createSetsAndZone Floor -$tol $floorMax -$tol $floorMax -$tol $tol
|
createSetsAndZone Floor -$tol $floorMax -$tol $floorMax -$tol $tol
|
||||||
echo "cellSet floorCells new faceToCell FloorFaces owner" >> $tmpSetSet
|
echo "cellSet floorCells new faceToCell FloorFaces owner" >> $tmpSetSet
|
||||||
echo "faceZoneSet floorFaces new setsToFaceZone FloorFaces floorCells" >> $tmpSetSet
|
echo "faceZoneSet floorFaces new setsToFaceZone FloorFaces floorCells" >> $tmpSetSet
|
||||||
|
|||||||
@ -4,17 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
|
|||||||
# Source tutorial run functions
|
# Source tutorial run functions
|
||||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||||
|
|
||||||
application=$(getApplication)
|
|
||||||
|
|
||||||
runApplication blockMesh
|
runApplication blockMesh
|
||||||
|
|
||||||
echo "Creating channel"
|
echo "Creating channel"
|
||||||
i=1
|
for i in 1 2
|
||||||
while [ "$i" -lt 3 ] ; do
|
do
|
||||||
cp system/extrudeMeshDict.${i} system/extrudeMeshDict
|
cp system/extrudeMeshDict.${i} system/extrudeMeshDict
|
||||||
echo "Running extrudeMesh, instance" ${i}
|
echo "Running extrudeMesh, instance" ${i}
|
||||||
extrudeMesh > log.extrudeMesh.${i}
|
extrudeMesh > log.extrudeMesh.${i}
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
done
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user