From 5f0effcdb0a138c08ae6533bff51f0c9bdd6c67a Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 14 Aug 2011 13:29:18 -0700 Subject: [PATCH 1/5] buildInstructions: Ubuntu_10.04.3 --- .../Compilation_Ubuntu_10.04.3_32-bit.txt | 108 ++++++++++++++++++ .../Compilation_Ubuntu_10.04.3_64-bit.txt | 108 ++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt create mode 100644 doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt diff --git a/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt new file mode 100644 index 000000000..693c9b43e --- /dev/null +++ b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt @@ -0,0 +1,108 @@ +Installation of OpenFOAM-1.6-ext on Ubuntu 10.04.3 32-bit + +- Proceed with the installation of the OS +- Update your OS installation using "Update Manager". +- If asked to reboot your system, please do so. + +-------------------------------------------------------------------------------- + +# Installation of additional system packages: +git: sudo apt-get install git-core +flex: sudo apt-get install flex +bison: sudo apt-get install bison +rpm: sudo apt-get install rpm +g++: sudo apt-get install g++ +libz: sudo apt-get install zlib1g-dev +binutils-dev : sudo apt-get install binutils-dev +qt4: sudo apt-get install libqt4-dev qt4-dev-tools + +libxext: sudo apt-get install libxext-dev +libxt : sudo apt-get install libxt-dev + +# You can also install everything at once: +sudo apt-get install git-core flex bison rpm g++ zlib1g-dev binutils-dev \ + libqt4-dev qt4-dev-tools libxext-dev libxt-dev + +-------------------------------------------------------------------------------- + +# Minor correction for make/gmake +sudo ln -s /usr/bin/make /usr/bin/gmake + +-------------------------------------------------------------------------------- + +# Installation of libstdc++.so.5: + +For Ubuntu 32bit: +----------------- +Grab the package libstdc++5_3.3.6-24_i386.deb from one of the sites listed here: +http://packages.debian.org/lenny/i386/libstdc++5/download + +wget http://ftp.us.debian.org/debian/pool/main/g/gcc-3.3/libstdc++5_3.3.6-24_i386.deb +dpkg-deb -x ./libstdc++5_3.3.6-24_i386.deb /tmp/tmp_dir + +sudo cp /tmp/tmp_dir/usr/lib/libstdc++.so.5.0.7 /usr/lib/ +sudo ln -s /usr/lib/libstdc++.so.5.0.7 /usr/lib/libstdc++.so.5 +rm -rf /tmp/tmp_dir + +-------------------------------------------------------------------------------- + +# Download OpenFOAM-1.6-ext +mkdir ~/OpenFOAM +cd ~/OpenFOAM +git clone git://openfoam-extend.git.sourceforge.net/gitroot/openfoam-extend/OpenFOAM-1.6-ext + +-------------------------------------------------------------------------------- + +# We are going to use the system installed version of QT4 +cp ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh-EXAMPLE ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +#Uncomment and modify the initialization of the variables QT_DIR and QT_BIN_DIR in the file prefs.sh + +sed -i s/"#export QT_DIR=path_to_system_installed_qt"/"export QT_DIR=\/usr"/g ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh +sed -i s/"#export QT_BIN_DIR=\$QT_DIR\/bin"/"export QT_BIN_DIR=\$QT_DIR\/bin"/g ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +# This section of the prefs.sh file should now look like this: + +#export QT_THIRD_PARTY=1 +export QT_DIR=/usr +export QT_BIN_DIR=$QT_DIR/bin + +-------------------------------------------------------------------------------- + +# Source your OpenFOAM environment to get the basic configuration for +# compilation +. ~/OpenFOAM/OpenFOAM-1.6-ext/etc/bashrc + +# Compile the ThirdParty packages +cd $WM_PROJECT_DIR/ThirdParty +./AllMake >& log.AllMake & +tail -f log.AllMake # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Update your OpenFOAM environment to get the basic configuration from the newly +# compiled ThirdParty packages +. ~/OpenFOAM/OpenFOAM-1.6-ext/etc/bashrc + +# Compile OpenFOAM-1.6-ext +cd $WM_PROJECT_DIR +./Allwmake >& log.Allwmake & +tail -f log.Allwmake # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Execute Allwmake a second time because of a bad library building sequence for +# the library -lfaceDecompositionMotionSolver + +./Allwmake >& log.Allwmake2 & +tail -f log.Allwmake2 # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Run a tutorial to check the basic functionality +cd $FOAM_TUTORIAL/incompressible/simpleFoam/pitzDaily +blockMesh >& log.blockMesh +simpleFoam >& log.simpleFoam +paraFoam + +# You are done! diff --git a/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt new file mode 100644 index 000000000..b5313bd8f --- /dev/null +++ b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt @@ -0,0 +1,108 @@ +Installation of OpenFOAM-1.6-ext on Ubuntu 10.04.3 64-bit + +- Proceed with the installation of the OS +- Update your OS installation using "Update Manager". +- If asked to reboot your system, please do so. + +-------------------------------------------------------------------------------- + +# Installation of additional system packages: +git: sudo apt-get install git-core +flex: sudo apt-get install flex +bison: sudo apt-get install bison +rpm: sudo apt-get install rpm +g++: sudo apt-get install g++ +libz: sudo apt-get install zlib1g-dev +binutils-dev : sudo apt-get install binutils-dev +qt4: sudo apt-get install libqt4-dev qt4-dev-tools + +libxext: sudo apt-get install libxext-dev +libxt : sudo apt-get install libxt-dev + +# You can also install everything at once: +sudo apt-get install git-core flex bison rpm g++ zlib1g-dev binutils-dev \ + libqt4-dev qt4-dev-tools libxext-dev libxt-dev + +-------------------------------------------------------------------------------- + +# Minor correction for make/gmake +sudo ln -s /usr/bin/make /usr/bin/gmake + +-------------------------------------------------------------------------------- + +# Installation of libstdc++.so.5: + +For Ubuntu 64bit: +----------------- +Grab the package libstdc++5_3.3.6-24_amd64.deb from one of the sites listed here: +http://packages.debian.org/lenny/amd64/Libstdc++5/download + +wget http://ftp.us.debian.org/debian/pool/main/g/gcc-3.3/libstdc++5_3.3.6-24_amd64.deb +dpkg-deb -x ./libstdc++5_3.3.6-24_amd64.deb /tmp/tmp_dir + +sudo cp /tmp/tmp_dir/usr/lib/libstdc++.so.5.0.7 /usr/lib/ +sudo ln -s /usr/lib/libstdc++.so.5.0.7 /usr/lib/libstdc++.so.5 +rm -rf /tmp/tmp_dir + +-------------------------------------------------------------------------------- + +# Download OpenFOAM-1.6-ext +mkdir ~/OpenFOAM +cd ~/OpenFOAM +git clone git://openfoam-extend.git.sourceforge.net/gitroot/openfoam-extend/OpenFOAM-1.6-ext + +-------------------------------------------------------------------------------- + +# We are going to use the system installed version of QT4 +cp ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh-EXAMPLE ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +#Uncomment and modify the initialization of the variables QT_DIR and QT_BIN_DIR in the file prefs.sh + +sed -i s/"#export QT_DIR=path_to_system_installed_qt"/"export QT_DIR=\/usr"/g ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh +sed -i s/"#export QT_BIN_DIR=\$QT_DIR\/bin"/"export QT_BIN_DIR=\$QT_DIR\/bin"/g ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +# This section of the prefs.sh file should now look like this: + +#export QT_THIRD_PARTY=1 +export QT_DIR=/usr +export QT_BIN_DIR=$QT_DIR/bin + +-------------------------------------------------------------------------------- + +# Source your OpenFOAM environment to get the basic configuration for +# compilation +. ~/OpenFOAM/OpenFOAM-1.6-ext/etc/bashrc + +# Compile the ThirdParty packages +cd $WM_PROJECT_DIR/ThirdParty +./AllMake >& log.AllMake & +tail -f log.AllMake # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Update your OpenFOAM environment to get the basic configuration from the newly +# compiled ThirdParty packages +. ~/OpenFOAM/OpenFOAM-1.6-ext/etc/bashrc + +# Compile OpenFOAM-1.6-ext +cd $WM_PROJECT_DIR +./Allwmake >& log.Allwmake & +tail -f log.Allwmake # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Execute Allwmake a second time because of a bad library building sequence for +# the library -lfaceDecompositionMotionSolver + +./Allwmake >& log.Allwmake2 & +tail -f log.Allwmake2 # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Run a tutorial to check the basic functionality +cd $FOAM_TUTORIAL/incompressible/simpleFoam/pitzDaily +blockMesh >& log.blockMesh +simpleFoam >& log.simpleFoam +paraFoam + +# You are done! From 988191671fd0933134e46125858ff621e4d4603b Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 14 Aug 2011 13:45:54 -0700 Subject: [PATCH 2/5] buildInstructions: Ubuntu_10.04.3: add the name of someone to blame --- .../Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt | 4 ++++ .../Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt index 693c9b43e..80bd0542d 100644 --- a/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt +++ b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt @@ -106,3 +106,7 @@ simpleFoam >& log.simpleFoam paraFoam # You are done! + +-------------------------------------------------------------------------------- +Martin Beaudoin +August 2011 diff --git a/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt index b5313bd8f..037946396 100644 --- a/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt +++ b/doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt @@ -106,3 +106,7 @@ simpleFoam >& log.simpleFoam paraFoam # You are done! + +-------------------------------------------------------------------------------- +Martin Beaudoin +August 2011 From b4c9a46dfa77d1bb33f219251dda4fa36ddbd5c7 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Tue, 16 Aug 2011 17:10:02 -0400 Subject: [PATCH 3/5] buildInstructions: Centos 5.5 --- .../5.5/Compilation_Centos_5.5_64bit.txt | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt diff --git a/doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt b/doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt new file mode 100644 index 000000000..fdedd1e44 --- /dev/null +++ b/doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt @@ -0,0 +1,164 @@ +Installation of OpenFOAM-1.6-ext on Centos 5.5 64-bit +-------------------------------------------------------------------------------- + +Network download and installation from: +ftp://mirrors.usc.edu/pub/linux/distributions/centos/5.5/os/x86_64/ + +Basic configuration: + Desktop - Gnome + Packages from CentOS Extras: unchecked + + Complete installation log: /root/install.log + +Run Package updater to update your installation + +-------------------------------------------------------------------------------- + +Add your user as a valid user for the command 'sudo'. + +You will need to use the command 'visudo' as the user root for this. + +I won't go into the details for this, there is a lot of info all over the Net +for doing this relatively minor adjustment. + +In doubt, simply ask your local Unix guru. + +-------------------------------------------------------------------------------- + +# Add the EPEL package repository: +sudo rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm + +-------------------------------------------------------------------------------- + +# Installation of additional system packages: + +sudo yum install git-1.7.4.1-1.el5.x86_64 +sudo yum install gcc.x86_64 gcc-c++.x86_64 +sudo yum install bison.x86_64 +sudo yum install flex.x86_64 +sudo yum install rpm-build-4.4.2.3-22.el5.x86_64 +sudo yum install zlib-devel-1.2.3-3.x86_64 +sudo yum install libX11-devel.x86_64 +sudo yum install libXext-devel.x86_64 +sudo yum install libXrender-devel.x86_64 +sudo yum install libXt-devel-1.0.2-3.2.el5.x86_64 + +# You can also install everything at once: + +sudo yum install \ + git-1.7.4.1-1.el5.x86_64 \ + gcc.x86_64 gcc-c++.x86_64 \ + bison.x86_64 \ + flex.x86_64 \ + rpm-build-4.4.2.3-22.el5.x86_64 \ + zlib-devel-1.2.3-3.x86_64 \ + libX11-devel.x86_64 \ + libXext-devel.x86_64 \ + libXrender-devel.x86_64 \ + libXt-devel-1.0.2-3.2.el5.x86_64 + +-------------------------------------------------------------------------------- + +# Download OpenFOAM-1.6-ext + +mkdir ~/OpenFOAM +cd ~/OpenFOAM +git clone git://openfoam-extend.git.sourceforge.net/gitroot/openfoam-extend/OpenFOAM-1.6-ext + + +-------------------------------------------------------------------------------- + +# We need to tweak our OpenFOAM setup using the prefs.sh file + +cp ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh-EXAMPLE \ + ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +-------------------------------------------------------------------------------- + +# We are going to use version 4.4.5 of gcc, provided by the ThirdParty packages +# +# The versions provided by Centos 5.5 are either too old, or a just a preview +# version of gcc 4.4.0, which is a bit 'green'. +# +# So the system installed compiler will only serve to compile gcc 4.4.5. + +# Modify the etc/prefs.sh file to switch to gcc 4.4.5 +sed -i s/"compilerInstall=System"/"compilerInstall=OpenFOAM\nWM_COMPILER=Gcc44"/g ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +# Activate the compilation of gcc 4.4.5 in the ThirdParty/AllMake.stage1 file +sed -i 0,/"#( rpm_make -p gmp-5.0.1"/s//"( rpm_make -p gmp-5.0.1"/ ~/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty/AllMake.stage1 +sed -i 0,/"#( rpm_make -p mpfr-3.0.1"/s//"( rpm_make -p mpfr-3.0.1"/ ~/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty/AllMake.stage1 +sed -i 0,/"#( rpm_make -p gcc-4.4.5"/s//"( rpm_make -p gcc-4.4.5"/ ~/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty/AllMake.stage1 + +# Add the wmake rules set for Gcc44 +ln -s ~/OpenFOAM/OpenFOAM-1.6-ext/wmake/rules/linux64Gcc ~/OpenFOAM/OpenFOAM-1.6-ext/wmake/rules/linux64Gcc44 + +-------------------------------------------------------------------------------- + + +# We are going to use the version of QT4 provided by the ThirdParty packages + +# Uncomment and modify the initialization of the variables QT_THIRD_PARTY in the +# file prefs.sh + +sed -i s/"#export QT_THIRD_PARTY=1"/"export QT_THIRD_PARTY=1"/g ~/OpenFOAM/OpenFOAM-1.6-ext/etc/prefs.sh + +# This section of the prefs.sh file should now look like this: + +export QT_THIRD_PARTY=1 +#export QT_DIR=path_to_system_installed_qt +#export QT_BIN_DIR=$QT_DIR/bin + + +-------------------------------------------------------------------------------- + +# Source this initial OpenFOAM environment to get the basic configuration for +# compilation +. ~/OpenFOAM/OpenFOAM-1.6-ext/etc/bashrc + +# You will get some warnings about missing file for gcc-4.4.5, and problem with +# your compiler installation. +# This is quite normal, your gcc-4.4.5 compiler is not even compiled and +# installed yet. Patience patience... + +# Compile the ThirdParty packages, including the gcc 4.4.5 compiler + +cd $WM_PROJECT_DIR/ThirdParty +./AllMake >& log.AllMake & +tail -f log.AllMake # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Update your OpenFOAM environment to get the basic configuration from the newly +# compiled ThirdParty packages + +. ~/OpenFOAM/OpenFOAM-1.6-ext/etc/bashrc + +# Compile OpenFOAM-1.6-ext + +cd $WM_PROJECT_DIR +./Allwmake >& log.Allwmake & +tail -f log.Allwmake # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Execute Allwmake a second time because of a bad library building sequence for +# the library -lfaceDecompositionMotionSolver + +./Allwmake >& log.Allwmake2 & +tail -f log.Allwmake2 # To keep an eye on the compilation process + +-------------------------------------------------------------------------------- + +# Run a tutorial to check the basic functionality + +cd $FOAM_TUTORIAL/incompressible/simpleFoam/pitzDaily +blockMesh >& log.blockMesh +simpleFoam >& log.simpleFoam +paraFoam + +# You are done! + +-------------------------------------------------------------------------------- +Martin Beaudoin +August 2011 From 6048822fcc592c4c1127249949f5d6cec2627368 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Fri, 31 May 2013 00:31:18 -0400 Subject: [PATCH 4/5] .gitignore: blacklisting files subject to a DMCA complaint by ANSYS --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index b6d81a490..013e5460d 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,12 @@ etc/settings.csh etc/setteings.sh +# The following files are blacklisted because of a DMCA complaint by ANSYS. +src/lduSolvers/tools/PriorityArray.C +src/lduSolvers/tools/PriorityArray.H +src/lduSolvers/amg/amgPolicy/samgPolicy.C +src/lduSolvers/amg/amgPolicy/samgPolicy.H +src/lduSolvers/amg/amgPolicy/aamgPolicy.C +src/lduSolvers/amg/amgPolicy/aamgPolicy.H + # end-of-file From f42972b7ee5412796f24a9f468c734f829dc8e14 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 2 Jun 2013 09:11:26 -0400 Subject: [PATCH 5/5] Fixing compilation of lduSolvers following removal of files --- src/lduSolvers/Make/files | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lduSolvers/Make/files b/src/lduSolvers/Make/files index ab36ce6b1..7d891ced3 100644 --- a/src/lduSolvers/Make/files +++ b/src/lduSolvers/Make/files @@ -30,7 +30,5 @@ $(amg)/coarseAmgLevel.C amgPolicy = $(amg)/amgPolicy $(amgPolicy)/amgPolicy.C $(amgPolicy)/pamgPolicy.C -$(amgPolicy)/aamgPolicy.C -$(amgPolicy)/samgPolicy.C LIB = $(FOAM_LIBBIN)/liblduSolvers