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

Conflicts:
	tests/test_score_flux_yn/results_true.dat
This commit is contained in:
Sterling Harper 2015-01-21 19:57:40 -05:00
commit 65926bfe26
45 changed files with 166402 additions and 166350 deletions

View file

@ -66,14 +66,11 @@ Prerequisites
To compile with support for parallel runs on a distributed-memory
architecture, you will need to have a valid implementation of MPI
installed on your machine. The code has been tested and is known to work
with the latest versions of both OpenMPI_ and MPICH_. Note that if using
OpenMPI, make sure that --with-mpi-f90-size is not set to medium or large
since this may prevent MPI calls from completing successfully in
OpenMC. OpenMPI and/or MPICH can be installed on Debian derivatives
with::
with the latest versions of both OpenMPI_ and MPICH_. OpenMPI and/or MPICH
can be installed on Debian derivatives with::
sudo apt-get install mpich2 libmpich2-dev
sudo apt-get install openmpi1.6-bin libopenmpi1.6-dev
sudo apt-get install mpich libmpich-dev
sudo apt-get install openmpi-bin libopenmpi1.6 libopenmpi-dev
* HDF5_ Library for portable binary output format