etc merge

This commit is contained in:
Hrvoje Jasak 2010-05-17 14:51:21 +01:00
parent db7fac3f24
commit fdce75c58e
21 changed files with 347 additions and 17494 deletions

View file

@ -56,7 +56,7 @@ alias app 'cd $FOAM_APP'
alias util 'cd $FOAM_UTILITIES'
alias sol 'cd $FOAM_SOLVERS'
alias tut 'cd $FOAM_TUTORIALS'
alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR'
alias work 'cd $WM_PROJECT_USER_DIR/work'
# -----------------------------------------------------------------------------

View file

@ -56,5 +56,6 @@ alias app='cd $FOAM_APP'
alias util='cd $FOAM_UTILITIES'
alias sol='cd $FOAM_SOLVERS'
alias tut='cd $FOAM_TUTORIALS'
alias foam3rdParty='cd $WM_THIRD_PARTY_DIR'
# -----------------------------------------------------------------------------

View file

@ -1,39 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright held by original author
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# cint/bashrc
#
# Description
# Setup file for cint
# Sourced from OpenFOAM-?.?/etc/bashrc
#
#------------------------------------------------------------------------------
export CINTSYSDIR=~/pub/CINT/cint
export PATH=$PATH:$CINTSYSDIR
export MANPATH=$MANPATH:$CINTSYSDIR/doc
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CINTSYSDIR
# -----------------------------------------------------------------------------

View file

@ -1,39 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright held by original author
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# cint/cshrc
#
# Description
# Startup File for cint
# Sourced from OpenFOAM-?.?/etc/cshrc
#
#------------------------------------------------------------------------------
setenv CINTSYSDIR ~/pub/CINT/cint
set path=($CINTSYSDIR $path)
setenv MANPATH ${MANPATH}:$CINTSYSDIR/doc
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$CINTSYSDIR
# -----------------------------------------------------------------------------

View file

@ -1,88 +0,0 @@
#!/bin/bash -f
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright held by original author
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Script
# bashrc
#
# Description
# Setup file for OpenDX.
# Sourced from .OpenFoam-?.?/bashrc
#
#------------------------------------------------------------------------------
if [ "$PS1" -a "$foamDotFile" ]; then
if [ ! "$FOAM_SILENT" ]; then
echo "Executing: $foamDotFile"
fi
fi
export DXROOT=$WM_PROJECT_INST_DIR/$WM_ARCH/dx-4.4.4/dx
if [ -r $DXROOT ]; then
# Seems to speed things up on DEC
# export DXNO_BACKING_STORE=YES
# Enable continous rotation
export DXFLING=1
export DX_SOCKET_BUFSIZE=131072
export PATH=$PATH:$DXROOT/bin
export DXARCH=`dx -whicharch`
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${DXROOT}/lib_${DXARCH}
if [ $DXARCH = "sgi" ]; then
#-- Dx has problems on multiprocessor machines. Someone more persistent
# than me should probable get it to work but I just switch it off.
export DXSHMEM=-1
export DXPROCESSORS=1
elif [ $DXARCH = "alphax" ]; then
#- default seems to be 24Mb so increase
export DXMEMORY 500
elif [ $DXARCH = "linux" ]; then
#- On IA64 needs new open-motif libs. Use if supplied.
MOTIFDIR=${WM_PROJECT_INST_DIR}/${WM_ARCH}/openMotif-2.2.2
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MOTIFDIR}/lib
fi
export NETWORK_DIR=${HOME}/$FOAM_DOT_DIR/apps/dxFoam/networks/macros
if [ "$DXMACROS" ]; then
if [ "$DXMACROS" != "$NETWORK_DIR" ]; then
export DXMACROS="${NETWORK_DIR}:${DXMACROS}"
fi
else
export DXMACROS="${NETWORK_DIR}"
fi
fi
# -----------------------------------------------------------------------------

View file

@ -1,88 +0,0 @@
#!/bin/csh -f
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright held by original author
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Script
# cshrc
#
# Description
# Startup File for OpenDX.
# Sourced from .OpenFoam-?.?/cshrc
#
#------------------------------------------------------------------------------
if ($?prompt && $?foamDotFile) then
if (! $?FOAM_SILENT) then
echo "Executing: $foamDotFile"
endif
endif
setenv DXROOT $WM_PROJECT_INST_DIR/$WM_ARCH/dx-4.4.4/dx
if ( -r $DXROOT ) then
# Seems to speed things up on DEC
# setenv DXNO_BACKING_STORE YES
# Continous rotation enabled
setenv DXFLING 1
setenv DX_SOCKET_BUFSIZE 131072
set path = ( $path $DXROOT/bin )
rehash
setenv DXARCH `dx -whicharch`
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${DXROOT}/lib_${DXARCH}
if ($DXARCH == sgi) then
#-- Dx has problems on multiprocessor machines. Someone more persistent
# than me should probable get it to work but I just switch it off.
setenv DXSHMEM -1
setenv DXPROCESSORS 1
else if ($DXARCH == alphax) then
#- default seems to be 24Mb so increase
setenv DXMEMORY 500
else if ($DXARCH == linux) then
#- On IA64 needs new open-motif libs. Use if supplied.
set MOTIFDIR=${WM_PROJECT_INST_DIR}/${WM_ARCH}/openMotif-2.2.2
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${MOTIFDIR}/lib
endif
setenv NETWORK_DIR ${HOME}/$FOAM_DOT_DIR/apps/dxFoam/networks/macros
if ($?DXMACROS) then
if ($DXMACROS != $NETWORK_DIR) then
setenv DXMACROS "${NETWORK_DIR}:${DXMACROS}"
endif
else
setenv DXMACROS "${NETWORK_DIR}"
endif
endif
# -----------------------------------------------------------------------------

View file

@ -1,213 +0,0 @@
//
// time: Tue Aug 28 10:23:52 2001
//
// version: 3.1.2 (format), 4.1.3 (DX)
//
//
// Begin MDF
// MODULE ExcludeList
// CATEGORY Macros
// DESCRIPTION excludes list of -0.5 .. 0.5 around value
// INPUT input_1; value list or string list or object; (no default);
// INPUT input_2; object; (no default);
// INPUT input_3; value list or string list or object; (no default);
// OUTPUT output_1; object;
// OUTPUT output_2; object;
// End MDF
// workspace: width = 658, height = 919
// layout: snap = 0, width = 50, height = 50, align = NN
//
macro ExcludeList(
input_1
,input_2
,input_3
) -> (
output_1
,output_2
) {
//
// node Input[3]: x = 28, y = 17, inputs = 0, label = Input
// parameter: position = 1, name = 'input_1', value = '(no default)', descriptive = 1, description = ' ', required = 0, visible = 1
//
ExcludeList_Input_3_out_1 = input_1;
//
// node Inquire[67]: x = 21, y = 123, inputs = 3, label = Inquire
// input[2]: defaulting = 1, visible = 1, type = 32, value = "is null"
//
ExcludeList_Inquire_67_out_1[cache: 2] =
Inquire(
ExcludeList_Input_3_out_1,
NULL,
NULL
) [instance: 67, cache: 1];
//
// node Compute[5]: x = 20, y = 228, inputs = 3, label = Compute
// input[1]: defaulting = 0, visible = 0, type = 32, value = "$0+1"
// expression: value = a+1
// name[2]: value = a
// name[3]: value = b
//
ExcludeList_Compute_5_out_1[cache: 2] =
Compute(
"$0+1",
ExcludeList_Inquire_67_out_1,
NULL
) [instance: 5, cache: 1];
//
// node Transmitter[8]: x = 22, y = 322, inputs = 1, label = isNull
//
isNull = ExcludeList_Compute_5_out_1;
//
// node Receiver[10]: x = 475, y = 147, inputs = 1, label = isNull
//
ExcludeList_Receiver_10_out_1[cache: 0] = isNull;
//
// node Route[186]: x = 525, y = 147, inputs = 2, outputs = 2, label = Route
//
ExcludeList_Route_186_out_1[cache: 2],
ExcludeList_Route_186_out_2[cache: 2] =
Route(
ExcludeList_Receiver_10_out_1,
ExcludeList_Input_3_out_1
) [instance: 186, cache: 1];
//
// node ForEachMember[2]: x = 475, y = 237, inputs = 1, label = ForEachMember
//
ExcludeList_ForEachMember_2_out_1[cache: 2],
ExcludeList_ForEachMember_2_out_2[cache: 2],
ExcludeList_ForEachMember_2_out_3[cache: 2] =
ForEachMember(
ExcludeList_Route_186_out_1
) [instance: 2, cache: 1];
//
// node Inquire[66]: x = 395, y = 326, inputs = 3, label = Inquire
// input[2]: defaulting = 0, visible = 1, type = 32, value = "is not null"
//
ExcludeList_Inquire_66_out_1[cache: 2] =
Inquire(
ExcludeList_ForEachMember_2_out_1,
"is not null",
NULL
) [instance: 66, cache: 1];
//
// node Route[187]: x = 488, y = 327, inputs = 2, outputs = 2, label = Route
//
ExcludeList_Route_187_out_1[cache: 2],
ExcludeList_Route_187_out_2[cache: 2] =
Route(
ExcludeList_Inquire_66_out_1,
ExcludeList_ForEachMember_2_out_1
) [instance: 187, cache: 1];
//
// node Compute[4]: x = 533, y = 422, inputs = 3, label = Compute
// input[1]: defaulting = 0, visible = 0, type = 32, value = "$0+0.5"
// expression: value = a+0.5
// name[2]: value = a
// name[3]: value = b
//
ExcludeList_Compute_4_out_1[cache: 2] =
Compute(
"$0+0.5",
ExcludeList_Route_187_out_1,
NULL
) [instance: 4, cache: 1];
//
// node Compute[68]: x = 453, y = 422, inputs = 3, label = Compute
// input[1]: defaulting = 0, visible = 0, type = 32, value = "$0-0.5"
// expression: value = a-0.5
// name[2]: value = a
// name[3]: value = b
//
ExcludeList_Compute_68_out_1[cache: 2] =
Compute(
"$0-0.5",
ExcludeList_Route_187_out_1,
NULL
) [instance: 68, cache: 1];
//
// node Input[2]: x = 241, y = 21, inputs = 0, label = Input
// parameter: position = 2, name = 'input_2', value = '(no default)', descriptive = 1, description = ' ', required = 0, visible = 1
//
ExcludeList_Input_2_out_1 = input_2;
//
// node GetLocal[2]: x = 343, y = 482, inputs = 3, label = GetLocal
//
ExcludeList_GetLocal_2_out_1[cache: 2],
ExcludeList_GetLocal_2_out_2[cache: 2] =
GetLocal(
ExcludeList_Input_2_out_1,
NULL,
NULL
) [instance: 2, cache: 1];
//
// node Include[3]: x = 413, y = 562, inputs = 6, label = Include
// input[2]: defaulting = 1, visible = 1, type = 5, value = -0.1
// input[3]: defaulting = 1, visible = 1, type = 5, value = 0.1
// input[4]: defaulting = 0, visible = 1, type = 3, value = 1
// input[5]: defaulting = 0, visible = 1, type = 3, value = 0
//
ExcludeList_Include_3_out_1[cache: 2] =
Include(
ExcludeList_GetLocal_2_out_1,
ExcludeList_Compute_68_out_1,
ExcludeList_Compute_4_out_1,
1,
0,
NULL
) [instance: 3, cache: 1];
//
// node Input[4]: x = 616, y = 31, inputs = 0, label = Input
// parameter: position = 3, name = 'input_3', value = '(no default)', descriptive = 1, description = ' ', required = 0, visible = 1
//
ExcludeList_Input_4_out_1 = input_3;
//
// node Output[1]: x = 263, y = 842, inputs = 1, label = Output
// parameter: position = 1, name = 'output_1', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
output_1 = ExcludeList_Route_187_out_1;
//
// node Receiver[11]: x = 423, y = 762, inputs = 1, label = isNull
//
ExcludeList_Receiver_11_out_1[cache: 0] = isNull;
//
// node Switch[195]: x = 483, y = 762, inputs = 3, label = Switch
//
ExcludeList_Switch_195_out_1[cache: 2] =
Switch(
ExcludeList_Receiver_11_out_1,
ExcludeList_Include_3_out_1,
ExcludeList_Input_4_out_1
) [instance: 195, cache: 1];
//
// node Output[2]: x = 489, y = 857, inputs = 1, label = Output
// parameter: position = 2, name = 'output_2', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
output_2 = ExcludeList_Switch_195_out_1;
//
// node SetLocal[2]: x = 343, y = 652, inputs = 3, label = SetLocal
//
SetLocal(
ExcludeList_Include_3_out_1,
ExcludeList_GetLocal_2_out_2,
NULL
) [instance: 2, cache: 1];
// network: end of macro body
}
ExcludeList_Input_3_out_1 = NULL;
ExcludeList_Inquire_67_out_1 = NULL;
ExcludeList_Compute_5_out_1 = NULL;
ExcludeList_Transmitter_8_out_1 = NULL;
ExcludeList_Receiver_10_out_1 = NULL;
ExcludeList_Route_186_out_1 = NULL;
ExcludeList_ForEachMember_2_out_1 = NULL;
ExcludeList_Inquire_66_out_1 = NULL;
ExcludeList_Route_187_out_1 = NULL;
ExcludeList_Compute_4_out_1 = NULL;
ExcludeList_Compute_68_out_1 = NULL;
ExcludeList_Input_2_out_1 = NULL;
ExcludeList_GetLocal_2_out_1 = NULL;
ExcludeList_GetLocal_2_out_2 = NULL;
ExcludeList_Include_3_out_1 = NULL;
ExcludeList_Input_4_out_1 = NULL;
ExcludeList_Receiver_11_out_1 = NULL;
ExcludeList_Switch_195_out_1 = NULL;

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -23,7 +23,7 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# ensightFoam/bashrc
# ensight/bashrc
#
# Description
# Setup file for Ensight 8.?

View file

@ -23,7 +23,7 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# ensightFoam/cshrc
# ensight/cshrc
#
# Description
# Startup File for Ensight 8.?.

View file

@ -1,65 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright held by original author
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# paraview/bashrc
#
# Description
# Setup file for Paraview.
# Sourced from OpenFOAM-?.?/etc/bashrc
#
#------------------------------------------------------------------------------
export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
if [ -r $CMAKE_HOME ]; then
export PATH=$CMAKE_HOME/bin:$PATH
else
unset CMAKE_HOME
fi
export ParaView_VERSION=2.4.4
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4
if [ "$PYTHONPATH" ]; then
export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping
else
export PYTHONPATH=$ParaView_DIR/Utilities/VTKPythonWrapping
fi
if [ -r $ParaView_INST_DIR ]; then
export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
export PATH=$ParaView_INST_DIR/bin:$PATH
export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}
export PV_PLUGIN_PATH=$FOAM_LIBBIN
fi
if [ -r $ParaView_DIR ]; then
export VTK_DIR=$ParaView_DIR/VTK
fi
# -----------------------------------------------------------------------------

View file

@ -1,65 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright held by original author
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# paraview/cshrc
#
# Description
# Startup File for Paraview.
# Sourced from OpenFOAM-?.?/etc/cshrc
#
#------------------------------------------------------------------------------
setenv CMAKE_HOME $WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
if ( -r $CMAKE_HOME ) then
set path=($CMAKE_HOME/bin $path)
else
unsetenv CMAKE_HOME
endif
setenv ParaView_VERSION 2.4.4
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
if ($?PYTHONPATH) then
setenv PYTHONPATH ${PYTHONPATH}:$ParaView_DIR/bin:$ParaView_DIR/Utilities/VTKPythonWrapping
else
setenv PYTHONPATH $ParaView_DIR/bin:$ParaView_DIR/Utilities/VTKPythonWrapping
endif
if ( -r $ParaView_INST_DIR ) then
setenv PV_INTERFACE_PATH $FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
set path=($ParaView_DIR/bin $path)
setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib:${ParaView_DIR}/lib/vtk:${LD_LIBRARY_PATH}
setenv PV_PLUGIN_PATH $FOAM_LIBBIN
endif
if ( -r $ParaView_DIR ) then
setenv VTK_DIR $ParaView_DIR/VTK
endif
# -----------------------------------------------------------------------------

View file

@ -29,26 +29,50 @@
# Setup file for ParaView3.
# Sourced from OpenFOAM-?.?/etc/bashrc
#
# Note
# The env. variable 'ParaView_DIR' is required for building plugins
#------------------------------------------------------------------------------
export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
if [ -r $CMAKE_HOME ]; then
# determine the cmake to be used
unset CMAKE_HOME
for cmake in cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
do
cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
if [ -r $cmake ]
then
export CMAKE_HOME=$cmake
export PATH=$CMAKE_HOME/bin:$PATH
else
unset CMAKE_HOME
break
fi
done
export ParaView_VERSION="3.3-cvs"
# export ParaView_VERSION="3.4.0"
# set MAJOR and VERSION variables if not already set
[ -z "$ParaView_MAJOR" ] && export ParaView_MAJOR=paraview-3.6
[ -z "$ParaView_VERSION" ] && export ParaView_VERSION=3.6.1
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
if [ "$PYTHONPATH" ]; then
export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping
# add in python libraries if required
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if [ -r $paraviewPython ]
then
if [ "$PYTHONPATH" ]
then
export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_DIR/lib/$ParaView_MAJOR
else
export PYTHONPATH=$ParaView_DIR/Utilities/VTKPythonWrapping
export PYTHONPATH=$paraviewPython:$ParaView_DIR/lib/$ParaView_MAJOR
fi
if [ $WM_ARCH == "darwinPpc" -o $WM_ARCH == "darwinIntel" ]
then
@ -56,6 +80,8 @@ then
fi
if [ -r $ParaView_DIR ]; then
if [ -r $ParaView_DIR ]
then
export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$ParaView_DIR/bin:$LD_LIBRARY_PATH
if [ $WM_ARCH == "darwinPpc" -o $WM_ARCH == "darwinIntel" ]
@ -73,4 +99,5 @@ if [ -r $ParaView_DIR ]; then
fi
fi
unset cmake paraviewPython
# -----------------------------------------------------------------------------

View file

@ -26,36 +26,44 @@
# paraview3/cshrc
#
# Description
# Startup File for Paraview3
# Sourced from OpenFOAM-?.?/etc/cshrc
# Setup file for paraview-3.x
# Sourced from OpenFOAM-*/etc/cshrc
#
# Note
# The env. variable 'ParaView_DIR' is required for building plugins
#------------------------------------------------------------------------------
setenv CMAKE_HOME $WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
if ( -r $CMAKE_HOME ) then
set path=($CMAKE_HOME/bin $path)
else
# determine the cmake to be used
unsetenv CMAKE_HOME
foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
set cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
if ( -r $cmake ) then
setenv CMAKE_HOME $cmake
set path=($CMAKE_HOME/bin $path)
break
endif
end
setenv ParaView_VERSION 3.3-cvs
if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR paraview-3.6
if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
# add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if ( -r $paraviewPython ) then
if ($?PYTHONPATH) then
setenv PYTHONPATH ${PYTHONPATH}:$ParaView_DIR/bin:$ParaView_DIR/Utilities/VTKPythonWrapping
setenv PYTHONPATH ${PYTHONPATH}:${paraviewPython}:$ParaView_DIR/lib/${$ParaView_MAJOR}
else
setenv PYTHONPATH $ParaView_DIR/bin:$ParaView_DIR/Utilities/VTKPythonWrapping
setenv PYTHONPATH ${paraviewPython}:$ParaView_DIR/lib/${$ParaView_MAJOR}
endif
endif
setenv PYTHONPATH $ParaView_DIR/lib/paraview-3.3/:$PYTHONPATH
if ( -r $ParaView_INST_DIR ) then
set path=($ParaView_DIR/bin $path)
setenv LD_LIBRARY_PATH $ParaView_DIR/lib:$LD_LIBRARY_PATH
setenv PV_PLUGIN_PATH $FOAM_LIBBIN
endif
unset cmake paraviewPython
# -----------------------------------------------------------------------------

View file

@ -33,13 +33,14 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
export WM_PROJECT_VERSION=1.5-dev
#: ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
export WM_PROJECT_VERSION=1.6-ext
# helps to easily write #ifdefs to detect a dev-version
export FOAM_DEV=1
#!!User:
################################################################################
# USER EDITABLE PART
#
# either set $FOAM_INST_DIR before sourcing this file or set
# $foamInstall below to where OpenFOAM is installed
#
@ -49,9 +50,22 @@ foamInstall=$HOME/$WM_PROJECT
# foamInstall=~$WM_PROJECT
# foamInstall=/usr/local/$WM_PROJECT
# foamInstall=/opt/$WM_PROJECT
#
# END OF (NORMAL) USER EDITABLE PART
################################################################################
# note the location for later use (eg, in job scripts)
: ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR
# 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
foamOldDirs="$FOAM_INST_DIR $HOME/$WM_PROJECT/$USER"
if [ "$WM_PROJECT_INST_DIR" != "$FOAM_INST_DIR" ]
then
foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
fi
# Location of site/user files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -62,13 +76,13 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
# Operating System/Platform from Unix or MSWindows
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_OS = Unix | MSWindows
: ${WM_OS:=Unix}; export WM_OS
# Operating System/Platform
# ~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_OSTYPE = POSIX | ????
: ${WM_OSTYPE:=POSIX}; export WM_OSTYPE
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
@ -91,12 +105,8 @@ export WM_NCOMPPROCS=2
# WM_COMPILE_OPTION = Opt | Debug | Prof
: ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
#: ${WM_COMPILE_OPTION:=Debug}; export WM_COMPILE_OPTION
# WM_JAVAC_OPTION = Opt | Debug
: ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION
# WM_MPLIB = | OPENMPI| LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
@ -137,9 +147,6 @@ Linux)
export WM_CFLAGS='-m64 -fPIC'
export WM_CXXFLAGS='-m64 -fPIC'
export WM_LDFLAGS='-m64'
#export WM_COMPILER=Icc
#export WM_CC='icc'
#export WM_CXX='icpc'
;;
*)
echo Unknown WM_ARCH_OPTION $WM_ARCH_OPTION, should be 32 or 64
@ -216,21 +223,18 @@ USAGE
esac
# Clean standard environment variables (PATH, MANPATH, LD_LIBRARY_PATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
# Remove anything under top-level foam directory
wildCards="$WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$USER"
#- Clean path/PATH
cleanPath=`$cleanProg "$PATH" "$wildCards"` && PATH="$cleanPath"
#- Clean PATH
cleanEnv=`$cleanProg "$PATH" "$foamOldDirs"` && PATH="$cleanEnv"
#- Clean LD_LIBRARY_PATH
cleanPath=`$cleanProg "$LD_LIBRARY_PATH" "$wildCards"` && LD_LIBRARY_PATH="$cleanPath"
cleanEnv=`$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleanEnv"
#- Clean MANPATH
cleanPath=`$cleanProg "$MANPATH" "$wildCards"` && MANPATH="$cleanPath"
cleanEnv=`$cleanProg "$MANPATH" "$foamCleanDirs"` && MANPATH="$cleanEnv"
export PATH LD_LIBRARY_PATH MANPATH
@ -255,33 +259,33 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc
# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#- Clean path/PATH. Only remove duplicates
cleanPath=`$cleanProg "$PATH"` && PATH="$cleanPath"
# Clean environment paths again. Only remove duplicates
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#- Clean PATH
cleanEnv=`$cleanProg "$PATH"` && PATH="$cleanEnv"
#- Clean LD_LIBRARY_PATH
cleanPath=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanPath"
cleanEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanEnv"
#- Clean MANPATH
cleanPath=`$cleanProg "$MANPATH"` && MANPATH="$cleanPath:"
cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv:"
export PATH LD_LIBRARY_PATH MANPATH
#- Clean LD_PRELOAD
if [ "$LD_PRELOAD" != "" ]; then
cleanPath=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanPath"
if [ "$LD_PRELOAD" != "" ]
then
cleanEnv=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanEnv"
export LD_PRELOAD
fi
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
unset cleanPath cleanProg foamInstall
unset cleanEnv cleanProg foamInstall foamOldDirs
unset _foamSource
# -----------------------------------------------------------------------------

View file

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.openfoam.org |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View file

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.openfoam.org |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -19,7 +19,6 @@ FoamFile
Documentation
{
docBrowser "kde-open %f";
// docBrowser "open %f"; // for the Mac
doxyDocDirs
(
"$WM_PROJECT_USER_DIR/Doxygen/html"
@ -39,6 +38,7 @@ DebugSwitches
cyclicGgi 0;
coupledLduMatrix 1;
Analytical 0;
APIdiffCoefFunc 0;
Ar 0;
BICCG 0;
@ -62,18 +62,25 @@ DebugSwitches
C8H18 0;
C9H20 0;
CH3OH 0;
CallbackRegistry 0;
CH4N2O 0;
CarnahanStarling 0;
CallbackRegistry 0;
CentredFitData<biLinearFitPolynomial> 0;
CentredFitData<linearFitPolynomial> 0;
CentredFitData<quadraticFitPolynomial> 0;
CentredFitData<quadraticLinearFitPolynomial> 0;
ChomiakInjector 0;
Cloud<basicKinematicParcel> 0;
Cloud<basicReactingParcel> 0;
Cloud<basicThermoParcel> 0;
Cloud<indexedParticle> 0;
Cloud<kinematicParcel> 0;
Cloud<parcel> 0;
Cloud<passiveParticle> 0;
Cloud<reactingParcel> 0;
Cloud<thermoParcel> 0;
Cloud<trackedParticle> 0;
CoEuler 0;
CompositionModel 0;
ConeInjection 0;
Constant 0;
ConstantRateDevolatilisation 0;
CrankNicholson 0;
CrossPowerLaw 0;
@ -82,6 +89,7 @@ DebugSwitches
DICGaussSeidel 0;
DILU 0;
DILUGaussSeidel 0;
DataEntry 0;
DeardorffDiffStress 0;
DispersionModel 0;
DispersionRASModel 0;
@ -91,6 +99,7 @@ DebugSwitches
Euler 0;
EulerImplicit 0;
EulerRotation 0;
extendedCellToFaceStencil 0;
FDIC 0;
FaceCellWave 0;
GAMG 0;
@ -112,39 +121,40 @@ DebugSwitches
H2O 0;
HashTable 0;
HeatTransferModel 0;
HerschelBulkley 0;
HrenyaSinclair 0;
IC8H18 0;
ICCG 0;
IDDESDelta 0;
IDEA 0;
IFstream 0;
IOMap<dictionary> 0;
IOPtrList<MRFZone> 0;
IOPtrList<coordinateSystem> 0;
IOPtrList<injector> 0;
IOPtrList<porousZone> 0;
IOobject 0;
InjectionModel 0;
IntegrationScheme 0;
JohnsonJackson 0;
KRR4 0;
KinematicCloud<kinematicParcel> 0;
KinematicCloud<reactingParcel> 0;
KinematicCloud<thermoParcel> 0;
KinematicParcel<reactingParcel> 0;
KinematicParcel<thermoParcel> 0;
KinematicCloud<basicKinematicParcel> 0;
KinematicCloud<basicReactingParcel> 0;
KinematicCloud<basicThermoParcel> 0;
KinematicParcel<basicReactingParcel> 0;
KinematicParcel<basicThermoParcel> 0;
LESModel 0;
LESdelta 0;
LESfilter 0;
LESmodel 0;
LISA 0;
LRR 0;
LRRDiffStress 0;
LamBremhorstKE 0;
LaunderGibsonRSTM 0;
LaunderSharmaKE 0;
LduMatrix 1;
LienCubicKE 0;
LienCubicKELowRe 0;
LienLeschzinerLowRe 0;
Lun 0;
LunSavage 0;
MB 0;
MC 0;
MCV 0;
@ -190,17 +200,19 @@ DebugSwitches
PatchToPatchInterpolation 0;
Phi 0;
PointEdgeWave 0;
POSIX 0;
Prandtl 0;
PrimitivePatch 0;
Pstream 0;
QUICK 0;
QUICKV 0;
QZeta 0;
RASModel 0;
RK 0;
RNGkEpsilon 0;
RanzMarshall 0;
ReactingCloud<reactingParcel> 0;
ReactingParcel<reactingParcel> 0;
ReactingCloud<basicReactingParcel> 0;
ReactingParcel<basicReactingParcel> 0;
Rebound 0;
ReitzDiwakar 0;
ReitzKHRT 0;
@ -213,6 +225,8 @@ DebugSwitches
SIBS 0;
SKA 0;
SLTS 0;
SRFModel 0;
SRFVelocity 0;
STARCDRotation 0;
Schaeffer 0;
SchillerNaumann 0;
@ -220,8 +234,9 @@ DebugSwitches
SingleKineticRateDevolatilisation 0;
SingleMixtureFraction 0;
Smagorinsky 0;
SmoothSolver 0;
SpalartAllmaras 0;
SpalartAllmarasDDES 0;
SpalartAllmarasIDDES 0;
SphereDrag 0;
StandardWallInteraction 0;
StaticHashTable 0;
@ -233,13 +248,16 @@ DebugSwitches
SyamlalOBrien 0;
SyamlalRogersOBrien 0;
TAB 0;
ThermoCloud<reactingParcel> 0;
ThermoCloud<thermoParcel> 0;
ThermoParcel<reactingParcel> 0;
ThermoParcel<thermoParcel> 0;
Table 0;
ThermoCloud<basicReactingParcel> 0;
ThermoCloud<basicThermoParcel> 0;
ThermoParcel<basicReactingParcel> 0;
ThermoParcel<basicThermoParcel> 0;
UMIST 0;
UMISTV 0;
Unix 0;
UpwindFitData<cubicUpwindFitPolynomial> 0;
UpwindFitData<quadraticLinearUpwindFitPolynomial> 0;
UpwindFitData<quadraticUpwindFitPolynomial> 0;
WallInteractionModel 0;
WenYu 0;
aC11H10 0;
@ -250,6 +268,9 @@ DebugSwitches
addPoint 0;
advective 0;
algebraicPair 0;
alphaContactAngle 0;
alphaFixedPressure 0;
alphatWallFunction 0;
angularOscillatingDisplacement 0;
angularOscillatingVelocity 0;
anisotropic 0;
@ -257,14 +278,21 @@ DebugSwitches
atomizationModel 0;
attachDetach 0;
autoHexMeshDriver 0;
autoLayerDriver 0;
autoRefineDriver 0;
autoSnapDriver 0;
bC11H10 0;
backward 0;
basePatch 0;
basicKinematicCloud 0;
basicKinematicParcel 0;
basicMixture 0;
basicReactingCloud 0;
basicReactingParcel 0;
basicThermo 0;
basicThermoCloud 0;
basicThermoParcel 0;
biLinearFit 0;
binaryAbsorptionEmission 0;
blended 0;
blobsSheetAtomization 0;
@ -279,7 +307,6 @@ DebugSwitches
boxToPoint 0;
breakupModel 0;
calculated 0;
cartesian 0;
cell 0;
cellClassification 0;
cellCuts 0;
@ -297,6 +324,8 @@ DebugSwitches
cellToFace 0;
cellToPoint 0;
cellZone 0;
centredCECStencil 0;
centredCFCStencil 0;
chemistryReader 0;
chemistrySolver 0;
chemkinReader 0;
@ -309,24 +338,25 @@ DebugSwitches
commSchedule 0;
commonRailInjector 0;
compound 0;
conductivityModel 0;
constInjector 0;
constant 0;
constantAbsorptionEmission 0;
constantGammaContactAngle 0;
constantAlphaContactAngle 0;
constantScatter 0;
coordinateRotation 0;
coordinateSystem 0;
coordinateSystems 0;
corrected 0;
coupled 0;
cubeRootVol 0;
cubic 0;
cubicUpwindFit 0;
curve 0;
cyclic 0;
cyclicLduInterface 0;
cyclicLduInterfaceField 0;
cylinderToCell 0;
cylindrical 0;
dataSchedule 0;
decompositionMethod 0;
definedHollowConeInjector 0;
definedInjector 0;
@ -335,11 +365,11 @@ DebugSwitches
diagonal 0;
dictionary 0;
dimensionSet 1;
directMapped 0;
directMappedBase 0;
directMappedPatch 0;
directMappedVelocityFlux 0;
directionMixed 0;
directional 0;
disallowDefaultFvsPatchField 0;
disallowGenericFvPatchField 0;
disallowGenericPointPatchField 0;
disallowGenericPolyPatch 0;
@ -350,6 +380,7 @@ DebugSwitches
displacementInterpolation 0;
displacementLaplacian 0;
displacementSBRStress 0;
distanceSurface 0;
downwind 0;
dragModel 0;
duplicatePoints 0;
@ -357,8 +388,8 @@ DebugSwitches
dynMixedSmagorinsky 0;
dynOneEqEddy 0;
dynSmagorinsky 0;
dynamicAlphaContactAngle 0;
dynamicFvMesh 0;
dynamicGammaContactAngle 0;
dynamicInkJetFvMesh 0;
dynamicMotionSolverFvMesh 0;
dynamicRefineFvMesh 0;
@ -368,6 +399,7 @@ DebugSwitches
empty 0;
engineMesh 0;
enrichedPatch 0;
epsilonWallFunction 0;
errorDrivenRefinement 0;
evaporationModel 0;
exponential 0;
@ -392,13 +424,20 @@ DebugSwitches
filteredLinear 0;
filteredLinear2 0;
filteredLinear2V 0;
filteredLinear3 0;
filteredLinear3V 0;
fixedEnthalpy 0;
fixedFluxBuoyantPressure 0;
buoyantPressure 0;
fixedFluxBoussinesqBuoyantPressure 0;
fixedFluxPressure 0;
fixedGradient 0;
fixedInternalEnergy 0;
fixedInternalValue 0;
fixedNormalSlip 0;
fixedPressureCompressibleDensity 0;
fixedUnburntEnthalpy 0;
fixedValue 0;
flowRateInletVelocity 0;
fluxCorrectedVelocity 0;
foamChemistryReader 0;
foamFile 0;
@ -421,20 +460,18 @@ DebugSwitches
fvTensorMatrix 0;
fvVectorMatrix 0;
fvsPatchField 0;
gammaContactAngle 0;
gammaFixedPressure 0;
general 0;
generic 0;
genericPatch 0;
geomCellLooper 0;
geometricSurfacePatch 0;
ggi 0;
global 0;
globalMeshData 0;
globalPoints 0;
gnuplot 0;
gradientDispersionRAS 0;
gradientEnthalpy 0;
gradientInternalEnergy 0;
gradientUnburntEnthalpy 0;
granularPressureModel 0;
hCombustionThermo 0;
@ -465,25 +502,29 @@ DebugSwitches
hhuMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
hierarchical 0;
hollowConeInjector 0;
iC3H8O 0;
indexedOctree 0;
indexedParticle 0;
injectorModel 0;
injectorType 0;
inletOutlet 0;
inletOutletTotalTemperature 0;
inputMode 0;
interfaceCompression 0;
intersectedSurface 0;
inverseDistance 0;
inverseFaceDistance 0;
inversePointDistance 0;
inverseVolume 0;
isoSurface 0;
isoSurfaceCell 0;
jplot 0;
jumpCyclic 0;
kEpsilon 0;
kOmega 0;
kOmegaSST 0;
kOmegaSSTSAS 0;
kqRWallFunction 0;
kinematicCloud 0;
kinematicParcel 0;
labelField 0;
labelList 0;
labelListList 0;
@ -502,6 +543,7 @@ DebugSwitches
leastSquares 0;
leastSquaresVectors 0;
level 2;
limitWith 0;
limited 0;
limitedCubic 0;
limitedCubic01 0;
@ -516,6 +558,7 @@ DebugSwitches
limitedSurfaceInterpolationScheme 0;
limitedVanLeer 0;
linear 0;
linearFit 0;
linearUpwind 0;
linearUpwindV 0;
liquid 0;
@ -526,7 +569,6 @@ DebugSwitches
localPointRegion 0;
lowReOneEqEddy 0;
manual 0;
massFlowRateInletVelocity 0;
meshCutAndRemove 0;
meshCutter 0;
meshModifier 0;
@ -538,6 +580,7 @@ DebugSwitches
midPointAndFace 0;
mixed 0;
mixedEnthalpy 0;
mixedInternalEnergy 0;
mixedSmagorinsky 0;
mixedUnburntEnthalpy 0;
mixerFvMesh 0;
@ -550,22 +593,32 @@ DebugSwitches
motionSolver 0;
movingConeTopoFvMesh 0;
movingWallVelocity 0;
muSgsWallFunction 0;
muSgsSpalartAllmarasWallFunction 0;
multiDirRefinement 0;
multiHoleInjector 0;
multivariateSelection 0;
mutStandardRoughWallFunction 0;
mutRoughWallFunction 0;
mutSpalartAllmarasStandardRoughWallFunction 0;
mutSpalartAllmarasStandardWallFunction 0;
mutSpalartAllmarasWallFunction 0;
mutWallFunction 0;
nC3H8O 0;
nbrToCell 0;
nearestToCell 0;
nearestToPoint 0;
noAbsorptionEmission 0;
noDragModel 0;
noRadiation 0;
none 0;
normal 0;
normalToFace 0;
nuSgsWallFunction 0;
nutStandardRoughWallFunction 0;
nutStandardWallFunction 0;
nuSgsSpalartAllmarasWallFunction 0;
nutRoughWallFunction 0;
nutSpalartAllmarasStandardRoughWallFunction 0;
nutSpalartAllmarasStandardWallFunction 0;
nutSpalartAllmarasWallFunction 0;
nutWallFunction 0;
obj 0;
objectRegistry 0;
octree 0;
octreeDataEdges 0;
@ -573,7 +626,7 @@ DebugSwitches
octreeDataFaceList 0;
octreeDataTriSurface 0;
off 0;
offsetTriSurfaceMesh 0;
omegaWallFunction 0;
oneEqEddy 0;
orientedSurface 0;
oscillatingDisplacement 0;
@ -615,11 +668,13 @@ DebugSwitches
polyMeshInfo 0;
polyTopoChange 0;
polyTopoChanger 0;
powerLaw 0;
pressureDirectedInletOutletVelocity 0;
pressureDirectedInletVelocity 0;
pressureInletOutletVelocity 0;
pressureInletUniformVelocity 0;
pressureInletVelocity 0;
pressureNormalInletOutletVelocity 0;
pressureSwirlInjector 0;
primitiveMesh 0;
primitiveMeshGeometry 0;
@ -631,11 +686,13 @@ DebugSwitches
pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>> 0;
pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>> 0;
quadratic 0;
radialModel 0;
quadraticFit 0;
quadraticLinearFit 0;
quadraticLinearUpwindFit 0;
quadraticUpwindFit 0;
radiationModel 0;
raw 0;
reactingCloud 0;
reactingParcel 0;
reaction 0;
realizableKE 0;
refinementHistory 0;
@ -643,6 +700,7 @@ DebugSwitches
reflect 0;
regIOobject 0;
regionSplit 0;
regionToCell 0;
remove 0;
removeCell 0;
removeCells 0;
@ -693,8 +751,8 @@ DebugSwitches
staticFvMesh 0;
steadyState 0;
stl 0;
stochasticDispersionRAS 0;
string 0;
stochasticDispersionRAS 0;
supersonicFreestream 0;
surfaceFeatures 0;
surfaceInterpolation 0;
@ -726,11 +784,12 @@ DebugSwitches
tensorAverageField 0;
tensorField 0;
thermoCloud 0;
thermoParcel 0;
thermophysicalFunction 0;
time 0;
timeVaryingGammaContactAngle 0;
timeVaryingAlphaContactAngle 0;
timeVaryingFlowRateInletVelocity 0;
timeVaryingMappedFixedValue 0;
timeVaryingTotalPressure 0;
timeVaryingUniformFixedValue 0;
timer 0;
topoAction 0;
@ -751,17 +810,19 @@ DebugSwitches
treeNode 0;
triSurface 0;
triSurfaceMesh 0;
triSurfaceMeshes 0;
turbulenceModel 0;
turbulentHeatFluxTemperature 0;
turbulentInlet 0;
turbulentIntensityKineticEnergyInlet 0;
turbulentMixingLengthDissipationRateInlet 0;
turbulentMixingLengthFrequencyInlet 0;
uncorrected 0;
undoableMeshCutter 0;
uniform 0;
uniformFixedValue 0;
unitInjector 0;
upwind 0;
upwindCFCStencil 0;
value 0;
vanAlbada 0;
vanAlbadaV 0;
@ -786,7 +847,7 @@ DebugSwitches
volTensorField::DimensionedInternalField 0;
volVectorField 0;
volVectorField::DimensionedInternalField 0;
vtkFoam 0;
vtk 0;
walkPatch 0;
wall 0;
wallHeatTransfer 0;
@ -817,54 +878,6 @@ OptimisationSwitches
// commsType blocking; //scheduled; //blocking;
floatTransfer 0;// Floating transfer not realiable
nProcsSimpleSum 0;
nSquaredProjection 0;
}
Tolerances
{
// Primitive mesh checking limits
primitiveMeshClosedThreshold 1e-6;
primitiveMeshAspectThreshold 1000;
primitiveMeshNonOrthThreshold 70;
primitiveMeshSkewThreshold 4;
primitiveMeshFaceAngleThreshold 10;
primitiveMeshFaceFlatnessThreshold 0.8;
// Geometric matching tolerances
cyclicMatchTol 1e-4;
processorMatchTol 1e-4;
// Volumetric closed domain
closedDomainTol 1e-10;
// Patch-to-patch interpolation tolerances
patchToPatchDirectHit 1e-5;
patchToPatchProjectionTol 0.05;
// Thermophysical models
specieThermoTol 1e-4;
// Intersection tolerance
intersectionPlanarTol 0.2;
intersectionMissTol 1e-10;
// Sliding interface
// slidingPointMergeTol 0.2;
// slidingEdgeMergeTol 0.05;
// slidingIntegralAdjTol 0.15;
// slidingEdgeMasterCatchFraction 0.4;
// slidingEdgeEndCutoffTol 0.0001;
// slidingEdgeCoPlanarTol 0.8;
slidingPointMergeTol 0.2;
slidingEdgeMergeTol 0.05;
slidingIntegralAdjTol 0.15;
slidingEdgeMasterCatchFraction 0.4;
slidingEdgeEndCutoffTol 0.0001;
slidingEdgeCoPlanarTol 0.8;
// GGIAreaErrorTol 1e-8;
}
DimensionedConstants
@ -883,7 +896,6 @@ DimensionedConstants
//- Stefan-Boltzmann constant [J/(K4 m2 s)]
sigmaSB sigmaSB [1 0 -3 -4 0 0 0] 5.670e-08;
/* USCS units
//- Universal gas constant [lbm ft2/(s2 kmol R)]

View file

@ -32,13 +32,14 @@
#------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM
setenv WM_PROJECT_VERSION 1.5-dev
#if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
setenv WM_PROJECT_VERSION 1.6-ext
# helps to easily write #ifdefs to detect a dev-version
setenv FOAM_DEV 1
#!!User:
################################################################################
# USER EDITABLE PART
#
# either setenv FOAM_INST_DIR before sourcing this file or set
# foamInstall below to where OpenFOAM is installed
#
@ -48,9 +49,17 @@ set foamInstall = $HOME/$WM_PROJECT
# set foamInstall = ~$WM_PROJECT
# set foamInstall = /usr/local/$WM_PROJECT
# set foamInstall = /opt/$WM_PROJECT
#
# END OF (NORMAL) USER EDITABLE PART
################################################################################
# note the location for later use (eg, in job scripts)
if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
# 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
set foamOldDirs="$FOAM_INST_DIR $HOME/$WM_PROJECT/$LOGNAME"
# Location of site/user files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -61,16 +70,16 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
# Operating System/Platform from Unix or MSWindows
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_OS = Unix | MSWindows
if ( ! $?WM_OS ) setenv WM_OS Unix
# Operating System/Platform
# ~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_OSTYPE = POSIX | ????
if ( ! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX
# Compiler: set to Gcc, Gcc42 or Icc (for Intel's icc)
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
@ -89,15 +98,9 @@ if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64
if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
# WM_COMPILE_OPTION = Opt | Debug | Prof
#if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
#if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Debug
setenv WM_COMPILE_OPTION Opt
#setenv WM_COMPILE_OPTION Debug
if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
# WM_JAVAC_OPTION = Opt | Debug
if ( ! $?WM_JAVAC_OPTION ) setenv WM_JAVAC_OPTION Opt
# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
@ -139,9 +142,6 @@ case Linux:
setenv WM_CFLAGS '-m64 -fPIC'
setenv WM_CXXFLAGS '-m64 -fPIC'
setenv WM_LDFLAGS '-m64'
#setenv WM_COMPILER Icc
#setenv WM_CC 'icc'
#setenv WM_CXX 'icpc'
breaksw
default:
@ -202,15 +202,15 @@ case SunOS:
default:
echo
echo "Your '$WM_ARCH' operating system is not supported by this release"
echo "of OpenFOAM. For further assistance, please contact www.openfoam.org"
echo "of OpenFOAM. For further assistance, please contact www.OpenFOAM.org"
echo
breaksw
endsw
# Clean standard environment variables (path, PATH, MANPATH, LD_LIBRARY_PATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Clean standard environment variables (path/PATH, LD_LIBRARY_PATH, MANPATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
set cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
if (! $?LD_LIBRARY_PATH ) then
@ -220,21 +220,18 @@ if (! $?MANPATH) then
setenv MANPATH ''
endif
# Remove anything under top-level foam directory
set wildCards="$WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$LOGNAME"
#- Clean path/PATH
set colonPath=`echo "$path" | sed -e 's/ /:/g'`
set PATH=`$cleanProg "$colonPath" "$wildCards"`
set cleanEnv=`$cleanProg "$colonPath" "$foamOldDirs"`
if ( $status == 0 ) then
set path=`echo "$PATH" | sed -e 's/:/ /g'`
set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
endif
#- Clean LD_LIBRARY_PATH
setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH" "$wildCards"`
setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"`
#- Clean MANPATH
setenv MANPATH `$cleanProg "$MANPATH" "$wildCards"`
setenv MANPATH `$cleanProg "$MANPATH" "$foamOldDirs"`
# Source project setup files
@ -248,17 +245,16 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
_foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#- Clean path/PATH. Only remove duplicates
# Clean environment paths again. Only remove duplicates
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#- Clean path/PATH
set colonPath=`echo "$path" | sed -e 's/ /:/g'`
set PATH=`$cleanProg "$colonPath"`
set cleanEnv=`$cleanProg "$colonPath"`
if ( $status == 0 ) then
set path=`echo "$PATH" | sed -e 's/:/ /g'`
set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
endif
#- Clean LD_LIBRARY_PATH
@ -274,9 +270,7 @@ endif
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
unset cleanProg
unset wildCards
unset colonPath
unset cleanEnv cleanProg colonPath foamInstall foamOldDirs
unalias _foamSource
# -----------------------------------------------------------------------------

View file

@ -35,8 +35,6 @@
alias _foamAddPath 'set path=(\!* $path)'
# prefix to LD_LIBRARY_PATH
alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
# make directory if it doesn't already exist
alias _foamMkDir 'if ( ! -d \!* ) mkdir -p \!*'
# location of the jobControl directory
setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
@ -53,15 +51,19 @@ setenv WM_DECOMP_INC -DFACE_DECOMP
setenv WM_DECOMP_LIBS "-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver"
# base configuration
setenv FOAM_SRC $WM_PROJECT_DIR/src
setenv FOAM_LIB $WM_PROJECT_DIR/lib
setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS
setenv FOAM_APP $WM_PROJECT_DIR/applications
setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
setenv FOAM_LIB $WM_PROJECT_DIR/lib
setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS
setenv FOAM_SRC $WM_PROJECT_DIR/src
# shared site configuration - similar naming convention as ~OpenFOAM expansion
setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
# user configuration
setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
# convenience
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
@ -73,16 +75,14 @@ setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
set path=($WM_DIR $WM_PROJECT_DIR/bin $path)
_foamAddPath $FOAM_APPBIN
_foamAddPath $FOAM_SITE_APPBIN
_foamAddPath $FOAM_USER_APPBIN
# Make sure to pick up dummy versions of external libraries last
_foamAddLib $FOAM_LIBBIN/dummy
_foamAddLib $FOAM_LIBBIN
_foamAddLib $FOAM_SITE_LIBBIN
_foamAddLib $FOAM_USER_LIBBIN
# create these directories if necessary:
_foamMkDir $FOAM_LIBBIN
_foamMkDir $FOAM_APPBIN
_foamMkDir $FOAM_USER_LIBBIN
_foamMkDir $FOAM_USER_APPBIN
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -94,7 +94,14 @@ switch ("$compilerInstall")
case OpenFOAM:
switch ("$WM_COMPILER")
case Gcc:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
breaksw
case Gcc43:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
breaksw
case Gcc42:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
@ -126,7 +133,7 @@ unset MPI_ARCH_PATH
switch ("$WM_MPLIB")
case OPENMPI:
set mpi_version=openmpi-1.2.6
set mpi_version=openmpi-1.3.3
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
@ -140,18 +147,28 @@ case OPENMPI:
unset mpi_version
breaksw
case LAM:
set mpi_version=lam-7.1.4
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
case SYSTEMOPENMPI:
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib
# This uses the installed openmpi. It needs mpicc installed!
set mpi_version=openmpi-system
# Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
setenv PINC `mpicc --showme:compile`
setenv PLIBS `mpicc --showme:link`
set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using system installed MPI:"
echo " compile flags : $PINC"
echo " link flags : $PLIBS"
echo " libmpi dir : $libDir"
endif
_foamAddLib $libDir
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
unset mpi_version
unset mpi_version libDir
breaksw
case MPICH:
@ -272,7 +289,6 @@ endif
# ~~~~~~~~~~~~~~~~~~~~
unalias _foamAddPath
unalias _foamAddLib
unalias _foamMkDir
unset minBufferSize
# -----------------------------------------------------------------------------

View file

@ -52,17 +52,6 @@ _foamAddLib()
}
# make directories if they don't already exist
_foamMkDir()
{
while [ $# -ge 1 ]
do
[ -d $1 ] || mkdir -p $1
shift
done
}
# location of the jobControl directory
export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
@ -78,15 +67,19 @@ export WM_DECOMP_INC=-DFACE_DECOMP
export WM_DECOMP_LIBS="-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver"
# base configuration
export FOAM_SRC=$WM_PROJECT_DIR/src
export FOAM_LIB=$WM_PROJECT_DIR/lib
export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS
export FOAM_APP=$WM_PROJECT_DIR/applications
export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
export FOAM_LIB=$WM_PROJECT_DIR/lib
export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS
export FOAM_SRC=$WM_PROJECT_DIR/src
# shared site configuration - similar naming convention as ~OpenFOAM expansion
export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
# user configuration
export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
# convenience
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
@ -97,11 +90,10 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
# add OpenFOAM scripts and wmake to the path
export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
_foamAddPath $FOAM_APPBIN $FOAM_USER_APPBIN
_foamAddLib $FOAM_LIBBIN $FOAM_USER_LIBBIN
# create these directories if necessary:
_foamMkDir $FOAM_LIBBIN $FOAM_USER_LIBBIN $FOAM_APPBIN $FOAM_USER_APPBIN
_foamAddPath $FOAM_APPBIN $FOAM_SITE_APPBIN $FOAM_USER_APPBIN
# Make sure to pick up dummy versions of external libraries last
_foamAddLib $FOAM_LIBBIN/dummy
_foamAddLib $FOAM_LIBBIN $FOAM_SITE_LIBBIN $FOAM_USER_LIBBIN
# Compiler settings
@ -114,11 +106,18 @@ unset compilerBin compilerLib
#compilerInstall=OpenFOAM
compilerInstall=System
case "$compilerInstall" in
case "${compilerInstall:-OpenFOAM}" in
OpenFOAM)
case "$WM_COMPILER" in
Gcc)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
Gcc43)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
Gcc42)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
@ -156,7 +155,7 @@ unset MPI_ARCH_PATH
case "$WM_MPLIB" in
OPENMPI)
mpi_version=openmpi-1.2.6
mpi_version=openmpi-1.3.3
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
@ -170,15 +169,24 @@ OPENMPI)
unset mpi_version
;;
LAM)
mpi_version=lam-7.1.4
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
SYSTEMOPENMPI)
mpi_version=openmpi-system
# Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
export PINC=`mpicc --showme:compile`
export PLIBS=`mpicc --showme:link`
libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Using system installed MPI:"
echo " compile flags : $PINC"
echo " link flags : $PLIBS"
echo " libmpi dir : $libDir"
fi
_foamAddLib $libDir
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
unset mpi_version
@ -291,13 +299,14 @@ export MPI_BUFFER_SIZE
# Switch on the hoard memory allocator if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#if [ -f $FOAM_LIBBIN/libhoard.so ]; then
#if [ -f $FOAM_LIBBIN/libhoard.so ]
#then
# export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
#fi
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
unset _foamAddPath _foamAddLib _foamMkDir minBufferSize
unset _foamAddPath _foamAddLib minBufferSize
# -----------------------------------------------------------------------------