diff options
Diffstat (limited to 'science/openfoam/files')
36 files changed, 731 insertions, 0 deletions
diff --git a/science/openfoam/files/patch-.OpenFOAM-++VER++_apps_paraview_bashrc b/science/openfoam/files/patch-.OpenFOAM-++VER++_apps_paraview_bashrc new file mode 100644 index 000000000000..429b726542a9 --- /dev/null +++ b/science/openfoam/files/patch-.OpenFOAM-++VER++_apps_paraview_bashrc @@ -0,0 +1,29 @@ +--- ./.OpenFOAM-1.2/apps/paraview/bashrc.orig Thu Jun 30 17:31:42 2005 ++++ ./.OpenFOAM-1.2/apps/paraview/bashrc Thu Dec 22 23:44:29 2005 +@@ -38,24 +38,15 @@ + fi + fi + +-export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.0.3 ++export CMAKE_HOME=/usr/local + +-if [ -r $CMAKE_HOME ]; then +- export PATH=$PATH:$CMAKE_HOME/bin +-fi +- +-#export ParaView_VERSION=1.8.5 + export ParaView_VERSION=2.2.0 + +-export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/paraview-$ParaView_VERSION +-#export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-1.8 ++export ParaView_INST_DIR=/usr/local + export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.2 + + if [ -r $ParaView_INST_DIR ]; then + export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make +- +- export PATH=$PATH:$ParaView_INST_DIR/bin +- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk + fi + + if [ -r $ParaView_DIR ]; then diff --git a/science/openfoam/files/patch-.OpenFOAM-++VER++_apps_paraview_cshrc b/science/openfoam/files/patch-.OpenFOAM-++VER++_apps_paraview_cshrc new file mode 100644 index 000000000000..d98b8a6a3210 --- /dev/null +++ b/science/openfoam/files/patch-.OpenFOAM-++VER++_apps_paraview_cshrc @@ -0,0 +1,29 @@ +--- ./.OpenFOAM-1.2/apps/paraview/cshrc.orig Thu Aug 18 11:10:08 2005 ++++ ./.OpenFOAM-1.2/apps/paraview/cshrc Thu Dec 22 23:44:08 2005 +@@ -38,24 +38,15 @@ + endif + endif + +-setenv CMAKE_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.0.3 ++setenv CMAKE_HOME /usr/local + +-if ( -r $CMAKE_HOME ) then +- set path=($path $CMAKE_HOME/bin ) +-endif +- +-#setenv ParaView_VERSION 1.8.5 + setenv ParaView_VERSION 2.2.0 + +-setenv ParaView_INST_DIR $WM_PROJECT_INST_DIR/$WM_ARCH/paraview-$ParaView_VERSION +-#setenv ParaView_DIR $ParaView_INST_DIR/lib/paraview-1.8 ++setenv ParaView_INST_DIR /usr/local + setenv ParaView_DIR $ParaView_INST_DIR/lib/paraview-2.2 + + if ( -r $ParaView_INST_DIR ) then + setenv PV_INTERFACE_PATH $FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make +- +- set path=($path $ParaView_INST_DIR/bin ) +- setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk + endif + + if ( -r $ParaView_DIR ) then diff --git a/science/openfoam/files/patch-.OpenFOAM-++VER++_bashrc b/science/openfoam/files/patch-.OpenFOAM-++VER++_bashrc new file mode 100644 index 000000000000..7879fe6961b1 --- /dev/null +++ b/science/openfoam/files/patch-.OpenFOAM-++VER++_bashrc @@ -0,0 +1,57 @@ +--- .OpenFOAM-1.2/bashrc.orig Fri Aug 12 18:59:28 2005 ++++ .OpenFOAM-1.2/bashrc Mon Dec 26 12:23:12 2005 +@@ -41,15 +41,15 @@ + # + # Location of FOAM installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-export WM_PROJECT_INST_DIR=$HOME/$WM_PROJECT ++#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/local/$WM_PROJECT + + # Check that the installation directory has been set and exists + if [ "$WM_PROJECT_INST_DIR" -a -d $WM_PROJECT_INST_DIR ]; then + +-export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION ++export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR + + # Location of users FOAM files + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@@ -58,7 +58,8 @@ + + # Compiler (if set to "" use the system compiler) + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-export WM_COMPILER=Gcc ++#export WM_COMPILER=Gcc ++export WM_COMPILER= + export WM_COMPILER_ARCH= + export WM_COMPILER_LIB_ARCH= + +@@ -66,7 +67,7 @@ + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + export WM_COMPILE_OPTION=Opt + #export WM_COMPILE_OPTION=Debug +-#setenv WM_COMPILE_OPTION Prof ++#export WM_COMPILE_OPTION=Prof + + export WM_JAVAC_OPTION=Opt + #export WM_JAVAC_OPTION=Debug +@@ -120,6 +121,16 @@ + #export WM_MPLIB= + export WM_MPLIB=LAM + #export WM_MPLIB=MPI ++ ++# FreeBSD workstation ++# ~~~~~~~~~~~~~~~~~~~ ++elif [ "$machineTest" = "FreeBSD" ]; then ++ ++ export WM_ARCH=FreeBSD ++ export WM_MPLIB=%%MPILIB%% ++ #export WM_MPLIB=LAM ++ #export WM_MPLIB=MPI ++ + + # SUN workstation + # ~~~~~~~~~~~~~~~ diff --git a/science/openfoam/files/patch-.OpenFOAM-++VER++_cshrc b/science/openfoam/files/patch-.OpenFOAM-++VER++_cshrc new file mode 100644 index 000000000000..04ae3f319e6e --- /dev/null +++ b/science/openfoam/files/patch-.OpenFOAM-++VER++_cshrc @@ -0,0 +1,50 @@ +--- .OpenFOAM-1.2/cshrc.orig Thu Aug 18 11:08:22 2005 ++++ .OpenFOAM-1.2/cshrc Mon Dec 26 12:12:11 2005 +@@ -41,16 +41,16 @@ + # + # Location of FOAM installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-setenv WM_PROJECT_INST_DIR $HOME/$WM_PROJECT ++#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/local/$WM_PROJECT + + # Check that the installation directory has been set and exists + if ( $?WM_PROJECT_INST_DIR ) then + if ( -d $WM_PROJECT_INST_DIR ) then + +-setenv WM_PROJECT_DIR $WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION ++setenv WM_PROJECT_DIR $WM_PROJECT_INST_DIR + + # Location of users FOAM files + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@@ -59,7 +59,8 @@ + + # Compiler (if set to "" use the system compiler) + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-setenv WM_COMPILER Gcc ++#setenv WM_COMPILER Gcc ++setenv WM_COMPILER + setenv WM_COMPILER_ARCH + setenv WM_COMPILER_LIB_ARCH + +@@ -119,7 +120,16 @@ + endif + + #setenv WM_MPLIB +- setenv WM_MPLIB LAM ++ #setenv WM_MPLIB LAM ++ #setenv WM_MPLIB MPI ++ ++# FreeBSD workstation ++# ~~~~~~~~~~~~~~~~~~~ ++else if ($machineTest == FreeBSD) then ++ ++ setenv WM_ARCH FreeBSD ++ setenv WM_MPLIB %%MPILIB%% ++ #setenv WM_MPLIB LAM + #setenv WM_MPLIB MPI + + # SUN workstation diff --git a/science/openfoam/files/patch-.bashrc b/science/openfoam/files/patch-.bashrc new file mode 100644 index 000000000000..a9e40f494ad6 --- /dev/null +++ b/science/openfoam/files/patch-.bashrc @@ -0,0 +1,15 @@ +--- .bashrc.orig Mon Aug 1 18:41:21 2005 ++++ .bashrc Fri Dec 30 18:36:45 2005 +@@ -135,6 +135,12 @@ + export JAVA_HOME=/usr/java/j2sdk1.4.2 + fi + ++# FreeBSD workstation ++# ~~~~~~~~~~~~~~~~~~~ ++elif [ "$machineTest" = "FreeBSD" ]; then ++ ++ export JAVA_HOME=%%JAVA_HOME%% ++ + # SUN workstation + # ~~~~~~~~~~~~~~~ + elif [ "$machineTest" = "SunOS" ]; then diff --git a/science/openfoam/files/patch-.cshrc b/science/openfoam/files/patch-.cshrc new file mode 100644 index 000000000000..52ac84e65e8d --- /dev/null +++ b/science/openfoam/files/patch-.cshrc @@ -0,0 +1,24 @@ +--- .cshrc.orig Mon Aug 1 18:41:43 2005 ++++ .cshrc Fri Dec 30 18:35:49 2005 +@@ -130,6 +130,12 @@ + setenv JAVA_HOME /usr/java/j2sdk1.4.2 + endif + ++# FreeBSD workstation ++# ~~~~~~~~~~~~~~~~~~~ ++else if ($machineTest == FreeBSD) then ++ ++ setenv JAVA_HOME %%JAVA_HOME%% ++ + # SUN workstation + # ~~~~~~~~~~~~~~~ + else if ($machineTest == SunOS) then +@@ -202,7 +208,7 @@ + AddLib $MPICH_ARCH_PATH/lib + AddPath $MPICH_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$MPICH_VERSION ++ setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-$MPICH_VERSION + AddLib $FOAM_MPI_LIBBIN + + else if ($WM_MPLIB == LAM) then diff --git a/science/openfoam/files/patch-Allwmake b/science/openfoam/files/patch-Allwmake new file mode 100644 index 000000000000..56c31eae8b08 --- /dev/null +++ b/science/openfoam/files/patch-Allwmake @@ -0,0 +1,20 @@ +--- Allwmake.orig Wed Jan 5 16:00:46 2005 ++++ Allwmake Sat Dec 17 23:42:15 2005 +@@ -1,4 +1,6 @@ +-#!/bin/sh ++#! /bin/csh -f ++ ++source .cshrc + + (cd wmake ; ./makeWmake) + +@@ -6,7 +8,6 @@ + + (cd applications ; ./Allwmake) + +-if [ $# = 1 -a "$1" = "doc" ] +-then ++if ($# == 1 && "$1" == "doc") then + (cd doc ; ./Allwmake) +-fi ++endif diff --git a/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_Allwmake b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_Allwmake new file mode 100644 index 000000000000..c1e483860082 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_Allwmake @@ -0,0 +1,12 @@ +--- applications/utilities/mesh/manipulation/patchTool/C++/Allwmake.orig Thu Dec 11 20:50:07 2003 ++++ applications/utilities/mesh/manipulation/patchTool/C++/Allwmake Fri Dec 23 19:43:34 2005 +@@ -3,6 +3,9 @@ + linux*) + CMD="wmake libso" + ;; ++ FreeBSD*) ++ CMD="wmake libso" ++ ;; + *) + CMD="wmake lib" + esac diff --git a/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_FoamXServer_Make_omniOptions b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_FoamXServer_Make_omniOptions new file mode 100644 index 000000000000..c657d69b2e14 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_FoamXServer_Make_omniOptions @@ -0,0 +1,13 @@ +--- applications/utilities/mesh/manipulation/patchTool/C++/FoamXServer/Make/omniOptions.orig Wed Aug 27 18:11:43 2003 ++++ applications/utilities/mesh/manipulation/patchTool/C++/FoamXServer/Make/omniOptions Mon Dec 19 10:37:06 2005 +@@ -4,6 +4,10 @@ + + OMNI_SYS_INC = -D__x86__ -D__linux__ -D__OSVERSION__=2 + ++#elif defined(FreeBSD) ++ ++ OMNI_SYS_INC = -D__%%ARCH%%__ -D__FreeBSD__ -D__OSVERSION__=%%OSVERMAJ%% ++ + #elif defined(solaris) + + OMNI_SYS_INC = -D__sparc__ -D__sunos__ -D__OSVERSION__=5 diff --git a/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_FoamXServer_Make_orbOptions b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_FoamXServer_Make_orbOptions new file mode 100644 index 000000000000..41c1f20cf155 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_FoamXServer_Make_orbOptions @@ -0,0 +1,30 @@ +--- applications/utilities/mesh/manipulation/patchTool/C++/FoamXServer/Make/orbOptions.orig Wed Aug 27 18:11:43 2003 ++++ applications/utilities/mesh/manipulation/patchTool/C++/FoamXServer/Make/orbOptions Wed Dec 21 23:09:37 2005 +@@ -3,6 +3,11 @@ + ORB_SYS_INC = + ORB_SYS_LIB = -ldl + ++#elif defined(FreeBSD) ++ ++ ORB_SYS_INC = ++ ORB_SYS_LIB = ++ + #elif defined(solaris) + + ORB_SYS_INC = +@@ -31,13 +36,11 @@ + + + ORB_INC = \ +- -I$(MICO_ARCH_PATH)/include \ ++ `mico-config --cxxflags` \ + $(ORB_SYS_INC) + + ORB_LIBS = \ +- -L$(MICO_ARCH_PATH)/lib \ +- -lmicocoss$(MICO_VERSION) \ +- -lmico$(MICO_VERSION) \ ++ `mico-config --cosslibs` \ + $(ORB_SYS_LIB) + + /* diff --git a/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_PatchToolServer_Make_omniOptions b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_PatchToolServer_Make_omniOptions new file mode 100644 index 000000000000..6b5c5f5fe27a --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_PatchToolServer_Make_omniOptions @@ -0,0 +1,13 @@ +--- applications/utilities/mesh/manipulation/patchTool/C++/PatchToolServer/Make/omniOptions.orig Thu Aug 28 10:37:04 2003 ++++ applications/utilities/mesh/manipulation/patchTool/C++/PatchToolServer/Make/omniOptions Mon Dec 19 10:21:25 2005 +@@ -4,6 +4,10 @@ + + OMNI_SYS_INC = -D__x86__ -D__linux__ -D__OSVERSION__=2 + ++#elif defined(FreeBSD) ++ ++ OMNI_SYS_INC = -D__%%ARCH%%__ -D__FreeBSD__ -D__OSVERSION__=%%OSVERMAJ%% ++ + #elif defined(solaris) + + OMNI_SYS_INC = -D__sparc__ -D__sunos__ -D__OSVERSION__=5 diff --git a/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_PatchToolServer_Make_orbOptions b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_PatchToolServer_Make_orbOptions new file mode 100644 index 000000000000..574e66278755 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_mesh_manipulation_patchTool_C++_PatchToolServer_Make_orbOptions @@ -0,0 +1,30 @@ +--- ./applications/utilities/mesh/manipulation/patchTool/C++/PatchToolServer/Make/orbOptions.orig Thu Aug 28 10:37:05 2003 ++++ ./applications/utilities/mesh/manipulation/patchTool/C++/PatchToolServer/Make/orbOptions Wed Dec 21 19:09:41 2005 +@@ -3,6 +3,11 @@ + ORB_SYS_INC = + ORB_SYS_LIB = -ldl + ++#elif defined(FreeBSD) ++ ++ ORB_SYS_INC = ++ ORB_SYS_LIB = ++ + #elif defined(solaris) + + ORB_SYS_INC = +@@ -31,13 +36,11 @@ + + + ORB_INC = \ +- -I$(MICO_ARCH_PATH)/include \ ++ `mico-config --cxxflags` \ + $(ORB_SYS_INC) + + ORB_LIBS = \ +- -L$(MICO_ARCH_PATH)/lib \ +- -lmicocoss$(MICO_VERSION) \ +- -lmico$(MICO_VERSION) \ ++ `mico-config --cosslibs` \ + $(ORB_SYS_LIB) + + /* diff --git a/science/openfoam/files/patch-applications_utilities_miscellaneous_foamFlex_config.h b/science/openfoam/files/patch-applications_utilities_miscellaneous_foamFlex_config.h new file mode 100644 index 000000000000..ee3757154756 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_miscellaneous_foamFlex_config.h @@ -0,0 +1,20 @@ +--- applications/utilities/miscellaneous/foamFlex/config.h.orig Mon Dec 2 18:16:12 2002 ++++ applications/utilities/miscellaneous/foamFlex/config.h Sun Dec 18 14:37:39 2005 +@@ -11,7 +11,7 @@ + #define STDC_HEADERS 1 + + /* Define if you have the <malloc.h> header file. */ +-#define HAVE_MALLOC_H 1 ++#undef HAVE_MALLOC_H + + /* Define if you have the <string.h> header file. */ + #define HAVE_STRING_H 1 +@@ -20,7 +20,7 @@ + #define HAVE_SYS_TYPES_H 1 + + /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ +-#define HAVE_ALLOCA_H 1 ++#undef HAVE_ALLOCA_H + + /* Define if platform-specific command line handling is necessary. */ + /* #undef NEED_ARGV_FIXUP */ diff --git a/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_PVFoamReader_vtkFoamData.h b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_PVFoamReader_vtkFoamData.h new file mode 100644 index 000000000000..a439ff9d5e11 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_PVFoamReader_vtkFoamData.h @@ -0,0 +1,11 @@ +--- ./applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/vtkFoamData.h.orig Wed Jun 22 14:33:47 2005 ++++ ./applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/vtkFoamData.h Tue Jan 3 18:43:11 2006 +@@ -37,7 +37,7 @@ + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +-#include "vtkDataSetSource.h" ++#include <vtk/vtkDataSetSource.h> + + /*---------------------------------------------------------------------------*\ + Class vtkFoamData Declaration diff --git a/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_PVFoamReader_vtkFoamReader.h b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_PVFoamReader_vtkFoamReader.h new file mode 100644 index 000000000000..fb55348947a8 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_PVFoamReader_vtkFoamReader.h @@ -0,0 +1,11 @@ +--- applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/vtkFoamReader.h.orig Mon Jul 4 12:34:01 2005 ++++ applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/vtkFoamReader.h Sat Dec 24 17:59:14 2005 +@@ -37,7 +37,7 @@ + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +-#include "vtkDataSetSource.h" ++#include <vtk/vtkDataSetSource.h> + #include "vtkFoamData.h" + + // * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // diff --git a/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoam.C b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoam.C new file mode 100644 index 000000000000..c03079879b8e --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoam.C @@ -0,0 +1,21 @@ +--- applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoam.C.orig Tue Aug 9 16:34:44 2005 ++++ applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoam.C Sat Dec 24 18:06:03 2005 +@@ -36,12 +36,12 @@ + #include "volPointInterpolation.H" + + #include "vtkFoamReader.h" +-#include "vtkDataArraySelection.h" +-#include "vtkUnstructuredGrid.h" +-#include "vtkPointData.h" +-#include "vtkCellData.h" +-#include "vtkFloatArray.h" +-#include "vtkCharArray.h" ++#include <vtk/vtkDataArraySelection.h> ++#include <vtk/vtkUnstructuredGrid.h> ++#include <vtk/vtkPointData.h> ++#include <vtk/vtkCellData.h> ++#include <vtk/vtkFloatArray.h> ++#include <vtk/vtkCharArray.h> + + // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + diff --git a/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoamAddInternalMesh.C b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoamAddInternalMesh.C new file mode 100644 index 000000000000..b52d63e4a7ba --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoamAddInternalMesh.C @@ -0,0 +1,13 @@ +--- applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoamAddInternalMesh.C.orig Wed Jun 22 14:33:48 2005 ++++ applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoamAddInternalMesh.C Thu Jan 5 00:20:12 2006 +@@ -30,8 +30,8 @@ + #include "fvMesh.H" + #include "cellModeller.H" + +-#include "vtkUnstructuredGrid.h" +-#include "vtkCellArray.h" ++#include <vtk/vtkUnstructuredGrid.h> ++#include <vtk/vtkCellArray.h> + + #include "vtkFoamInsertNextPoint.H" + diff --git a/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoamAddPatch.C b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoamAddPatch.C new file mode 100644 index 000000000000..5cc17c919c1a --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_postProcessing_graphics_PVFoamReader_vtkFoam_vtkFoamAddPatch.C @@ -0,0 +1,13 @@ +--- applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoamAddPatch.C.orig Wed Jun 22 14:33:48 2005 ++++ applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoamAddPatch.C Fri Jan 6 12:29:38 2006 +@@ -29,8 +29,8 @@ + #include "vtkFoam.H" + #include "polyPatch.H" + +-#include "vtkUnstructuredGrid.h" +-#include "vtkCellArray.h" ++#include <vtk/vtkUnstructuredGrid.h> ++#include <vtk/vtkCellArray.h> + + #include "vtkFoamInsertNextPoint.H" + diff --git a/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_Allwmake b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_Allwmake new file mode 100644 index 000000000000..e573e46e885a --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_Allwmake @@ -0,0 +1,12 @@ +--- applications/utilities/preProcessing/FoamX/C++/Allwmake.orig Mon Sep 20 16:52:26 2004 ++++ applications/utilities/preProcessing/FoamX/C++/Allwmake Thu Dec 22 23:54:04 2005 +@@ -3,6 +3,9 @@ + linux*) + CMD="wmake libso" + ;; ++ FreeBSD*) ++ CMD="wmake libso" ++ ;; + *) + CMD="wmake lib" + esac diff --git a/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_ITypeDescriptorImpl.C b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_ITypeDescriptorImpl.C new file mode 100644 index 000000000000..0a55d83f2855 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_ITypeDescriptorImpl.C @@ -0,0 +1,14 @@ +--- applications/utilities/preProcessing/FoamX/C++/FoamXLib/ITypeDescriptorImpl.C.orig Wed Aug 17 11:35:37 2005 ++++ applications/utilities/preProcessing/FoamX/C++/FoamXLib/ITypeDescriptorImpl.C Sat Dec 24 18:36:45 2005 +@@ -39,6 +39,11 @@ + // Namespaces + #include "FoamXNameSpaces.H" + ++#if (__FreeBSD__) ++# include <sys/types.h> ++ typedef unsigned long ulong; ++#endif ++ + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + FoamX::ITypeDescriptorImpl::ITypeDescriptorImpl diff --git a/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_Make_omniOptions b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_Make_omniOptions new file mode 100644 index 000000000000..60ae1d3bb424 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_Make_omniOptions @@ -0,0 +1,13 @@ +--- applications/utilities/preProcessing/FoamX/C++/FoamXLib/Make/omniOptions.orig Mon Jan 17 16:46:05 2005 ++++ applications/utilities/preProcessing/FoamX/C++/FoamXLib/Make/omniOptions Mon Dec 19 10:42:46 2005 +@@ -4,6 +4,10 @@ + + OMNI_SYS_INC = -D__x86__ -D__linux__ -D__OSVERSION__=2 + ++#elif defined(FreeBSD) ++ ++ OMNI_SYS_INC = -D__%%ARCH%%__ -D__FreeBSD__ -D__OSVERSION__=%%OSVERMAJ%% ++ + #elif defined(solaris) + + OMNI_SYS_INC = -D__sparc__ -D__sunos__ -D__OSVERSION__=5 diff --git a/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_Make_orbOptions b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_Make_orbOptions new file mode 100644 index 000000000000..a94ee82c19b5 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_Make_orbOptions @@ -0,0 +1,30 @@ +--- ./applications/utilities/preProcessing/FoamX/C++/FoamXLib/Make/orbOptions.orig Mon Jan 17 16:46:05 2005 ++++ ./applications/utilities/preProcessing/FoamX/C++/FoamXLib/Make/orbOptions Wed Dec 21 19:11:49 2005 +@@ -3,6 +3,11 @@ + ORB_SYS_INC = + ORB_SYS_LIB = -ldl + ++#elif defined(FreeBSD) ++ ++ ORB_SYS_INC = ++ ORB_SYS_LIB = ++ + #elif defined(solaris) + + ORB_SYS_INC = +@@ -36,13 +41,11 @@ + + + ORB_INC = \ +- -I$(MICO_ARCH_PATH)/include \ ++ `mico-config --cxxflags` \ + $(ORB_SYS_INC) + + ORB_LIBS = \ +- -L$(MICO_ARCH_PATH)/lib \ +- -lmicocoss$(MICO_VERSION) \ +- -lmico$(MICO_VERSION) \ ++ `mico-config --cosslibs` \ + $(ORB_SYS_LIB) + + /* diff --git a/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_ProcessControl.C b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_ProcessControl.C new file mode 100644 index 000000000000..adeff30ca327 --- /dev/null +++ b/science/openfoam/files/patch-applications_utilities_preProcessing_FoamX_C++_FoamXLib_ProcessControl.C @@ -0,0 +1,12 @@ +--- applications/utilities/preProcessing/FoamX/C++/FoamXLib/ProcessControl.C.orig Wed Jun 22 14:33:39 2005 ++++ applications/utilities/preProcessing/FoamX/C++/FoamXLib/ProcessControl.C Thu Dec 22 00:01:29 2005 +@@ -30,6 +30,9 @@ + #include <fcntl.h> + #include <sys/wait.h> + #include <errno.h> ++#if defined(__FreeBSD__) ++# include <sys/stat.h> ++#endif + + // Foam header files. + #include "ProcessControl.H" diff --git a/science/openfoam/files/patch-bin_foamInstallationTest b/science/openfoam/files/patch-bin_foamInstallationTest new file mode 100644 index 000000000000..644b12085ae9 --- /dev/null +++ b/science/openfoam/files/patch-bin_foamInstallationTest @@ -0,0 +1,61 @@ +--- bin/foamInstallationTest.orig Tue Jun 21 18:07:04 2005 ++++ bin/foamInstallationTest Mon Dec 26 16:17:07 2005 +@@ -34,7 +34,7 @@ + + # SETTINGS + #~~~~~~~~~ +-FOAM_VERSION=1.1 ++FOAM_VERSION=1.2 + GCC_VERSION=3.4.3 + GZIP_VERSION=1.3.5 + GTAR_VERSION=1.13.25 +@@ -94,7 +94,7 @@ + if [ $LDIFF -le 1 ]; then + while [ $LDIFF -lt 0 ] ; do + WORD="$WORD " +- LDIFF=`expr $LDIFF + 1` ++ LDIFF=`expr 0 + $LDIFF + 1` + done + echo "$WORD" + else +@@ -321,6 +321,16 @@ + RESULT="Networking_cannot_reach_$1" + fi + ;; ++ FreeBSD) ++ PINGTEST=`/sbin/ping -c 1 $1 2>&1` ++ if [ "`echo $PINGTEST | grep "1 packets received"`" != "" ] ; then ++ RESULT="Successful" ++ elif [ "`echo $PINGTEST | grep "unknown host"`" != "" ] ; then ++ RESULT="No_entry_for_\"$1\"_in_/etc/hosts" ++ else ++ RESULT="Networking_cannot_reach_$1" ++ fi ++ ;; + *) + PINGTEST=`/bin/ping -w 3 -c 1 $1 2>&1` + if [ "`echo $PINGTEST | grep "1 received"`" != "" ] ; then +@@ -435,12 +445,12 @@ + echo "`fixlen "Host:" $WIDTH` ${HOST_NAME}" + fi + # +-if [ "$OS" = "Linux" ] || [ "$OS" = "LinuxAMD64" ] || [ "$OS" = "SunOS" ]; then ++if [ "$OS" = "Linux" ] || [ "$OS" = "LinuxAMD64" ] || [ "$OS" = "FreeBSD" ] || [ "$OS" = "SunOS" ]; then + echo "`fixlen "OS:" $WIDTH` ${OS} version ${OS_VERSION}" + else + echo "FATAL ERROR: Incompatible operating system \"$OS\"." + echo " Foam${FOAM_VERSION} is currently " +- echo " available for Linux and SunOS only." ++ echo " available for Linux, FreeBSD and SunOS only." + echo + FATALERROR=`expr $FATALERROR + 1` + fi +@@ -558,7 +568,7 @@ + hline #-------------------- + echo "$COL1 $COL2 $COL3" + hline #-------------------- +-reportExecutable gcc "${WM_COMPILER_DIR}/bin/gcc" ++reportExecutable gcc "/usr/bin/gcc" + reportExecutable java "${JAVA_HOME}/bin/java" + reportExecutable gzip + if [ "$OS" = "Linux" ] ; then diff --git a/science/openfoam/files/patch-bin_foamSystemCheck b/science/openfoam/files/patch-bin_foamSystemCheck new file mode 100644 index 000000000000..5b5c4cd5b2e8 --- /dev/null +++ b/science/openfoam/files/patch-bin_foamSystemCheck @@ -0,0 +1,23 @@ +--- bin/foamSystemCheck.orig Tue Jun 21 18:07:04 2005 ++++ bin/foamSystemCheck Mon Dec 26 16:03:08 2005 +@@ -119,6 +119,20 @@ + RESULT="Ping_not_installed_in_usual_path" + fi + ;; ++ FreeBSD) ++ if [ -x '/sbin/ping' ] ; then ++ PINGTEST=`/sbin/ping -c 1 $1 2>&1` ++ if [ -n "`echo $PINGTEST | grep '1 packets received'`" ] ; then ++ RESULT="Successful" ++ elif [ -n "`echo $PINGTEST | grep 'unknown host'`" ] ; then ++ RESULT='Unknown host' ++ else ++ RESULT='Networking not set' ++ fi ++ else ++ RESULT="Ping_not_installed_in_usual_path" ++ fi ++ ;; + # OSF*) + # if [ -x '/usr/sbin/ping' ] ; then + # PINGTEST=`ping -t 3 -c 1 $1 2>&1` diff --git a/science/openfoam/files/patch-src_Allwmake b/science/openfoam/files/patch-src_Allwmake new file mode 100644 index 000000000000..0cafec5e31af --- /dev/null +++ b/science/openfoam/files/patch-src_Allwmake @@ -0,0 +1,21 @@ +--- 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 + +-wmake libso zlib-1.2.1 ++# Use system zlib ++#wmake libso zlib-1.2.1 + wmake libso foamUser + + FOAM_SRC_DIR=`pwd` +@@ -123,7 +124,8 @@ + + wmake libso Gstream + +-(cd malloc ; ./Allwmake) ++# Don't build FreeBSD malloc ++#(cd malloc ; ./Allwmake) + + if [ ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ] + then diff --git a/science/openfoam/files/patch-src_OpenFOAM_Make_options b/science/openfoam/files/patch-src_OpenFOAM_Make_options new file mode 100644 index 000000000000..870ff97ee538 --- /dev/null +++ b/science/openfoam/files/patch-src_OpenFOAM_Make_options @@ -0,0 +1,9 @@ +--- src/OpenFOAM/Make/options.orig Tue Jan 25 16:51:06 2005 ++++ src/OpenFOAM/Make/options Fri Dec 30 21:24:48 2005 +@@ -1,5 +1,4 @@ + EXE_INC = \ +- -DWM_PROJECT_VERSION='"'$(WM_PROJECT_VERSION)'"' \ +- -I$(LIB_SRC)/zlib-1.2.1 ++ -DWM_PROJECT_VERSION='"'$(WM_PROJECT_VERSION)'"' + + LIB_LIBS = -L$(FOAM_LIBBIN)/dummy -lPstream -lfoamUser -lz diff --git a/science/openfoam/files/patch-src_OpenFOAM_OSspecific_Unix_fileStat.C b/science/openfoam/files/patch-src_OpenFOAM_OSspecific_Unix_fileStat.C new file mode 100644 index 000000000000..22c18f0322b6 --- /dev/null +++ b/science/openfoam/files/patch-src_OpenFOAM_OSspecific_Unix_fileStat.C @@ -0,0 +1,10 @@ +--- src/OpenFOAM/OSspecific/Unix/fileStat.C.orig Tue Jun 21 18:06:05 2005 ++++ src/OpenFOAM/OSspecific/Unix/fileStat.C Sun Dec 18 14:59:12 2005 +@@ -33,7 +33,6 @@ + + #include <signal.h> + #include <unistd.h> +-#include <sys/sysmacros.h> + + /* + #undef major diff --git a/science/openfoam/files/patch-wmake_Makefile b/science/openfoam/files/patch-wmake_Makefile new file mode 100644 index 000000000000..a2e627ba4b42 --- /dev/null +++ b/science/openfoam/files/patch-wmake_Makefile @@ -0,0 +1,10 @@ +--- wmake/Makefile.orig Tue Jun 21 18:10:23 2005 ++++ wmake/Makefile Sun Dec 18 21:16:33 2005 +@@ -143,6 +143,7 @@ + $(EXE): $(OBJECTS) + $(WM_SCRIPTS)/mkObjectDir $(EXE) + $(LINKEXE) $(OBJECTS) -L$(LIB_WM_OPTIONS_DIR) \ ++ -rpath-link $(LIB_WM_OPTIONS_DIR) -rpath-link $(FOAM_MPI_LIBBIN) \ + $(EXE_LIBS) -l$(WM_PROJECT) $(SYS_LIBS) $(LINK_LIBS) $(GLIBS) -o $(EXE) + + exe: $(SEXE) diff --git a/science/openfoam/files/patch-wmake_makeWmake b/science/openfoam/files/patch-wmake_makeWmake new file mode 100644 index 000000000000..b521cece2015 --- /dev/null +++ b/science/openfoam/files/patch-wmake_makeWmake @@ -0,0 +1,20 @@ +--- 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 .. ++ + #------------------------------------------------------------------------------ diff --git a/science/openfoam/files/patch-wmake_rules_FreeBSD_c b/science/openfoam/files/patch-wmake_rules_FreeBSD_c new file mode 100644 index 000000000000..46749bb1705d --- /dev/null +++ b/science/openfoam/files/patch-wmake_rules_FreeBSD_c @@ -0,0 +1,11 @@ +--- wmake/rules/FreeBSD/c.orig Mon Nov 22 18:30:37 2004 ++++ wmake/rules/FreeBSD/c Sat Dec 17 23:56:13 2005 +@@ -2,7 +2,7 @@ + + cWARN = -Wall + +-cc = gcc -m32 ++cc = $(CC) + + include $(RULES)/c$(WM_COMPILE_OPTION) + diff --git a/science/openfoam/files/patch-wmake_rules_FreeBSD_c++ b/science/openfoam/files/patch-wmake_rules_FreeBSD_c++ new file mode 100644 index 000000000000..159289d3df55 --- /dev/null +++ b/science/openfoam/files/patch-wmake_rules_FreeBSD_c++ @@ -0,0 +1,21 @@ +--- wmake/rules/FreeBSD/c++.orig Sun Apr 24 00:36:58 2005 ++++ wmake/rules/FreeBSD/c++ Fri Jan 6 13:50:58 2006 +@@ -1,8 +1,6 @@ + .SUFFIXES: .C .cxx .cc .cpp + +-c++WARN = -Wall -W -Wno-unused-parameter -Wold-style-cast +- +-CC = g++ -m32 ++c++WARN = -Wall -W -Wno-unused-parameter + + include $(RULES)/c++$(WM_COMPILE_OPTION) + +@@ -15,7 +13,7 @@ + cctoo = $(Ctoo) + cpptoo = $(Ctoo) + +-LINK_LIBS = $(c++DBUG) ++LINK_LIBS = $(c++DBUG) -lstdc++ + + LINKLIBSO = $(CC) $(c++FLAGS) -shared + LINKEXE = $(CC) $(c++FLAGS) diff --git a/science/openfoam/files/patch-wmake_rules_FreeBSD_c++Opt b/science/openfoam/files/patch-wmake_rules_FreeBSD_c++Opt new file mode 100644 index 000000000000..9e9691d8d4bb --- /dev/null +++ b/science/openfoam/files/patch-wmake_rules_FreeBSD_c++Opt @@ -0,0 +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 +@@ -1,2 +1,2 @@ + c++DBUG = +-c++OPT = -O3 -ffast-math ++c++OPT = $(CXXFLAGS) -ffast-math diff --git a/science/openfoam/files/patch-wmake_rules_FreeBSD_cOpt b/science/openfoam/files/patch-wmake_rules_FreeBSD_cOpt new file mode 100644 index 000000000000..142b12782d19 --- /dev/null +++ b/science/openfoam/files/patch-wmake_rules_FreeBSD_cOpt @@ -0,0 +1,6 @@ +--- wmake/rules/FreeBSD/cOpt.orig Mon Nov 22 18:30:37 2004 ++++ wmake/rules/FreeBSD/cOpt Sun Dec 18 10:17:09 2005 +@@ -1,2 +1,2 @@ + cDBUG = +-cOPT = -O3 ++cOPT = $(CFLAGS) diff --git a/science/openfoam/files/patch-wmake_rules_FreeBSD_general b/science/openfoam/files/patch-wmake_rules_FreeBSD_general new file mode 100644 index 000000000000..b2d21075fe08 --- /dev/null +++ b/science/openfoam/files/patch-wmake_rules_FreeBSD_general @@ -0,0 +1,9 @@ +--- wmake/rules/FreeBSD/general.orig Mon Apr 18 20:22:21 2005 ++++ wmake/rules/FreeBSD/general Sat Dec 24 00:40:11 2005 +@@ -1,5 +1,4 @@ +-CPP = /lib/cpp -D$(WM_ARCH) +-LD = ld -melf_i386 ++CPP += -D$(WM_ARCH) + + include $(RULES)/X + diff --git a/science/openfoam/files/pkg-message.in b/science/openfoam/files/pkg-message.in new file mode 100644 index 000000000000..440ca25313bc --- /dev/null +++ b/science/openfoam/files/pkg-message.in @@ -0,0 +1,32 @@ +-------------------------------------------------------------------------------- +OpenFOAM requires environment variable settings contained in files in +%%PREFIX%%/%%REALNAME%%/.%%REALNAME%%-%%VER%%. + +a) EITHER, if running bash or ksh (if in doubt type 'echo $SHELL'), +source the .%%REALNAME%%-%%VER%%/bashrc file by adding the following line to +the end of your $HOME/.bashrc file: + +. %%PREFIX%%/%%REALNAME%%/.%%REALNAME%%-%%VER%%/bashrc + +Then update the environment variables by sourcing the $HOME/.bashrc +file by typing in the terminal: +. $HOME/.bashrc + +b) OR, if running tcsh or csh, source the .%%REALNAME%%-%%VER%%/cshrc file by +adding the following line to the end of your $HOME/.cshrc file: + +source %%PREFIX%%/%%REALNAME%%/.%%REALNAME%%-%%VER%%/cshrc + +Then update the environment variables by sourcing the $HOME/.cshrc +file by typing in the terminal: +source $HOME/.cshrc + +If you plan to run FoamX, copy its directories to your $HOME: + +mkdir -p $HOME/.%%REALNAME%%-%%VER%%/apps +cp -R %%PREFIX%%/%%REALNAME%%/.%%REALNAME%%-%%VER%%/apps/FoamX \ +$HOME/.%%REALNAME%%-%%VER%%/apps + +Then, you could run foamInstallationTest to check your installaton. +See %%PREFIX%%/%%REALNAME%%/README, § 6, to get started. +-------------------------------------------------------------------------------- |