Small fixes for #332

This commit is contained in:
Sterling Harper 2014-10-17 14:21:15 -04:00
parent a3ff5423eb
commit e7d6d7487f
4 changed files with 5 additions and 17 deletions

View file

@ -267,7 +267,7 @@ contains
call fatal_error("ACE library '" // trim(filename) // "' does not exist!")
elseif (readable(1:3) == 'NO') then
call fatal_error("ACE library '" // trim(filename) // "' is not readable!&
&Change file permissions with chmod command.")
& Change file permissions with chmod command.")
end if
! display message

View file

@ -135,7 +135,7 @@ contains
cmfd % indices(3)))
if (get_arraysize_integer(node_mesh, "map") /= &
product(cmfd % indices(1:3))) then
call fatal_error('FATAL==>CMFD coremap not to correct dimensions')
call fatal_error('CMFD coremap not to correct dimensions')
end if
allocate(iarray(get_arraysize_integer(node_mesh, "map")))
call get_node_array(node_mesh, "map", iarray)
@ -342,7 +342,7 @@ contains
call get_node_array(node_mesh, "dimension", iarray3(1:n))
if (any(iarray3(1:n) <= 0)) then
call fatal_error("All entries on the <dimension> element for a tally mesh&
&must be positive.")
& must be positive.")
end if
! Read dimensions in each direction

View file

@ -11,8 +11,6 @@ module fixed_source
use tally, only: synchronize_tallies, setup_active_usertallies
use tracking, only: transport
character(2*MAX_LINE_LEN) :: message ! Message to output unit
contains
subroutine run_fixedsource()
@ -96,8 +94,8 @@ contains
subroutine initialize_batch()
message = "Simulating batch " // trim(to_str(current_batch)) // "..."
call write_message(message, 1)
call write_message("Simulating batch " // trim(to_str(current_batch)) &
&// "...", 1)
! Reset total starting particle weight used for normalizing tallies
total_weight = ZERO

View file

@ -2006,16 +2006,6 @@ contains
! =======================================================================
! READ DATA FOR FILTERS
! In older versions, tally filters were specified with a <filters>
! element followed by sub-elements <cell>, <mesh>, etc. This checks for
! the old format and if it is present, raises an error
! if (get_number_nodes(node_tal, "filters") > 0) then
! call fatal_error("Tally filters should be specified with multiple &
! &<filter> elements. Did you forget to change your <filters> &
! &element?")
! end if
! Get pointer list to XML <filter> and get number of filters
call get_node_list(node_tal, "filter", node_filt_list)
n_filters = get_list_size(node_filt_list)