GIT: Initial state after latest Foundation merge

This commit is contained in:
Andrew Heather
2016-09-20 14:49:08 +01:00
4571 changed files with 115696 additions and 74609 deletions

View File

@ -32,47 +32,26 @@
# Change compiled version aliases
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
alias wmSET 'source $WM_PROJECT_DIR/etc/cshrc'
alias wm64 'wmSET WM_ARCH_OPTION=64'
alias wm32 'wmSET WM_ARCH_OPTION=32'
alias wmSP 'wmSET WM_PRECISION_OPTION=SP'
alias wmDP 'wmSET WM_PRECISION_OPTION=DP'
alias wmSet 'source $WM_PROJECT_DIR/etc/cshrc'
alias wm64 'wmSet WM_ARCH_OPTION=64'
alias wm32 'wmSet WM_ARCH_OPTION=32'
alias wmSP 'wmSet WM_PRECISION_OPTION=SP'
alias wmDP 'wmSet WM_PRECISION_OPTION=DP'
# refresh the environment
alias wmREFRESH 'wmSET $FOAM_SETTINGS'
# Clear env
alias wmUnset 'source $WM_PROJECT_DIR/etc/config.csh/unset'
# clear env
alias wmUNSET 'source $WM_PROJECT_DIR/etc/config.csh/unset'
# Toggle wmakeScheduler on/off
# - also need to set WM_HOSTS
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
alias wmSchedON 'setenv WM_SCHEDULER $WM_PROJECT_DIR/wmake/wmakeScheduler'
alias wmSchedOFF 'unsetenv WM_SCHEDULER'
# Change ParaView version
# ~~~~~~~~~~~~~~~~~~~~~~~
alias foamPV 'source `$WM_PROJECT_DIR/etc/config.csh/paraview` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
alias wmSchedOn 'setenv WM_SCHEDULER $WM_PROJECT_DIR/wmake/wmakeScheduler'
alias wmSchedOff 'unsetenv WM_SCHEDULER'
# Change directory aliases
# ~~~~~~~~~~~~~~~~~~~~~~~~
alias src 'cd $FOAM_SRC'
alias lib 'cd $FOAM_LIBBIN'
alias run 'cd $FOAM_RUN'
alias foam 'cd $WM_PROJECT_DIR'
alias foamsrc 'cd $FOAM_SRC/$WM_PROJECT'
alias foamfv 'cd $FOAM_SRC/finiteVolume'
alias app 'cd $FOAM_APP'
alias util 'cd $FOAM_UTILITIES'
alias sol 'cd $FOAM_SOLVERS'
alias tut 'cd $FOAM_TUTORIALS'
alias foamApps 'cd $FOAM_APP'
alias foamSol 'cd $FOAM_SOLVERS'
alias foamTuts 'cd $FOAM_TUTORIALS'
alias foamUtils 'cd $FOAM_UTILITIES'
alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR'
if ( $?WM_PROJECT_SITE ) then
alias foamSite 'cd $WM_PROJECT_SITE'
@ -80,4 +59,30 @@ else
alias foamSite 'cd $WM_PROJECT_INST_DIR/site'
endif
alias src 'cd $FOAM_SRC'
alias lib 'cd $FOAM_LIBBIN'
alias app 'cd $FOAM_APP'
alias sol 'cd $FOAM_SOLVERS'
alias util 'cd $FOAM_UTILITIES'
alias tut 'cd $FOAM_TUTORIALS'
alias run 'cd $FOAM_RUN'
# Refresh the environment
# ~~~~~~~~~~~~~~~~~~~~~~~
alias wmRefresh 'set wmProjectDir=$WM_PROJECT_DIR; set foamSettings=$FOAM_SETTINGS; wmUnset; source $wmProjectDir/etc/cshrc $foamSettings'
# Change OpenFOAM version
# ~~~~~~~~~~~~~~~~~~~~~~~
alias foamVersion \
'if ( "\!*" != "" ) source $FOAM_INST_DIR/OpenFOAM-\!*/etc/cshrc; foam; echo OpenFOAM-$WM_PROJECT_VERSION'
# Change ParaView version
# ~~~~~~~~~~~~~~~~~~~~~~~
alias foamPV \
'source $WM_PROJECT_DIR/etc/config.csh/paraview ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
#------------------------------------------------------------------------------

View File

@ -30,19 +30,19 @@
#
#------------------------------------------------------------------------------
# fallback value
# Fallback value
if (! $?CEI_HOME) then
setenv CEI_HOME /usr/local/ensight/CEI
endif
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
setenv CEI_ARCH linux_2.6_32
endif
# add to path
# Add to path
setenv PATH ${CEI_HOME}/bin:${PATH}
setenv ENSIGHT9_INPUT dummy

View File

@ -30,7 +30,7 @@
# The prefs.csh file will be sourced by the OpenFOAM etc/cshrc when it is
# found by foamEtcFile.
#
# See Also
# See also
# 'foamEtcFile -help' or 'foamEtcFile -list' for information about the
# paths searched
#

View File

@ -25,19 +25,20 @@
# config.csh/paraview
#
# Description
# Setup file for paraview
# Setup file for paraview-[3-5].x
# Sourced from OpenFOAM-<VERSION>/etc/cshrc or from foamPV alias
#
# Note
# The env. variables 'ParaView_DIR' and 'ParaView_MAJOR'
# are required for building plugins
#
#------------------------------------------------------------------------------
# clean the PATH
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
# Clean the PATH
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
if ( $status == 0 ) setenv PATH $cleaned
# determine the cmake to be used
# Determine the cmake to be used
unsetenv CMAKE_HOME
foreach cmake ( cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
@ -49,7 +50,12 @@ foreach cmake ( cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 c
end
#- ParaView version, automatically determine major version:
#setenv ParaView_VERSION 3.12.0
#setenv ParaView_VERSION 4.0.1
#setenv ParaView_VERSION 4.1.0
#setenv ParaView_VERSION 4.3.1
#setenv ParaView_VERSION 4.4.0
#setenv ParaView_VERSION 5.0.0
setenv ParaView_VERSION 5.0.1
setenv ParaView_MAJOR detect
@ -66,15 +72,15 @@ while ( $#argv > 0 )
end
# set MAJOR version to correspond to VERSION
# Set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
switch ("$ParaView_VERSION")
case "$ParaView_MAJOR".*:
# version and major appear to correspond
# Version and major appear to correspond
breaksw
case [0-9]*:
# extract major from the version
# Extract major from the version
setenv ParaView_MAJOR `echo ${ParaView_VERSION} | \
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
breaksw
@ -86,7 +92,7 @@ set paraviewArchName=ParaView-$ParaView_VERSION
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
# set paths if binaries or source are present
# Set paths if binaries or source are present
if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview-3.0) then
@ -108,7 +114,7 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
endif
# add in python libraries if required
# Add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if ( -r $paraviewPython ) then
if ($?PYTHONPATH) then

View File

@ -150,7 +150,7 @@ setenv FOAM_APPBIN $WM_PROJECT_DIR/platforms/$WM_OPTIONS/bin
setenv FOAM_LIBBIN $WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib
# External (ThirdParty) libraries
setenv FOAM_EXT_LIBBIN $WM_THIRD_PARTY_DIR/platforms/$WM_OPTIONS/lib
setenv FOAM_EXT_LIBBIN $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib
# Site-specific directory
if ( $?WM_PROJECT_SITE ) then

View File

@ -37,40 +37,33 @@ if ( $?WM_PROJECT_DIR ) then
if ( ! -f "$foamClean" || ! -x "$foamClean" ) unset foamClean
endif
set foamOldDirs=""
# The old dirs to be cleaned from the various environment variables
# - remove anything under top-level directory.
# NB: the WM_PROJECT_INST_DIR might not be identical between versions
#
if ( $?WM_PROJECT_INST_DIR ) then
set foamOldDirs="$WM_PROJECT_INST_DIR"
endif
if ( $?WM_PROJECT ) then
set foamOldDirs="$HOME/$WM_PROJECT/$LOGNAME $foamOldDirs"
endif
# The old dirs to be cleaned from the environment variables
set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$LOGNAME $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
if ( $?WM_PROJECT_SITE ) then
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
set foamOldDirs="$foamOldDirs $WM_PROJECT_SITE"
endif
if ( $?ParaView_DIR ) then
set foamOldDirs="$foamOldDirs $ParaView_DIR"
endif
#------------------------------------------------------------------------------
# unset WM_* environment variables
# Unset WM_* environment variables
unsetenv WM_ARCH
unsetenv WM_ARCH_OPTION
unsetenv WM_CC
unsetenv WM_CFLAGS
unsetenv WM_COMPILER
unsetenv WM_COMPILER_ARCH
unsetenv WM_COMPILER_TYPE
unsetenv WM_COMPILER_LIB_ARCH
unsetenv WM_COMPILE_OPTION
unsetenv WM_CXX
unsetenv WM_CXXFLAGS
unsetenv WM_DIR
unsetenv WM_HOSTS
unsetenv WM_LABEL_OPTION
unsetenv WM_LABEL_SIZE
unsetenv WM_LDFLAGS
unsetenv WM_LINK_LANGUAGE
unsetenv WM_MPLIB
@ -89,7 +82,7 @@ unsetenv WM_THIRD_PARTY_DIR
#------------------------------------------------------------------------------
# unset FOAM_* environment variables
# Unset FOAM_* environment variables
unsetenv FOAM_APPBIN
unsetenv FOAM_APP
@ -114,19 +107,22 @@ unsetenv FOAM_UTILITIES
#------------------------------------------------------------------------------
# unset MPI-related environment variables
# Unset MPI-related environment variables
unsetenv MPI_ARCH_PATH
unsetenv MPI_BUFFER_SIZE
unsetenv OPAL_PREFIX
#------------------------------------------------------------------------------
# unset Ensight/ParaView-related environment variables
# Unset Ensight/ParaView-related environment variables
unsetenv ENSIGHT9_READER
unsetenv CMAKE_HOME
unsetenv ParaView_DIR
unsetenv ParaView_INCLUDE_DIR
unsetenv ParaView_MAJOR
unsetenv ParaView_VERSION
unsetenv PV_PLUGIN_PATH
#------------------------------------------------------------------------------
@ -141,7 +137,13 @@ unsetenv MPFR_ARCH_PATH
unsetenv SCOTCH_ARCH_PATH
#------------------------------------------------------------------------------
# cleanup environment
# Unset foamyHexMesh-related environment variables
unsetenv FOAMY_HEX_MESH
#------------------------------------------------------------------------------
# Cleanup environment
# PATH, LD_LIBRARY_PATH, MANPATH
if ( $?foamClean ) then
@ -169,38 +171,33 @@ endif
unset cleaned foamClean foamOldDirs
#------------------------------------------------------------------------------
# cleanup aliases
# Cleanup aliases
unalias wmSET
unalias wmSet
unalias wm64
unalias wm32
unalias wmSP
unalias wmDP
unalias wmREFRESH
unalias wmUNSET
unalias wmRefresh
unalias wmUnset
unalias wmSchedON
unalias wmSchedOFF
unalias foamPV
unalias wmSchedOn
unalias wmSchedOff
unalias foam
unalias foamSite
unalias src
unalias lib
unalias run
unalias foam
unalias foamsrc
unalias foamfv
unalias app
unalias util
unalias sol
unalias util
unalias tut
unalias run
unalias foamApps
unalias foamSol
unalias foamTuts
unalias foamUtils
unalias foam3rdParty
unalias foamSite
unalias foamVersion
unalias foamPV
#------------------------------------------------------------------------------