Respond to comments from @smharper on #840

This commit is contained in:
Paul Romano 2017-03-27 07:46:31 -05:00
parent 60e4d6c539
commit cf7faabc82
3 changed files with 4 additions and 12 deletions

View file

@ -798,11 +798,11 @@ class Settings(object):
_RES_SCAT_METHODS)
elif key == 'energy_min':
name = 'resonance scattering minimum energy'
cv.check_type(name, value, float)
cv.check_type(name, value, Real)
cv.check_greater_than(name, value, 0)
elif key == 'energy_max':
name = 'resonance scattering minimum energy'
cv.check_type(name, value, float)
cv.check_type(name, value, Real)
cv.check_greater_than(name, value, 0)
elif key == 'nuclides':
cv.check_type('resonance scattering nuclides', value,

View file

@ -5302,15 +5302,6 @@ contains
end do
end associate
! Check to make sure resonance scattering upper energy is below URR
! minimum, if present
if (nuc % urr_present) then
if (res_scat_energy_max > nuc % urr_data(1) % energy(1)) then
call fatal_error("Resonance scattering maximum energy is above the &
&bottom of the unresolved resonance region.")
end if
end if
exit
end if
end do

View file

@ -306,6 +306,7 @@ module nuclide_header
! Read energy grid
energy_group = open_group(group_id, 'energy')
do i = 1, n_temperature
temp_str = trim(to_str(temps_to_read % data(i))) // "K"
energy_dset = open_dataset(energy_group, temp_str)
call get_shape(energy_dset, dims)
allocate(this % grid(i) % energy(int(dims(1), 4)))
@ -315,7 +316,7 @@ module nuclide_header
! Check for 0K energy grid
if (object_exists(energy_group, '0K')) then
energy_dset = open_dataset(energy_group, temp_str)
energy_dset = open_dataset(energy_group, '0K')
call get_shape(energy_dset, dims)
allocate(this % energy_0K(int(dims(1), 4)))
call read_dataset(this % energy_0K, energy_dset)