Merge remote-tracking branch 'upstream/develop' into hex_lattice

This commit is contained in:
Sterling Harper 2015-02-18 14:05:37 -05:00
commit beb5506a72
2 changed files with 7 additions and 7 deletions

View file

@ -88,11 +88,11 @@ Prerequisites
* PETSc_ for CMFD acceleration
To enable CMFD acceleration, you will need to have PETSc_ (3.4.2 or higher)
installed on your computer. The installed version will need to have been
compiled with the same compiler you intend to compile OpenMC with. OpenMC
requires PETSc_ to be configured with Fortran datatypes. An example of
configuring PETSc_ is listed below::
To enable some features of CMFD acceleration, you will need to have
PETSc_ (3.4.2 or higher) installed on your computer. The installed version
will need to have been compiled with the same compiler you intend to
compile OpenMC with. OpenMC requires PETSc_ to be configured with Fortran
datatypes. An example of configuring PETSc_ is listed below::
./configure --prefix=/opt/petsc/3.4.4 --download-f-blas-lapack \
--with-mpi-dir=/opt/mpich/3.1 --with-shared-libraries \

View file

@ -42,9 +42,9 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
./configure --prefix=$PWD/../petsc_install -q --download-fblaslapack \
--with-mpi-dir=$PWD/../mpich_install --with-share-libraries \
--with-fortran-datatypes
make PETSC_DIR=/home/travis/build/bhermanmit/openmc/petsc-3.5.3 \
make PETSC_DIR=$PWD \
PETSC_ARCH=arch-linux2-c-debug all >/dev/null 2>&1
make PETSC_DIR=/home/travis/build/bhermanmit/openmc/petsc-3.5.3 \
make PETSC_DIR=$PWD \
PETSC_ARCH=arch-linux2-c-debug install >/dev/null 2>&1
make install >/dev/null 2>&1
cd ..