Mercurial > hg > cfcfd3
changeset 170:85355f691bf1
sphinx docs: some re-shuffling of Fedora notes.
Added some more fellows to the licence copyright as suggested by PJ.
| author | Peter Blyton <p.blyton@uq.edu.au> |
|---|---|
| date | Thu, 12 Apr 2012 16:44:44 +1000 |
| parents | 10a99808ecf8 |
| children | e821d8363f7c |
| files | doc/sphinx/eilmer3.rst doc/sphinx/getting-started.rst |
| diffstat | 2 files changed, 11 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/sphinx/eilmer3.rst Thu Apr 12 16:11:13 2012 +1000 +++ b/doc/sphinx/eilmer3.rst Thu Apr 12 16:44:44 2012 +1000 @@ -34,12 +34,13 @@ the user-defined (Lua) functions. You don't need it to run Eilmer3 otherwise. -For running on some managed computers, such as our blackhole cluster, also add the following:: +.. _label-openmpi-fedora: + +For running on Fedora, also add the following:: - $ module load openmpi/1.2-gnu-4.1 - $ module load swig - -IMPORTANT: Do NOT load lua as was done in the example for Elmer2. + module load openmpi-i386 + # Or, for 64-bit: + module load openmpi-x86_64 Then, try out the cone20-simple example:: @@ -248,13 +249,3 @@ Then I can use do the above transfer by issuing the following command:: $ rsync-eilmer my-sim/ remote:my-sim - -Open MPI on Fedora -^^^^^^^^^^^^^^^^^^ -Fedora does not load a particular MPI library into your path upon installation, -as there are a number of MPI implementations avaliable. Open MPI can be loaded -by adding the following to your ``.bash_profile``:: - - module load openmpi-i386 - # Or, for 64-bit: - module load openmpi-x86_64
--- a/doc/sphinx/getting-started.rst Thu Apr 12 16:11:13 2012 +1000 +++ b/doc/sphinx/getting-started.rst Thu Apr 12 16:44:44 2012 +1000 @@ -29,7 +29,8 @@ Licence ------- CFCFD program collection is a set of flow simulation tools for compressible fluids. -Copyright (C) 1991-2012 Peter Jacobs, Rowan Gollan, Daniel Potter and +Copyright (C) 1991-2012 Peter Jacobs, Rowan Gollan, Daniel Potter, +Brendan O'Flaherty, Fabian Zander, Wilson Chan, Peter Blyton and other members of the CFCFD group. This collection is free software: you can redistribute it and/or modify @@ -81,9 +82,10 @@ #. gcc #. gcc-c++ #. m4 -#. openmpi-devel +#. openmpi +#. openmpi-devel (to use openmpi on Fedora, :ref:`the module must be loaded <label-openmpi-fedora>`) #. gcc-gfortran -#. libgfortran.i686 and glibc-devel.i686 (to compile the CEA code on 64-bit Fedora) +#. libgfortran.i686 and glibc-devel.i686 (to compile the 32-bit CEA code on 64-bit Fedora) #. swig #. python-devel #. numpy