From 9666d7bcae46f2fde2addf38535e60d8311afdaa Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 8 Jul 2021 08:27:21 +0100 Subject: [PATCH] Updated the documentation to reflect changes --- doc/install/fludag.rst | 21 +++++++++++++-------- doc/usersguide/uw2.rst | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/install/fludag.rst b/doc/install/fludag.rst index 4fcced0bfd..d5d8cd1b64 100644 --- a/doc/install/fludag.rst +++ b/doc/install/fludag.rst @@ -10,13 +10,15 @@ Install FLUKA ~~~~~~~~~~~~~ FluDAG uses FLUKA_ from CERN/INFN. In order to download FLUKA you need to become -a registered user, which you can do at the `FLUKA registration -`_ page. +a registered user, which you can do at the `FLUKA-INFN registration +`_ page for FLUKA-INFN and `FLUKA-CERN registration page `_. Save your user ID and password for future FLUKA updates. We recommend an x64 -worfklow and thus you should download the 64-bit executable. The name of the -downloaded tarball is of the form ``fluka20xx.xx-linux-gfor64bitAA.tar.gz``. -Refer to the `installation instructions `_ when building FLUKA. +worfklow and thus you should download the 64-bit executable. For FLUKA-INFN, the +name of the downloaded tarball is of the form ``fluka20xx.xx-linux-gfor64bitAA.tar.gz``. +Refer to the `installation instructions `_ when building FLUKA. + +For FLUKA-CERN, x64 is the only option and refer to `installation instructions `_ Take care to follow the FLUKA site instructions when setting the ``$FLUPRO`` and ``$FLUFOR`` environment variables. @@ -24,7 +26,8 @@ Take care to follow the FLUKA site instructions when setting the ``$FLUPRO`` and .. include:: configure_dag-code_header.txt The following CMake command will build FluDAG. Note that ``$FLUPRO`` should have -previously been defined as part of the FLUKA install. +previously been defined as part of the FLUKA install. FLUPRO can also be set explictly +to the base path of FLUKA, for example ``/home/user/fluka-cern/fluka4.01`` :: $ cmake ../src -DMOAB_DIR=$HOME/dagmc_bld/MOAB \ @@ -60,5 +63,7 @@ like this: .. include:: test_dagmc.txt .. _FLUKA: http://www.fluka.org/fluka.php -.. _FLUKA_register: https://www.fluka.org/fluka.php?id=secured_intro -.. _FLUKA_install: http://www.fluka.org/fluka.php?id=ins_run +.. _FLUKA_infn_register: https://www.fluka.org/fluka.php?id=secured_intro +.. _FLUKA_cern_register: https://fluka.cern/home +.. _FLUKA_infn_install: http://www.fluka.org/fluka.php?id=ins_run +.. _FLUKA_cern_install: https://fluka.cern/documentation/installation diff --git a/doc/usersguide/uw2.rst b/doc/usersguide/uw2.rst index 002acd1419..8b7d95a8c8 100644 --- a/doc/usersguide/uw2.rst +++ b/doc/usersguide/uw2.rst @@ -147,7 +147,7 @@ run the ``mainfludag`` executable to produce the ``mat.inp`` file which contains all the detailed material assignments and compound descriptions. :: - $ mainfludag geom.h5m + $ mainfludag --dagmc geom.h5m The user should then paste the contents of ``mat.inp`` into the main FLUKA input deck. Now the user must make a symbolic link to the geometry file named