From 680cb0993c5b58966d3f552a0b26abb9defad94f Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Sun, 18 Sep 2011 19:31:45 -0400 Subject: [PATCH] Score module is now named Tally. Tally type is now named TallyObject. --- src/DEPENDENCIES | 22 ++++++++++++---------- src/OBJECTS | 2 +- src/global.f90 | 18 +++++++++--------- src/input_xml.f90 | 3 ++- src/main.f90 | 2 +- src/output.f90 | 15 ++++++++------- src/physics.f90 | 2 +- src/{score.f90 => tally.f90} | 4 ++-- src/tally_header.f90 | 4 ++-- 9 files changed, 38 insertions(+), 34 deletions(-) rename src/{score.f90 => tally.f90} (99%) diff --git a/src/DEPENDENCIES b/src/DEPENDENCIES index 49605d4851..12589fa11c 100644 --- a/src/DEPENDENCIES +++ b/src/DEPENDENCIES @@ -80,6 +80,7 @@ input_xml.o: geometry_header.o input_xml.o: global.o input_xml.o: output.o input_xml.o: string.o +input_xml.o: tally_header.o input_xml.o: xml_geometry.o input_xml.o: xml_materials.o input_xml.o: xml_settings.o @@ -100,9 +101,9 @@ main.o: mpi_routines.o main.o: output.o main.o: particle_header.o main.o: physics.o -main.o: score.o main.o: source.o main.o: string.o +main.o: tally.o main.o: timing.o mpi_routines.o: constants.o @@ -118,6 +119,7 @@ output.o: endf.o output.o: geometry_header.o output.o: global.o output.o: string.o +output.o: tally_header.o physics.o: constants.o physics.o: cross_section_header.o @@ -131,17 +133,9 @@ physics.o: interpolation.o physics.o: mcnp_random.o physics.o: output.o physics.o: particle_header.o -physics.o: score.o physics.o: search.o physics.o: string.o - -score.o: constants.o -score.o: cross_section.o -score.o: error.o -score.o: global.o -score.o: output.o -score.o: search.o -score.o: string.o +physics.o: tally.o search.o: constants.o search.o: error.o @@ -158,4 +152,12 @@ source.o: physics.o string.o: constants.o string.o: error.o +tally.o: constants.o +tally.o: cross_section.o +tally.o: error.o +tally.o: global.o +tally.o: output.o +tally.o: search.o +tally.o: string.o + timing.o: constants.o diff --git a/src/OBJECTS b/src/OBJECTS index 3746d3fa3d..38d3cfdab8 100644 --- a/src/OBJECTS +++ b/src/OBJECTS @@ -24,11 +24,11 @@ mpi_routines.o \ output.o \ particle_header.o \ physics.o \ -score.o \ search.o \ source.o \ source_header.o \ string.o \ +tally.o \ tally_header.o \ timing.o \ xml_geometry.o \ diff --git a/src/global.f90 b/src/global.f90 index 5631b376ed..bc9288aace 100644 --- a/src/global.f90 +++ b/src/global.f90 @@ -9,7 +9,7 @@ module global use material_header, only: Material use particle_header, only: Particle use source_header, only: ExtSource - use tally_header, only: Tally + use tally_header, only: TallyObject use timing, only: Timer #ifdef MPI @@ -20,14 +20,14 @@ module global save ! Main arrays for cells, surfaces, materials - type(Cell), allocatable, target :: cells(:) - type(Universe), allocatable, target :: universes(:) - type(Lattice), allocatable, target :: lattices(:) - type(Surface), allocatable, target :: surfaces(:) - type(Material), allocatable, target :: materials(:) - type(xsData), allocatable, target :: xsdatas(:) - type(Tally), allocatable, target :: tallies(:) - type(Tally), allocatable, target :: tallies_global(:) + type(Cell), allocatable, target :: cells(:) + type(Universe), allocatable, target :: universes(:) + type(Lattice), allocatable, target :: lattices(:) + type(Surface), allocatable, target :: surfaces(:) + type(Material), allocatable, target :: materials(:) + type(xsData), allocatable, target :: xsdatas(:) + type(TallyObject), allocatable, target :: tallies(:) + type(TallyObject), allocatable, target :: tallies_global(:) integer :: n_cells ! # of cells integer :: n_universes ! # of universes integer :: n_lattices ! # of lattices diff --git a/src/input_xml.f90 b/src/input_xml.f90 index df9cb9e25f..24553e524f 100644 --- a/src/input_xml.f90 +++ b/src/input_xml.f90 @@ -9,6 +9,7 @@ module input_xml use output, only: message use string, only: lower_case, int_to_str, str_to_int, str_to_real, & split_string + use tally_header, only: TallyObject implicit none @@ -508,7 +509,7 @@ contains character(MAX_WORD_LEN) :: word character(MAX_WORD_LEN) :: words(MAX_WORDS) logical :: file_exists - type(Tally), pointer :: t => null() + type(TallyObject), pointer :: t => null() ! Check if tallies.xml exists filename = trim(path_input) // "tallies.xml" diff --git a/src/main.f90 b/src/main.f90 index bf4eeee771..398d7ad630 100644 --- a/src/main.f90 +++ b/src/main.f90 @@ -8,7 +8,7 @@ program main use output, only: message, header, print_runtime use particle_header, only: Particle use physics, only: transport - use score, only: calculate_keff + use tally, only: calculate_keff use source, only: get_source_particle use string, only: int_to_str use timing, only: timer_start, timer_stop diff --git a/src/output.f90 b/src/output.f90 index 4d35060f4c..f4bdea7ffc 100644 --- a/src/output.f90 +++ b/src/output.f90 @@ -9,6 +9,7 @@ module output use geometry_header, only: Cell, Universe, Surface use global use string, only: upper_case, int_to_str, real_to_str + use tally_header, only: TallyObject implicit none @@ -503,7 +504,7 @@ contains subroutine print_tally(tal) - type(Tally), pointer :: tal + type(TallyObject), pointer :: tal integer :: i character(MAX_LINE_LEN) :: string @@ -605,12 +606,12 @@ contains subroutine print_summary() - type(Surface), pointer :: s => null() - type(Cell), pointer :: c => null() - type(Universe), pointer :: u => null() - type(Lattice), pointer :: l => null() - type(Material), pointer :: m => null() - type(Tally), pointer :: t => null() + type(Surface), pointer :: s => null() + type(Cell), pointer :: c => null() + type(Universe), pointer :: u => null() + type(Lattice), pointer :: l => null() + type(Material), pointer :: m => null() + type(TallyObject), pointer :: t => null() integer :: i ! print summary of cells diff --git a/src/physics.f90 b/src/physics.f90 index 98ef890ea2..0ffe000281 100644 --- a/src/physics.f90 +++ b/src/physics.f90 @@ -13,7 +13,7 @@ module physics use mcnp_random, only: rang use output, only: message, print_particle use particle_header, only: Particle - use score, only: score_tally + use tally, only: score_tally use search, only: binary_search use string, only: int_to_str diff --git a/src/score.f90 b/src/tally.f90 similarity index 99% rename from src/score.f90 rename to src/tally.f90 index 0617f94563..9fd969b610 100644 --- a/src/score.f90 +++ b/src/tally.f90 @@ -1,4 +1,4 @@ -module score +module tally use constants use cross_section, only: get_macro_xs @@ -284,4 +284,4 @@ contains end subroutine add_to_score -end module score +end module tally diff --git a/src/tally_header.f90 b/src/tally_header.f90 index 1617404a47..9997aaee1a 100644 --- a/src/tally_header.f90 +++ b/src/tally_header.f90 @@ -27,7 +27,7 @@ module tally_header ! is given by the TallyBins and the scores are stored in a TallyScore array. !=============================================================================== - type Tally + type TallyObject ! Basic data integer :: uid @@ -60,6 +60,6 @@ module tally_header type(TallyScore), allocatable :: score(:) - end type Tally + end type TallyObject end module tally_header