From dbf492200d5bcb71b4eb9e2ecd366087b843cf77 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 31 Jan 2013 10:19:45 -0500 Subject: [PATCH] Changed arguments for add_tallies. Closes #141. --- src/cmfd_input.F90 | 2 +- src/input_xml.F90 | 2 +- src/tally_initialize.F90 | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index 7213457e2..18e7d1a63 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -318,7 +318,7 @@ contains call mesh_dict % add_key(m % id, n_user_meshes + 1) ! allocate tallies - call add_tallies(n_cmfd_tallies, i_cmfd_tallies) + call add_tallies("cmfd", n_cmfd_tallies) ! begin loop around tallies do i = 1, n_cmfd_tallies diff --git a/src/input_xml.F90 b/src/input_xml.F90 index d0965ba08..6d3775363 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -1292,7 +1292,7 @@ contains ! Allocate tally array if (n_user_tallies > 0) then - call add_tallies(n_user_tallies, i_user_tallies) + call add_tallies("user", n_user_tallies) end if ! Check for setting diff --git a/src/tally_initialize.F90 b/src/tally_initialize.F90 index 19a5a8760..04928499e 100644 --- a/src/tally_initialize.F90 +++ b/src/tally_initialize.F90 @@ -162,10 +162,10 @@ contains ! tallies, etc. !=============================================================================== - subroutine add_tallies(n, i_tally) + subroutine add_tallies(tally_group, n) - integer, intent(in) :: n ! number of tallies to add - integer, intent(out) :: i_tally ! index of tally group + character(*), intent(in) :: tally_group ! name of tally group + integer, intent(in) :: n ! number of tallies to add type(TallyObject), allocatable :: temp(:) ! temporary tallies array @@ -185,7 +185,12 @@ contains end if ! Set index for ths tally group - i_tally = n_tallies + select case(tally_group) + case ("user") + i_user_tallies = n_tallies + case ("cmfd") + i_cmfd_tallies = n_tallies + end select ! Set n_tallies n_tallies = size(tallies)