mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'olesenm'
This commit is contained in:
andy
4
.gitignore
vendored
4
.gitignore
vendored
@ -60,8 +60,8 @@ doc/[Dd]oxygen/man
|
||||
# untracked configuration files
|
||||
/etc/prefs.csh
|
||||
/etc/prefs.sh
|
||||
/etc/config/*.csh
|
||||
/etc/config/*.sh
|
||||
/etc/config/prefs.csh
|
||||
/etc/config/prefs.sh
|
||||
|
||||
# source packages - anywhere
|
||||
*.tar.bz2
|
||||
|
||||
@ -131,7 +131,7 @@ do
|
||||
paraviewInstall="$2"
|
||||
# replace ParaView_DIR=...
|
||||
_inlineSed \
|
||||
etc/apps/paraview3/bashrc \
|
||||
etc/config/paraview.sh \
|
||||
'/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \
|
||||
"Replacing ParaView_DIR setting by '$paraviewInstall'"
|
||||
shift 2
|
||||
|
||||
@ -177,7 +177,7 @@ _foamEval()
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh`
|
||||
|
||||
# Evaluate command-line parameters and record settings for later
|
||||
# these can be used to set/unset values, or specify prefs files
|
||||
# these can be used to set/unset values, or specify alternative pref files
|
||||
export FOAM_SETTINGS="$@"
|
||||
_foamEval $@
|
||||
|
||||
@ -201,13 +201,13 @@ export PATH LD_LIBRARY_PATH MANPATH
|
||||
# Source project setup files
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
_foamSource $WM_PROJECT_DIR/etc/settings.sh
|
||||
_foamSource $WM_PROJECT_DIR/etc/aliases.sh
|
||||
_foamSource $WM_PROJECT_DIR/etc/config/aliases.sh
|
||||
|
||||
|
||||
# Source user setup files for optional packages
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc`
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc`
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.sh`
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.sh`
|
||||
|
||||
|
||||
# Clean environment paths again. Only remove duplicates
|
||||
|
||||
51
etc/config/README
Normal file
51
etc/config/README
Normal file
@ -0,0 +1,51 @@
|
||||
The main OpenFOAM settings are located in the parent etc/ directory
|
||||
|
||||
* bashrc, cshrc
|
||||
entry point for sourcing
|
||||
|
||||
* settings.csh, settings.sh
|
||||
core settings
|
||||
|
||||
* prefs.csh, prefs.sh
|
||||
these files are untracked and can be used for some site-defined
|
||||
settings
|
||||
|
||||
|
||||
The etc/config/ directory contains various configuration files in
|
||||
sh/csh variants:
|
||||
|
||||
* aliases.csh, aliases.sh
|
||||
aliases for interactive shells
|
||||
|
||||
* unset.csh, unset.sh
|
||||
sourced to clear as many OpenFOAM environment settings as possible
|
||||
|
||||
|
||||
* ensight.csh, ensight.sh
|
||||
application settings for EnSight
|
||||
|
||||
* paraview.csh, paraview.sh
|
||||
application settings for ParaView
|
||||
|
||||
* scotch.sh
|
||||
application settings for compiling against scotch
|
||||
|
||||
---
|
||||
|
||||
The config/example directory contains various example configuration files
|
||||
in sh/csh variants
|
||||
|
||||
* compiler.csh, compiler.sh
|
||||
an example of fine tuning ThirdParty compiler settings for OpenFOAM
|
||||
|
||||
* openmpi.csh, openmpi.sh
|
||||
an example of fine tuning openmpi settings for OpenFOAM
|
||||
|
||||
* paraview.csh, paraview.sh
|
||||
an example of chaining to the standard config/paraview.sh with a
|
||||
different ParaView_VERSION
|
||||
|
||||
* prefs.csh, prefs.sh
|
||||
an example of supplying alternative site-defined settings
|
||||
|
||||
---
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/aliases.csh
|
||||
# etc/config/aliases.csh
|
||||
#
|
||||
# Description
|
||||
# Aliases for working with OpenFOAM
|
||||
@ -39,7 +39,7 @@ alias wmSP 'wmSET WM_PRECISION_OPTION=SP'
|
||||
alias wmDP 'wmSET WM_PRECISION_OPTION=DP'
|
||||
|
||||
# clear env
|
||||
alias wmUNSET='source $WM_PROJECT_DIR/etc/unset.csh'
|
||||
alias wmUNSET='source $WM_PROJECT_DIR/etc/config/unset.csh'
|
||||
|
||||
# Toggle wmakeScheduler on/off
|
||||
# - also need to set WM_HOSTS
|
||||
@ -49,7 +49,7 @@ alias wmSchedOFF 'unsetenv WM_SCHEDULER'
|
||||
|
||||
# Change ParaView version
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~
|
||||
alias foamPV 'source `$WM_PROJECT_DIR/etc/apps/paraview3/cshrc` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
|
||||
alias foamPV 'source `$WM_PROJECT_DIR/etc/config/paraview.csh` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
|
||||
|
||||
|
||||
# Change directory aliases
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/aliases.sh
|
||||
# etc/config/aliases.sh
|
||||
#
|
||||
# Description
|
||||
# Aliases for working with OpenFOAM
|
||||
@ -39,7 +39,7 @@ alias wmSP='wmSET WM_PRECISION_OPTION=SP'
|
||||
alias wmDP='wmSET WM_PRECISION_OPTION=DP'
|
||||
|
||||
# clear env
|
||||
alias wmUNSET='. $WM_PROJECT_DIR/etc/unset.sh'
|
||||
alias wmUNSET='. $WM_PROJECT_DIR/etc/config/unset.sh'
|
||||
|
||||
# Toggle wmakeScheduler on/off
|
||||
# - also need to set WM_HOSTS
|
||||
@ -52,7 +52,7 @@ alias wmSchedOFF='unset WM_SCHEDULER'
|
||||
unset foamPV
|
||||
foamPV()
|
||||
{
|
||||
. $WM_PROJECT_DIR/etc/apps/paraview3/bashrc ParaView_VERSION=$1
|
||||
. $WM_PROJECT_DIR/etc/config/paraview.sh ParaView_VERSION=$1
|
||||
echo "paraview-$ParaView_VERSION (major: $ParaView_MAJOR)"
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
# \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
|
||||
# \\/ M anipulation |
|
||||
#-------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# ensight/cshrc
|
||||
# config/ensight.csh
|
||||
#
|
||||
# Description
|
||||
# Setup file for Ensight
|
||||
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
# \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# ensight/bashrc
|
||||
# config/ensight.sh
|
||||
#
|
||||
# Description
|
||||
# Setup file for Ensight
|
||||
@ -22,10 +22,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# config/compiler.csh
|
||||
# config/example/compiler.csh
|
||||
#
|
||||
# Description
|
||||
# Fine tuning of ThirdParty compiler settings for OpenFOAM
|
||||
# Example of fine tuning ThirdParty compiler settings for OpenFOAM
|
||||
# Sourced from OpenFOAM-<VERSION>/etc/settings.csh
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
@ -22,10 +22,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# config/compiler.sh
|
||||
# config/example/compiler.sh
|
||||
#
|
||||
# Description
|
||||
# Fine tuning of ThirdParty compiler settings for OpenFOAM
|
||||
# Example of fine tuning ThirdParty compiler settings for OpenFOAM
|
||||
# Sourced from OpenFOAM-<VERSION>/etc/settings.sh
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
@ -22,10 +22,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# config/openmpi.csh
|
||||
# config/example/openmpi.csh
|
||||
#
|
||||
# Description
|
||||
# Fine tuning of openmpi settings for OpenFOAM
|
||||
# Example of fine tuning openmpi settings for OpenFOAM
|
||||
# Sourced from OpenFOAM-<VERSION>/etc/settings.csh
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
@ -22,10 +22,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# config/openmpi.sh
|
||||
# config/example/openmpi.sh
|
||||
#
|
||||
# Description
|
||||
# Fine tuning of openmpi settings for OpenFOAM
|
||||
# Example of fine tuning openmpi settings for OpenFOAM
|
||||
# Sourced from OpenFOAM-<VERSION>/etc/settings.sh
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
@ -22,10 +22,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# paraview3/cshrc-EXAMPLE
|
||||
# config/example/paraview.csh
|
||||
#
|
||||
# Description
|
||||
# Example of chaining to the standard paraview3/cshrc with a
|
||||
# Example of chaining to the standard config/paraview.csh with a
|
||||
# different ParaView_VERSION
|
||||
#
|
||||
# Note
|
||||
@ -35,10 +35,10 @@
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# Use other (shipped) cshrc with a different ParaView_VERSION
|
||||
# Use other (shipped) paraview.csh with a different ParaView_VERSION
|
||||
#
|
||||
|
||||
set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o apps/paraview3/cshrc`
|
||||
set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.csh`
|
||||
if ( $status == 0 ) source $foamFile ParaView_VERSION=3.9.0
|
||||
|
||||
unset foamFile
|
||||
@ -22,10 +22,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# paraview3/bashrc-EXAMPLE
|
||||
# config/example/paraview.sh
|
||||
#
|
||||
# Description
|
||||
# Example of chaining to the standard paraview3/bashrc with a
|
||||
# Example of chaining to the standard config/paraview.sh with a
|
||||
# different ParaView_VERSION
|
||||
#
|
||||
# Note
|
||||
@ -35,10 +35,10 @@
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# Use other (shipped) bashrc with a different ParaView_VERSION
|
||||
# Use other (shipped) paraview.sh with a different ParaView_VERSION
|
||||
#
|
||||
|
||||
foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o apps/paraview3/bashrc 2>/dev/null)
|
||||
foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.sh 2>/dev/null)
|
||||
[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.9.0
|
||||
|
||||
unset foamFile
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/prefs.csh
|
||||
# config/example/prefs.csh
|
||||
#
|
||||
# Description
|
||||
# Preset variables for the OpenFOAM configuration - C-Shell shell syntax.
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/prefs.sh
|
||||
# config/example/prefs.sh
|
||||
#
|
||||
# Description
|
||||
# Preset variables for the OpenFOAM configuration - POSIX shell syntax.
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# paraview3/cshrc
|
||||
# config/paraview.csh
|
||||
#
|
||||
# Description
|
||||
# Setup file for paraview-3.x
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# paraview3/bashrc
|
||||
# config/paraview.sh
|
||||
#
|
||||
# Description
|
||||
# Setup file for paraview-3.x
|
||||
@ -113,7 +113,6 @@ else
|
||||
unset PV_PLUGIN_PATH
|
||||
fi
|
||||
|
||||
|
||||
unset _foamParaviewEval
|
||||
unset cleaned cmake paraviewInstDir paraviewPython
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# scotch/bashrc
|
||||
# config/scotch.sh
|
||||
#
|
||||
# Description
|
||||
# Setup file for scotch include/libraries.
|
||||
@ -36,5 +36,4 @@
|
||||
export SCOTCH_VERSION=scotch_5.1.11
|
||||
export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
|
||||
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/unset.csh
|
||||
# etc/config/unset.csh
|
||||
#
|
||||
# Description
|
||||
# Clear as many OpenFOAM environment settings as possible
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/unset.sh
|
||||
# etc/config/unset.sh
|
||||
#
|
||||
# Description
|
||||
# Clear as many OpenFOAM environment settings as possible
|
||||
@ -138,7 +138,7 @@ alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; if (\!*
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh`
|
||||
|
||||
# Evaluate command-line parameters and record settings for later
|
||||
# these can be used to set/unset values, or specify prefs files
|
||||
# these can be used to set/unset values, or specify alternative pref files
|
||||
setenv FOAM_SETTINGS "${*}"
|
||||
while ( $#argv > 0 )
|
||||
switch ($argv[1])
|
||||
@ -195,12 +195,12 @@ if ( $status == 0 ) setenv MANPATH $cleaned
|
||||
# Source project setup files
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
_foamSource $WM_PROJECT_DIR/etc/settings.csh
|
||||
_foamSource $WM_PROJECT_DIR/etc/aliases.csh
|
||||
_foamSource $WM_PROJECT_DIR/etc/config/aliases.csh
|
||||
|
||||
# Source user setup files for optional packages
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/cshrc`
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/cshrc`
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.csh`
|
||||
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.csh`
|
||||
|
||||
|
||||
# Clean environment paths again. Only remove duplicates
|
||||
|
||||
@ -3,13 +3,13 @@ cd ${0%/*} || exit 1 # run from this directory
|
||||
makeType=${1:-libso}
|
||||
|
||||
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
|
||||
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
|
||||
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
|
||||
then
|
||||
. $settings
|
||||
echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
|
||||
else
|
||||
echo
|
||||
echo "Error: no apps/scotch/bashrc settings"
|
||||
echo "Error: no config/scotch.sh settings"
|
||||
echo
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user