From c78617a224adc8f211b3c3611abebc705a2ff8bf Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Wed, 18 Feb 2015 00:39:47 -0500 Subject: [PATCH 1/2] Fixed install doc to reflect #314 --- docs/source/usersguide/install.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index 7cb7ac7a45..6fc002b1b8 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -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 \ From 1d3ebb61eb1494f51e908d2c342ccc1c46342569 Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Wed, 18 Feb 2015 06:07:07 -0500 Subject: [PATCH 2/2] fixed petsc source path in travis install file --- tests/travis_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/travis_install.sh b/tests/travis_install.sh index e0461d82cb..f7d1036309 100755 --- a/tests/travis_install.sh +++ b/tests/travis_install.sh @@ -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 ..