From 3ff3787bb3ee760ebec9628bb695dc2f66782ca7 Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Wed, 15 Feb 2012 12:07:26 -0800 Subject: [PATCH] incorporated changes into setting manual tallies from pauls latest commit on input.xml --- src/cmfd_input.F90 | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index 5654ad5806..0b631813e3 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -114,8 +114,18 @@ contains filename = trim(path_input) // "cmfd.xml" call read_xml_file_cmfd_t(filename) - ! allocate mesh + ! set global variables n_meshes = 1 + n_tallies = 3 + n_analog_tallies = 2 + n_current_tallies = 1 + + ! Allocate list of pointers for tallies by type + allocate(analog_tallies(n_analog_tallies)) + allocate(tracklength_tallies(n_tracklength_tallies)) + allocate(current_tallies(n_current_tallies)) + + ! allocate mesh allocate(meshes(n_meshes)) m => meshes(1) @@ -165,7 +175,6 @@ contains call dict_add_key(mesh_dict, m % id, 1) ! allocate tallies - n_tallies = 3 allocate(tallies(n_tallies)) ! begin loop around tallies @@ -232,6 +241,9 @@ contains t % score_bins(2) % scalar = SCORE_TOTAL t % score_bins(3) % scalar = SCORE_SCATTER_1 + ! Increment the appropriate index and set pointer + analog_tallies(1) = 1 + else if (i == 2) then ! set tally estimator to analog @@ -265,6 +277,9 @@ contains t % score_bins(1) % scalar = SCORE_NU_SCATTER t % score_bins(2) % scalar = SCORE_NU_FISSION + ! Increment the appropriate index and set pointer + analog_tallies(2) = 2 + else if (i == 3) then ! set tally estimator to analog @@ -304,6 +319,9 @@ contains & product(m % dimension + 1) * 6 end if + ! Increment the appropriate index and set pointer + current_tallies(1) = 3 + end if end do