mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
- Upgrade to 1.4.1
Changelog at <http://www.opencfd.co.uk/openfoam/version1.4.1.html> - OpenMPI is used by default, unless WITH_MPICH or WITH_LAM is set.
This commit is contained in:
Thierry Thomas
parent
be294883be
commit
f1c30a0f98
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=197423
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= ${REALNAME:L}
|
||||
PORTVERSION= 1.4
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.4.1
|
||||
CATEGORIES= science math
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= foam
|
||||
@ -21,15 +20,16 @@ BUILD_DEPENDS= micod:${PORTSDIR}/devel/mico \
|
||||
bash:${PORTSDIR}/shells/bash \
|
||||
cmake:${PORTSDIR}/devel/cmake \
|
||||
${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode \
|
||||
${LOCALBASE}/lib/parmetis/libmetis.a:${PORTSDIR}/math/parmetis \
|
||||
${PARAVIEW_LIB}/ParaViewConfig.cmake:${PORTSDIR}/science/paraview \
|
||||
${LOCALBASE}/share/java/java3d/jar/j3dutils.jar:${PORTSDIR}/java/java3d \
|
||||
${LOCALBASE}/include/libiberty/demangle.h:${PORTSDIR}/devel/gnulibiberty\
|
||||
${LOCALBASE}/include/vtk/vtkDataSetSource.h:${PORTSDIR}/math/vtk-headers\
|
||||
${X11BASE}/lib/X11/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
|
||||
# ${LOCALBASE}/lib/parmetis/libmetis.a:${PORTSDIR}/math/parmetis
|
||||
LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
|
||||
readline.5:${PORTSDIR}/devel/readline \
|
||||
metis.1:${PORTSDIR}/math/metis
|
||||
readline.5:${PORTSDIR}/devel/readline
|
||||
# OpenFOAM requires metis-5.0, not yet in the ports tree
|
||||
# metis.1:${PORTSDIR}/math/metis
|
||||
# CGAL.0:${PORTSDIR}/math/cgal
|
||||
RUN_DEPENDS= micod:${PORTSDIR}/devel/mico \
|
||||
dx:${PORTSDIR}/graphics/opendx \
|
||||
@ -85,14 +85,16 @@ VER2FIX= applications/utilities/mesh/manipulation/patchTool/C++/PatchToolServer/
|
||||
GL2FIX= applications/utilities/miscellaneous/foamDebugSwitches/Make/options
|
||||
PARARC= bashrc cshrc
|
||||
PS2FIX= runFoamXHB patchTool foamJob killFoamX foamEndJob
|
||||
BASH2FIX= wmake/bashScripts/makeFiles wmake/bashScripts/makeOptions wmake/bashScripts/addCompile \
|
||||
wmake/bashScripts/mkObjectDir .OpenFOAM-${PORTVERSION}/apps/ensightFoam/bashrc
|
||||
BASH2FIX= .OpenFOAM-${PORTVERSION}/apps/ensightFoam/bashrc
|
||||
MALLOC2FIX= src/MGridGenGamgAgglomeration/ParMGridGen-1.0/MGridGen/IMlib/IMlib.h \
|
||||
src/MGridGenGamgAgglomeration/ParMGridGen-1.0/MGridGen/Lib/mgridgen.h
|
||||
src/MGridGenGamgAgglomeration/ParMGridGen-1.0/MGridGen/Lib/mgridgen.h \
|
||||
applications/utilities/parallelProcessing/decompositionMethods/metis-5.0pre2/libmetis/stdheaders.h\
|
||||
applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/ParMetis-3.1/METISLib/stdheaders.h\
|
||||
applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/ParMetis-3.1/ParMETISLib/stdheaders.h
|
||||
LOCAL2FIX= wmake/rules/General/CGAL wmake/rules/${OPSYS}/general \
|
||||
applications/utilities/parallelProcessing/decomposePar/Make/options \
|
||||
applications/utilities/parallelProcessing/redistributeMeshPar/Make/options\
|
||||
applications/utilities/parallelProcessing/decompositionMethods/Make/options
|
||||
applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/Make/options
|
||||
APPSUBDIR= ${OPSYS}${PRECISION}${COMPOPT}
|
||||
APPDIR= applications/bin/${APPSUBDIR}
|
||||
|
||||
@ -102,19 +104,30 @@ DOCS= README doc/Guides-a4 doc/Guides-usletter
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/lam
|
||||
RUN_DEPENDS+= ${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/lam
|
||||
MAKE_ENV+= WM_MPLIB=LAM LAM_ARCH_PATH=${LOCALBASE}
|
||||
OMPI_VER= 1.2.2
|
||||
MPICH_VER= 1.0.5
|
||||
LAM_VER= `${LOCALBASE}/bin/laminfo -version lam full | ${AWK} '{print $$2}'`
|
||||
MPI_LIB= LAM
|
||||
PLIST_SUB+= MPI="@comment " LAM="" LAM_VER=${LAM_VERSION}
|
||||
.else # TODO: add support for OpenMPI
|
||||
PLIST_SUB+= MPI="lam" MPI_VER=${LAM_VERSION}
|
||||
.elif defined(WITH_MPICH)
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
|
||||
RUN_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2
|
||||
MAKE_ENV+= WM_MPLIB=MPICH MPICH_ARCH_PATH=${LOCALBASE}/mpich2
|
||||
MPI_LIBPATH= ${LOCALBASE}/mpich2/lib
|
||||
OMPI_VER= 1.2.2
|
||||
MPICH_VER= `${LOCALBASE}/mpich2/bin/mpich2version --version`
|
||||
LAM_VER= 7.1.2
|
||||
MPI_LIB= MPICH
|
||||
PLIST_SUB+= MPI="" LAM="@comment " MPICH_VER=${MPICH_VERSION}
|
||||
PLIST_SUB+= MPI="mpich" MPI_VER=${MPICH_VERSION}
|
||||
.else
|
||||
LIB_DEPENDS= mpi.0:${PORTSDIR}/net/openmpi
|
||||
MAKE_ENV+= WM_MPLIB=OPENMPI OPENMPI_ARCH_PATH=${LOCALBASE}/mpi/openmpi
|
||||
OMPI_VER= `${LOCALBASE}/mpi/openmpi/bin/ompi_info --version ompi full --parsable | ${GREP} ompi:version:full | ${CUT} -d: -f4-`
|
||||
LAM_VER= 7.1.2
|
||||
MPICH_VER= 1.0.5
|
||||
MPI_LIBPATH= ${LOCALBASE}/mpi/openmpi/lib
|
||||
MPI_LIB= OPENMPI
|
||||
PLIST_SUB+= MPI="openmpi" MPI_VER=${OMPI_VERSION}
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
@ -125,24 +138,42 @@ MICO_VER= `${LOCALBASE}/bin/mico-config --version`
|
||||
MICO_VER= 2.3.12
|
||||
.endif
|
||||
|
||||
# OpenMPI is the default, unless another MPI exists
|
||||
.if exists(${LOCALBASE}/mpi/openmpi/bin/ompi_info)
|
||||
WITH_OMPI= yes
|
||||
.endif
|
||||
.if !defined(WITH_OMPI)
|
||||
. if exists(${LOCALBASE}/mpich2/bin/mpich2version)
|
||||
WITH_MPICH= yes
|
||||
. elif exists(${LOCALBASE}/bin/laminfo)
|
||||
WITH_LAM= yes
|
||||
. endif
|
||||
.endif
|
||||
|
||||
.if defined(WITH_LAM)
|
||||
. if exists(${LOCALBASE}/bin/laminfo)
|
||||
LAM_VERSION!= ${LOCALBASE}/bin/laminfo -version lam full | ${AWK} '{print $$2}'
|
||||
. else
|
||||
LAM_VERSION= ${LAM_VER}
|
||||
. endif
|
||||
.else
|
||||
.elif defined(WITH_MPICH)
|
||||
. if exists(${LOCALBASE}/mpich2/bin/mpich2version)
|
||||
MPICH_VERSION!= ${LOCALBASE}/mpich2/bin/mpich2version --version
|
||||
. else
|
||||
MPICH_VERSION= ${MPICH_VER}
|
||||
. endif
|
||||
.else
|
||||
. if exists(${LOCALBASE}/mpi/openmpi/bin/ompi_info)
|
||||
OMPI_VERSION!= ${LOCALBASE}/mpi/openmpi/bin/ompi_info --version ompi full --parsable | ${GREP} ompi:version:full | ${CUT} -d: -f4-
|
||||
. else
|
||||
OMPI_VERSION= 1.2.2
|
||||
. endif
|
||||
.endif
|
||||
|
||||
OSVERMAJ= ${OSREL:R}
|
||||
|
||||
post-extract:
|
||||
${CP} -Rp ${WRKSRC}/wmake/rules/linux ${WRKSRC}/wmake/rules/${OPSYS}
|
||||
${CP} -Rp ${WRKSRC}/wmake/rules/linuxGcc ${WRKSRC}/wmake/rules/${OPSYS}
|
||||
${RM} ${WRKSRC}/wmake/rules/${OPSYS}/dirToString
|
||||
${RM} -rf ${WRKSRC}/applications/utilities/mesh/manipulation/setSet/readline-5.0/platforms
|
||||
${FIND} ${WRKSRC}/applications/utilities/mesh/conversion/ccm26ToFoam/libccmio \
|
||||
@ -158,6 +189,8 @@ pre-configure:
|
||||
-e "s|^#!/bin/bash|#! ${LOCALBASE}/bin/bash|" \
|
||||
-e "s|2\.3\.12|${MICO_VER}|" \
|
||||
-e "s|\$$MICO_PATH/platforms/\$$WM_OPTIONS|${LOCALBASE}|" \
|
||||
-e "s|1\.2\.3|${OMPI_VER}|" \
|
||||
-e "s|\$$OPENMPI_HOME/platforms/\$$WM_OPTIONS|${LOCALBASE}/mpi/openmpi|" \
|
||||
-e "s|1\.2\.4|${MPICH_VER}|" \
|
||||
-e "s|\$$MPICH_PATH/platforms/\$$WM_OPTIONS|${LOCALBASE}/mpich2|"\
|
||||
-e "s|7\.1\.2|${LAM_VER}|" \
|
||||
@ -173,6 +206,9 @@ pre-configure:
|
||||
${BASH2FIX:S|^|${WRKSRC}/|}
|
||||
${REINPLACE_CMD} -e "s|<malloc.h>|<stdlib.h>|" \
|
||||
${MALLOC2FIX:S|^|${WRKSRC}/|}
|
||||
# ${REINPLACE_CMD} -e 's|-lmetis|-L${LOCALBASE}/lib -lmetis|' \
|
||||
# -e 's|../metis-5.0pre2/include|${LOCALBASE}/include/metis|' \
|
||||
# ${WRKSRC}/applications/utilities/parallelProcessing/decompositionMethods/decompositionMethods/Make/options
|
||||
.for f in ${THRD2FIX}
|
||||
${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|" \
|
||||
-e "s|-lpthread|${PTHREAD_LIBS}|" \
|
||||
@ -201,8 +237,8 @@ pre-configure:
|
||||
${WRKSRC}/${f}
|
||||
.endfor
|
||||
${REINPLACE_CMD} -e \
|
||||
's|$$CURDIR/readline-5.0/platforms/$$WM_OPTIONS|${LOCALBASE}|' \
|
||||
${WRKSRC}/applications/utilities/mesh/manipulation/setSet/Allwmake
|
||||
's|/usr/include/readline/readline.h|${LOCALBASE}/include/readline/readline.h|' \
|
||||
${WRKSRC}/applications/utilities/mesh/manipulation/Optional/Allwmake
|
||||
.if defined(MPI_LIBPATH)
|
||||
${REINPLACE_CMD} -e \
|
||||
'/LINKEXE/s|OPTIONS_DIR)|OPTIONS_DIR) -L${MPI_LIBPATH} -rpath-link ${MPI_LIBPATH}|'\
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (OpenFOAM-1.4.General.gtgz) = 70ca156b34ef94a7ae519e4a98500a05
|
||||
SHA256 (OpenFOAM-1.4.General.gtgz) = 6de40e44c68aa350b16a3b3a59930f0a7601685f5e5204052234f044cd0163a3
|
||||
SIZE (OpenFOAM-1.4.General.gtgz) = 140438988
|
||||
MD5 (OpenFOAM-1.4.1.General.gtgz) = c5ff8530332fea07e648e7339c34cd1a
|
||||
SHA256 (OpenFOAM-1.4.1.General.gtgz) = c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
|
||||
SIZE (OpenFOAM-1.4.1.General.gtgz) = 148526808
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
--- ./.OpenFOAM-1.4/apps/paraview/bashrc.orig Wed Apr 11 10:06:39 2007
|
||||
+++ ./.OpenFOAM-1.4/apps/paraview/bashrc Thu Apr 12 21:24:33 2007
|
||||
--- ./.OpenFOAM-1.4.1/apps/paraview/bashrc.orig Tue May 8 21:05:21 2007
|
||||
+++ ./.OpenFOAM-1.4.1/apps/paraview/bashrc Fri Aug 3 19:06:33 2007
|
||||
@@ -38,22 +38,15 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.2
|
||||
-export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6
|
||||
-
|
||||
-if [ -r $CMAKE_HOME ]; then
|
||||
- export PATH=$CMAKE_HOME/bin:$PATH
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
--- ./.OpenFOAM-1.4/apps/paraview/cshrc.orig Wed Apr 11 10:25:55 2007
|
||||
+++ ./.OpenFOAM-1.4/apps/paraview/cshrc Thu Apr 12 21:31:17 2007
|
||||
@@ -38,22 +38,13 @@
|
||||
--- ./.OpenFOAM-1.4.1/apps/paraview/cshrc.orig Tue May 8 21:05:06 2007
|
||||
+++ ./.OpenFOAM-1.4.1/apps/paraview/cshrc Fri Aug 3 19:08:03 2007
|
||||
@@ -38,22 +38,15 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-setenv CMAKE_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.2
|
||||
-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/local
|
||||
|
||||
setenv ParaView_VERSION 2.4.4
|
||||
|
||||
-setenv ParaView_INST_DIR $WM_PROJECT_INST_DIR/$WM_ARCH/paraview-$ParaView_VERSION
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- .OpenFOAM-1.4/bashrc.orig Wed Apr 11 15:57:15 2007
|
||||
+++ .OpenFOAM-1.4/bashrc Thu Apr 12 21:38:50 2007
|
||||
--- .OpenFOAM-1.4.1/bashrc.orig Thu Aug 2 23:28:12 2007
|
||||
+++ .OpenFOAM-1.4.1/bashrc Fri Aug 3 19:23:19 2007
|
||||
@@ -41,15 +41,15 @@
|
||||
#
|
||||
# Location of FOAM installation
|
||||
@ -23,16 +23,16 @@
|
||||
|
||||
# Compiler (if set to "" use the system compiler)
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
-export WM_COMPILER=Gcc4
|
||||
+#export WM_COMPILER=Gcc4
|
||||
-export WM_COMPILER=Gcc
|
||||
+#export WM_COMPILER=Gcc
|
||||
+export WM_COMPILER=
|
||||
export WM_COMPILER_ARCH=
|
||||
export WM_COMPILER_LIB_ARCH=
|
||||
|
||||
@@ -128,6 +129,15 @@
|
||||
#export WM_MPLIB=MPICH
|
||||
#export WM_MPLIB=MPICH-GM
|
||||
#export WM_MPLIB=GAMMA
|
||||
#export WM_MPLIB=MPIGAMMA
|
||||
+ #export WM_MPLIB=MPI
|
||||
+
|
||||
+# FreeBSD workstation
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- .OpenFOAM-1.4/cshrc.orig Mon Apr 2 10:18:57 2007
|
||||
+++ .OpenFOAM-1.4/cshrc Thu Apr 12 21:42:11 2007
|
||||
--- .OpenFOAM-1.4.1/cshrc.orig Tue Jul 31 17:39:07 2007
|
||||
+++ .OpenFOAM-1.4.1/cshrc Fri Aug 3 21:03:49 2007
|
||||
@@ -41,16 +41,16 @@
|
||||
#
|
||||
# Location of FOAM installation
|
||||
@ -24,12 +24,12 @@
|
||||
|
||||
# Compiler (if set to "" use the system compiler)
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
-setenv WM_COMPILER Gcc4
|
||||
-setenv WM_COMPILER Gcc
|
||||
+setenv WM_COMPILER
|
||||
setenv WM_COMPILER_ARCH
|
||||
setenv WM_COMPILER_LIB_ARCH
|
||||
|
||||
@@ -131,6 +131,15 @@
|
||||
@@ -128,6 +128,15 @@
|
||||
#setenv WM_MPLIB MPICH
|
||||
#setenv WM_MPLIB MPICH-GM
|
||||
#setenv WM_MPLIB GAMMA
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./applications/utilities/parallelProcessing/decompositionMethods/metisDecomp/metisDecomp.C.orig Wed Mar 28 17:10:00 2007
|
||||
+++ ./applications/utilities/parallelProcessing/decompositionMethods/metisDecomp/metisDecomp.C Fri Apr 20 07:39:47 2007
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
-# include "metis.h"
|
||||
+# include <metis/metis.h>
|
||||
}
|
||||
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- ./applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.orig Sat Dec 16 00:26:20 2006
|
||||
+++ ./applications/utilities/parallelProcessing/redistributeMeshPar/Make/options Mon Apr 23 18:55:22 2007
|
||||
@@ -7,6 +7,7 @@
|
||||
EXE_LIBS = \
|
||||
-lfiniteVolume \
|
||||
-ldecompositionMethods \
|
||||
+ /usr/local/lib/parmetis/libmetis.a -L/usr/local/lib/parmetis -lparmetis \
|
||||
-lmeshTools \
|
||||
-ldynamicMesh \
|
||||
-lfoamUtil
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./applications/utilities/parallelProcessing/Allwmake.orig Fri Dec 15 19:07:54 2006
|
||||
+++ ./applications/utilities/parallelProcessing/Allwmake Wed Apr 18 07:48:37 2007
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -x
|
||||
|
||||
-(cd decompositionMethods; Allwmake)
|
||||
+(cd decompositionMethods; ./Allwmake)
|
||||
wmake decomposePar
|
||||
wmake reconstructPar
|
||||
wmake reconstructParMesh
|
||||
@ -1,12 +0,0 @@
|
||||
--- applications/utilities/parallelProcessing/decompositionMethods/Allwmake.orig Wed Dec 13 09:58:42 2006
|
||||
+++ applications/utilities/parallelProcessing/decompositionMethods/Allwmake Thu Apr 19 19:36:19 2007
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -x
|
||||
|
||||
-wmake libso parMetisDecomp/ParMetis-3.1/METISLib
|
||||
-wmake libso parMetisDecomp/ParMetis-3.1/ParMETISLib
|
||||
+#wmake libso parMetisDecomp/ParMetis-3.1/METISLib
|
||||
+#wmake libso parMetisDecomp/ParMetis-3.1/ParMETISLib
|
||||
#wmake libso metisDecomp/metis-4.0/Lib
|
||||
wmake libso
|
||||
@ -1,15 +0,0 @@
|
||||
--- ./applications/utilities/parallelProcessing/decompositionMethods/Make/options.orig Tue Apr 3 10:01:43 2007
|
||||
+++ ./applications/utilities/parallelProcessing/decompositionMethods/Make/options Sun Apr 22 21:24:04 2007
|
||||
@@ -2,9 +2,8 @@
|
||||
|
||||
EXE_INC = \
|
||||
$(PFLAGS) $(PINC) \
|
||||
- -IparMetisDecomp/ParMetis-3.1/ParMETISLib \
|
||||
- -IparMetisDecomp/ParMetis-3.1
|
||||
+ -I/usr/local/include/parmetis
|
||||
|
||||
LIB_LIBS = \
|
||||
- -lmetis \
|
||||
- -lparmetis
|
||||
+ -L/usr/local/lib/parmetis -lmetis \
|
||||
+ -L/usr/local/lib/parmetis -lparmetis
|
||||
@ -1,10 +0,0 @@
|
||||
--- ./applications/utilities/parallelProcessing/decomposePar/Make/options.orig Sun Sep 3 14:13:16 2006
|
||||
+++ ./applications/utilities/parallelProcessing/decomposePar/Make/options Mon Apr 23 18:53:33 2007
|
||||
@@ -6,6 +6,7 @@
|
||||
EXE_LIBS = \
|
||||
-lfiniteVolume \
|
||||
-ldecompositionMethods \
|
||||
+ /usr/local/lib/parmetis/libmetis.a -L/usr/local/lib/parmetis -lparmetis \
|
||||
-llagrangian \
|
||||
-lmeshTools \
|
||||
-lfoamUtil
|
||||
@ -1,16 +1,5 @@
|
||||
--- ./bin/foamInstallationTest.orig Mon Apr 2 10:16:13 2007
|
||||
+++ ./bin/foamInstallationTest Thu Apr 12 22:01:32 2007
|
||||
@@ -36,8 +36,8 @@
|
||||
#~~~~~~~~~
|
||||
FOAM_VERSION=1.4
|
||||
GCC_VERSION=4.1.1
|
||||
-GZIP_VERSION=1.3.5
|
||||
-GTAR_VERSION=1.13.25
|
||||
+GZIP_VERSION=`gzip -V 2>&1 | head -1 | awk '{print $2}'`
|
||||
+GTAR_VERSION=`gtar --version | awk '{print $4}'`
|
||||
JAVA_VERSION=1.4.2+
|
||||
|
||||
#GLOBAL VARIABLES
|
||||
--- ./bin/foamInstallationTest.orig Fri Aug 3 22:38:53 2007
|
||||
+++ ./bin/foamInstallationTest Fri Aug 3 22:41:59 2007
|
||||
@@ -92,7 +92,7 @@
|
||||
if [ $LDIFF -le 1 ]; then
|
||||
while [ $LDIFF -lt 0 ] ; do
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
--- src/Allwmake.orig Mon Aug 15 11:37:17 2005
|
||||
+++ src/Allwmake Thu Dec 29 22:25:52 2005
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
--- ./src/Allwmake.orig Fri Jul 27 17:54:28 2007
|
||||
+++ ./src/Allwmake Sat Aug 4 23:53:46 2007
|
||||
@@ -3,7 +3,8 @@
|
||||
|
||||
(cd $FOAM_SRC/OpenFOAM ; wmakeLnInclude . )
|
||||
|
||||
-wmake libso zlib-1.2.1
|
||||
+# Use system zlib
|
||||
+# Don't build zlib
|
||||
+#wmake libso zlib-1.2.1
|
||||
wmake libso foamUser
|
||||
|
||||
FOAM_SRC_DIR=`pwd`
|
||||
@@ -123,7 +124,8 @@
|
||||
if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
|
||||
then
|
||||
@@ -139,7 +140,8 @@
|
||||
|
||||
wmake libso Gstream
|
||||
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- src/OpenFOAM/OSspecific/Unix/printStack.C.orig Fri May 18 15:24:33 2007
|
||||
+++ src/OpenFOAM/OSspecific/Unix/printStack.C Sun Aug 5 00:07:39 2007
|
||||
@@ -35,6 +35,8 @@
|
||||
#include <execinfo.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
+typedef u_long ulong;
|
||||
+
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./src/OpenFOAM/db/error/error.C.orig Fri Feb 24 17:56:39 2006
|
||||
+++ ./src/OpenFOAM/db/error/error.C Fri Mar 31 14:06:02 2006
|
||||
@@ -38,7 +38,7 @@
|
||||
#if defined(__GNUC__)
|
||||
#include "IStringStream.H"
|
||||
#include <execinfo.h>
|
||||
-#include <demangle.h>
|
||||
+#include <libiberty/demangle.h>
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -1,14 +1,14 @@
|
||||
--- src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C.orig Tue Mar 20 21:35:42 2007
|
||||
+++ src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C Mon Apr 16 23:09:38 2007
|
||||
@@ -307,8 +307,10 @@
|
||||
--- src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C.orig Tue Jun 26 18:53:30 2007
|
||||
+++ src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C Sun Aug 5 18:01:13 2007
|
||||
@@ -295,8 +295,10 @@
|
||||
|
||||
// Send all fieldNames. This has to be exactly the same set as is
|
||||
// being received!
|
||||
+
|
||||
+ // FreeBSD: following patch only for gcc-3.4, to be removed with gcc-4.2
|
||||
const fldType& fld =
|
||||
- subsetter.baseMesh().lookupObject<fldType>(fieldNames[i]);
|
||||
+ subsetter.baseMesh().template lookupObject<fldType>(fieldNames[i]);
|
||||
const GeoField& fld =
|
||||
- subsetter.baseMesh().lookupObject<GeoField>(fieldNames[i]);
|
||||
+ subsetter.baseMesh().template lookupObject<GeoField>(fieldNames[i]);
|
||||
|
||||
tmp<fldType> tsubfld = subsetter.interpolate(fld);
|
||||
tmp<GeoField> tsubfld = subsetter.interpolate(fld);
|
||||
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- ./src/triSurface/triSurface/interfaces/NAS/readNAS.C.orig Fri Jul 6 16:44:48 2007
|
||||
+++ ./src/triSurface/triSurface/interfaces/NAS/readNAS.C Sun Aug 5 00:21:48 2007
|
||||
@@ -56,7 +56,7 @@
|
||||
{
|
||||
exp = -exp;
|
||||
}
|
||||
- return mantissa*pow10(exp);
|
||||
+ return mantissa*pow(10.0, exp);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1,20 +0,0 @@
|
||||
--- wmake/makeWmake.orig Tue Jun 21 18:10:23 2005
|
||||
+++ wmake/makeWmake Sun Dec 18 10:02:15 2005
|
||||
@@ -59,4 +59,17 @@
|
||||
|
||||
cd ..
|
||||
|
||||
+rm -rf shScripts
|
||||
+mkdir shScripts
|
||||
+
|
||||
+cd kshScripts
|
||||
+
|
||||
+for file in *
|
||||
+do
|
||||
+ cat $file | sed s/ksh/sh/ > ../shScripts/$file
|
||||
+ chmod ugo+rx ../shScripts/$file
|
||||
+done
|
||||
+
|
||||
+cd ..
|
||||
+
|
||||
#------------------------------------------------------------------------------
|
||||
@ -1,5 +1,5 @@
|
||||
--- wmake/rules/FreeBSD/c.orig Mon Nov 22 18:30:37 2004
|
||||
+++ wmake/rules/FreeBSD/c Sat Dec 17 23:56:13 2005
|
||||
--- ./wmake/rules/FreeBSD/c.orig Mon Apr 30 12:27:24 2007
|
||||
+++ ./wmake/rules/FreeBSD/c Sun Aug 5 11:11:55 2007
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
cWARN = -Wall
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
--- ./wmake/rules/FreeBSD/c++.orig Tue Nov 7 23:16:13 2006
|
||||
+++ ./wmake/rules/FreeBSD/c++ Thu Apr 12 22:15:28 2007
|
||||
@@ -1,21 +1,19 @@
|
||||
--- ./wmake/rules/FreeBSD/c++.orig Mon Apr 30 12:27:24 2007
|
||||
+++ ./wmake/rules/FreeBSD/c++ Sun Aug 5 18:31:44 2007
|
||||
@@ -1,21 +1,20 @@
|
||||
.SUFFIXES: .C .cxx .cc .cpp
|
||||
|
||||
-c++WARN = -Wall -W -Wno-unused-parameter -Wold-style-cast
|
||||
-
|
||||
-c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
|
||||
+c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter
|
||||
|
||||
-CC = g++ -m32
|
||||
+c++WARN = -Wall -W -Wno-unused-parameter
|
||||
|
||||
include $(RULES)/c++$(WM_COMPILE_OPTION)
|
||||
|
||||
ptFLAGS = -DNoRepository -ftemplate-depth-30
|
||||
ptFLAGS = -DNoRepository -ftemplate-depth-40
|
||||
|
||||
-c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread
|
||||
+c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC $(PTHREAD_CFLAGS)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- wmake/rules/FreeBSD/c++Opt.orig Mon Nov 22 18:30:37 2004
|
||||
+++ wmake/rules/FreeBSD/c++Opt Sun Dec 18 00:00:51 2005
|
||||
--- ./wmake/rules/FreeBSD/c++Opt.orig Mon Apr 30 12:27:24 2007
|
||||
+++ ./wmake/rules/FreeBSD/c++Opt Sun Aug 5 11:21:13 2007
|
||||
@@ -1,2 +1,2 @@
|
||||
c++DBUG =
|
||||
-c++OPT = -O3 -ffast-math
|
||||
+c++OPT = $(CXXFLAGS) -ffast-math
|
||||
-c++OPT = -O3
|
||||
+c++OPT = $(CXXFLAGS)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- ./wmake/rules/FreeBSD/general.orig Wed Jan 17 11:20:37 2007
|
||||
+++ ./wmake/rules/FreeBSD/general Thu Apr 12 22:22:50 2007
|
||||
--- ./wmake/rules/FreeBSD/general.orig Fri May 18 15:26:03 2007
|
||||
+++ ./wmake/rules/FreeBSD/general Sun Aug 5 11:39:03 2007
|
||||
@@ -1,7 +1,6 @@
|
||||
-CPP = /lib/cpp $(GFLAGS)
|
||||
-LD = ld -melf_i386
|
||||
+CPP += -D$(WM_ARCH)
|
||||
|
||||
-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
|
||||
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
|
||||
+PROJECT_LIBS = -l$(WM_PROJECT) -L/usr/local/lib -liberty -lexecinfo
|
||||
|
||||
include $(RULES)/X
|
||||
|
||||
@ -1,11 +1,6 @@
|
||||
--- wmake/wmake.orig Mon Apr 2 10:24:58 2007
|
||||
+++ wmake/wmake Tue Apr 17 19:05:13 2007
|
||||
@@ -159,11 +159,11 @@
|
||||
then
|
||||
if [ -e Allwmake ]
|
||||
then
|
||||
- Allwmake
|
||||
+ ./Allwmake
|
||||
--- ./wmake/wmake.orig Thu May 10 11:11:28 2007
|
||||
+++ ./wmake/wmake Sat Aug 4 00:01:13 2007
|
||||
@@ -163,7 +163,7 @@
|
||||
exit $?
|
||||
elif [ ! -d $MakeDir ]
|
||||
then
|
||||
|
||||
@ -27,6 +27,8 @@ mkdir -p $HOME/.%%REALNAME%%-%%VER%%/apps
|
||||
cp -R %%PREFIX%%/%%REALNAME%%/.%%REALNAME%%-%%VER%%/apps/FoamX \
|
||||
$HOME/.%%REALNAME%%-%%VER%%/apps
|
||||
|
||||
and set FOAMX_CONFIG to $HOME/.%%REALNAME%%-%%VER%%/apps/FoamX
|
||||
|
||||
Then, you could run foamInstallationTest to check your installaton.
|
||||
See %%PREFIX%%/%%REALNAME%%/README, § 6, to get started.
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user