Fixes and a script to compile Foam in one go

--HG--
extra : amend_source : 367e251b7df6b13cda03ddf956dbbfa9bec4b51d
This commit is contained in:
Bernhard Gschaider 2014-02-10 15:12:04 +01:00
parent 338173c01e
commit ad198e0854
6 changed files with 39 additions and 3 deletions

3
.gitignore vendored
View file

@ -119,4 +119,7 @@ src/lduSolvers/amg/amgPolicy/samgPolicy.H
src/lduSolvers/amg/amgPolicy/aamgPolicy.C src/lduSolvers/amg/amgPolicy/aamgPolicy.C
src/lduSolvers/amg/amgPolicy/aamgPolicy.H src/lduSolvers/amg/amgPolicy/aamgPolicy.H
# vagrant stuff
vagrantSandbox/.vagrant/
# end-of-file # end-of-file

View file

@ -108,4 +108,7 @@ src/lduSolvers/amg/amgPolicy/samgPolicy.H
src/lduSolvers/amg/amgPolicy/aamgPolicy.C src/lduSolvers/amg/amgPolicy/aamgPolicy.C
src/lduSolvers/amg/amgPolicy/aamgPolicy.H src/lduSolvers/amg/amgPolicy/aamgPolicy.H
# vagrant stuff
vagrantSandbox/.vagrant/
# end-of-file # end-of-file

View file

@ -16,11 +16,11 @@
One can then connect to the virtual machine with One can then connect to the virtual machine with
: vagrant ssh <machinName> : vagrant ssh <machinName>
and will be in the =$HOME= directory of the user =vagrant= where in and will be in the =$HOME= directory of the user =vagrant= where in
the directory =~/OpenFOAM/OpenFOAM-1.6-ext= the sources are the directory =~/foam/foam-extend-3.0= the sources are
available. Modifications can be pushed "outside" the virtual machine available. Modifications can be pushed "outside" the virtual machine
with with
: hg push : hg push
There is also a symbolic link =~/OpenFOAM/OpenFOAM-1.6-ext-parent= There is also a symbolic link =~/foam/foam-extend-3.0-parent=
to the sources if you want to edit there directly. Use with care to the sources if you want to edit there directly. Use with care
and don't compile in that directory unless you know what you're and don't compile in that directory unless you know what you're
doing doing
@ -32,3 +32,10 @@
=postfix=-package) =postfix=-package)
- maverick :: Tries to fix the problems with the - maverick :: Tries to fix the problems with the
=lucid=-machine. Not yet working =lucid=-machine. Not yet working
- centos65 :: A CentOS 6.5 machine with preinstalled development
tools
* Scripts
In the home directory these scripts are found
- bootstrapFoam.sh :: A script whose aim it is to compile Foam and
the ThirdParty-packages in one go (no paraview and QT). If this
works the box is considered operational

View file

@ -8,7 +8,7 @@ echo
# some of these packages are already installed. But lets be sure # some of these packages are already installed. But lets be sure
neededPackages=(gcc-g++ mercurial git flex bison make ccache rpm-build) neededPackages=(gcc-g++ mercurial git flex bison make ccache rpm-build wget zlib-devel)
bonusPackages=(emacs csh tcsh zsh) bonusPackages=(emacs csh tcsh zsh)
for p in ${neededPackages[@]}; do for p in ${neededPackages[@]}; do

View file

@ -7,4 +7,5 @@ fi
# User specific aliases and functions # User specific aliases and functions
export WM_SCHEDULER=ccache
export CCACHE_DIR=/vagrant/ccache4vm export CCACHE_DIR=/vagrant/ccache4vm

View file

@ -0,0 +1,22 @@
#! /bin/bash
# Just to be sure
export WM_SCHEDULER=ccache
export CCACHE_DIR=/vagrant/ccache4vm
cd foam/foam-extend-3.0
source etc/bashrc
( cd wmake/src && make )
cd $WM_THIRD_PARTY_DIR
./AllMake.stage0
./AllMake.stage1
./AllMake.stage2
./AllMake.stage3
cd $WM_PROJECT_DIR
# pick up installed packages
source etc/bashrc
./Allwmake