diff options
author | Oliver Borm (oli) <oli.borm@web.de> | 2008-07-22 22:20:59 +0000 |
---|---|---|
committer | Oliver Borm (oli) <oli.borm@web.de> | 2008-07-22 22:20:59 +0000 |
commit | 0ae2d1a42726d8651f51a7de36ee02ae53d37968 (patch) | |
tree | fb4ba8fb9a2c5308b61c906a14e874190aefe419 | |
parent | sci-libs/openfoam-bin: Version bump to 1.5 for bug 104257 (diff) | |
download | sunrise-0ae2d1a42726d8651f51a7de36ee02ae53d37968.tar.gz sunrise-0ae2d1a42726d8651f51a7de36ee02ae53d37968.tar.bz2 sunrise-0ae2d1a42726d8651f51a7de36ee02ae53d37968.zip |
sci-libs/openfoam-wmake: Version bump to 1.5
svn path=/sunrise/; revision=6549
-rw-r--r-- | sci-libs/openfoam-wmake/ChangeLog | 4 | ||||
-rw-r--r-- | sci-libs/openfoam-wmake/Manifest | 5 | ||||
-rw-r--r-- | sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch | 436 | ||||
-rw-r--r-- | sci-libs/openfoam-wmake/openfoam-wmake-1.5.ebuild | 102 |
4 files changed, 546 insertions, 1 deletions
diff --git a/sci-libs/openfoam-wmake/ChangeLog b/sci-libs/openfoam-wmake/ChangeLog index 29132936e..2a077323c 100644 --- a/sci-libs/openfoam-wmake/ChangeLog +++ b/sci-libs/openfoam-wmake/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Jul 2008; Oliver Borm (boroli) <oli.borm@web.de> + +openfoam-wmake-1.5.ebuild, +files/OpenFOAM-1.5-compile.patch: + Version bump to 1.5 + 08 Apr 2008; Oliver Borm (boroli) <oli.borm@web.de> openfoam-wmake-1.4.1_p20080328.ebuild: Just changed the patch source URI, according to the new sources from dev.ge.org diff --git a/sci-libs/openfoam-wmake/Manifest b/sci-libs/openfoam-wmake/Manifest index 9abf956f6..550034b53 100644 --- a/sci-libs/openfoam-wmake/Manifest +++ b/sci-libs/openfoam-wmake/Manifest @@ -1,7 +1,10 @@ +AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89 AUX openfoam-wmake-compile-1.4.1_p20080328.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5 AUX openfoam-wmake-paraFoam-1.4.1_p20080328.patch 1065 RMD160 b20c53b7976fd9c25303dc3d2a31f8f02cfd7468 SHA1 52233c957fed91051f7e0fa99647ae616a366833 SHA256 0afa1abae77b52da3343983b892f7b975117b5758e0582b726b58adc41561d70 DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28 +DIST OpenFOAM-1.5.General.gtgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31 DIST openfoam-wmake-1.4.1_p20080328.patch 577734 RMD160 029ab9b4f316dce127a609bd1907386003faa42e SHA1 72d783eadd975d8ffc980b3579a57d26337a9cb2 SHA256 3c52e2cb70bdbb38ea874fcabc2fa9a7d3bf6650c6433170b01d8622883beacc EBUILD openfoam-wmake-1.4.1_p20080328.ebuild 7742 RMD160 75a8ab7b16c8e44d802d02c25f368aba125759e3 SHA1 00ea8dc959a491cf8c5c3029ab2eed6508933168 SHA256 22e5b55304fed48f48e46bb1a4a7c0a3f2682eeaacd7dc4582b2c0eff9a02e39 -MISC ChangeLog 1280 RMD160 7da5c8b1b5bc726c79954648f4c931a6a9a98da7 SHA1 88a0a23ad2cd2eef760320cfd54727e399964352 SHA256 af887fdde9a7810be81d9913e469ba6ddad0d3971aabbd4eceead56ce2f98a92 +EBUILD openfoam-wmake-1.5.ebuild 2540 RMD160 59cf0b6ee4220437b8e7c7087c065b9a8d3e2813 SHA1 508b68b5c429fb7424c856c9046d0869697cc1db SHA256 f333af61aeb9f3fc310a0df7d5bd1771b9bfd7ae411286e09dfb709196f4a479 +MISC ChangeLog 1422 RMD160 c6ad87e1e64bbf1633aa72b0c79b030551793e50 SHA1 2cb6c210e6093a14cd5dc8cf6447b59916fe7165 SHA256 ba50588713127a369cb0118a5a92749c3f86f2e3f2e608533fbf9d53ea179b10 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch b/sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch new file mode 100644 index 000000000..4479cb384 --- /dev/null +++ b/sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch @@ -0,0 +1,436 @@ +--- OpenFOAM-1.5-src/etc/bashrc 2008-07-09 19:08:57.000000000 +0200 ++++ OpenFOAM-1.5/etc/bashrc 2008-07-21 23:07:48.000000000 +0200 +@@ -42,9 +42,9 @@ + # + # Location of FOAM installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-foamInstall=$HOME/$WM_PROJECT ++# foamInstall=$HOME/$WM_PROJECT + # foamInstall=~$WM_PROJECT +-# foamInstall=/usr/local/$WM_PROJECT ++foamInstall=/usr/lib/$WM_PROJECT + # foamInstall=/opt/$WM_PROJECT + + : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR +@@ -59,7 +59,7 @@ + + # 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 + + + # Operating System/Platform from Unix or MSWindows +@@ -192,15 +192,15 @@ + + + _foamSource $WM_PROJECT_DIR/etc/settings.sh +-_foamSource $WM_PROJECT_DIR/etc/aliases.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/paraview3/bashrc + # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc +-_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc ++# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc + + + # Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH) +--- OpenFOAM-1.5-src/etc/settings.sh 2008-06-27 13:19:25.000000000 +0200 ++++ OpenFOAM-1.5/etc/settings.sh 2008-07-21 00:50:00.000000000 +0200 +@@ -56,30 +56,30 @@ + export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH + + #- Location of the jobControl directory +-export FOAM_JOB_DIR=$FOAM_INST_DIR/jobControl ++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}$WM_PRECISION_OPTION$WM_COMPILE_OPTION ++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/$WM_OPTIONS ++export FOAM_LIBBIN=$FOAM_LIB + _foamAddLib $FOAM_LIBBIN + + export FOAM_APP=$WM_PROJECT_DIR/applications +-export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS ++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/$WM_OPTIONS ++export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib + _foamAddLib $FOAM_USER_LIBBIN + +-export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS ++export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin + _foamAddPath $FOAM_USER_APPBIN + + export FOAM_RUN=$WM_PROJECT_USER_DIR/run +@@ -93,7 +93,7 @@ + # Select compiler installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # WM_COMPILER_INST = OpenFOAM | System +-WM_COMPILER_INST=OpenFOAM ++WM_COMPILER_INST=System + + case "$WM_COMPILER_INST" in + OpenFOAM) +@@ -136,45 +136,47 @@ + + case "$WM_MPLIB" in + OPENMPI) +- mpi_version=openmpi-1.2.6 +- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version +- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS +- ++ 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 ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION ++# 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 ++ 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 ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION ++# unset mpi_version + ;; + + MPICH) +- mpi_version=mpich-1.2.4 +- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version +- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS ++ 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 ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION ++# unset mpi_version + ;; + + MPICH-GM) +--- OpenFOAM-1.5-src/etc/cshrc 2008-07-09 19:09:28.000000000 +0200 ++++ OpenFOAM-1.5/etc/cshrc 2008-07-20 22:31:22.000000000 +0200 +@@ -58,7 +58,7 @@ + + # 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 + + + # Operating System/Platform from Unix or MSWindows +@@ -188,12 +188,12 @@ + alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*' + + _foamSource $WM_PROJECT_DIR/etc/settings.csh +-_foamSource $WM_PROJECT_DIR/etc/aliases.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/paraview3/cshrc + # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc + + +--- OpenFOAM-1.5-src/etc/settings.csh 2008-06-27 13:19:25.000000000 +0200 ++++ OpenFOAM-1.5/etc/settings.csh 2008-07-20 23:14:59.000000000 +0200 +@@ -39,30 +39,30 @@ + set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path) + + #- Location of the jobControl directory +-setenv FOAM_JOB_DIR $FOAM_INST_DIR/jobControl ++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$WM_PRECISION_OPTION$WM_COMPILE_OPTION ++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/$WM_OPTIONS ++setenv FOAM_LIBBIN $FOAM_LIB + _foamAddLib $FOAM_LIBBIN + + setenv FOAM_APP $WM_PROJECT_DIR/applications +-setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS ++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/$WM_OPTIONS ++setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib + _foamAddLib $FOAM_USER_LIBBIN + +-setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS ++setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin + _foamAddPath $FOAM_USER_APPBIN + + setenv FOAM_RUN $WM_PROJECT_USER_DIR/run +@@ -76,7 +76,7 @@ + # Select compiler installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # WM_COMPILER_INST = OpenFOAM | System +-set WM_COMPILER_INST=OpenFOAM ++set WM_COMPILER_INST=System + + switch ("$WM_COMPILER_INST") + case OpenFOAM: +@@ -125,45 +125,48 @@ + + 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 ++# 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 ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ 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 LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version ++# 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 ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ 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 ++# 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 ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich ++# unset mpi_version + breaksw + + case MPICH-GM: +--- OpenFOAM-1.5-src/wmake/rules/General/flex++ 2008-05-01 16:16:40.000000000 +0200 ++++ OpenFOAM-1.5/wmake/rules/General/flex++ 2008-07-22 16:18:41.000000000 +0200 +@@ -1,6 +1,6 @@ + .SUFFIXES: .L + +-Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ ++Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ + + .L.dep: + $(MAKE_DEP) +--- OpenFOAM-1.5-src/wmake/Makefile 2008-06-27 13:19:31.000000000 +0200 ++++ OpenFOAM-1.5/wmake/Makefile 2008-07-20 23:06:27.000000000 +0200 +@@ -56,7 +56,7 @@ + + LIB_SRC = $(WM_PROJECT_DIR)/src + LIB_DIR = $(WM_PROJECT_DIR)/lib +-LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS) ++LIB_WM_OPTIONS_DIR = $(LIB_DIR) + OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS) + CLASSES_DIR = $(MAKE_DIR)/classes + +--- OpenFOAM-1.5-src/bin/paraFoam 2008-07-03 18:14:43.000000000 +0200 ++++ OpenFOAM-1.5/bin/paraFoam 2008-07-22 15:23:24.000000000 +0200 +@@ -77,8 +77,8 @@ + [ -s "$parentDir/$check" ] || usage "file does not exist: '$parentDir/$check'" + done + +-#caseFile="$caseName.foam" +-caseFile="$caseName.OpenFOAM" ++caseFile="$caseName.foam" ++# caseFile="$caseName.OpenFOAM" + + case "$ParaView_VERSION" in + 2*) +@@ -96,7 +96,7 @@ + *) + # Clean up on termination and on Ctrl-C + trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT +- touch $caseFile ++ ln system/controlDict $caseFile + paraview --data=$caseFile + ;; + +--- OpenFOAM-1.5-src/src/decompositionAgglomeration/decompositionMethods/Make/options 2008-06-09 16:22:09.000000000 +0200 ++++ OpenFOAM-1.5/src/decompositionAgglomeration/decompositionMethods/Make/options 2008-07-20 22:19:30.000000000 +0200 +@@ -1,6 +1,5 @@ + EXE_INC = \ +- -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include ++ -I/usr/include/metis + + LIB_LIBS = \ +- -lmetis \ +- -lGKlib ++ -lmetis +--- OpenFOAM-1.5-src/src/decompositionAgglomeration/parMetisDecomp/Make/options 2008-06-09 16:23:55.000000000 +0200 ++++ OpenFOAM-1.5/src/decompositionAgglomeration/parMetisDecomp/Make/options 2008-07-20 22:24:04.000000000 +0200 +@@ -2,11 +2,11 @@ + + EXE_INC = \ + $(PFLAGS) $(PINC) \ +- -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \ +- -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \ ++ -I/usr/include/parmetis \ ++ -I/usr/include/metis \ + -I../decompositionMethods/lnInclude + + LIB_LIBS = \ + -L$(FOAM_MPI_LIBBIN) \ +- -lmetis-parmetis \ ++ -lmetis \ + -lparmetis +--- OpenFOAM-1.5-src/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options 2008-06-09 16:22:37.000000000 +0200 ++++ OpenFOAM-1.5/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options 2008-07-21 20:45:42.000000000 +0200 +@@ -1,5 +1,3 @@ +-ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0 +- + TYPE_REAL= + #if defined(SP) + TYPE_REAL=-DTYPE_REAL +@@ -7,9 +5,9 @@ + + EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ +- -I$(ParMGridGen)/MGridGen/Lib/lnInclude \ +- -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \ ++ -I/usr/include/mgridgen \ + $(TYPE_REAL) + + LIB_LIBS = \ ++ -lIMlib \ + -lMGridGen +--- OpenFOAM-1.5-src/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C 2008-07-09 10:43:41.000000000 +0200 ++++ OpenFOAM-1.5/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C 2008-07-21 22:02:55.000000000 +0200 +@@ -240,6 +240,7 @@ + // ~~~~~~~~~~~~~~~~~~~~~~~~~ + // Only look at surface intersections (minLevel and surface curvature), + // do not do internal refinement (refinementShells) ++PtrList<featureEdgeMesh> dummy(0); + + labelList candidateCells + ( +@@ -248,7 +249,8 @@ + refineParams.keepPoints()[0], + refineParams.curvature(), + +- PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++// PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++dummy, //dummy featureMeshes; + labelList(0), // dummy featureLevels; + + false, // featureRefinement +@@ -382,6 +384,8 @@ + << "----------------------------" << nl + << endl; + ++PtrList<featureEdgeMesh> dummy(0); ++ + labelList candidateCells + ( + meshRefiner_.refineCandidates +@@ -389,7 +393,8 @@ + refineParams.keepPoints()[0], + refineParams.curvature(), + +- PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++// PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++dummy, // dummy featureMeshes; + labelList(0), // dummy featureLevels; + + false, // featureRefinement diff --git a/sci-libs/openfoam-wmake/openfoam-wmake-1.5.ebuild b/sci-libs/openfoam-wmake/openfoam-wmake-1.5.ebuild new file mode 100644 index 000000000..3ac06408f --- /dev/null +++ b/sci-libs/openfoam-wmake/openfoam-wmake-1.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils versionator multilib toolchain-funcs + +MY_PN="OpenFOAM" +MY_PV=$(get_version_component_range 1-2) +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="OpenFOAM - wmake" +HOMEPAGE="http://www.opencfd.co.uk/openfoam/" +SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~amd64 ~x86" +IUSE="examples doc" + +DEPEND="!sci-libs/openfoam + !sci-libs/openfoam-bin + virtual/mpi + || ( >sci-visualization/paraview-3.0 sci-visualization/opendx )" + +S="${WORKDIR}"/${MY_P} + +pkg_setup() { + if ! version_is_at_least 4.1 $(gcc-version) ; then + die "${PN} requires >=sys-devel/gcc-4.1 to compile." + fi + + elog + elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :" + elog "source /usr/$(get_libdir)/${MY_PN}/bashrc" + ewarn + ewarn "FoamX is deprecated since ${MY_PN}-1.5! " + ewarn +} + +src_unpack() { + ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz + unpack ./${MY_P}.General.tgz + + cd "${S}" + epatch "${FILESDIR}"/${MY_P}-compile.patch +} + +src_compile() { + if has_version sys-cluster/lam-mpi ; then + export WM_MPLIB=LAM + elif has_version sys-cluster/mpich2 ; then + export WM_MPLIB=MPICH + elif has_version sys-cluster/openmpi ; then + export WM_MPLIB=OPENMPI + else + die "You need one of the following mpi implementations: openmpi, lam-mpi or mpich2" + fi + + sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc + sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc + + export FOAM_INST_DIR="${WORKDIR}" + source etc/bashrc + + find wmake -name dirToString | xargs rm -rf + find wmake -name wmkdep | xargs rm -rf + + cd wmake/src + make || die "could not build wmake" +} + +src_test() { + cd bin + ./foamInstallationTest +} + +src_install() { + insinto /usr/$(get_libdir)/${MY_PN}/${MY_P} + doins -r etc + + rm -rf tutorials/rhoPorousSimpleFoam/angledDuctExplicit/{0,constant} + cp -a tutorials/rhoPorousSimpleFoam/angledDuctImplicit/{0,constant} tutorials/rhoPorousSimpleFoam/angledDuctExplicit + use examples && doins -r tutorials + + insopts -m0755 + doins -r bin + + insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/wmake + doins -r wmake/* + + insopts -m0644 + insinto /usr/share/doc/${PF} + doins doc/Guides-a4/*.pdf + dodoc README + + if use doc ; then + dohtml -r doc/Doxygen + fi + + dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/etc/bashrc /usr/$(get_libdir)/${MY_PN}/bashrc + dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/etc/cshrc /usr/$(get_libdir)/${MY_PN}/cshrc +} |