Attachment #161146 for bug #104257




#
# Location of FOAM installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# foamInstall=$HOME/$WM_PROJECT
# foamInstall=~$WM_PROJECT
foamInstall=/usr/lib/$WM_PROJECT
# foamInstall=/opt/$WM_PROJECT

: ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR


# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty


# Operating System/Platform from Unix or MSWindows



_foamSource $WM_PROJECT_DIR/etc/settings.sh
# _foamSource $WM_PROJECT_DIR/etc/aliases.sh


# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# _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


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




export PATH=$WM_PROJECT_DIR/bin:$FOAM_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++
export WM_OPTIONS=$WM_ARCH${WM_COMPILER}
export PATH=$WM_DIR:$PATH

export FOAM_SRC=$WM_PROJECT_DIR/src
export FOAM_LIB=$WM_PROJECT_DIR/lib
export FOAM_LIBBIN=$FOAM_LIB
_foamAddLib $FOAM_LIBBIN

export FOAM_APP=$WM_PROJECT_DIR/applications
export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin
_foamAddPath $FOAM_APPBIN

export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
export FOAM_UTILITIES=$FOAM_APP/utilities
export FOAM_SOLVERS=$FOAM_APP/solvers

export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib
_foamAddLib $FOAM_USER_LIBBIN

export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin
_foamAddPath $FOAM_USER_APPBIN

export FOAM_RUN=$WM_PROJECT_USER_DIR/run

# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_COMPILER_INST = OpenFOAM | System
WM_COMPILER_INST=System

case "$WM_COMPILER_INST" in
OpenFOAM)


case "$WM_MPLIB" in
OPENMPI)
    MPI_VERSION=openmpi
#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
    export MPI_ARCH_PATH=/usr
    # Tell OpenMPI where to find its install directory
    export OPAL_PREFIX=$MPI_ARCH_PATH

#     _foamAddLib  $MPI_ARCH_PATH/lib
#     _foamAddPath $MPI_ARCH_PATH/bin

    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
#     unset mpi_version
    ;;

LAM)
    MPI_VERSION=lam
#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
    export MPI_ARCH_PATH=/usr
#     export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
    # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too

#     _foamAddLib  $MPI_ARCH_PATH/lib
#     _foamAddPath $MPI_ARCH_PATH/bin

    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
#     unset mpi_version
    ;;

MPICH)
    MPI_VERSION=mpich
#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
    export MPI_ARCH_PATH=/usr
    export MPICH_ROOT=$MPI_ARCH_PATH

#     _foamAddLib  $MPI_ARCH_PATH/lib
#     _foamAddPath $MPI_ARCH_PATH/bin

    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
#     unset mpi_version
    ;;

MPICH-GM)





# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty


# Operating System/Platform from Unix or MSWindows

alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*'

_foamSource $WM_PROJECT_DIR/etc/settings.csh
# _foamSource $WM_PROJECT_DIR/etc/aliases.csh

# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc






set path=($WM_PROJECT_DIR/bin $FOAM_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++
setenv WM_OPTIONS $WM_ARCH$WM_COMPILER
set path=($WM_DIR $path)

setenv FOAM_SRC $WM_PROJECT_DIR/src
setenv FOAM_LIB $WM_PROJECT_DIR/lib
setenv FOAM_LIBBIN $FOAM_LIB
_foamAddLib $FOAM_LIBBIN

setenv FOAM_APP $WM_PROJECT_DIR/applications
setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin
_foamAddPath $FOAM_APPBIN

setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
setenv FOAM_UTILITIES $FOAM_APP/utilities
setenv FOAM_SOLVERS $FOAM_APP/solvers

setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib
_foamAddLib $FOAM_USER_LIBBIN

setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin
_foamAddPath $FOAM_USER_APPBIN

setenv FOAM_RUN $WM_PROJECT_USER_DIR/run

# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_COMPILER_INST = OpenFOAM | System
set WM_COMPILER_INST=System

switch ("$WM_COMPILER_INST")
case OpenFOAM:


switch ("$WM_MPLIB")
case OPENMPI:
#     set mpi_version=openmpi-1.2.6
#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
    setenv MPI_ARCH_PATH /usr

    # Tell OpenMPI where to find its install directory
    setenv OPAL_PREFIX $MPI_ARCH_PATH

#     _foamAddLib  $MPI_ARCH_PATH/lib
#     _foamAddPath $MPI_ARCH_PATH/bin

    setenv FOAM_MPI_LIBBIN $FOAM_LIB/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 MPI_ARCH_PATH /usr
#     setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
    # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too

#     _foamAddLib  $MPI_ARCH_PATH/lib
#     _foamAddPath $MPI_ARCH_PATH/bin

    setenv FOAM_MPI_LIBBIN $FOAM_LIB/lam
#     unset mpi_version
    breaksw

case MPICH:
#     set mpi_version=mpich-1.2.4
#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
    setenv MPI_ARCH_PATH /usr
    setenv MPICH_ROOT $MPI_ARCH_PATH

#     _foamAddLib  $MPI_ARCH_PATH/lib
#     _foamAddPath $MPI_ARCH_PATH/bin

    setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich
#     unset mpi_version
    breaksw

case MPICH-GM:

Lines 1-6 Link Here

(-)OpenFOAM-1.5-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++ $$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 56-62 Link Here

(-)OpenFOAM-1.5-src/wmake/Makefile (-1 / +1 lines)
56		56
57	LIB_SRC = $(WM_PROJECT_DIR)/src	57	LIB_SRC = $(WM_PROJECT_DIR)/src
58	LIB_DIR = $(WM_PROJECT_DIR)/lib	58	LIB_DIR = $(WM_PROJECT_DIR)/lib
59	LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)	59	LIB_WM_OPTIONS_DIR = $(LIB_DIR)
60	OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS)	60	OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS)
61	CLASSES_DIR = $(MAKE_DIR)/classes	61	CLASSES_DIR = $(MAKE_DIR)/classes
62		62

Lines 77-84 Link Here

(-)OpenFOAM-1.5-src/bin/paraFoam (-3 / +3 lines)
77	[ -s "$parentDir/$check" ] \|\| usage "file does not exist: '$parentDir/$check'"	77	[ -s "$parentDir/$check" ] \|\| usage "file does not exist: '$parentDir/$check'"
78	done	78	done
79		79
80	#caseFile="$caseName.foam"	80	caseFile="$caseName.foam"
81	caseFile="$caseName.OpenFOAM"	81	# caseFile="$caseName.OpenFOAM"
82		82
83	case "$ParaView_VERSION" in	83	case "$ParaView_VERSION" in
84	2*)	84	2*)
Lines 96-102 Link Here
96	*)	96	*)
97	# Clean up on termination and on Ctrl-C	97	# Clean up on termination and on Ctrl-C
98	trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT	98	trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
99	touch $caseFile	99	ln system/controlDict $caseFile
100	paraview --data=$caseFile	100	paraview --data=$caseFile
101	;;	101	;;
102		102

Lines 1-6 Link Here

(-)OpenFOAM-1.5-src/src/decompositionAgglomeration/decompositionMethods/Make/options (-3 / +2 lines)
1	EXE_INC = \	1	EXE_INC = \
2	-I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include	2	-I/usr/include/metis
3		3
4	LIB_LIBS = \	4	LIB_LIBS = \
5	-lmetis \	5	-lmetis
6	-lGKlib

Lines 2-12 Link Here

(-)OpenFOAM-1.5-src/src/decompositionAgglomeration/parMetisDecomp/Make/options (-3 / +3 lines)
2		2
3	EXE_INC = \	3	EXE_INC = \
4	$(PFLAGS) $(PINC) \	4	$(PFLAGS) $(PINC) \
5	-I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \	5	-I/usr/include/parmetis \
6	-I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \	6	-I/usr/include/metis \
7	-I../decompositionMethods/lnInclude	7	-I../decompositionMethods/lnInclude
8		8
9	LIB_LIBS = \	9	LIB_LIBS = \
10	-L$(FOAM_MPI_LIBBIN) \	10	-L$(FOAM_MPI_LIBBIN) \
11	-lmetis-parmetis \	11	-lmetis \
12	-lparmetis	12	-lparmetis

Lines 1-5 Link Here

(-)OpenFOAM-1.5-src/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options (-4 / +2 lines)
1	ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0
2
3	TYPE_REAL=	1	TYPE_REAL=
4	#if defined(SP)	2	#if defined(SP)
5	TYPE_REAL=-DTYPE_REAL	3	TYPE_REAL=-DTYPE_REAL
Lines 7-15 Link Here
7		5
8	EXE_INC = \	6	EXE_INC = \
9	-I$(LIB_SRC)/finiteVolume/lnInclude \	7	-I$(LIB_SRC)/finiteVolume/lnInclude \
10	-I$(ParMGridGen)/MGridGen/Lib/lnInclude \	8	-I/usr/include/mgridgen \
11	-I$(ParMGridGen)/MGridGen/IMlib/lnInclude \
12	$(TYPE_REAL)	9	$(TYPE_REAL)
13		10
14	LIB_LIBS = \	11	LIB_LIBS = \
		12	-lIMlib \
15	-lMGridGen	13	-lMGridGen

Lines 240-245 Link Here

(-)OpenFOAM-1.5-src/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C (-2 / +7 lines)
240	// ~~~~~~~~~~~~~~~~~~~~~~~~~	240	// ~~~~~~~~~~~~~~~~~~~~~~~~~
241	// Only look at surface intersections (minLevel and surface curvature),	241	// Only look at surface intersections (minLevel and surface curvature),
242	// do not do internal refinement (refinementShells)	242	// do not do internal refinement (refinementShells)
		243	PtrList<featureEdgeMesh> dummy(0);
243		244
244	labelList candidateCells	245	labelList candidateCells
245	(	246	(
Lines 248-254 Link Here
248	refineParams.keepPoints()[0],	249	refineParams.keepPoints()[0],
249	refineParams.curvature(),	250	refineParams.curvature(),
250		251
251	PtrList<featureEdgeMesh>(0), // dummy featureMeshes;	252	// PtrList<featureEdgeMesh>(0), // dummy featureMeshes;
		253	dummy, //dummy featureMeshes;
252	labelList(0), // dummy featureLevels;	254	labelList(0), // dummy featureLevels;
253		255
254	false, // featureRefinement	256	false, // featureRefinement
Lines 382-387 Link Here
382	<< "----------------------------" << nl	384	<< "----------------------------" << nl
383	<< endl;	385	<< endl;
384		386
		387	PtrList<featureEdgeMesh> dummy(0);
		388
385	labelList candidateCells	389	labelList candidateCells
386	(	390	(
387	meshRefiner_.refineCandidates	391	meshRefiner_.refineCandidates
Lines 389-395 Link Here
389	refineParams.keepPoints()[0],	393	refineParams.keepPoints()[0],
390	refineParams.curvature(),	394	refineParams.curvature(),
391		395
392	PtrList<featureEdgeMesh>(0), // dummy featureMeshes;	396	// PtrList<featureEdgeMesh>(0), // dummy featureMeshes;
		397	dummy, // dummy featureMeshes;
393	labelList(0), // dummy featureLevels;	398	labelList(0), // dummy featureLevels;
394		399
395	false, // featureRefinement	400	false, // featureRefinement

Return to bug 104257

Lines 42-50 Link Here

(-)OpenFOAM-1.5-src/etc/bashrc (-6 / +6 lines)
42	#	42	#
43	# Location of FOAM installation	43	# Location of FOAM installation
44	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	44	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
45	foamInstall=$HOME/$WM_PROJECT	45	# foamInstall=$HOME/$WM_PROJECT
46	# foamInstall=~$WM_PROJECT	46	# foamInstall=~$WM_PROJECT
47	# foamInstall=/usr/local/$WM_PROJECT	47	foamInstall=/usr/lib/$WM_PROJECT
48	# foamInstall=/opt/$WM_PROJECT	48	# foamInstall=/opt/$WM_PROJECT
49		49
50	: ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR	50	: ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR
Lines 59-65 Link Here
59		59
60	# Location of third-party software	60	# Location of third-party software
61	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	61	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
62	export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty	62	# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
63		63
64		64
65	# Operating System/Platform from Unix or MSWindows	65	# Operating System/Platform from Unix or MSWindows
Lines 192-206 Link Here
192		192
193		193
194	_foamSource $WM_PROJECT_DIR/etc/settings.sh	194	_foamSource $WM_PROJECT_DIR/etc/settings.sh
195	_foamSource $WM_PROJECT_DIR/etc/aliases.sh	195	# _foamSource $WM_PROJECT_DIR/etc/aliases.sh
196		196
197		197
198	# Source user setup files for optional packages	198	# Source user setup files for optional packages
199	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	199	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
200	# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc	200	# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
201	_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc	201	# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
202	# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc	202	# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc
203	_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc	203	# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
204		204
205		205
206	# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)	206	# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)

Lines 56-85 Link Here

(-)OpenFOAM-1.5-src/etc/settings.sh (-30 / +32 lines)
56	export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH	56	export PATH=$WM_PROJECT_DIR/bin:$FOAM_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=$FOAM_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++
63	export WM_OPTIONS=$WM_ARCH${WM_COMPILER}$WM_PRECISION_OPTION$WM_COMPILE_OPTION	63	export WM_OPTIONS=$WM_ARCH${WM_COMPILER}
64	export PATH=$WM_DIR:$PATH	64	export PATH=$WM_DIR:$PATH
65		65
66	export FOAM_SRC=$WM_PROJECT_DIR/src	66	export FOAM_SRC=$WM_PROJECT_DIR/src
67	export FOAM_LIB=$WM_PROJECT_DIR/lib	67	export FOAM_LIB=$WM_PROJECT_DIR/lib
68	export FOAM_LIBBIN=$FOAM_LIB/$WM_OPTIONS	68	export FOAM_LIBBIN=$FOAM_LIB
69	_foamAddLib $FOAM_LIBBIN	69	_foamAddLib $FOAM_LIBBIN
70		70
71	export FOAM_APP=$WM_PROJECT_DIR/applications	71	export FOAM_APP=$WM_PROJECT_DIR/applications
72	export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS	72	export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin
73	_foamAddPath $FOAM_APPBIN	73	_foamAddPath $FOAM_APPBIN
74		74
75	export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials	75	export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
76	export FOAM_UTILITIES=$FOAM_APP/utilities	76	export FOAM_UTILITIES=$FOAM_APP/utilities
77	export FOAM_SOLVERS=$FOAM_APP/solvers	77	export FOAM_SOLVERS=$FOAM_APP/solvers
78		78
79	export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS	79	export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib
80	_foamAddLib $FOAM_USER_LIBBIN	80	_foamAddLib $FOAM_USER_LIBBIN
81		81
82	export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS	82	export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin
83	_foamAddPath $FOAM_USER_APPBIN	83	_foamAddPath $FOAM_USER_APPBIN
84		84
85	export FOAM_RUN=$WM_PROJECT_USER_DIR/run	85	export FOAM_RUN=$WM_PROJECT_USER_DIR/run
Lines 93-99 Link Here
93	# Select compiler installation	93	# Select compiler installation
94	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~	94	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
95	# WM_COMPILER_INST = OpenFOAM \| System	95	# WM_COMPILER_INST = OpenFOAM \| System
96	WM_COMPILER_INST=OpenFOAM	96	WM_COMPILER_INST=System
97		97
98	case "$WM_COMPILER_INST" in	98	case "$WM_COMPILER_INST" in
99	OpenFOAM)	99	OpenFOAM)
Lines 136-180 Link Here
136		136
137	case "$WM_MPLIB" in	137	case "$WM_MPLIB" in
138	OPENMPI)	138	OPENMPI)
139	mpi_version=openmpi-1.2.6	139	MPI_VERSION=openmpi
140	export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version	140	# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
141	export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS	141	# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
142		142	export MPI_ARCH_PATH=/usr
143	# Tell OpenMPI where to find its install directory	143	# Tell OpenMPI where to find its install directory
144	export OPAL_PREFIX=$MPI_ARCH_PATH	144	export OPAL_PREFIX=$MPI_ARCH_PATH
145		145
146	_foamAddLib $MPI_ARCH_PATH/lib	146	# _foamAddLib $MPI_ARCH_PATH/lib
147	_foamAddPath $MPI_ARCH_PATH/bin	147	# _foamAddPath $MPI_ARCH_PATH/bin
148		148
149	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version	149	export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
150	unset mpi_version	150	# unset mpi_version
151	;;	151	;;
152		152
153	LAM)	153	LAM)
154	mpi_version=lam-7.1.4	154	MPI_VERSION=lam
155	export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version	155	# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
156	export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS	156	# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
157	export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version	157	export MPI_ARCH_PATH=/usr
		158	# export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
158	# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too	159	# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
159		160
160	_foamAddLib $MPI_ARCH_PATH/lib	161	# _foamAddLib $MPI_ARCH_PATH/lib
161	_foamAddPath $MPI_ARCH_PATH/bin	162	# _foamAddPath $MPI_ARCH_PATH/bin
162		163
163	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version	164	export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
164	unset mpi_version	165	# unset mpi_version
165	;;	166	;;
166		167
167	MPICH)	168	MPICH)
168	mpi_version=mpich-1.2.4	169	MPI_VERSION=mpich
169	export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version	170	# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
170	export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS	171	# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
		172	export MPI_ARCH_PATH=/usr
171	export MPICH_ROOT=$MPI_ARCH_PATH	173	export MPICH_ROOT=$MPI_ARCH_PATH
172		174
173	_foamAddLib $MPI_ARCH_PATH/lib	175	# _foamAddLib $MPI_ARCH_PATH/lib
174	_foamAddPath $MPI_ARCH_PATH/bin	176	# _foamAddPath $MPI_ARCH_PATH/bin
175		177
176	export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version	178	export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
177	unset mpi_version	179	# unset mpi_version
178	;;	180	;;
179		181
180	MPICH-GM)	182	MPICH-GM)

Lines 58-64 Link Here

(-)OpenFOAM-1.5-src/etc/cshrc (-3 / +3 lines)
58		58
59	# Location of third-party software	59	# Location of third-party software
60	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	60	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
61	setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty	61	# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
62		62
63		63
64	# Operating System/Platform from Unix or MSWindows	64	# Operating System/Platform from Unix or MSWindows
Lines 188-199 Link Here
188	alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!"; source \!'	188	alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!"; source \!'
189		189
190	_foamSource $WM_PROJECT_DIR/etc/settings.csh	190	_foamSource $WM_PROJECT_DIR/etc/settings.csh
191	_foamSource $WM_PROJECT_DIR/etc/aliases.csh	191	# _foamSource $WM_PROJECT_DIR/etc/aliases.csh
192		192
193	# Source user setup files for optional packages	193	# Source user setup files for optional packages
194	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	194	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195	# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc	195	# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
196	_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc	196	# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
197	# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc	197	# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc
198		198
199		199

Lines 39-68 Link Here

(-)OpenFOAM-1.5-src/etc/settings.csh (-29 / +32 lines)
39	set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path)	39	set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path)
40		40
41	#- Location of the jobControl directory	41	#- Location of the jobControl directory
42	setenv FOAM_JOB_DIR $FOAM_INST_DIR/jobControl	42	setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl
43		43
44	setenv WM_DIR $WM_PROJECT_DIR/wmake	44	setenv WM_DIR $WM_PROJECT_DIR/wmake
45	setenv WM_LINK_LANGUAGE c++	45	setenv WM_LINK_LANGUAGE c++
46	setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION	46	setenv WM_OPTIONS $WM_ARCH$WM_COMPILER
47	set path=($WM_DIR $path)	47	set path=($WM_DIR $path)
48		48
49	setenv FOAM_SRC $WM_PROJECT_DIR/src	49	setenv FOAM_SRC $WM_PROJECT_DIR/src
50	setenv FOAM_LIB $WM_PROJECT_DIR/lib	50	setenv FOAM_LIB $WM_PROJECT_DIR/lib
51	setenv FOAM_LIBBIN $FOAM_LIB/$WM_OPTIONS	51	setenv FOAM_LIBBIN $FOAM_LIB
52	_foamAddLib $FOAM_LIBBIN	52	_foamAddLib $FOAM_LIBBIN
53		53
54	setenv FOAM_APP $WM_PROJECT_DIR/applications	54	setenv FOAM_APP $WM_PROJECT_DIR/applications
55	setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS	55	setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin
56	_foamAddPath $FOAM_APPBIN	56	_foamAddPath $FOAM_APPBIN
57		57
58	setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials	58	setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
59	setenv FOAM_UTILITIES $FOAM_APP/utilities	59	setenv FOAM_UTILITIES $FOAM_APP/utilities
60	setenv FOAM_SOLVERS $FOAM_APP/solvers	60	setenv FOAM_SOLVERS $FOAM_APP/solvers
61		61
62	setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS	62	setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib
63	_foamAddLib $FOAM_USER_LIBBIN	63	_foamAddLib $FOAM_USER_LIBBIN
64		64
65	setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS	65	setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin
66	_foamAddPath $FOAM_USER_APPBIN	66	_foamAddPath $FOAM_USER_APPBIN
67		67
68	setenv FOAM_RUN $WM_PROJECT_USER_DIR/run	68	setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
Lines 76-82 Link Here
76	# Select compiler installation	76	# Select compiler installation
77	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~	77	# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
78	# WM_COMPILER_INST = OpenFOAM \| System	78	# WM_COMPILER_INST = OpenFOAM \| System
79	set WM_COMPILER_INST=OpenFOAM	79	set WM_COMPILER_INST=System
80		80
81	switch ("$WM_COMPILER_INST")	81	switch ("$WM_COMPILER_INST")
82	case OpenFOAM:	82	case OpenFOAM:
Lines 125-169 Link Here
125		125
126	switch ("$WM_MPLIB")	126	switch ("$WM_MPLIB")
127	case OPENMPI:	127	case OPENMPI:
128	set mpi_version=openmpi-1.2.6	128	# set mpi_version=openmpi-1.2.6
129	setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version	129	# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
130	setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS	130	# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
		131	setenv MPI_ARCH_PATH /usr
131		132
132	# Tell OpenMPI where to find its install directory	133	# Tell OpenMPI where to find its install directory
133	setenv OPAL_PREFIX $MPI_ARCH_PATH	134	setenv OPAL_PREFIX $MPI_ARCH_PATH
134		135
135	_foamAddLib $MPI_ARCH_PATH/lib	136	# _foamAddLib $MPI_ARCH_PATH/lib
136	_foamAddPath $MPI_ARCH_PATH/bin	137	# _foamAddPath $MPI_ARCH_PATH/bin
137		138
138	setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version	139	setenv FOAM_MPI_LIBBIN $FOAM_LIB/openmpi
139	unset mpi_version	140	# unset mpi_version
140	breaksw	141	breaksw
141		142
142	case LAM:	143	case LAM:
143	set mpi_version=lam-7.1.4	144	# set mpi_version=lam-7.1.4
144	setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version	145	# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
145	setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS	146	# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
146	setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version	147	setenv MPI_ARCH_PATH /usr
		148	# setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
147	# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too	149	# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
148		150
149	_foamAddLib $MPI_ARCH_PATH/lib	151	# _foamAddLib $MPI_ARCH_PATH/lib
150	_foamAddPath $MPI_ARCH_PATH/bin	152	# _foamAddPath $MPI_ARCH_PATH/bin
151		153
152	setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version	154	setenv FOAM_MPI_LIBBIN $FOAM_LIB/lam
153	unset mpi_version	155	# unset mpi_version
154	breaksw	156	breaksw
155		157
156	case MPICH:	158	case MPICH:
157	set mpi_version=mpich-1.2.4	159	# set mpi_version=mpich-1.2.4
158	setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version	160	# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
159	setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS	161	# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
		162	setenv MPI_ARCH_PATH /usr
160	setenv MPICH_ROOT $MPI_ARCH_PATH	163	setenv MPICH_ROOT $MPI_ARCH_PATH
161		164
162	_foamAddLib $MPI_ARCH_PATH/lib	165	# _foamAddLib $MPI_ARCH_PATH/lib
163	_foamAddPath $MPI_ARCH_PATH/bin	166	# _foamAddPath $MPI_ARCH_PATH/bin
164		167
165	setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version	168	setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich
166	unset mpi_version	169	# unset mpi_version
167	breaksw	170	breaksw
168		171
169	case MPICH-GM:	172	case MPICH-GM: