Add OPENMC_ to the MULTIPOLE_LIBRARY env variable

This commit is contained in:
Sterling Harper 2016-03-25 16:27:59 -04:00
parent afccdba6d5
commit 49f9c66728
4 changed files with 11 additions and 9 deletions

View file

@ -47,7 +47,7 @@ before_script:
- export OPENMC_CROSS_SECTIONS=$PWD/nndc/cross_sections.xml
- wget http://web.mit.edu/smharper/Public/multipole_lib.tar.gz
- tar -xzf multipole_lib.tar.gz
- export MULTIPOLE_LIBRARY=$PWD/multipole_lib
- export OPENMC_MULTIPOLE_LIBRARY=$PWD/multipole_lib
- cd ..
script:

View file

@ -288,7 +288,7 @@ The ``<multipole_library>`` element indicates the directory containing a
windowed multipole library. If a windowed multipole library is available,
OpenMC can use it for on-the-fly Doppler-broadening of resolved resonance range
cross sections. If this element is absent from the settings.xml file, the
:envvar:`MULTIPOLE_LIBRARY` environment variable will be used.
:envvar:`OPENMC_MULTIPOLE_LIBRARY` environment variable will be used.
.. note:: The <use_windowed_multipole> element must also be set to "True"
for windowed multipole functionality.

View file

@ -76,8 +76,9 @@ class SettingsFile(object):
calculations to find the path to the XML cross section file.
multipole_library : str
Indicates the path to a directory containing a windowed multipole
cross section library. If it is not set, the :envvar:`MULTIPOLE_LIBRARY'
environment variable will be used. A multipole library is optional.
cross section library. If it is not set, the
:envvar:`OPENMC_MULTIPOLE_LIBRARY' environment variable will be used. A
multipole library is optional.
energy_grid : {'nuclide', 'logarithm', 'material-union'}
Set the method used to search energy grids.
energy_mode : {'continuous-energy', 'multi-group'}

View file

@ -136,9 +136,9 @@ contains
call fatal_error("No cross_sections.xml file was specified in &
&settings.xml or in the OPENMC_CROSS_SECTIONS environment &
&variable. OpenMC needs such a file to identify where to &
&find ACE cross section libraries. Please consult the user's &
&guide at http://mit-crpg.github.io/openmc for information on &
&how to set up ACE cross section libraries.")
&find ACE cross section libraries. Please consult the &
&user's guide at http://mit-crpg.github.io/openmc for &
&information on how to set up ACE cross section libraries.")
else
call warning("The CROSS_SECTIONS environment variable is &
&deprecated. Please update your environment to use &
@ -147,7 +147,8 @@ contains
end if
path_cross_sections = trim(env_variable)
else
call get_environment_variable("OPENMC_MG_CROSS_SECTIONS", env_variable)
call get_environment_variable("OPENMC_MG_CROSS_SECTIONS", &
env_variable)
if (len_trim(env_variable) == 0) then
call fatal_error("No cross_sections.xml file was specified in &
&settings.xml or in the OPENMC_MG_CROSS_SECTIONS environment &
@ -170,7 +171,7 @@ contains
run_mode /= MODE_PLOTTING) then
! No library location specified in settings.xml, check
! environment variable
call get_environment_variable("MULTIPOLE_LIBRARY", env_variable)
call get_environment_variable("OPENMC_MULTIPOLE_LIBRARY", env_variable)
path_multipole = trim(env_variable)
else
call get_node_value(doc, "multipole_library", path_multipole)