Attachment #135019 for bug #104257

Lines 130-140 Link Here

(-)OpenFOAM-1.4.1-src/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluentMeshToFoam.L (-4 / +4 lines)
130	nl (\n\|\r)	130	nl (\n\|\r)
131	spaceNl ({space}\|{nl})*	131	spaceNl ({space}\|{nl})*
132		132
133	alpha [_[:alpha:]]	133	alpha [_[:alpha:] ]
134	digit [[:digit:]]	134	digit [[:digit:] ]
135	decDigit [[:digit:]]	135	decDigit [[:digit:] ]
136	octalDigit [0-7]	136	octalDigit [0-7]
137	hexDigit [[:xdigit:]]	137	hexDigit [[:xdigit:] ]
138		138
139	lbrac "("	139	lbrac "("
140	rbrac ")"	140	rbrac ")"

Lines 115-125 Link Here

(-)OpenFOAM-1.4.1-src/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L (-4 / +4 lines)
115	cspace ","{space}	115	cspace ","{space}
116	spaceNl ({space}\|\n\|\r)*	116	spaceNl ({space}\|\n\|\r)*
117		117
118	alpha [_[:alpha:]]	118	alpha [_[:alpha:] ]
119	digit [[:digit:]]	119	digit [[:digit:] ]
120	decDigit [[:digit:]]	120	decDigit [[:digit:] ]
121	octalDigit [0-7]	121	octalDigit [0-7]
122	hexDigit [[:xdigit:]]	122	hexDigit [[:xdigit:] ]
123		123
124	lbrac "("	124	lbrac "("
125	rbrac ")"	125	rbrac ")"

Lines 91-101 Link Here

(-)OpenFOAM-1.4.1-src/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L (-4 / +4 lines)
91	cspace ","{space}	91	cspace ","{space}
92	spaceNl ({space}\|\n)*	92	spaceNl ({space}\|\n)*
93		93
94	alpha [_[:alpha:]]	94	alpha [_[:alpha:] ]
95	digit [[:digit:]]	95	digit [[:digit:] ]
96	dec_digit [[:digit:]]	96	dec_digit [[:digit:] ]
97	octal_digit [0-7]	97	octal_digit [0-7]
98	hex_digit [[:xdigit:]]	98	hex_digit [[:xdigit:] ]
99		99
100	lbrac "("	100	lbrac "("
101	rbrac ")"	101	rbrac ")"

Lines 2-6 Link Here

(-)OpenFOAM-1.4.1-src/applications/utilities/mesh/manipulation/patchTool/Java/Allwmake (-1 / +1 lines)
2	set -x	2	set -x
3		3
4	rmclassall	4	rmclassall
5	javac -classpath ".:../lib/j3d-org.jar" -d Make/classes/ PatchTool/PatchTool.java	5	javac -classpath ".:../lib/j3d-org.jar:/usr/share/sun-java3d-bin/lib/vecmath.jar:/usr/share/sun-java3d-bin/lib/j3dutils.jar:/usr/share/sun-java3d-bin/lib/j3dcore.jar" -d Make/classes/ PatchTool/PatchTool.java
6	jar cf ../lib/PatchTool.jar -C Make/classes .	6	jar cf ../lib/PatchTool.jar -C Make/classes .

Lines 1-6 Link Here

(-)OpenFOAM-1.4.1-src/applications/utilities/mesh/manipulation/patchTool/Java/Make/options (-1 / +1 lines)
1	/* EXE_INC = ../lib/j3d-org.jar */	1	/* EXE_INC = ../lib/j3d-org.jar */
2		2
3	EXE_INC = -classpath ".:Make/classes:../lib/j3d-org.jar"	3	EXE_INC = -classpath ".:Make/classes:../lib/j3d-org.jar:/usr/share/sun-java3d-bin/lib/vecmath.jar:/usr/share/sun-java3d-bin/lib/j3dutils.jar:/usr/share/sun-java3d-bin/lib/j3dcore.jar"
4		4
5	LIB_LIBS = META-INF/MANIFEST.MF	5	LIB_LIBS = META-INF/MANIFEST.MF
6		6

Lines 1-6 Link Here

(-)OpenFOAM-1.4.1-src/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/Make/options (-1 / +1 lines)
1	EXE_INC = \	1	EXE_INC = \
2	-I$(LIB_SRC)/finiteVolume/lnInclude \	2	-I$(LIB_SRC)/finiteVolume/lnInclude \
3	-I$(ParaView_INST_DIR)/include \	3	-I$(ParaView_INST_DIR)/include/vtk-5.0 \
4	-I../PVFoamReader	4	-I../PVFoamReader
5		5
6	LIB_LIBS = \	6	LIB_LIBS = \




export PATH=${WM_PROJECT_DIR}/bin:$WM_PROJECT_INST_DIR/$WM_ARCH/bin:$PATH

#- Location of the jobControl directory
export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl

export WM_DIR=$WM_PROJECT_DIR/wmake
export WM_LINK_LANGUAGE=c++

WM_COMPILER_LIB=

if [ "$WM_COMPILER" = "Gcc" -o "$machineTest" = "Linux" -a "$WM_COMPILER" = "" ]; then
    export WM_COMPILER_DIR="/usr"
    WM_COMPILER_BIN="$WM_COMPILER_DIR/bin:$WM_COMPILER_DIR/../gdb-6.4/bin"
    WM_COMPILER_LIB=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib:
fi

# ~~~~~~~~~~~~~~~~~
if [ "$machineTest" = "Linux" ]; then

    #export JAVA_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/j2sdk1.4.2_05
    export JAVA_HOME=${JAVA_HOME} #Set Java jdk env variable to system $JAVA_HOME
    processor=`uname -m`

    if [ "$processor" = "ia64" ]; then


if [ .$WM_MPLIB = .OPENMPI ]; then

#     export OPENMPI_VERSION=1.2.3
    export OPENMPI_VERSION=`/usr/bin/ompi_info --version ompi full --parsable | grep ompi:version:full | cut -d: -f4-`
#    export OPENMPI_HOME=$FOAM_SRC/openmpi-$OPENMPI_VERSION
#    export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
    export OPENMPI_ARCH_PATH=/usr

    # Tell OpenMPI where to find it's install directory
    export OPAL_PREFIX=$OPENMPI_ARCH_PATH


elif [ .$WM_MPLIB = .LAM ]; then

#     export LAM_VERSION=7.1.2
    export LAM_VERSION=`/usr/bin/laminfo -version lam full | awk '{print $$2}'`
#     export LAMHOME=$FOAM_SRC/lam-$LAM_VERSION
#     export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
    export LAM_ARCH_PATH=/usr

    AddLib $LAM_ARCH_PATH/lib
    AddPath $LAM_ARCH_PATH/bin

     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/lam-$LAM_VERSION

elif [ .$WM_MPLIB = .MPICH ]; then

#     export MPICH_VERSION=1.2.4
    export MPICH_VERSION=`/usr/bin/mpich2version --version`
#     export MPICH_PATH=$FOAM_SRC/mpich-$MPICH_VERSION
    export MPICH_ARCH_PATH=/usr
    export MPICH_ROOT=$MPICH_ARCH_PATH

    AddLib $MPICH_ARCH_PATH/lib
    AddPath $MPICH_ARCH_PATH/bin

     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$MPICH_VERSION

elif [ .$WM_MPLIB = .MPICH-GM ]; then





set path=($WM_PROJECT_DIR/bin $WM_PROJECT_INST_DIR/$WM_ARCH/bin $path)

#- Location of the jobControl directory
setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl

setenv WM_DIR $WM_PROJECT_DIR/wmake
setenv WM_LINK_LANGUAGE c++

set WM_COMPILER_LIB=

if ($WM_COMPILER == "Gcc" || $machineTest == "Linux" && $?WM_COMPILER) then
    setenv WM_COMPILER_DIR "/usr"
    set WM_COMPILER_BIN="$WM_COMPILER_DIR/bin $WM_COMPILER_DIR/../gdb-6.4/bin"
    set WM_COMPILER_LIB=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib:
endif

# ~~~~~~~~~~~~~~~~~
if ($machineTest == Linux) then

    #setenv JAVA_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/j2sdk1.4.2_05
    setenv JAVA_HOME ${JAVA_HOME} #Set Java jdk env variable to system $JAVA_HOME

    set processor = `uname -m`



if ($WM_MPLIB == OPENMPI) then

#     setenv OPENMPI_VERSION 1.2.3
    setenv OPENMPI_VERSION=`/usr/bin/ompi_info --version ompi full --parsable | grep ompi:version:full | cut -d: -f4-`
#     setenv OPENMPI_HOME $FOAM_SRC/openmpi-$OPENMPI_VERSION
#     setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
    setenv OPENMPI_ARCH_PATH=/usr

    # Tell OpenMPI where to find it's install directory
    setenv OPAL_PREFIX $OPENMPI_ARCH_PATH


else if ($WM_MPLIB == LAM) then

#     setenv LAM_VERSION 7.1.2
    setenv LAM_VERSION=`/usr/bin/laminfo -version lam full | awk '{print $$2}'`
#     setenv LAMHOME $FOAM_SRC/lam-$LAM_VERSION
#     setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
    setenv LAM_ARCH_PATH=/usr

    AddLib $LAM_ARCH_PATH/lib
    AddPath $LAM_ARCH_PATH/bin


else if ($WM_MPLIB == MPICH) then

#     setenv MPICH_VERSION 1.2.4
     setenv MPICH_VERSION=`/usr/bin/mpich2version --version`
#     setenv MPICH_PATH $FOAM_SRC/mpich-$MPICH_VERSION
    setenv MPICH_ARCH_PATH /usr
    setenv MPICH_ROOT $MPICH_ARCH_PATH

    AddLib $MPICH_ARCH_PATH/lib




    fi
fi

# export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6

# if [ -r $CMAKE_HOME ]; then
#     export PATH=$CMAKE_HOME/bin:$PATH
# fi

export CMAKE_HOME=/usr

export ParaView_VERSION=2.6.2

export ParaView_INST_DIR=/usr
export ParaView_DIR=$ParaView_INST_DIR/lib/ParaView-2.6

export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/paraview-$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4

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}
fi

if [ -r $ParaView_DIR ]; then




    endif
endif

# setenv CMAKE_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6

# if ( -r $CMAKE_HOME ) then
#     set path=($CMAKE_HOME/bin $path)
# endif

setenv CMAKE_HOME /usr

setenv ParaView_VERSION 2.6.2

setenv ParaView_INST_DIR /usr
setenv ParaView_DIR $ParaView_INST_DIR/lib/paraview-$ParaView_VERSION

if ( -r $ParaView_INST_DIR ) then
    setenv PV_INTERFACE_PATH $FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make

#     set path=($ParaView_INST_DIR/bin $path)
#     setenv LD_LIBRARY_PATH ${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}
endif

if ( -r $ParaView_DIR ) then




#
# Location of FOAM installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT
#export WM_PROJECT_INST_DIR=~$WM_PROJECT
#export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
#export WM_PROJECT_INST_DIR=/usr/local/$WM_PROJECT
export WM_PROJECT_INST_DIR=/usr/lib/$WM_PROJECT

# Check that the installation directory has been set and exists
if [ "$WM_PROJECT_INST_DIR" -a -d $WM_PROJECT_INST_DIR ]; then


# Compiler (if set to "" use the system compiler)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export WM_COMPILER=
export WM_COMPILER_ARCH=
export WM_COMPILER_LIB_ARCH=


    #export WM_COMPILER_LIB_ARCH=/mabi=64

    #export WM_MPLIB=
    #export WM_MPLIB=MPI
    export WM_MPLIB=OPENMPI
    #export WM_MPLIB=LAM
    #export WM_MPLIB=MPICH
    #export WM_MPLIB=MPICH-GM


# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ensightFoam/bashrc
#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/paraview/bashrc
#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ParaView3/bashrc






#
# Location of FOAM installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT
#setenv WM_PROJECT_INST_DIR ~$WM_PROJECT
#setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
#setenv WM_PROJECT_INST_DIR /usr/local/$WM_PROJECT
setenv WM_PROJECT_INST_DIR /usr/lib/$WM_PROJECT

# Check that the installation directory has been set and exists
if ( $?WM_PROJECT_INST_DIR ) then


# Compiler (if set to "" use the system compiler)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv WM_COMPILER
setenv WM_COMPILER_ARCH
setenv WM_COMPILER_LIB_ARCH


    #setenv WM_COMPILER_LIB_ARCH /mabi=64

    #setenv WM_MPLIB
    #setenv WM_MPLIB MPI
    setenv WM_MPLIB OPENMPI
    #setenv WM_MPLIB LAM
    #setenv WM_MPLIB MPICH
    #setenv WM_MPLIB MPICH-GM


# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ensightFoam/cshrc
#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/paraview/cshrc


# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)





(cd $FOAM_SRC/OpenFOAM ; wmakeLnInclude . )

# wmake libso zlib-1.2.1
#
# if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
# then
# 
#     cd $OPENMPI_HOME
# 
#         gmake distclean
#         rm -rf $OPENMPI_ARCH_PATH
# 
#         ./configure \
#             --prefix=$OPENMPI_ARCH_PATH \
#             --disable-mpirun-prefix-by-default \
#             --disable-orterun-prefix-by-default \
#             --enable-shared --disable-static \
#             --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
#             --disable-mpi-profile
# 
#         gmake
#         gmake install
#         gmake distclean
# 
#     cd $FOAM_SRC
# fi
# 
# if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]
# then
# 
#     cd $LAMHOME
# 
#         gmake distclean
#         rm -rf $LAM_ARCH_PATH
# 
#         ./configure \
#             --prefix=$LAM_ARCH_PATH \
#             --enable-shared \
#             --disable-static \
#             --without-romio \
#             --without-mpi2cpp \
#             --without-profiling \
#             --without-fc
# 
#         gmake
#         gmake install
#         gmake distclean
# 
#     cd $FOAM_SRC
# fi
# 
# if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]
# then
#     
#     cd $MPICH_PATH
# 
#         make distclean
#         rm -rf $MPICH_ARCH_PATH
#         rm util/machines/machines.*
# 
#         ./configure \
#             --without-mpe \
#             --disable-f77 \
#             --disable-f90 \
#             --disable-f90modules \
#             --disable-c++ \
#             --disable-mpedbg \
#             --disable-devdebug \
#             --disable-debug \
#             --enable-sharedlib=$MPICH_ARCH_PATH/lib \
#             --with-device=ch_p4 \
#             -prefix=$MPICH_ARCH_PATH
#         make
#         make install
#         make distclean
# 
#         if [ -r $MPICH_ARCH_PATH ]
#         then
#             cd $MPICH_ARCH_PATH/bin
#             for file in *
#             do
#                 sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$
#                 mv temp.$$ $file
#                 chmod ugo+rx $file
#             done
# 
#             cd $MPICH_ARCH_PATH/lib
# 
#             if [ -r libmpich.so.1.0 ]
#             then
#                 rm *.so
#                 ln -s libmpich.so.1.0 libmpich.so
#             fi
# 
#             cd $MPICH_ARCH_PATH
#         fi
# 
#     cd $FOAM_SRC
# fi

(cd Pstream ; ./Allwmake)
wmake libso OpenFOAM

Lines 1-6 Link Here

(-)OpenFOAM-1.4.1-src/wmake/rules/General/flex++ (-1 / +1 lines)
1	.SUFFIXES: .L	1	.SUFFIXES: .L
2		2
3	Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $.C ; $(CC) $(c++FLAGS) -c $.C -o $@	3	Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $.C ; $(CC) $(c++FLAGS) -c $.C -o $@
4		4
5	.L.dep:	5	.L.dep:
6	$(MAKE_DEP)	6	$(MAKE_DEP)

Lines 1-6 Link Here

(-)OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test (-1 / +1 lines)
1	.SUFFIXES: .L	1	.SUFFIXES: .L
2		2
3	Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $.C ; $(CC) $(c++FLAGS) -c $.C -o $@	3	Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $.C ; $(CC) $(c++FLAGS) -c $.C -o $@
4		4
5	.L.dep:	5	.L.dep:
6	$(MAKE_DEP)	6	$(MAKE_DEP)

Lines 109-115 Link Here

(-)OpenFOAM-1.4.1-src/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L (-1 / +1 lines)
109	label [1-9]{dec_digit}*	109	label [1-9]{dec_digit}*
110	zeroLabel {digit}*	110	zeroLabel {digit}*
111		111
112	word ([[:alnum:]]\|[[:punct:]])+	112	word ([[:alnum:] ]\|[[:punct:] ])+
113	string {word}({some_space}{word})*	113	string {word}({some_space}{word})*
114		114
115	exponent_part [eEdD][-+]?{digit}+	115	exponent_part [eEdD][-+]?{digit}+

Lines 159-165 Link Here

(-)OpenFOAM-1.4.1-src/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L (-1 / +1 lines)
159	zeroLabel {digit}*	159	zeroLabel {digit}*
160	signedInteger [-+]?{integer}	160	signedInteger [-+]?{integer}
161		161
162	word ([[:alnum:]]\|[[:punct:]])*	162	word ([[:alnum:] ]\|[[:punct:] ])*
163	string {word}({some_space}{word})*	163	string {word}({some_space}{word})*
164		164
165	exponent_part [eE][-+]?{digit}+	165	exponent_part [eE][-+]?{digit}+

Return to bug 104257

Lines 56-62 Link Here

(-)OpenFOAM-1.4.1-src/.bashrc (-15 / +20 lines)
56	export PATH=${WM_PROJECT_DIR}/bin:$WM_PROJECT_INST_DIR/$WM_ARCH/bin:$PATH	56	export PATH=${WM_PROJECT_DIR}/bin:$WM_PROJECT_INST_DIR/$WM_ARCH/bin:$PATH
57		57
58	#- Location of the jobControl directory	58	#- Location of the jobControl directory
59	export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl	59	export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl
60		60
61	export WM_DIR=$WM_PROJECT_DIR/wmake	61	export WM_DIR=$WM_PROJECT_DIR/wmake
62	export WM_LINK_LANGUAGE=c++	62	export WM_LINK_LANGUAGE=c++
Lines 97-103 Link Here
97	WM_COMPILER_LIB=	97	WM_COMPILER_LIB=
98		98
99	if [ "$WM_COMPILER" = "Gcc" -o "$machineTest" = "Linux" -a "$WM_COMPILER" = "" ]; then	99	if [ "$WM_COMPILER" = "Gcc" -o "$machineTest" = "Linux" -a "$WM_COMPILER" = "" ]; then
100	export WM_COMPILER_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/gcc-4.2.1$WM_COMPILER_ARCH	100	export WM_COMPILER_DIR="/usr"
101	WM_COMPILER_BIN="$WM_COMPILER_DIR/bin:$WM_COMPILER_DIR/../gdb-6.4/bin"	101	WM_COMPILER_BIN="$WM_COMPILER_DIR/bin:$WM_COMPILER_DIR/../gdb-6.4/bin"
102	WM_COMPILER_LIB=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib:	102	WM_COMPILER_LIB=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib:
103	fi	103	fi
Lines 115-122 Link Here
115	# ~~~~~~~~~~~~~~~~~	115	# ~~~~~~~~~~~~~~~~~
116	if [ "$machineTest" = "Linux" ]; then	116	if [ "$machineTest" = "Linux" ]; then
117		117
118	export JAVA_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/j2sdk1.4.2_05	118	#export JAVA_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/j2sdk1.4.2_05
119		119	export JAVA_HOME=${JAVA_HOME} #Set Java jdk env variable to system $JAVA_HOME
120	processor=`uname -m`	120	processor=`uname -m`
121		121
122	if [ "$processor" = "ia64" ]; then	122	if [ "$processor" = "ia64" ]; then
Lines 176-184 Link Here
176		176
177	if [ .$WM_MPLIB = .OPENMPI ]; then	177	if [ .$WM_MPLIB = .OPENMPI ]; then
178		178
179	export OPENMPI_VERSION=1.2.3	179	# export OPENMPI_VERSION=1.2.3
180	export OPENMPI_HOME=$FOAM_SRC/openmpi-$OPENMPI_VERSION	180	export OPENMPI_VERSION=`/usr/bin/ompi_info --version ompi full --parsable \| grep ompi:version:full \| cut -d: -f4-`
181	export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS	181	# export OPENMPI_HOME=$FOAM_SRC/openmpi-$OPENMPI_VERSION
		182	# export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
		183	export OPENMPI_ARCH_PATH=/usr
182		184
183	# Tell OpenMPI where to find it's install directory	185	# Tell OpenMPI where to find it's install directory
184	export OPAL_PREFIX=$OPENMPI_ARCH_PATH	186	export OPAL_PREFIX=$OPENMPI_ARCH_PATH
Lines 190-215 Link Here
190		192
191	elif [ .$WM_MPLIB = .LAM ]; then	193	elif [ .$WM_MPLIB = .LAM ]; then
192		194
193	export LAM_VERSION=7.1.2	195	# export LAM_VERSION=7.1.2
194	export LAMHOME=$FOAM_SRC/lam-$LAM_VERSION	196	export LAM_VERSION=`/usr/bin/laminfo -version lam full \| awk '{print $$2}'`
195	export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS	197	# export LAMHOME=$FOAM_SRC/lam-$LAM_VERSION
		198	# export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
		199	export LAM_ARCH_PATH=/usr
196		200
197	AddLib $LAM_ARCH_PATH/lib	201	AddLib $LAM_ARCH_PATH/lib
198	AddPath $LAM_ARCH_PATH/bin	202	AddPath $LAM_ARCH_PATH/bin
199		203
200	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/lam-$LAM_VERSION	204	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/lam-$LAM_VERSION
201		205
202	elif [ .$WM_MPLIB = .MPICH ]; then	206	elif [ .$WM_MPLIB = .MPICH ]; then
203		207
204	export MPICH_VERSION=1.2.4	208	# export MPICH_VERSION=1.2.4
205	export MPICH_PATH=$FOAM_SRC/mpich-$MPICH_VERSION	209	export MPICH_VERSION=`/usr/bin/mpich2version --version`
206	export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS	210	# export MPICH_PATH=$FOAM_SRC/mpich-$MPICH_VERSION
		211	export MPICH_ARCH_PATH=/usr
207	export MPICH_ROOT=$MPICH_ARCH_PATH	212	export MPICH_ROOT=$MPICH_ARCH_PATH
208		213
209	AddLib $MPICH_ARCH_PATH/lib	214	AddLib $MPICH_ARCH_PATH/lib
210	AddPath $MPICH_ARCH_PATH/bin	215	AddPath $MPICH_ARCH_PATH/bin
211		216
212	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$MPICH_VERSION	217	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$MPICH_VERSION
213		218
214	elif [ .$WM_MPLIB = .MPICH-GM ]; then	219	elif [ .$WM_MPLIB = .MPICH-GM ]; then
215		220

Lines 45-51 Link Here

(-)OpenFOAM-1.4.1-src/.cshrc (-12 / +18 lines)
45	set path=($WM_PROJECT_DIR/bin $WM_PROJECT_INST_DIR/$WM_ARCH/bin $path)	45	set path=($WM_PROJECT_DIR/bin $WM_PROJECT_INST_DIR/$WM_ARCH/bin $path)
46		46
47	#- Location of the jobControl directory	47	#- Location of the jobControl directory
48	setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl	48	setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl
49		49
50	setenv WM_DIR $WM_PROJECT_DIR/wmake	50	setenv WM_DIR $WM_PROJECT_DIR/wmake
51	setenv WM_LINK_LANGUAGE c++	51	setenv WM_LINK_LANGUAGE c++
Lines 86-92 Link Here
86	set WM_COMPILER_LIB=	86	set WM_COMPILER_LIB=
87		87
88	if ($WM_COMPILER == "Gcc" \|\| $machineTest == "Linux" && $?WM_COMPILER) then	88	if ($WM_COMPILER == "Gcc" \|\| $machineTest == "Linux" && $?WM_COMPILER) then
89	setenv WM_COMPILER_DIR $WM_PROJECT_INST_DIR/$WM_ARCH/gcc-4.2.1$WM_COMPILER_ARCH	89	setenv WM_COMPILER_DIR "/usr"
90	set WM_COMPILER_BIN="$WM_COMPILER_DIR/bin $WM_COMPILER_DIR/../gdb-6.4/bin"	90	set WM_COMPILER_BIN="$WM_COMPILER_DIR/bin $WM_COMPILER_DIR/../gdb-6.4/bin"
91	set WM_COMPILER_LIB=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib:	91	set WM_COMPILER_LIB=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib:
92	endif	92	endif
Lines 109-115 Link Here
109	# ~~~~~~~~~~~~~~~~~	109	# ~~~~~~~~~~~~~~~~~
110	if ($machineTest == Linux) then	110	if ($machineTest == Linux) then
111		111
112	setenv JAVA_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/j2sdk1.4.2_05	112	#setenv JAVA_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/j2sdk1.4.2_05
		113	setenv JAVA_HOME ${JAVA_HOME} #Set Java jdk env variable to system $JAVA_HOME
113		114
114	set processor = `uname -m`	115	set processor = `uname -m`
115		116
Lines 170-178 Link Here
170		171
171	if ($WM_MPLIB == OPENMPI) then	172	if ($WM_MPLIB == OPENMPI) then
172		173
173	setenv OPENMPI_VERSION 1.2.3	174	# setenv OPENMPI_VERSION 1.2.3
174	setenv OPENMPI_HOME $FOAM_SRC/openmpi-$OPENMPI_VERSION	175	setenv OPENMPI_VERSION=`/usr/bin/ompi_info --version ompi full --parsable \| grep ompi:version:full \| cut -d: -f4-`
175	setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS	176	# setenv OPENMPI_HOME $FOAM_SRC/openmpi-$OPENMPI_VERSION
		177	# setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
		178	setenv OPENMPI_ARCH_PATH=/usr
176		179
177	# Tell OpenMPI where to find it's install directory	180	# Tell OpenMPI where to find it's install directory
178	setenv OPAL_PREFIX $OPENMPI_ARCH_PATH	181	setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
Lines 184-192 Link Here
184		187
185	else if ($WM_MPLIB == LAM) then	188	else if ($WM_MPLIB == LAM) then
186		189
187	setenv LAM_VERSION 7.1.2	190	# setenv LAM_VERSION 7.1.2
188	setenv LAMHOME $FOAM_SRC/lam-$LAM_VERSION	191	setenv LAM_VERSION=`/usr/bin/laminfo -version lam full \| awk '{print $$2}'`
189	setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS	192	# setenv LAMHOME $FOAM_SRC/lam-$LAM_VERSION
		193	# setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
		194	setenv LAM_ARCH_PATH=/usr
190		195
191	AddLib $LAM_ARCH_PATH/lib	196	AddLib $LAM_ARCH_PATH/lib
192	AddPath $LAM_ARCH_PATH/bin	197	AddPath $LAM_ARCH_PATH/bin
Lines 195-203 Link Here
195		200
196	else if ($WM_MPLIB == MPICH) then	201	else if ($WM_MPLIB == MPICH) then
197		202
198	setenv MPICH_VERSION 1.2.4	203	# setenv MPICH_VERSION 1.2.4
199	setenv MPICH_PATH $FOAM_SRC/mpich-$MPICH_VERSION	204	setenv MPICH_VERSION=`/usr/bin/mpich2version --version`
200	setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS	205	# setenv MPICH_PATH $FOAM_SRC/mpich-$MPICH_VERSION
		206	setenv MPICH_ARCH_PATH /usr
201	setenv MPICH_ROOT $MPICH_ARCH_PATH	207	setenv MPICH_ROOT $MPICH_ARCH_PATH
202		208
203	AddLib $MPICH_ARCH_PATH/lib	209	AddLib $MPICH_ARCH_PATH/lib

Lines 38-59 Link Here

(-)OpenFOAM-1.4.1-src/.OpenFOAM-1.4.1/apps/paraview/bashrc (-9 / +12 lines)
38	fi	38	fi
39	fi	39	fi
40		40
41	export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6	41	# export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6
42		42
43	if [ -r $CMAKE_HOME ]; then	43	# if [ -r $CMAKE_HOME ]; then
44	export PATH=$CMAKE_HOME/bin:$PATH	44	# export PATH=$CMAKE_HOME/bin:$PATH
45	fi	45	# fi
		46
		47	export CMAKE_HOME=/usr
		48
		49	export ParaView_VERSION=2.6.2
46		50
47	export ParaView_VERSION=2.4.4	51	export ParaView_INST_DIR=/usr
		52	export ParaView_DIR=$ParaView_INST_DIR/lib/ParaView-2.6
48		53
49	export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/paraview-$ParaView_VERSION
50	export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4
51		54
52	if [ -r $ParaView_INST_DIR ]; then	55	if [ -r $ParaView_INST_DIR ]; then
53	export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make	56	export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
54		57
55	export PATH=$ParaView_INST_DIR/bin:$PATH	58	# export PATH=$ParaView_INST_DIR/bin:$PATH
56	export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}	59	# export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}
57	fi	60	fi
58		61
59	if [ -r $ParaView_DIR ]; then	62	if [ -r $ParaView_DIR ]; then

Lines 41-50 Link Here

(-)OpenFOAM-1.4.1-src/.OpenFOAM-1.4.1/bashrc (-6 / +7 lines)
41	#	41	#
42	# Location of FOAM installation	42	# Location of FOAM installation
43	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	43	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44	export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT	44	#export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT
45	#export WM_PROJECT_INST_DIR=~$WM_PROJECT	45	#export WM_PROJECT_INST_DIR=~$WM_PROJECT
46	#export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION	46	#export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
47	#export WM_PROJECT_INST_DIR=/usr/local/$WM_PROJECT	47	#export WM_PROJECT_INST_DIR=/usr/local/$WM_PROJECT
		48	export WM_PROJECT_INST_DIR=/usr/lib/$WM_PROJECT
48		49
49	# Check that the installation directory has been set and exists	50	# Check that the installation directory has been set and exists
50	if [ "$WM_PROJECT_INST_DIR" -a -d $WM_PROJECT_INST_DIR ]; then	51	if [ "$WM_PROJECT_INST_DIR" -a -d $WM_PROJECT_INST_DIR ]; then
Lines 58-64 Link Here
58		59
59	# Compiler (if set to "" use the system compiler)	60	# Compiler (if set to "" use the system compiler)
60	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	61	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
61	export WM_COMPILER=Gcc	62	export WM_COMPILER=
62	export WM_COMPILER_ARCH=	63	export WM_COMPILER_ARCH=
63	export WM_COMPILER_LIB_ARCH=	64	export WM_COMPILER_LIB_ARCH=
64		65
Lines 151-158 Link Here
151	#export WM_COMPILER_LIB_ARCH=/mabi=64	152	#export WM_COMPILER_LIB_ARCH=/mabi=64
152		153
153	#export WM_MPLIB=	154	#export WM_MPLIB=
154	export WM_MPLIB=MPI	155	#export WM_MPLIB=MPI
155	#export WM_MPLIB=OPENMPI	156	export WM_MPLIB=OPENMPI
156	#export WM_MPLIB=LAM	157	#export WM_MPLIB=LAM
157	#export WM_MPLIB=MPICH	158	#export WM_MPLIB=MPICH
158	#export WM_MPLIB=MPICH-GM	159	#export WM_MPLIB=MPICH-GM
Lines 216-223 Link Here
216		217
217	# Source user setup files for optional packages	218	# Source user setup files for optional packages
218	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	219	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
219	SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ensightFoam/bashrc	220	#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ensightFoam/bashrc
220	SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/paraview/bashrc	221	#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/paraview/bashrc
221	#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ParaView3/bashrc	222	#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ParaView3/bashrc
222		223
223		224

Lines 41-50 Link Here

(-)OpenFOAM-1.4.1-src/.OpenFOAM-1.4.1/cshrc (-6 / +7 lines)
41	#	41	#
42	# Location of FOAM installation	42	# Location of FOAM installation
43	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	43	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44	setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT	44	#setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT
45	#setenv WM_PROJECT_INST_DIR ~$WM_PROJECT	45	#setenv WM_PROJECT_INST_DIR ~$WM_PROJECT
46	#setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION	46	#setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
47	#setenv WM_PROJECT_INST_DIR /usr/local/$WM_PROJECT	47	#setenv WM_PROJECT_INST_DIR /usr/local/$WM_PROJECT
		48	setenv WM_PROJECT_INST_DIR /usr/lib/$WM_PROJECT
48		49
49	# Check that the installation directory has been set and exists	50	# Check that the installation directory has been set and exists
50	if ( $?WM_PROJECT_INST_DIR ) then	51	if ( $?WM_PROJECT_INST_DIR ) then
Lines 59-65 Link Here
59		60
60	# Compiler (if set to "" use the system compiler)	61	# Compiler (if set to "" use the system compiler)
61	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	62	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
62	setenv WM_COMPILER Gcc	63	setenv WM_COMPILER
63	setenv WM_COMPILER_ARCH	64	setenv WM_COMPILER_ARCH
64	setenv WM_COMPILER_LIB_ARCH	65	setenv WM_COMPILER_LIB_ARCH
65		66
Lines 151-158 Link Here
151	#setenv WM_COMPILER_LIB_ARCH /mabi=64	152	#setenv WM_COMPILER_LIB_ARCH /mabi=64
152		153
153	#setenv WM_MPLIB	154	#setenv WM_MPLIB
154	setenv WM_MPLIB MPI	155	#setenv WM_MPLIB MPI
155	#setenv WM_MPLIB OPENMPI	156	setenv WM_MPLIB OPENMPI
156	#setenv WM_MPLIB LAM	157	#setenv WM_MPLIB LAM
157	#setenv WM_MPLIB MPICH	158	#setenv WM_MPLIB MPICH
158	#setenv WM_MPLIB MPICH-GM	159	#setenv WM_MPLIB MPICH-GM
Lines 219-226 Link Here
219		220
220	# Source user setup files for optional packages	221	# Source user setup files for optional packages
221	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	222	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
222	SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ensightFoam/cshrc	223	#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/ensightFoam/cshrc
223	SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/paraview/cshrc	224	#SOURCE $WM_PROJECT_DIR/$FOAM_DOT_DIR/apps/paraview/cshrc
224		225
225		226
226	# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)	227	# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)

Lines 3-105 Link Here

(-)OpenFOAM-1.4.1-src/src/Allwmake (-97 / +97 lines)
3		3
4	(cd $FOAM_SRC/OpenFOAM ; wmakeLnInclude . )	4	(cd $FOAM_SRC/OpenFOAM ; wmakeLnInclude . )
5		5
6	wmake libso zlib-1.2.1	6	# wmake libso zlib-1.2.1
7		7	#
8	if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]	8	# if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
9	then	9	# then
10		10	#
11	cd $OPENMPI_HOME	11	# cd $OPENMPI_HOME
12		12	#
13	gmake distclean	13	# gmake distclean
14	rm -rf $OPENMPI_ARCH_PATH	14	# rm -rf $OPENMPI_ARCH_PATH
15		15	#
16	./configure \	16	# ./configure \
17	--prefix=$OPENMPI_ARCH_PATH \	17	# --prefix=$OPENMPI_ARCH_PATH \
18	--disable-mpirun-prefix-by-default \	18	# --disable-mpirun-prefix-by-default \
19	--disable-orterun-prefix-by-default \	19	# --disable-orterun-prefix-by-default \
20	--enable-shared --disable-static \	20	# --enable-shared --disable-static \
21	--disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \	21	# --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
22	--disable-mpi-profile	22	# --disable-mpi-profile
23		23	#
24	gmake	24	# gmake
25	gmake install	25	# gmake install
26	gmake distclean	26	# gmake distclean
27		27	#
28	cd $FOAM_SRC	28	# cd $FOAM_SRC
29	fi	29	# fi
30		30	#
31	if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]	31	# if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]
32	then	32	# then
33		33	#
34	cd $LAMHOME	34	# cd $LAMHOME
35		35	#
36	gmake distclean	36	# gmake distclean
37	rm -rf $LAM_ARCH_PATH	37	# rm -rf $LAM_ARCH_PATH
38		38	#
39	./configure \	39	# ./configure \
40	--prefix=$LAM_ARCH_PATH \	40	# --prefix=$LAM_ARCH_PATH \
41	--enable-shared \	41	# --enable-shared \
42	--disable-static \	42	# --disable-static \
43	--without-romio \	43	# --without-romio \
44	--without-mpi2cpp \	44	# --without-mpi2cpp \
45	--without-profiling \	45	# --without-profiling \
46	--without-fc	46	# --without-fc
47		47	#
48	gmake	48	# gmake
49	gmake install	49	# gmake install
50	gmake distclean	50	# gmake distclean
51		51	#
52	cd $FOAM_SRC	52	# cd $FOAM_SRC
53	fi	53	# fi
54		54	#
55	if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]	55	# if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]
56	then	56	# then
57		57	#
58	cd $MPICH_PATH	58	# cd $MPICH_PATH
59		59	#
60	make distclean	60	# make distclean
61	rm -rf $MPICH_ARCH_PATH	61	# rm -rf $MPICH_ARCH_PATH
62	rm util/machines/machines.*	62	# rm util/machines/machines.*
63		63	#
64	./configure \	64	# ./configure \
65	--without-mpe \	65	# --without-mpe \
66	--disable-f77 \	66	# --disable-f77 \
67	--disable-f90 \	67	# --disable-f90 \
68	--disable-f90modules \	68	# --disable-f90modules \
69	--disable-c++ \	69	# --disable-c++ \
70	--disable-mpedbg \	70	# --disable-mpedbg \
71	--disable-devdebug \	71	# --disable-devdebug \
72	--disable-debug \	72	# --disable-debug \
73	--enable-sharedlib=$MPICH_ARCH_PATH/lib \	73	# --enable-sharedlib=$MPICH_ARCH_PATH/lib \
74	--with-device=ch_p4 \	74	# --with-device=ch_p4 \
75	-prefix=$MPICH_ARCH_PATH	75	# -prefix=$MPICH_ARCH_PATH
76	make	76	# make
77	make install	77	# make install
78	make distclean	78	# make distclean
79		79	#
80	if [ -r $MPICH_ARCH_PATH ]	80	# if [ -r $MPICH_ARCH_PATH ]
81	then	81	# then
82	cd $MPICH_ARCH_PATH/bin	82	# cd $MPICH_ARCH_PATH/bin
83	for file in *	83	# for file in *
84	do	84	# do
85	sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$	85	# sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$
86	mv temp.$$ $file	86	# mv temp.$$ $file
87	chmod ugo+rx $file	87	# chmod ugo+rx $file
88	done	88	# done
89		89	#
90	cd $MPICH_ARCH_PATH/lib	90	# cd $MPICH_ARCH_PATH/lib
91		91	#
92	if [ -r libmpich.so.1.0 ]	92	# if [ -r libmpich.so.1.0 ]
93	then	93	# then
94	rm *.so	94	# rm *.so
95	ln -s libmpich.so.1.0 libmpich.so	95	# ln -s libmpich.so.1.0 libmpich.so
96	fi	96	# fi
97		97	#
98	cd $MPICH_ARCH_PATH	98	# cd $MPICH_ARCH_PATH
99	fi	99	# fi
100		100	#
101	cd $FOAM_SRC	101	# cd $FOAM_SRC
102	fi	102	# fi
103		103
104	(cd Pstream ; ./Allwmake)	104	(cd Pstream ; ./Allwmake)
105	wmake libso OpenFOAM	105	wmake libso OpenFOAM