Corrections to etc/settings.sh.

This commit is contained in:
Martin Beaudoin 2010-11-24 01:13:57 -05:00
parent 63a1e2fac3
commit de0c0ab8ec

View file

@ -362,102 +362,75 @@ export MPI_BUFFER_SIZE
# appropriate XXX_DIR environment variable for a given package in order to disable # appropriate XXX_DIR environment variable for a given package in order to disable
# the sourcing of the ThirdParty version of the same package. # the sourcing of the ThirdParty version of the same package.
# Load Mesquite library if the MESQUITE_DIR variable is empty or non-existent # Load Mesquite library
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~
if [ ! -n "${MESQUITE_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS/etc/mesquite-2.1.2.sh
[ -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS/etc/mesquite-2.1.2.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "MESQUITE_DIR is initialized to: $MESQUITE_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "MESQUITE_DIR is initialized to: $MESQUITE_DIR"
# Load Metis library if the METIS_DIR variable is empty or non-existent # Load Metis library
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~
if [ ! -n "${METIS_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/metis-5.0pre2 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.0pre2/platforms/$WM_OPTIONS/etc/metis-5.0pre2.sh
[ -e $WM_THIRD_PARTY_DIR/packages/metis-5.0pre2 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.0pre2/platforms/$WM_OPTIONS/etc/metis-5.0pre2.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "METIS_DIR is initialized to: $METIS_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "METIS_DIR is initialized to: $METIS_DIR"
# Load ParMetis library if the PARMETIS_DIR variable is empty or non-existent # Load ParMetis library
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~
if [ ! -n "${PARMETIS_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/ParMetis-3.1.1 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/ParMetis-3.1.1/platforms/$WM_OPTIONS/etc/ParMetis-3.1.1.sh
[ -e $WM_THIRD_PARTY_DIR/packages/ParMetis-3.1.1 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/ParMetis-3.1.1/platforms/$WM_OPTIONS/etc/ParMetis-3.1.1.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PARMETIS_DIR is initialized to: $PARMETIS_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PARMETIS_DIR is initialized to: $PARMETIS_DIR"
# Load ParMGridGen library if the PARMGRIDGEN_DIR variable is empty or non-existent # Load ParMGridGen library
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~
if [ ! -n "${PARMGRIDGEN_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS/etc/ParMGridGen-1.0.sh
[ -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS/etc/ParMGridGen-1.0.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PARMGRIDGEN_DIR is initialized to: $PARMGRIDGEN_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PARMGRIDGEN_DIR is initialized to: $PARMGRIDGEN_DIR"
# Load Scotch library if the SCOTCH_DIR variable is empty or non-existent # Load Scotch library
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~
if [ ! -n "${SCOTCH_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/scotch-5.1.10b ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/scotch-5.1.10b/platforms/$WM_OPTIONS/etc/scotch-5.1.10b.sh
[ -e $WM_THIRD_PARTY_DIR/packages/scotch-5.1.10b ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/scotch-5.1.10b/platforms/$WM_OPTIONS/etc/scotch-5.1.10b.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "SCOTCH_DIR is initialized to: $SCOTCH_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "SCOTCH_DIR is initialized to: $SCOTCH_DIR"
# Load cmake if the CMAKE_DIR variable is empty or non-existent # Load cmake
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~
if [ ! -n "${CMAKE_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3/platforms/$WM_OPTIONS/etc/cmake-2.8.3.sh
[ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3/platforms/$WM_OPTIONS/etc/cmake-2.8.3.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "CMAKE_DIR is initialized to: $CMAKE_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "CMAKE_DIR is initialized to: $CMAKE_DIR"
# Load Python if the PYTHON_DIR variable is empty or non-existent # Load Python
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~
if [ ! -n "${PYTHON_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/Python-2.7 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/Python-2.7/platforms/$WM_OPTIONS/etc/Python-2.7.sh
[ -e $WM_THIRD_PARTY_DIR/packages/Python-2.7 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/Python-2.7/platforms/$WM_OPTIONS/etc/Python-2.7.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PYTHON_DIR is initialized to: $PYTHON_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PYTHON_DIR is initialized to: $PYTHON_DIR"
# Load QT if the QT_DIR variable is empty or non-existent # Load QT
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~
if [ ! -n "${QT_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.7.0 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.7.0/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.7.0.sh
[ -e $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.7.0 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.7.0/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.7.0.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "QT_DIR is initialized to: $QT_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "QT_DIR is initialized to: $QT_DIR"
# Load ParaView if the PARAVIEW_DIR variable is empty or non-existent # Load ParaView
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~
if [ ! -n "${PARAVIEW_DIR:+x}" ] [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1 ] && {
then _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
[ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1 ] && { }
_foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
}
fi
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PARAVIEW_DIR is initialized to: $PARAVIEW_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "PARAVIEW_DIR is initialized to: $PARAVIEW_DIR"