From 62d18e89fb65b6735a53fa211a2465a79d74e4f4 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 30 Oct 2015 13:40:16 -0400 Subject: [PATCH 001/149] Extended particle types to have CE and MG types, propogated changes necessary to rest of code so it works as it used to for CE .... at least its supposed to --- src/cross_section.F90 | 4 +- src/eigenvalue.F90 | 2 +- src/geometry.F90 | 39 +++---- src/mesh.F90 | 1 - src/output.F90 | 11 +- src/particle_header.F90 | 120 +++++++++++++++++--- src/particle_restart.F90 | 20 +++- src/particle_restart_write.F90 | 4 +- src/physics.F90 | 201 +++++++++++++++++---------------- src/plot.F90 | 16 +-- src/simulation.F90 | 10 +- src/source.F90 | 4 +- src/tally.F90 | 70 ++++++------ src/track_output.F90 | 6 +- src/tracking.F90 | 31 +++-- 15 files changed, 330 insertions(+), 209 deletions(-) diff --git a/src/cross_section.F90 b/src/cross_section.F90 index 1c56d961e1..1586912a96 100644 --- a/src/cross_section.F90 +++ b/src/cross_section.F90 @@ -8,7 +8,7 @@ module cross_section use global use list_header, only: ListElemInt use material_header, only: Material - use particle_header, only: Particle + use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: prn use search, only: binary_search @@ -27,7 +27,7 @@ contains subroutine calculate_xs(p) - type(Particle), intent(inout) :: p + type(Particle_CE), intent(in) :: p integer :: i ! loop index over nuclides integer :: i_nuclide ! index into nuclides array diff --git a/src/eigenvalue.F90 b/src/eigenvalue.F90 index 403347caa1..50d6cabc5e 100644 --- a/src/eigenvalue.F90 +++ b/src/eigenvalue.F90 @@ -10,7 +10,7 @@ module eigenvalue use math, only: t_percentile use mesh, only: count_bank_sites use mesh_header, only: RegularMesh - use particle_header, only: Particle + ! use particle_header, only: Particle_Base use random_lcg, only: prn, set_particle_seed, prn_skip use search, only: binary_search use string, only: to_str diff --git a/src/geometry.F90 b/src/geometry.F90 index e922479b1d..e3058d6e00 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -6,7 +6,8 @@ module geometry &RectLattice, HexLattice use global use output, only: write_message - use particle_header, only: LocalCoord, Particle + use particle_header, only: LocalCoord, Particle_Base, Particle_CE, & + Particle_MG use particle_restart_write, only: write_particle_restart use surface_header use string, only: to_str @@ -32,7 +33,7 @@ contains pure function cell_contains(c, p) result(in_cell) type(Cell), intent(in) :: c - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p logical :: in_cell if (c%simple) then @@ -44,7 +45,7 @@ contains pure function simple_cell_contains(c, p) result(in_cell) type(Cell), intent(in) :: c - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p logical :: in_cell integer :: i @@ -78,7 +79,7 @@ contains pure function complex_cell_contains(c, p) result(in_cell) type(Cell), intent(in) :: c - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p logical :: in_cell integer :: i @@ -139,7 +140,7 @@ contains subroutine check_cell_overlap(p) - type(Particle), intent(inout) :: p + class(Particle_Base), intent(inout) :: p integer :: i ! cell loop index on a level integer :: j ! coordinate level index @@ -187,9 +188,9 @@ contains recursive subroutine find_cell(p, found, search_cells) - type(Particle), intent(inout) :: p - logical, intent(inout) :: found - integer, optional :: search_cells(:) + class(Particle_Base), intent(inout) :: p + logical, intent(inout) :: found + integer, optional :: search_cells(:) integer :: i ! index over cells integer :: j ! coordinate level index integer :: i_xyz(3) ! indices in lattice @@ -339,8 +340,8 @@ contains !=============================================================================== subroutine cross_surface(p, last_cell) - type(Particle), intent(inout) :: p - integer, intent(in) :: last_cell ! last cell particle was in + class(Particle_Base), intent(inout) :: p + integer, intent(in) :: last_cell ! last cell particle was in real(8) :: u ! x-component of direction real(8) :: v ! y-component of direction @@ -501,8 +502,8 @@ contains subroutine cross_lattice(p, lattice_translation) - type(Particle), intent(inout) :: p - integer, intent(in) :: lattice_translation(3) + class(Particle_Base), intent(inout) :: p + integer, intent(in) :: lattice_translation(3) integer :: j integer :: i_xyz(3) ! indices in lattice logical :: found ! particle found in cell? @@ -574,11 +575,11 @@ contains subroutine distance_to_boundary(p, dist, surface_crossed, lattice_translation, & next_level) - type(Particle), intent(inout) :: p - real(8), intent(out) :: dist - integer, intent(out) :: surface_crossed - integer, intent(out) :: lattice_translation(3) - integer, intent(out) :: next_level + class(Particle_Base), intent(inout) :: p + real(8), intent(out) :: dist + integer, intent(out) :: surface_crossed + integer, intent(out) :: lattice_translation(3) + integer, intent(out) :: next_level integer :: i ! index for surface in cell integer :: j @@ -954,8 +955,8 @@ contains subroutine handle_lost_particle(p, message) - type(Particle), intent(inout) :: p - character(*) :: message + class(Particle_Base), intent(inout) :: p + character(*) :: message ! Print warning and write lost particle file call warning(message) diff --git a/src/mesh.F90 b/src/mesh.F90 index 3d0235d189..9cb8dc5969 100644 --- a/src/mesh.F90 +++ b/src/mesh.F90 @@ -3,7 +3,6 @@ module mesh use constants use global use mesh_header - use particle_header, only: Particle use search, only: binary_search #ifdef MPI diff --git a/src/output.F90 b/src/output.F90 index 55cd5b2a5b..5bb90343c4 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -12,7 +12,7 @@ module output use math, only: t_percentile use mesh_header, only: RegularMesh use mesh, only: mesh_indices_to_bin, bin_to_mesh_indices - use particle_header, only: LocalCoord, Particle + use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use plot_header use string, only: to_upper, to_str use tally_header, only: TallyObject @@ -251,7 +251,7 @@ contains subroutine print_particle(p) - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p integer :: i ! index for coordinate levels type(Cell), pointer :: c @@ -308,7 +308,12 @@ contains ! Display weight, energy, grid index, and interpolation factor write(ou,*) ' Weight = ' // to_str(p % wgt) - write(ou,*) ' Energy = ' // to_str(p % E) + select type(p) + type is (Particle_CE) + write(ou,*) ' Energy = ' // to_str(p % E) + type is (Particle_MG) + write(ou,*) ' Energy Group = ' // to_str(p % g) + end select write(ou,*) ' Delayed Group = ' // to_str(p % delayed_group) write(ou,*) diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 0b9b251ee5..6b4d38845a 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -38,7 +38,7 @@ module particle_header ! geometry !=============================================================================== - type Particle + type, abstract :: Particle_Base ! Basic data integer(8) :: id ! Unique ID integer :: type ! Particle type (n, p, e, etc) @@ -49,7 +49,6 @@ module particle_header ! Other physical data real(8) :: wgt ! particle weight - real(8) :: E ! energy real(8) :: mu ! angle of scatter logical :: alive ! is particle alive? @@ -57,7 +56,6 @@ module particle_header real(8) :: last_xyz(3) ! previous coordinates real(8) :: last_uvw(3) ! previous direction coordinates real(8) :: last_wgt ! pre-collision particle weight - real(8) :: last_E ! pre-collision energy real(8) :: absorb_wgt ! weight absorbed for survival biasing ! What event last took place @@ -92,9 +90,54 @@ module particle_header contains procedure :: initialize => initialize_particle procedure :: clear => clear_particle - procedure :: initialize_from_source - procedure :: create_secondary - end type Particle + procedure(initialize_from_source_), deferred, pass :: initialize_from_source + procedure(create_secondary_), deferred, pass :: create_secondary + end type Particle_Base + + type, extends(Particle_Base) :: Particle_CE + ! Energy Data + real(8) :: E ! post-collision energy + real(8) :: last_E ! pre-collision energy + + contains + procedure :: initialize_from_source => initialize_from_source_ce + procedure :: create_secondary => create_secondary_ce + end type Particle_CE + + type, extends(Particle_Base) :: Particle_MG + ! Energy Data + integer :: g ! post-collision energy group + integer :: last_g ! pre-collision energy group + + contains + procedure :: initialize_from_source => initialize_from_source_mg + procedure :: create_secondary => create_secondary_mg + end type Particle_MG + + abstract interface + +!=============================================================================== +! INITIALIZE_FROM_SOURCE_ returns .true. if the given lattice indices fit within the +! bounds of the lattice. Returns false otherwise. + + subroutine initialize_from_source_(this, src) + import Particle_Base + import Bank + class(Particle_Base), intent(inout) :: this + type(Bank), intent(in) :: src + end subroutine initialize_from_source_ + +!=============================================================================== +! CREATE_SECONDARY_ Generates a secondary particle from this + + subroutine create_secondary_(this, uvw, type) + import Particle_Base + class(Particle_Base), intent(inout) :: this + real(8), intent(in) :: uvw(3) + integer, intent(in) :: type + end subroutine create_secondary_ + + end interface contains @@ -105,7 +148,7 @@ contains subroutine initialize_particle(this) - class(Particle) :: this + class(Particle_Base) :: this ! Clear coordinate lists call this % clear() @@ -141,7 +184,7 @@ contains subroutine clear_particle(this) - class(Particle) :: this + class(Particle_Base) :: this integer :: i ! remove any coordinate levels @@ -174,9 +217,9 @@ contains ! fission, or simply as a secondary particle. !=============================================================================== - subroutine initialize_from_source(this, src) - class(Particle), intent(inout) :: this - type(Bank), intent(in) :: src + subroutine initialize_from_source_ce(this, src) + class(Particle_CE), intent(inout) :: this + type(Bank), intent(in) :: src ! set defaults call this % initialize() @@ -191,17 +234,37 @@ contains this % E = src % E this % last_E = src % E - end subroutine initialize_from_source + end subroutine initialize_from_source_ce + + subroutine initialize_from_source_mg(this, src) + class(Particle_MG), intent(inout) :: this + type(Bank), intent(in) :: src + + ! set defaults + call this % initialize() + + ! copy attributes from source bank site + this % wgt = src % wgt + this % last_wgt = src % wgt + this % coord(1) % xyz = src % xyz + this % coord(1) % uvw = src % uvw + this % last_xyz = src % xyz + this % last_uvw = src % uvw + !!! The following requires a MG version of Bank + this % g = src % E + this % last_g = src % E + + end subroutine initialize_from_source_mg !=============================================================================== ! CREATE_SECONDARY stores the current phase space attributes of the particle in ! the secondary bank and increments the number of sites in the secondary bank. !=============================================================================== - subroutine create_secondary(this, uvw, type) - class(Particle), intent(inout) :: this - real(8), intent(in) :: uvw(3) - integer, intent(in) :: type + subroutine create_secondary_ce(this, uvw, type) + class(Particle_CE), intent(inout) :: this + real(8), intent(in) :: uvw(3) + integer, intent(in) :: type integer :: n @@ -218,6 +281,29 @@ contains this % secondary_bank(n) % E = this % E this % n_secondary = n - end subroutine create_secondary + end subroutine create_secondary_ce + + subroutine create_secondary_mg(this, uvw, type) + class(Particle_MG), intent(inout) :: this + real(8), intent(in) :: uvw(3) + integer, intent(in) :: type + + integer :: n + + ! Check to make sure that the hard-limit on secondary particles is not + ! exceeded. + if (this % n_secondary == MAX_SECONDARY) then + call fatal_error("Too many secondary particles created.") + end if + + n = this % n_secondary + 1 + this % secondary_bank(n) % wgt = this % wgt + this % secondary_bank(n) % xyz(:) = this % coord(1) % xyz + this % secondary_bank(n) % uvw(:) = uvw + !!! The following requires a MG version of Bank + this % secondary_bank(n) % E = this % g + this % n_secondary = n + + end subroutine create_secondary_mg end module particle_header diff --git a/src/particle_restart.F90 b/src/particle_restart.F90 index 2e0523d484..fc3eb4393e 100644 --- a/src/particle_restart.F90 +++ b/src/particle_restart.F90 @@ -8,7 +8,7 @@ module particle_restart use global use hdf5_interface, only: file_open, file_close, read_dataset use output, only: write_message, print_particle - use particle_header, only: Particle + use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: set_particle_seed use tracking, only: transport @@ -28,7 +28,7 @@ contains integer(8) :: particle_seed integer :: previous_run_mode - type(Particle) :: p + class(Particle_Base), pointer :: p ! Set verbosity high verbosity = 10 @@ -66,7 +66,7 @@ contains !=============================================================================== subroutine read_particle_restart(p, previous_run_mode) - type(Particle), intent(inout) :: p + class(Particle_Base), intent(inout) :: p integer, intent(inout) :: previous_run_mode integer :: int_scalar @@ -96,7 +96,12 @@ contains end select call read_dataset(file_id, 'id', p%id) call read_dataset(file_id, 'weight', p%wgt) - call read_dataset(file_id, 'energy', p%E) + select type(p) + type is (Particle_CE) + call read_dataset(file_id, 'energy', p%E) + type is (Particle_MG) + call read_dataset(file_id, 'energy_group', p%g) + end select call read_dataset(file_id, 'xyz', p%coord(1)%xyz) call read_dataset(file_id, 'uvw', p%coord(1)%uvw) @@ -104,7 +109,12 @@ contains p%last_wgt = p%wgt p%last_xyz = p%coord(1)%xyz p%last_uvw = p%coord(1)%uvw - p%last_E = p%E + select type(p) + type is (Particle_CE) + p%last_E = p%E + type is (Particle_MG) + p%last_g = p%g + end select ! Close hdf5 file call file_close(file_id) diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index edd779df09..9dff7e5f3b 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -3,7 +3,7 @@ module particle_restart_write use bank_header, only: Bank use global use hdf5_interface - use particle_header, only: Particle + use particle_header, only: Particle_Base use string, only: to_str use hdf5 @@ -19,7 +19,7 @@ contains !=============================================================================== subroutine write_particle_restart(p) - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p integer(HID_T) :: file_id character(MAX_FILE_LEN) :: filename diff --git a/src/physics.F90 b/src/physics.F90 index 581cb04c9d..aae7027bae 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -12,7 +12,7 @@ module physics use math, only: maxwell_spectrum, watt_spectrum use mesh, only: get_mesh_indices use output, only: write_message - use particle_header, only: Particle + use particle_header, only: Particle_Base, Particle_CE, Particle_MG use particle_restart_write, only: write_particle_restart use random_lcg, only: prn use search, only: binary_search @@ -32,7 +32,7 @@ contains subroutine collision(p) - type(Particle), intent(inout) :: p + type(Particle_CE), intent(inout) :: p ! Store pre-collision particle properties p % last_wgt = p % wgt @@ -70,7 +70,7 @@ contains subroutine sample_reaction(p) - type(Particle), intent(inout) :: p + type(Particle_CE), intent(inout) :: p integer :: i_nuclide ! index in nuclides array integer :: i_reaction ! index in nuc % reactions array @@ -123,9 +123,9 @@ contains function sample_nuclide(p, base) result(i_nuclide) - type(Particle), intent(in) :: p - character(7), intent(in) :: base ! which reaction to sample based on - integer :: i_nuclide + class(Particle_Base), intent(in) :: p + character(7), intent(in) :: base ! which reaction to sample based on + integer :: i_nuclide integer :: i real(8) :: prob @@ -240,8 +240,8 @@ contains subroutine absorption(p, i_nuclide) - type(Particle), intent(inout) :: p - integer, intent(in) :: i_nuclide + class(Particle_Base), intent(inout) :: p + integer, intent(in) :: i_nuclide if (survival_biasing) then ! Determine weight absorbed in survival biasing @@ -281,7 +281,7 @@ contains subroutine russian_roulette(p) - type(Particle), intent(inout) :: p + class(Particle_Base), intent(inout) :: p if (p % wgt < weight_cutoff) then if (prn() < p % wgt / weight_survive) then @@ -302,8 +302,8 @@ contains subroutine scatter(p, i_nuclide) - type(Particle), intent(inout) :: p - integer, intent(in) :: i_nuclide + type(Particle_CE), intent(inout) :: p + integer, intent(in) :: i_nuclide integer :: i integer :: i_grid @@ -1059,9 +1059,9 @@ contains subroutine create_fission_sites(p, i_nuclide, i_reaction) - type(Particle), intent(inout) :: p - integer, intent(in) :: i_nuclide - integer, intent(in) :: i_reaction + class(Particle_Base), intent(inout) :: p + integer, intent(in) :: i_nuclide + integer, intent(in) :: i_reaction integer :: nu_d(MAX_DELAYED_GROUPS) ! number of delayed neutrons born integer :: i ! loop index @@ -1175,10 +1175,10 @@ contains function sample_fission_energy(nuc, rxn, p) result(E_out) - type(Nuclide), pointer :: nuc - type(Reaction), pointer :: rxn - type(Particle), intent(inout) :: p ! Particle causing fission - real(8) :: E_out ! outgoing energy of fission neutron + type(Nuclide), pointer :: nuc + type(Reaction), pointer :: rxn + class(Particle_Base), intent(inout) :: p ! Particle causing fission + real(8) :: E_out ! outgoing E of fission neutron integer :: j ! index on nu energy grid / precursor group integer :: lc ! index before start of energies/nu values @@ -1195,103 +1195,106 @@ contains real(8) :: prob ! cumulative probability type(DistEnergy), pointer :: edist - ! Determine total nu - nu_t = nu_total(nuc, p % E) + select type(p) + type is (Particle_CE) + ! Determine total nu + nu_t = nu_total(nuc, p % E) - ! Determine delayed nu - nu_d = nu_delayed(nuc, p % E) + ! Determine delayed nu + nu_d = nu_delayed(nuc, p % E) - ! Determine delayed neutron fraction - beta = nu_d / nu_t + ! Determine delayed neutron fraction + beta = nu_d / nu_t - if (prn() < beta) then - ! ==================================================================== - ! DELAYED NEUTRON SAMPLED + if (prn() < beta) then + ! ==================================================================== + ! DELAYED NEUTRON SAMPLED - ! sampled delayed precursor group - xi = prn() - lc = 1 - prob = ZERO - do j = 1, nuc % n_precursor - ! determine number of interpolation regions and energies - NR = int(nuc % nu_d_precursor_data(lc + 1)) - NE = int(nuc % nu_d_precursor_data(lc + 2 + 2*NR)) + ! sampled delayed precursor group + xi = prn() + lc = 1 + prob = ZERO + do j = 1, nuc % n_precursor + ! determine number of interpolation regions and energies + NR = int(nuc % nu_d_precursor_data(lc + 1)) + NE = int(nuc % nu_d_precursor_data(lc + 2 + 2*NR)) - ! determine delayed neutron precursor yield for group j - yield = interpolate_tab1(nuc % nu_d_precursor_data( & - lc+1:lc+2+2*NR+2*NE), p % E) + ! determine delayed neutron precursor yield for group j + yield = interpolate_tab1(nuc % nu_d_precursor_data( & + lc+1:lc+2+2*NR+2*NE), p % E) - ! Check if this group is sampled - prob = prob + yield - if (xi < prob) exit + ! Check if this group is sampled + prob = prob + yield + if (xi < prob) exit - ! advance pointer - lc = lc + 2 + 2*NR + 2*NE + 1 - end do + ! advance pointer + lc = lc + 2 + 2*NR + 2*NE + 1 + end do - ! if the sum of the probabilities is slightly less than one and the - ! random number is greater, j will be greater than nuc % - ! n_precursor -- check for this condition - j = min(j, nuc % n_precursor) + ! if the sum of the probabilities is slightly less than one and the + ! random number is greater, j will be greater than nuc % + ! n_precursor -- check for this condition + j = min(j, nuc % n_precursor) - ! set the delayed group for the particle born from fission - p % delayed_group = j + ! set the delayed group for the particle born from fission + p % delayed_group = j - ! select energy distribution for group j - law = nuc % nu_d_edist(j) % law - edist => nuc % nu_d_edist(j) + ! select energy distribution for group j + law = nuc % nu_d_edist(j) % law + edist => nuc % nu_d_edist(j) - ! sample from energy distribution - n_sample = 0 - do - if (law == 44 .or. law == 61) then - call sample_energy(edist, p % E, E_out, mu) - else - call sample_energy(edist, p % E, E_out) - end if + ! sample from energy distribution + n_sample = 0 + do + if (law == 44 .or. law == 61) then + call sample_energy(edist, p % E, E_out, mu) + else + call sample_energy(edist, p % E, E_out) + end if - ! resample if energy is greater than maximum neutron energy - if (E_out < energy_max_neutron) exit + ! resample if energy is greater than maximum neutron energy + if (E_out < energy_max_neutron) exit - ! check for large number of resamples - n_sample = n_sample + 1 - if (n_sample == MAX_SAMPLE) then - ! call write_particle_restart(p) - call fatal_error("Resampled energy distribution maximum number of " & - &// "times for nuclide " // nuc % name) - end if - end do + ! check for large number of resamples + n_sample = n_sample + 1 + if (n_sample == MAX_SAMPLE) then + ! call write_particle_restart(p) + call fatal_error("Resampled energy distribution maximum number of " & + &// "times for nuclide " // nuc % name) + end if + end do - else - ! ==================================================================== - ! PROMPT NEUTRON SAMPLED + else + ! ==================================================================== + ! PROMPT NEUTRON SAMPLED - ! set the delayed group for the particle born from fission to 0 - p % delayed_group = 0 + ! set the delayed group for the particle born from fission to 0 + p % delayed_group = 0 - ! sample from prompt neutron energy distribution - law = rxn % edist % law - n_sample = 0 - do - if (law == 44 .or. law == 61) then - call sample_energy(rxn%edist, p % E, E_out, prob) - else - call sample_energy(rxn%edist, p % E, E_out) - end if + ! sample from prompt neutron energy distribution + law = rxn % edist % law + n_sample = 0 + do + if (law == 44 .or. law == 61) then + call sample_energy(rxn%edist, p % E, E_out, prob) + else + call sample_energy(rxn%edist, p % E, E_out) + end if - ! resample if energy is greater than maximum neutron energy - if (E_out < energy_max_neutron) exit + ! resample if energy is greater than maximum neutron energy + if (E_out < energy_max_neutron) exit - ! check for large number of resamples - n_sample = n_sample + 1 - if (n_sample == MAX_SAMPLE) then - ! call write_particle_restart(p) - call fatal_error("Resampled energy distribution maximum number of " & - &// "times for nuclide " // nuc % name) - end if - end do + ! check for large number of resamples + n_sample = n_sample + 1 + if (n_sample == MAX_SAMPLE) then + ! call write_particle_restart(p) + call fatal_error("Resampled energy distribution maximum number of " & + &// "times for nuclide " // nuc % name) + end if + end do - end if + end if + end select end function sample_fission_energy @@ -1301,9 +1304,9 @@ contains !=============================================================================== subroutine inelastic_scatter(nuc, rxn, p) - type(Nuclide), pointer :: nuc - type(Reaction), pointer :: rxn - type(Particle), intent(inout) :: p + type(Nuclide), pointer :: nuc + type(Reaction), pointer :: rxn + type(Particle_CE), intent(inout) :: p integer :: i ! loop index integer :: law ! secondary energy distribution law diff --git a/src/plot.F90 b/src/plot.F90 index a5497bc203..6ac2da2c14 100644 --- a/src/plot.F90 +++ b/src/plot.F90 @@ -9,7 +9,7 @@ module plot use mesh, only: get_mesh_indices use mesh_header, only: RegularMesh use output, only: write_message - use particle_header, only: Particle, LocalCoord + use particle_header, only: LocalCoord, Particle_Base use plot_header use ppmlib, only: Image, init_image, allocate_image, & deallocate_image, set_pixel @@ -56,7 +56,7 @@ contains subroutine position_rgb(p, pl, rgb, id) - type(Particle), intent(inout) :: p + class(Particle_Base), intent(inout) :: p type(ObjectPlot), pointer, intent(in) :: pl integer, intent(out) :: rgb(3) integer, intent(out) :: id @@ -123,9 +123,9 @@ contains real(8) :: in_pixel real(8) :: out_pixel real(8) :: xyz(3) - type(Image) :: img - type(Particle) :: p - type(ProgressBar) :: progress + type(Image) :: img + class(Particle_Base), pointer :: p + type(ProgressBar) :: progress ! Initialize and allocate space for image call init_image(img) @@ -362,9 +362,9 @@ contains integer(HSIZE_T) :: offset(3) real(8) :: vox(3) ! x, y, and z voxel widths real(8) :: ll(3) ! lower left starting point for each sweep direction - type(Particle) :: p - type(ProgressBar) :: progress - type(c_ptr) :: f_ptr + class(Particle_Base), pointer :: p + type(ProgressBar) :: progress + type(c_ptr) :: f_ptr ! compute voxel widths in each direction vox = pl % width/dble(pl % pixels) diff --git a/src/simulation.F90 b/src/simulation.F90 index cc230d645b..a674a18df4 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -15,7 +15,7 @@ module simulation use global use output, only: write_message, header, print_columns, & print_batch_keff, print_generation - use particle_header, only: Particle + use particle_header, only: Particle_Base use random_lcg, only: set_particle_seed use source, only: initialize_source use state_point, only: write_state_point, write_source_point @@ -39,8 +39,8 @@ contains subroutine run_simulation() - type(Particle) :: p - integer(8) :: i_work + class(Particle_Base), pointer :: p + integer(8) :: i_work if (.not. restart_run) call initialize_source() @@ -124,8 +124,8 @@ contains subroutine initialize_history(p, index_source) - type(Particle), intent(inout) :: p - integer(8), intent(in) :: index_source + class(Particle_Base), intent(inout) :: p + integer(8), intent(in) :: index_source integer(8) :: particle_seed ! unique index for particle integer :: i diff --git a/src/source.F90 b/src/source.F90 index 6226517f3e..e8cb420083 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -9,7 +9,7 @@ module source use hdf5_interface, only: file_create, file_open, file_close, read_dataset use math, only: maxwell_spectrum, watt_spectrum use output, only: write_message - use particle_header, only: Particle + use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: prn, set_particle_seed, prn_set_stream use state_point, only: read_source_bank, write_source_bank use string, only: to_str @@ -108,7 +108,7 @@ contains real(8) :: a ! Arbitrary parameter 'a' real(8) :: b ! Arbitrary parameter 'b' logical :: found ! Does the source particle exist within geometry? - type(Particle) :: p ! Temporary particle for using find_cell + class(Particle_Base), pointer :: p ! Temporary particle for using find_cell integer, save :: num_resamples = 0 ! Number of resamples encountered ! Set weight to one by default diff --git a/src/tally.F90 b/src/tally.F90 index 0586860191..248f87c6a7 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -11,7 +11,8 @@ module tally mesh_intersects_2d, mesh_intersects_3d use mesh_header, only: RegularMesh use output, only: header - use particle_header, only: LocalCoord, Particle + use particle_header, only: LocalCoord, Particle_Base, Particle_CE, & + Particle_MG use search, only: binary_search use string, only: to_str use tally_header, only: TallyResult, TallyMapItem, TallyMapElement @@ -37,7 +38,7 @@ contains subroutine score_general(p, t, start_index, filter_index, i_nuclide, & atom_density, flux) - type(Particle), intent(in) :: p + type(Particle_CE), intent(in) :: p type(TallyObject), pointer, intent(inout) :: t integer, intent(in) :: start_index integer, intent(in) :: i_nuclide @@ -837,10 +838,10 @@ contains subroutine score_all_nuclides(p, i_tally, flux, filter_index) - type(Particle), intent(in) :: p - integer, intent(in) :: i_tally - real(8), intent(in) :: flux - integer, intent(in) :: filter_index + type(Particle_CE), intent(in) :: p + integer, intent(in) :: i_tally + real(8), intent(in) :: flux + integer, intent(in) :: filter_index integer :: i ! loop index for nuclides in material integer :: i_nuclide ! index in nuclides array @@ -891,7 +892,7 @@ contains subroutine score_analog_tally(p) - type(Particle), intent(in) :: p + type(Particle_CE), intent(in) :: p integer :: i integer :: i_tally @@ -999,9 +1000,9 @@ contains subroutine score_fission_eout(p, t, i_score) - type(Particle), intent(in) :: p - type(TallyObject), pointer :: t - integer, intent(in) :: i_score ! index for score + type(Particle_CE), intent(in) :: p + type(TallyObject), pointer :: t + integer, intent(in) :: i_score ! index for score integer :: i ! index of outgoing energy filter integer :: n ! number of energies on filter @@ -1061,7 +1062,7 @@ contains subroutine score_fission_delayed_eout(p, t, i_score) - type(Particle), intent(in) :: p + type(Particle_CE), intent(in) :: p type(TallyObject), intent(inout) :: t integer, intent(in) :: i_score ! index for score @@ -1187,8 +1188,8 @@ contains subroutine score_tracklength_tally(p, distance) - type(Particle), intent(in) :: p - real(8), intent(in) :: distance + type(Particle_CE), intent(in) :: p + real(8), intent(in) :: distance integer :: i integer :: i_tally @@ -1300,9 +1301,9 @@ contains subroutine score_tl_on_mesh(p, i_tally, d_track) - type(Particle), intent(in) :: p - integer, intent(in) :: i_tally - real(8), intent(in) :: d_track + type(Particle_CE), intent(in) :: p + integer, intent(in) :: i_tally + real(8), intent(in) :: d_track integer :: i ! loop index for filter/score bins integer :: j ! loop index for direction @@ -1585,7 +1586,7 @@ contains subroutine score_collision_tally(p) - type(Particle), intent(in) :: p + type(Particle_CE), intent(in) :: p integer :: i integer :: i_tally @@ -1694,9 +1695,9 @@ contains subroutine get_scoring_bins(p, i_tally, found_bin) - type(Particle), intent(in) :: p - integer, intent(in) :: i_tally - logical, intent(out) :: found_bin + type(Particle_CE), intent(in) :: p + integer, intent(in) :: i_tally + logical, intent(out) :: found_bin integer :: i ! loop index for filters integer :: j @@ -1902,7 +1903,7 @@ contains subroutine score_surface_current(p) - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p integer :: i integer :: i_tally @@ -1967,19 +1968,22 @@ contains uvw = p % coord(1) % uvw ! determine incoming energy bin - j = t % find_filter(FILTER_ENERGYIN) - if (j > 0) then - n = t % filters(j) % n_bins - ! check if energy of the particle is within energy bins - if (p % E < t % filters(j) % real_bins(1) .or. & - p % E > t % filters(j) % real_bins(n + 1)) then - cycle - end if + select type(p) + type is (Particle_CE) + j = t % find_filter(FILTER_ENERGYIN) + if (j > 0) then + n = t % filters(j) % n_bins + ! check if energy of the particle is within energy bins + if (p % E < t % filters(j) % real_bins(1) .or. & + p % E > t % filters(j) % real_bins(n + 1)) then + cycle + end if - ! search to find incoming energy bin - matching_bins(j) = binary_search(t % filters(j) % real_bins, & - n + 1, p % E) - end if + ! search to find incoming energy bin + matching_bins(j) = binary_search(t % filters(j) % real_bins, & + n + 1, p % E) + end if + end select ! ======================================================================= ! SPECIAL CASES WHERE TWO INDICES ARE THE SAME diff --git a/src/track_output.F90 b/src/track_output.F90 index 1665ac25ea..867cd4a787 100644 --- a/src/track_output.F90 +++ b/src/track_output.F90 @@ -7,7 +7,7 @@ module track_output use global use hdf5_interface - use particle_header, only: Particle + use particle_header, only: Particle_Base use string, only: to_str use hdf5 @@ -43,7 +43,7 @@ contains !=============================================================================== subroutine write_particle_track(p) - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p real(8), allocatable :: new_coords(:, :) integer :: i @@ -93,7 +93,7 @@ contains !=============================================================================== subroutine finalize_particle_track(p) - type(Particle), intent(in) :: p + class(Particle_Base), intent(in) :: p integer :: i integer :: n_particle_tracks diff --git a/src/tracking.F90 b/src/tracking.F90 index 2e4503e139..8dc8c7772e 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -8,7 +8,7 @@ module tracking use geometry_header, only: Universe, BASE_UNIVERSE use global use output, only: write_message - use particle_header, only: LocalCoord, Particle + use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use physics, only: collision use random_lcg, only: prn use string, only: to_str @@ -27,7 +27,7 @@ contains subroutine transport(p) - type(Particle), intent(inout) :: p + class(Particle_Base), intent(inout) :: p integer :: j ! coordinate level integer :: next_level ! next coordinate level to check @@ -83,7 +83,10 @@ contains ! material is the same as the last material and the energy of the ! particle hasn't changed, we don't need to lookup cross sections again. - if (p % material /= p % last_material) call calculate_xs(p) + select type(p) + type is (Particle_CE) + if (p % material /= p % last_material) call calculate_xs(p) + end select ! Find the distance to the nearest boundary call distance_to_boundary(p, d_boundary, surface_crossed, & @@ -105,8 +108,13 @@ contains end do ! Score track-length tallies - if (active_tracklength_tallies % size() > 0) & - call score_tracklength_tally(p, distance) + if (active_tracklength_tallies % size() > 0) then + select type(p) + type is (Particle_CE) + call score_tracklength_tally(p, distance) + end select + end if + ! Score track-length estimate of k-eff if (run_mode == MODE_EIGENVALUE) then @@ -151,14 +159,19 @@ contains ! Clear surface component p % surface = NONE - call collision(p) + select type(p) + type is (Particle_CE) + call collision(p) + end select ! Score collision estimator tallies -- this is done after a collision ! has occurred rather than before because we need information on the ! outgoing energy for any tallies with an outgoing energy filter - - if (active_collision_tallies % size() > 0) call score_collision_tally(p) - if (active_analog_tallies % size() > 0) call score_analog_tally(p) + select type(p) + type is (Particle_CE) + if (active_collision_tallies % size() > 0) call score_collision_tally(p) + if (active_analog_tallies % size() > 0) call score_analog_tally(p) + end select ! Reset banked weight during collision p % n_bank = 0 From 6ab37ed3b4a3390a1a19ccc67cae0a71c1acdce5 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 30 Oct 2015 16:22:41 -0400 Subject: [PATCH 002/149] MG-ified the Bank Type. Not happy with the way this is done - adding group attrib to normal class - but the BIND(C) attribute is really not allowing me to do extended types. The other fix is to create a completely separate type for Bank_MG, which in the end I suspect will result in way to much duplicated code --- src/bank_header.F90 | 3 ++- src/particle_header.F90 | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/bank_header.F90 b/src/bank_header.F90 index 0cb49af35d..ad829341f0 100644 --- a/src/bank_header.F90 +++ b/src/bank_header.F90 @@ -5,7 +5,7 @@ module bank_header implicit none !=============================================================================== -! BANK is used for storing fission sites in eigenvalue calculations. Since all +! BANK* is used for storing fission sites in eigenvalue calculations. Since all ! the state information of a neutron is not needed, this type allows sites to be ! stored with less memory !=============================================================================== @@ -15,6 +15,7 @@ module bank_header real(C_DOUBLE) :: xyz(3) ! location of bank particle real(C_DOUBLE) :: uvw(3) ! diretional cosines real(C_DOUBLE) :: E ! energy + integer(C_INT) :: g ! energy group integer(C_INT) :: delayed_group ! delayed group end type Bank diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 6b4d38845a..40d7499015 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -250,9 +250,8 @@ contains this % coord(1) % uvw = src % uvw this % last_xyz = src % xyz this % last_uvw = src % uvw - !!! The following requires a MG version of Bank - this % g = src % E - this % last_g = src % E + this % g = src % g + this % last_g = src % g end subroutine initialize_from_source_mg @@ -300,8 +299,7 @@ contains this % secondary_bank(n) % wgt = this % wgt this % secondary_bank(n) % xyz(:) = this % coord(1) % xyz this % secondary_bank(n) % uvw(:) = uvw - !!! The following requires a MG version of Bank - this % secondary_bank(n) % E = this % g + this % secondary_bank(n) % g = this % g this % n_secondary = n end subroutine create_secondary_mg From a2d7bb96a6c86cd334c187c0f37f514650e770d7 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 30 Oct 2015 16:52:56 -0400 Subject: [PATCH 003/149] Able to read in materials.xml file including new macroscopic identifier --- src/global.F90 | 6 +- src/input_xml.F90 | 251 +++++++++++++++++++++++++++++++--------------- 2 files changed, 173 insertions(+), 84 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index a4c80daa79..98c3a6ed66 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -59,7 +59,11 @@ module global integer :: n_lost_particles ! ============================================================================ - ! CROSS SECTION RELATED VARIABLES + ! ENERGY TREATMENT RELATED VARIABLES + logical :: run_CE = .true. ! Run in CE mode? + + ! ============================================================================ + ! CONTINUOUS-ENERGY CROSS SECTION RELATED VARIABLES ! Cross section arrays type(Nuclide), allocatable, target :: nuclides(:) ! Nuclide cross-sections diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 58e4013355..dda1b90837 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -121,6 +121,17 @@ contains end if end if + ! Find if a multi-group or continuous-energy simulation is desired + if (check_for_node(doc, "energy_mode")) then + call get_node_value(doc, "energy_mode", temp_str) + temp_str = trim(to_lower(temp_str)) + if (temp_str == "mg" .or. temp_str == "multi-group") then + run_CE = .false. + else if (temp_str == "ce" .or. temp_str == "continuous") then + run_CE = .true. + end if + end if + ! Set output directory if a path has been specified on the ! element if (check_for_node(doc, "output_path")) then @@ -1784,6 +1795,7 @@ contains type(Node), pointer :: node_sab => null() type(NodeList), pointer :: node_mat_list => null() type(NodeList), pointer :: node_nuc_list => null() + type(NodeList), pointer :: node_macro_list => null() type(NodeList), pointer :: node_ele_list => null() type(NodeList), pointer :: node_sab_list => null() @@ -1841,6 +1853,7 @@ contains ! Copy material name if (check_for_node(node_mat, "name")) then call get_node_value(node_mat, "name", mat % name) + mat % name = to_lower(mat % name) end if if (run_mode == MODE_PLOTTING) then @@ -1873,6 +1886,19 @@ contains sum_density = .true. + else if (units == 'macro') then + if (check_for_node(node_dens, "value")) then + ! Copy value + call get_node_value(node_dens, "value", val) + else + val = ONE + end if + + ! Set density + mat % density = val + + sum_density = .false. + else ! Copy value call get_node_value(node_dens, "value", val) @@ -1904,66 +1930,122 @@ contains ! READ AND PARSE TAGS ! Check to ensure material has at least one nuclide - if (.not. check_for_node(node_mat, "nuclide") .and. & - .not. check_for_node(node_mat, "element")) then - call fatal_error("No nuclides or natural elements specified on & - &material " // trim(to_str(mat % id))) + if ((.not. check_for_node(node_mat, "nuclide") .and. & + .not. check_for_node(node_mat, "element")) .and. & + (.not. check_for_node(node_mat, "macroscopic"))) then + call fatal_error("No macroscopic data, nuclides or natural elements & + &specified on material " // trim(to_str(mat % id))) end if + ! Create list of macroscopic x/s based on those specified, just treat + ! them as nuclides. This is all really a facade so the user thinks they + ! are entering in macroscopic data but the code treats them the same + ! as nuclides internally. ! Get pointer list of XML - call get_node_list(node_mat, "nuclide", node_nuc_list) + call get_node_list(node_mat, "macroscopic", node_macro_list) + if (get_list_size(node_macro_list) > 1) then + call fatal_error("Only one macroscopic data permitted per material, " & + &// trim(to_str(mat % id))) + else if (get_list_size(node_macro_list) == 1) then - ! Create list of nuclides based on those specified plus natural elements - INDIVIDUAL_NUCLIDES: do j = 1, get_list_size(node_nuc_list) - ! Combine nuclide identifier and cross section and copy into names - call get_list_item(node_nuc_list, j, node_nuc) + call get_list_item(node_macro_list, 1, node_nuc) ! Check for empty name on nuclide if (.not.check_for_node(node_nuc, "name")) then - call fatal_error("No name specified on nuclide in material " & + call fatal_error("No name specified on macroscopic data in material " & &// trim(to_str(mat % id))) end if ! Check for cross section if (.not.check_for_node(node_nuc, "xs")) then if (default_xs == '') then - call fatal_error("No cross section specified for nuclide in & - &material " // trim(to_str(mat % id))) + call fatal_error("No cross section specified for macroscopic data & + & in material " // trim(to_str(mat % id))) else - name = trim(default_xs) + name = to_lower(trim(default_xs)) end if end if ! store full name call get_node_value(node_nuc, "name", temp_str) if (check_for_node(node_nuc, "xs")) & - call get_node_value(node_nuc, "xs", name) + call get_node_value(node_nuc, "xs", name) name = trim(temp_str) // "." // trim(name) + name = to_lower(name) ! save name and density to list call list_names % append(name) ! Check if no atom/weight percents were specified or if both atom and ! weight percents were specified - if (.not.check_for_node(node_nuc, "ao") .and. & - .not.check_for_node(node_nuc, "wo")) then - call fatal_error("No atom or weight percent specified for nuclide " & - &// trim(name)) - elseif (check_for_node(node_nuc, "ao") .and. & - check_for_node(node_nuc, "wo")) then - call fatal_error("Cannot specify both atom and weight percents for a & - &nuclide: " // trim(name)) - end if - - ! Copy atom/weight percents - if (check_for_node(node_nuc, "ao")) then - call get_node_value(node_nuc, "ao", temp_dble) - call list_density % append(temp_dble) + if (units == 'macro') then + call list_density % append(ONE) else - call get_node_value(node_nuc, "wo", temp_dble) - call list_density % append(-temp_dble) + call fatal_error("Units can only be macro for macroscopic data " & + &// trim(name)) end if - end do INDIVIDUAL_NUCLIDES + else + + ! Get pointer list of XML + call get_node_list(node_mat, "nuclide", node_nuc_list) + + ! Create list of nuclides based on those specified plus natural elements + INDIVIDUAL_NUCLIDES: do j = 1, get_list_size(node_nuc_list) + ! Combine nuclide identifier and cross section and copy into names + call get_list_item(node_nuc_list, j, node_nuc) + + ! Check for empty name on nuclide + if (.not.check_for_node(node_nuc, "name")) then + call fatal_error("No name specified on nuclide in material " & + &// trim(to_str(mat % id))) + end if + + ! Check for cross section + if (.not.check_for_node(node_nuc, "xs")) then + if (default_xs == '') then + call fatal_error("No cross section specified for nuclide in & + &material " // trim(to_str(mat % id))) + else + name = to_lower(trim(default_xs)) + end if + end if + + ! store full name + call get_node_value(node_nuc, "name", temp_str) + if (check_for_node(node_nuc, "xs")) & + call get_node_value(node_nuc, "xs", name) + name = trim(temp_str) // "." // trim(name) + name = to_lower(name) + + ! save name and density to list + call list_names % append(name) + + ! Check if no atom/weight percents were specified or if both atom and + ! weight percents were specified + if (units == 'macro') then + call list_density % append(ONE) + else + if (.not.check_for_node(node_nuc, "ao") .and. & + .not.check_for_node(node_nuc, "wo")) then + call fatal_error("No atom or weight percent specified for nuclide " & + &// trim(name)) + elseif (check_for_node(node_nuc, "ao") .and. & + check_for_node(node_nuc, "wo")) then + call fatal_error("Cannot specify both atom and weight percents for a & + &nuclide: " // trim(name)) + end if + + ! Copy atom/weight percents + if (check_for_node(node_nuc, "ao")) then + call get_node_value(node_nuc, "ao", temp_dble) + call list_density % append(temp_dble) + else + call get_node_value(node_nuc, "wo", temp_dble) + call list_density % append(-temp_dble) + end if + end if + end do INDIVIDUAL_NUCLIDES + end if ! ======================================================================= ! READ AND PARSE TAGS @@ -1989,7 +2071,7 @@ contains call fatal_error("No cross section specified for nuclide in & &material " // trim(to_str(mat % id))) else - temp_str = trim(default_xs) + temp_str = to_lower(trim(default_xs)) end if end if @@ -2031,14 +2113,16 @@ contains name = trim(list_names % get_item(j)) if (.not. xs_listing_dict % has_key(to_lower(name))) then call fatal_error("Could not find nuclide " // trim(name) & - &// " in cross_sections.xml file!") + &// " in cross_sections data file!") end if - ! Check to make sure cross-section is continuous energy neutron table - n = len_trim(name) - if (name(n:n) /= 'c') then - call fatal_error("Cross-section table " // trim(name) & - &// " is not a continuous-energy neutron table.") + if (run_CE) then + ! Check to make sure cross-section is continuous energy neutron table + n = len_trim(name) + if (name(n:n) /= 'c') then + call fatal_error("Cross-section table " // trim(name) & + &// " is not a continuous-energy neutron table.") + end if end if ! Find xs_listing and set the name/alias according to the listing @@ -2080,59 +2164,60 @@ contains ! ======================================================================= ! READ AND PARSE TAG FOR S(a,b) DATA + if (run_CE) then + ! Get pointer list to XML + call get_node_list(node_mat, "sab", node_sab_list) - ! Get pointer list to XML - call get_node_list(node_mat, "sab", node_sab_list) + n_sab = get_list_size(node_sab_list) + if (n_sab > 0) then + ! Set number of S(a,b) tables + mat % n_sab = n_sab - n_sab = get_list_size(node_sab_list) - if (n_sab > 0) then - ! Set number of S(a,b) tables - mat % n_sab = n_sab + ! Allocate names and indices for nuclides and tables + allocate(mat % sab_names(n_sab)) + allocate(mat % i_sab_nuclides(n_sab)) + allocate(mat % i_sab_tables(n_sab)) - ! Allocate names and indices for nuclides and tables - allocate(mat % sab_names(n_sab)) - allocate(mat % i_sab_nuclides(n_sab)) - allocate(mat % i_sab_tables(n_sab)) + ! Initialize i_sab_nuclides + mat % i_sab_nuclides = NONE - ! Initialize i_sab_nuclides - mat % i_sab_nuclides = NONE + do j = 1, n_sab + ! Get pointer to S(a,b) table + call get_list_item(node_sab_list, j, node_sab) - do j = 1, n_sab - ! Get pointer to S(a,b) table - call get_list_item(node_sab_list, j, node_sab) + ! Determine name of S(a,b) table + if (.not.check_for_node(node_sab, "name") .or. & + .not.check_for_node(node_sab, "xs")) then + call fatal_error("Need to specify and for S(a,b) & + &table.") + end if + call get_node_value(node_sab, "name", name) + call get_node_value(node_sab, "xs", temp_str) + name = trim(name) // "." // trim(temp_str) + mat % sab_names(j) = name - ! Determine name of S(a,b) table - if (.not.check_for_node(node_sab, "name") .or. & - .not.check_for_node(node_sab, "xs")) then - call fatal_error("Need to specify and for S(a,b) & - &table.") - end if - call get_node_value(node_sab, "name", name) - call get_node_value(node_sab, "xs", temp_str) - name = trim(name) // "." // trim(temp_str) - mat % sab_names(j) = name + ! Check that this nuclide is listed in the cross_sections.xml file + if (.not. xs_listing_dict % has_key(to_lower(name))) then + call fatal_error("Could not find S(a,b) table " // trim(name) & + &// " in cross_sections.xml file!") + end if - ! Check that this nuclide is listed in the cross_sections.xml file - if (.not. xs_listing_dict % has_key(to_lower(name))) then - call fatal_error("Could not find S(a,b) table " // trim(name) & - &// " in cross_sections.xml file!") - end if + ! Find index in xs_listing and set the name and alias according to the + ! listing + index_list = xs_listing_dict % get_key(to_lower(name)) + name = xs_listings(index_list) % name - ! Find index in xs_listing and set the name and alias according to the - ! listing - index_list = xs_listing_dict % get_key(to_lower(name)) - name = xs_listings(index_list) % name - - ! If this S(a,b) table hasn't been encountered yet, we need to add its - ! name and alias to the sab_dict - if (.not. sab_dict % has_key(to_lower(name))) then - index_sab = index_sab + 1 - mat % i_sab_tables(j) = index_sab - call sab_dict % add_key(to_lower(name), index_sab) - else - mat % i_sab_tables(j) = sab_dict % get_key(to_lower(name)) - end if - end do + ! If this S(a,b) table hasn't been encountered yet, we need to add its + ! name and alias to the sab_dict + if (.not. sab_dict % has_key(to_lower(name))) then + index_sab = index_sab + 1 + mat % i_sab_tables(j) = index_sab + call sab_dict % add_key(to_lower(name), index_sab) + else + mat % i_sab_tables(j) = sab_dict % get_key(to_lower(name)) + end if + end do + end if end if ! Add material to dictionary From 8ec4c917817f18a9683a2c068a599bd9ce8497d9 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 30 Oct 2015 20:25:32 -0400 Subject: [PATCH 004/149] Worked on the old ace_header and split it up into nuclide and sab_header to make more sense when the MGXS version of nuclide gets put in' --- src/ace.F90 | 23 ++-- src/ace_header.F90 | 263 ----------------------------------------- src/cross_section.F90 | 18 +-- src/energy_grid.F90 | 6 +- src/fission.F90 | 28 ++--- src/global.F90 | 6 +- src/nuclide_header.F90 | 248 ++++++++++++++++++++++++++++++++++++++ src/output.F90 | 10 +- src/physics.F90 | 21 ++-- src/sab_header.F90 | 62 ++++++++++ src/summary.F90 | 3 +- src/tally.F90 | 2 +- 12 files changed, 372 insertions(+), 318 deletions(-) create mode 100644 src/nuclide_header.F90 create mode 100644 src/sab_header.F90 diff --git a/src/ace.F90 b/src/ace.F90 index 22fcc6b3d5..a93f722958 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -1,7 +1,6 @@ module ace - use ace_header, only: Nuclide, Reaction, SAlphaBeta, XsListing, & - DistEnergy + use ace_header, only: Reaction, DistEnergy use constants use endf, only: reaction_name, is_fission, is_disappearance use error, only: fatal_error, warning @@ -9,7 +8,9 @@ module ace use global use list_header, only: ListInt use material_header, only: Material + use nuclide_header use output, only: write_message + use sab_header, only: SAlphaBeta use set_header, only: SetChar use string, only: to_str, to_lower @@ -46,7 +47,7 @@ contains character(12) :: name ! name of isotope, e.g. 92235.03c character(12) :: alias ! alias of nuclide, e.g. U-235.03c type(Material), pointer :: mat => null() - type(Nuclide), pointer :: nuc => null() + type(Nuclide_CE), pointer :: nuc => null() type(SAlphaBeta), pointer :: sab => null() type(SetChar) :: already_read @@ -258,7 +259,7 @@ contains character(10) :: mat ! material identifier character(70) :: comment ! comment for ACE table character(MAX_FILE_LEN) :: filename ! path to ACE cross section library - type(Nuclide), pointer :: nuc => null() + type(Nuclide_CE), pointer :: nuc => null() type(SAlphaBeta), pointer :: sab => null() type(XsListing), pointer :: listing => null() @@ -418,7 +419,7 @@ contains subroutine read_esz(nuc, data_0K) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc logical :: data_0K ! are we reading 0K data? @@ -508,7 +509,7 @@ contains subroutine read_nu_data(nuc) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer :: i ! loop index integer :: JXS2 ! location for fission nu data @@ -708,7 +709,7 @@ contains subroutine read_reactions(nuc) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer :: i ! loop indices integer :: i_fission ! index in nuc % index_fission @@ -891,7 +892,7 @@ contains subroutine read_angular_dist(nuc) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer :: JXS8 ! location of angular distribution locators integer :: JXS9 ! location of angular distributions @@ -986,7 +987,7 @@ contains subroutine read_energy_dist(nuc) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer :: LED ! location of energy distribution locators integer :: LOCC ! location of energy distributions for given MT @@ -1302,7 +1303,7 @@ contains subroutine read_unr_res(nuc) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer :: JXS23 ! location of URR data integer :: lc ! locator @@ -1391,7 +1392,7 @@ contains subroutine generate_nu_fission(nuc) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer :: i ! index on nuclide energy grid real(8) :: E ! energy diff --git a/src/ace_header.F90 b/src/ace_header.F90 index 467887c193..1fb444b1ae 100644 --- a/src/ace_header.F90 +++ b/src/ace_header.F90 @@ -85,212 +85,6 @@ module ace_header procedure :: clear => urrdata_clear ! Deallocates UrrData end type UrrData -!=============================================================================== -! NUCLIDE contains all the data for an ACE-format continuous-energy cross -! section. The ACE format (A Compact ENDF format) is used in MCNP and several -! other Monte Carlo codes. -!=============================================================================== - - type Nuclide - character(10) :: name ! name of nuclide, e.g. 92235.03c - integer :: zaid ! Z and A identifier, e.g. 92235 - integer :: listing ! index in xs_listings - real(8) :: awr ! weight of nucleus in neutron masses - real(8) :: kT ! temperature in MeV (k*T) - - ! Linked list of indices in nuclides array of instances of this same nuclide - type(ListInt) :: nuc_list - - ! Energy grid information - integer :: n_grid ! # of nuclide grid points - integer, allocatable :: grid_index(:) ! log grid mapping indices - real(8), allocatable :: energy(:) ! energy values corresponding to xs - - ! Microscopic cross sections - real(8), allocatable :: total(:) ! total cross section - real(8), allocatable :: elastic(:) ! elastic scattering - real(8), allocatable :: fission(:) ! fission - real(8), allocatable :: nu_fission(:) ! neutron production - real(8), allocatable :: absorption(:) ! absorption (MT > 100) - real(8), allocatable :: heating(:) ! heating - - ! Resonance scattering info - logical :: resonant = .false. ! resonant scatterer? - character(10) :: name_0K = '' ! name of 0K nuclide, e.g. 92235.00c - character(16) :: scheme ! target velocity sampling scheme - integer :: n_grid_0K ! number of 0K energy grid points - real(8), allocatable :: energy_0K(:) ! energy grid for 0K xs - real(8), allocatable :: elastic_0K(:) ! Microscopic elastic cross section - real(8), allocatable :: xs_cdf(:) ! CDF of v_rel times cross section - real(8) :: E_min ! lower cutoff energy for res scattering - real(8) :: E_max ! upper cutoff energy for res scattering - - ! Fission information - logical :: fissionable ! nuclide is fissionable? - logical :: has_partial_fission ! nuclide has partial fission reactions? - integer :: n_fission ! # of fission reactions - integer, allocatable :: index_fission(:) ! indices in reactions - - ! Total fission neutron emission - integer :: nu_t_type - real(8), allocatable :: nu_t_data(:) - - ! Prompt fission neutron emission - integer :: nu_p_type - real(8), allocatable :: nu_p_data(:) - - ! Delayed fission neutron emission - integer :: nu_d_type - integer :: n_precursor ! # of delayed neutron precursors - real(8), allocatable :: nu_d_data(:) - real(8), allocatable :: nu_d_precursor_data(:) - type(DistEnergy), pointer :: nu_d_edist(:) => null() - - ! Unresolved resonance data - logical :: urr_present - integer :: urr_inelastic - type(UrrData), pointer :: urr_data => null() - - ! Reactions - integer :: n_reaction ! # of reactions - type(Reaction), pointer :: reactions(:) => null() - - ! Type-Bound procedures - contains - procedure :: clear => nuclide_clear ! Deallocates Nuclide - end type Nuclide - -!=============================================================================== -! NUCLIDE0K temporarily contains all 0K cross section data and other parameters -! needed to treat resonance scattering before transferring them to NUCLIDE -!=============================================================================== - - type Nuclide0K - - character(10) :: nuclide ! name of nuclide, e.g. U-238 - character(16) :: scheme = 'ares' ! target velocity sampling scheme - character(10) :: name ! name of nuclide, e.g. 92235.03c - character(10) :: name_0K ! name of 0K nuclide, e.g. 92235.00c - real(8) :: E_min = 0.01e-6_8 ! lower cutoff energy for res scattering - real(8) :: E_max = 1000.0e-6_8 ! upper cutoff energy for res scattering - - end type Nuclide0K - -!=============================================================================== -! DISTENERGYSAB contains the secondary energy/angle distributions for inelastic -! thermal scattering collisions which utilize a continuous secondary energy -! representation. -!=============================================================================== - - type DistEnergySab - integer :: n_e_out - real(8), allocatable :: e_out(:) - real(8), allocatable :: e_out_pdf(:) - real(8), allocatable :: e_out_cdf(:) - real(8), allocatable :: mu(:,:) - end type DistEnergySab - -!=============================================================================== -! SALPHABETA contains S(a,b) data for thermal neutron scattering, typically off -! of light isotopes such as water, graphite, Be, etc -!=============================================================================== - - type SAlphaBeta - character(10) :: name ! name of table, e.g. lwtr.10t - real(8) :: awr ! weight of nucleus in neutron masses - real(8) :: kT ! temperature in MeV (k*T) - integer :: n_zaid ! Number of valid zaids - integer, allocatable :: zaid(:) ! List of valid Z and A identifiers, e.g. 6012 - - ! threshold for S(a,b) treatment (usually ~4 eV) - real(8) :: threshold_inelastic - real(8) :: threshold_elastic = ZERO - - ! Inelastic scattering data - integer :: n_inelastic_e_in ! # of incoming E for inelastic - integer :: n_inelastic_e_out ! # of outgoing E for inelastic - integer :: n_inelastic_mu ! # of outgoing angles for inelastic - integer :: secondary_mode ! secondary mode (equal/skewed/continuous) - real(8), allocatable :: inelastic_e_in(:) - real(8), allocatable :: inelastic_sigma(:) - ! The following are used only if secondary_mode is 0 or 1 - real(8), allocatable :: inelastic_e_out(:,:) - real(8), allocatable :: inelastic_mu(:,:,:) - ! The following is used only if secondary_mode is 3 - ! The different implementation is necessary because the continuous - ! representation has a variable number of outgoing energy points for each - ! incoming energy - type(DistEnergySab), allocatable :: inelastic_data(:) ! One for each Ein - - ! Elastic scattering data - integer :: elastic_mode ! elastic mode (discrete/exact) - integer :: n_elastic_e_in ! # of incoming E for elastic - integer :: n_elastic_mu ! # of outgoing angles for elastic - real(8), allocatable :: elastic_e_in(:) - real(8), allocatable :: elastic_P(:) - real(8), allocatable :: elastic_mu(:,:) - end type SAlphaBeta - -!=============================================================================== -! XSLISTING contains data read from a cross_sections.xml file -!=============================================================================== - - type XsListing - character(12) :: name ! table name, e.g. 92235.70c - character(12) :: alias ! table alias, e.g. U-235.70c - integer :: type ! type of table (cont-E neutron, S(A,b), etc) - integer :: zaid ! ZAID identifier = 1000*Z + A - integer :: filetype ! ASCII or BINARY - integer :: location ! location of table within library - integer :: recl ! record length for library - integer :: entries ! number of entries per record - real(8) :: awr ! atomic weight ratio (# of neutron masses) - real(8) :: kT ! Boltzmann constant * temperature (MeV) - logical :: metastable ! is this nuclide metastable? - character(MAX_FILE_LEN) :: path ! path to library containing table - end type XsListing - -!=============================================================================== -! NUCLIDEMICROXS contains cached microscopic cross sections for a -! particular nuclide at the current energy -!=============================================================================== - - type NuclideMicroXS - integer :: index_grid ! index on nuclide energy grid - integer :: index_temp ! temperature index for nuclide - real(8) :: last_E = ZERO ! last evaluated energy - real(8) :: interp_factor ! interpolation factor on nuc. energy grid - real(8) :: total ! microscropic total xs - real(8) :: elastic ! microscopic elastic scattering xs - real(8) :: absorption ! microscopic absorption xs - real(8) :: fission ! microscopic fission xs - real(8) :: nu_fission ! microscopic production xs - real(8) :: kappa_fission ! microscopic energy-released from fission - - ! Information for S(a,b) use - integer :: index_sab ! index in sab_tables (zero means no table) - integer :: last_index_sab = 0 ! index in sab_tables last used by this nuclide - real(8) :: elastic_sab ! microscopic elastic scattering on S(a,b) table - - ! Information for URR probability table use - logical :: use_ptable ! in URR range with probability tables? - real(8) :: last_prn - end type NuclideMicroXS - -!=============================================================================== -! MATERIALMACROXS contains cached macroscopic cross sections for the material a -! particle is traveling through -!=============================================================================== - - type MaterialMacroXS - real(8) :: total ! macroscopic total xs - real(8) :: elastic ! macroscopic elastic scattering xs - real(8) :: absorption ! macroscopic absorption xs - real(8) :: fission ! macroscopic fission xs - real(8) :: nu_fission ! macroscopic production xs - real(8) :: kappa_fission ! macroscopic energy-released from fission - end type MaterialMacroXS - contains !=============================================================================== @@ -362,62 +156,5 @@ module ace_header end subroutine urrdata_clear -!=============================================================================== -! NUCLIDE_CLEAR resets and deallocates data in Nuclide. -!=============================================================================== - - subroutine nuclide_clear(this) - - class(Nuclide), intent(inout) :: this ! The Nuclide object to clear - - integer :: i ! Loop counter - - if (allocated(this % energy)) & - deallocate(this % energy, this % total, this % elastic, & - & this % fission, this % nu_fission, this % absorption) - - if (allocated(this % energy_0K)) & - deallocate(this % energy_0K) - - if (allocated(this % elastic_0K)) & - deallocate(this % elastic_0K) - - if (allocated(this % xs_cdf)) & - deallocate(this % xs_cdf) - - if (allocated(this % heating)) & - deallocate(this % heating) - - if (allocated(this % index_fission)) deallocate(this % index_fission) - - if (allocated(this % nu_t_data)) deallocate(this % nu_t_data) - if (allocated(this % nu_p_data)) deallocate(this % nu_p_data) - if (allocated(this % nu_d_data)) deallocate(this % nu_d_data) - - if (allocated(this % nu_d_precursor_data)) & - deallocate(this % nu_d_precursor_data) - - if (associated(this % nu_d_edist)) then - do i = 1, size(this % nu_d_edist) - call this % nu_d_edist(i) % clear() - end do - deallocate(this % nu_d_edist) - end if - - if (associated(this % urr_data)) then - call this % urr_data % clear() - deallocate(this % urr_data) - end if - - if (associated(this % reactions)) then - do i = 1, size(this % reactions) - call this % reactions(i) % clear() - end do - deallocate(this % reactions) - end if - - call this % nuc_list % clear() - - end subroutine nuclide_clear end module ace_header diff --git a/src/cross_section.F90 b/src/cross_section.F90 index 1586912a96..4e75970733 100644 --- a/src/cross_section.F90 +++ b/src/cross_section.F90 @@ -1,6 +1,6 @@ module cross_section - use ace_header, only: Nuclide, SAlphaBeta, Reaction, UrrData + use ace_header, only: Reaction, UrrData use constants use energy_grid, only: grid_method, log_spacing use error, only: fatal_error @@ -8,8 +8,10 @@ module cross_section use global use list_header, only: ListElemInt use material_header, only: Material + use nuclide_header use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: prn + use sab_header, only: SAlphaBeta use search, only: binary_search implicit none @@ -154,7 +156,7 @@ contains integer :: i_high ! upper logarithmic mapping index real(8), intent(in) :: E ! energy real(8) :: f ! interp factor on nuclide energy grid - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Material), pointer :: mat ! Set pointer to nuclide and material @@ -381,7 +383,7 @@ contains real(8) :: inelastic ! inelastic cross section logical :: same_nuc ! do we know the xs for this nuclide at this energy? type(UrrData), pointer :: urr - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn micro_xs(i_nuclide) % use_ptable = .true. @@ -553,11 +555,11 @@ contains function elastic_xs_0K(E, nuc) result(xs_out) - type(Nuclide), pointer :: nuc ! target nuclide at temperature - integer :: i_grid ! index on nuclide energy grid - real(8) :: f ! interp factor on nuclide energy grid - real(8), intent(inout) :: E ! trial energy - real(8) :: xs_out ! 0K xs at trial energy + type(Nuclide_CE), pointer :: nuc ! target nuclide at temperature + integer :: i_grid ! index on nuclide energy grid + real(8) :: f ! interp factor on nuclide energy grid + real(8), intent(inout) :: E ! trial energy + real(8) :: xs_out ! 0K xs at trial energy ! Determine index on nuclide energy grid if (E < nuc % energy_0K(1)) then diff --git a/src/energy_grid.F90 b/src/energy_grid.F90 index 66419f83cc..fa56b04956 100644 --- a/src/energy_grid.F90 +++ b/src/energy_grid.F90 @@ -27,7 +27,7 @@ contains integer :: i ! index in nuclides array integer :: j ! index in materials array type(ListReal) :: list - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Material), pointer :: mat call write_message("Creating unionized energy grid...", 5) @@ -70,7 +70,7 @@ contains real(8) :: E_max ! Maximum energy in MeV real(8) :: E_min ! Minimum energy in MeV real(8), allocatable :: umesh(:) ! Equally log-spaced energy grid - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc ! Set minimum/maximum energies E_max = energy_max_neutron @@ -179,7 +179,7 @@ contains integer :: index_e ! index on union energy grid real(8) :: union_energy ! energy on union grid real(8) :: energy ! energy on nuclide grid - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Material), pointer :: mat do k = 1, n_materials diff --git a/src/fission.F90 b/src/fission.F90 index 7b2911997b..5669080b75 100644 --- a/src/fission.F90 +++ b/src/fission.F90 @@ -1,10 +1,10 @@ module fission - use ace_header, only: Nuclide + use nuclide_header, only: Nuclide_CE use constants - use error, only: fatal_error - use interpolation, only: interpolate_tab1 - use search, only: binary_search + use error, only: fatal_error + use interpolation, only: interpolate_tab1 + use search, only: binary_search implicit none @@ -17,9 +17,9 @@ contains function nu_total(nuc, E) result(nu) - type(Nuclide), pointer :: nuc ! nuclide from which to find nu - real(8), intent(in) :: E ! energy of incoming neutron - real(8) :: nu ! number of total neutrons emitted per fission + type(Nuclide_CE), pointer :: nuc ! nuclide from which to find nu + real(8), intent(in) :: E ! energy of incoming neutron + real(8) :: nu ! number of total neutrons emitted per fission integer :: i ! loop index integer :: NC ! number of polynomial coefficients @@ -51,9 +51,9 @@ contains function nu_prompt(nuc, E) result(nu) - type(Nuclide), pointer :: nuc ! nuclide from which to find nu - real(8), intent(in) :: E ! energy of incoming neutron - real(8) :: nu ! number of prompt neutrons emitted per fission + type(Nuclide_CE), pointer :: nuc ! nuclide from which to find nu + real(8), intent(in) :: E ! energy of incoming neutron + real(8) :: nu ! number of prompt neutrons emitted per fission integer :: i ! loop index integer :: NC ! number of polynomial coefficients @@ -89,9 +89,9 @@ contains function nu_delayed(nuc, E) result(nu) - type(Nuclide), intent(in) :: nuc ! nuclide from which to find nu - real(8), intent(in) :: E ! energy of incoming neutron - real(8) :: nu ! number of delayed neutrons emitted per fission + type(Nuclide_CE) :: nuc ! nuclide from which to find nu + real(8), intent(in) :: E ! energy of incoming neutron + real(8) :: nu ! number of delayed neutrons emitted per fission if (nuc % nu_d_type == NU_NONE) then ! since no prompt or delayed data is present, this means all neutron @@ -113,7 +113,7 @@ contains function yield_delayed(nuc, E, g) result(yield) - type(Nuclide), intent(in) :: nuc ! nuclide from which to find nu + type(Nuclide_CE), pointer :: nuc ! nuclide from which to find nu real(8), intent(in) :: E ! energy of incoming neutron real(8) :: yield ! delayed neutron precursor yield integer, intent(in) :: g ! the delayed neutron precursor group diff --git a/src/global.F90 b/src/global.F90 index 98c3a6ed66..6ac5be3423 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -1,7 +1,5 @@ module global - use ace_header, only: Nuclide, SAlphaBeta, xsListing, NuclideMicroXS, & - MaterialMacroXS, Nuclide0K use bank_header, only: Bank use cmfd_header use constants @@ -9,7 +7,9 @@ module global use geometry_header, only: Cell, Universe, Lattice, LatticeContainer use material_header, only: Material use mesh_header, only: RegularMesh + use nuclide_header use plot_header, only: ObjectPlot + use sab_header, only: SAlphaBeta use set_header, only: SetInt use surface_header, only: SurfaceContainer use source_header, only: ExtSource @@ -66,7 +66,7 @@ module global ! CONTINUOUS-ENERGY CROSS SECTION RELATED VARIABLES ! Cross section arrays - type(Nuclide), allocatable, target :: nuclides(:) ! Nuclide cross-sections + type(Nuclide_CE), allocatable, target :: nuclides(:) ! Nuclide cross-sections type(SAlphaBeta), allocatable, target :: sab_tables(:) ! S(a,b) tables type(XsListing), allocatable, target :: xs_listings(:) ! cross_sections.xml listings diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 new file mode 100644 index 0000000000..47baf96e37 --- /dev/null +++ b/src/nuclide_header.F90 @@ -0,0 +1,248 @@ +module nuclide_header + + use ace_header + use constants + use list_header, only: ListInt + ! use math, only: calc_pn, calc_rn!, expand_harmonic + !use scattdata_header + ! use xml_interface + + implicit none + +!=============================================================================== +! NUCLIDE_BASE contains the base nuclidic data for a nuclide, which does not depend +! upon how the nuclear data is represented (i.e., CE, or any variant of MG). +! The extended types, Nuclide_CE and Nuclide_MG deal with the rest +!=============================================================================== + + type, abstract :: Nuclide_Base + character(12) :: name ! name of nuclide, e.g. 92235.03c + integer :: zaid ! Z and A identifier, e.g. 92235 + real(8) :: awr ! Atomic Weight Ratio + integer :: listing ! index in xs_listings + real(8) :: kT ! temperature in MeV (k*T) + + ! Linked list of indices in nuclides array of instances of this same nuclide + type(ListInt) :: nuc_list + + ! Fission information + logical :: fissionable ! nuclide is fissionable? + + contains + procedure(nuclide_base_clear_), deferred, pass :: clear ! Deallocates Nuclide + end type Nuclide_Base + + type, extends(Nuclide_Base) :: Nuclide_CE + ! Energy grid information + integer :: n_grid ! # of nuclide grid points + integer, allocatable :: grid_index(:) ! log grid mapping indices + real(8), allocatable :: energy(:) ! energy values corresponding to xs + + ! Microscopic cross sections + real(8), allocatable :: total(:) ! total cross section + real(8), allocatable :: elastic(:) ! elastic scattering + real(8), allocatable :: fission(:) ! fission + real(8), allocatable :: nu_fission(:) ! neutron production + real(8), allocatable :: absorption(:) ! absorption (MT > 100) + real(8), allocatable :: heating(:) ! heating + + ! Resonance scattering info + logical :: resonant = .false. ! resonant scatterer? + character(10) :: name_0K = '' ! name of 0K nuclide, e.g. 92235.00c + character(16) :: scheme ! target velocity sampling scheme + integer :: n_grid_0K ! number of 0K energy grid points + real(8), allocatable :: energy_0K(:) ! energy grid for 0K xs + real(8), allocatable :: elastic_0K(:) ! Microscopic elastic cross section + real(8), allocatable :: xs_cdf(:) ! CDF of v_rel times cross section + real(8) :: E_min ! lower cutoff energy for res scattering + real(8) :: E_max ! upper cutoff energy for res scattering + + ! Fission information + logical :: has_partial_fission ! nuclide has partial fission reactions? + integer :: n_fission ! # of fission reactions + integer, allocatable :: index_fission(:) ! indices in reactions + + ! Total fission neutron emission + integer :: nu_t_type + real(8), allocatable :: nu_t_data(:) + + ! Prompt fission neutron emission + integer :: nu_p_type + real(8), allocatable :: nu_p_data(:) + + ! Delayed fission neutron emission + integer :: nu_d_type + integer :: n_precursor ! # of delayed neutron precursors + real(8), allocatable :: nu_d_data(:) + real(8), allocatable :: nu_d_precursor_data(:) + type(DistEnergy), pointer :: nu_d_edist(:) => null() + + ! Unresolved resonance data + logical :: urr_present + integer :: urr_inelastic + type(UrrData), pointer :: urr_data => null() + + ! Reactions + integer :: n_reaction ! # of reactions + type(Reaction), pointer :: reactions(:) => null() + + ! Type-Bound procedures + contains + procedure, pass :: clear => nuclide_ce_clear + end type Nuclide_CE + +!=============================================================================== +! NUCLIDECONTAINER pointer array for storing Nuclides +!=============================================================================== + + type NuclideContainer + class(Nuclide_Base), pointer :: obj + end type NuclideContainer + +!=============================================================================== +! NUCLIDE0K temporarily contains all 0K cross section data and other parameters +! needed to treat resonance scattering before transferring them to NUCLIDE_CE +!=============================================================================== + + type Nuclide0K + + character(10) :: nuclide ! name of nuclide, e.g. U-238 + character(16) :: scheme = 'ares' ! target velocity sampling scheme + character(10) :: name ! name of nuclide, e.g. 92235.03c + character(10) :: name_0K ! name of 0K nuclide, e.g. 92235.00c + real(8) :: E_min = 0.01e-6_8 ! lower cutoff energy for res scattering + real(8) :: E_max = 1000.0e-6_8 ! upper cutoff energy for res scattering + + end type Nuclide0K + +!=============================================================================== +! NUCLIDEMICROXS contains cached microscopic cross sections for a +! particular nuclide at the current energy +!=============================================================================== + + type NuclideMicroXS + integer :: index_grid ! index on nuclide energy grid + integer :: index_temp ! temperature index for nuclide + real(8) :: last_E = ZERO ! last evaluated energy + real(8) :: interp_factor ! interpolation factor on nuc. energy grid + real(8) :: total ! microscropic total xs + real(8) :: elastic ! microscopic elastic scattering xs + real(8) :: absorption ! microscopic absorption xs + real(8) :: fission ! microscopic fission xs + real(8) :: nu_fission ! microscopic production xs + real(8) :: kappa_fission ! microscopic energy-released from fission + + ! Information for S(a,b) use + integer :: index_sab ! index in sab_tables (zero means no table) + integer :: last_index_sab = 0 ! index in sab_tables last used by this nuclide + real(8) :: elastic_sab ! microscopic elastic scattering on S(a,b) table + + ! Information for URR probability table use + logical :: use_ptable ! in URR range with probability tables? + real(8) :: last_prn + end type NuclideMicroXS + +!=============================================================================== +! MATERIALMACROXS contains cached macroscopic cross sections for the material a +! particle is traveling through +!=============================================================================== + + type MaterialMacroXS + real(8) :: total ! macroscopic total xs + real(8) :: elastic ! macroscopic elastic scattering xs + real(8) :: absorption ! macroscopic absorption xs + real(8) :: fission ! macroscopic fission xs + real(8) :: nu_fission ! macroscopic production xs + real(8) :: kappa_fission ! macroscopic energy-released from fission + end type MaterialMacroXS + +!=============================================================================== +! XSLISTING contains data read from a CE or MG cross_sections.xml file +! (or equivalent) +!=============================================================================== + + type XsListing + character(12) :: name ! table name, e.g. 92235.70c + character(12) :: alias ! table alias, e.g. U-235.70c + integer :: type ! type of table (cont-E neutron, S(A,b), etc) + integer :: zaid ! ZAID identifier = 1000*Z + A + integer :: filetype ! ASCII or BINARY + integer :: location ! location of table within library + integer :: recl ! record length for library + integer :: entries ! number of entries per record + real(8) :: awr ! atomic weight ratio (# of neutron masses) + real(8) :: kT ! Boltzmann constant * temperature (MeV) + logical :: metastable ! is this nuclide metastable? + character(MAX_FILE_LEN) :: path ! path to library containing table + end type XsListing + + contains + + +!=============================================================================== +! NUCLIDE_*_CLEAR resets and deallocates data in Nuclide_Base, Nuclide_Iso +! or Nuclide_Angle +!=============================================================================== + + subroutine nuclide_base_clear_(this) + + class(Nuclide_Base), intent(inout) :: this + + call this % nuc_list % clear() + end subroutine nuclide_base_clear_ + + subroutine nuclide_ce_clear(this) + + class(Nuclide_CE), intent(inout) :: this ! The Nuclide object to clear + + integer :: i ! Loop counter + + if (allocated(this % energy)) & + deallocate(this % energy, this % total, this % elastic, & + & this % fission, this % nu_fission, this % absorption) + + if (allocated(this % energy_0K)) & + deallocate(this % energy_0K) + + if (allocated(this % elastic_0K)) & + deallocate(this % elastic_0K) + + if (allocated(this % xs_cdf)) & + deallocate(this % xs_cdf) + + if (allocated(this % heating)) & + deallocate(this % heating) + + if (allocated(this % index_fission)) deallocate(this % index_fission) + + if (allocated(this % nu_t_data)) deallocate(this % nu_t_data) + if (allocated(this % nu_p_data)) deallocate(this % nu_p_data) + if (allocated(this % nu_d_data)) deallocate(this % nu_d_data) + + if (allocated(this % nu_d_precursor_data)) & + deallocate(this % nu_d_precursor_data) + + if (associated(this % nu_d_edist)) then + do i = 1, size(this % nu_d_edist) + call this % nu_d_edist(i) % clear() + end do + deallocate(this % nu_d_edist) + end if + + if (associated(this % urr_data)) then + call this % urr_data % clear() + deallocate(this % urr_data) + end if + + if (associated(this % reactions)) then + do i = 1, size(this % reactions) + call this % reactions(i) % clear() + end do + deallocate(this % reactions) + end if + + call nuclide_base_clear_(this) + + end subroutine nuclide_ce_clear + + end module nuclide_header \ No newline at end of file diff --git a/src/output.F90 b/src/output.F90 index 5bb90343c4..f933a2eb87 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -2,7 +2,7 @@ module output use, intrinsic :: ISO_FORTRAN_ENV - use ace_header, only: Nuclide, Reaction, UrrData + use ace_header, only: Reaction, UrrData use constants use endf, only: reaction_name use error, only: fatal_error, warning @@ -12,8 +12,10 @@ module output use math, only: t_percentile use mesh_header, only: RegularMesh use mesh, only: mesh_indices_to_bin, bin_to_mesh_indices + use nuclide_header use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use plot_header + use sab_header, only: SAlphaBeta use string, only: to_upper, to_str use tally_header, only: TallyObject @@ -326,7 +328,7 @@ contains subroutine print_nuclide(nuc, unit) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc integer, optional :: unit integer :: i ! loop index over nuclides @@ -531,8 +533,8 @@ contains integer :: i ! loop index integer :: unit_xs ! cross_sections.out file unit character(MAX_FILE_LEN) :: path ! path of summary file - type(Nuclide), pointer :: nuc => null() - type(SAlphaBeta), pointer :: sab => null() + type(Nuclide_CE), pointer :: nuc => null() + type(SAlphaBeta), pointer :: sab => null() ! Create filename for log file path = trim(path_output) // "cross_sections.out" diff --git a/src/physics.F90 b/src/physics.F90 index aae7027bae..b298fde9ce 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -1,6 +1,6 @@ module physics - use ace_header, only: Nuclide, Reaction, DistEnergy + use ace_header, only: Reaction, DistEnergy use constants use cross_section, only: elastic_xs_0K use endf, only: reaction_name @@ -11,6 +11,7 @@ module physics use material_header, only: Material use math, only: maxwell_spectrum, watt_spectrum use mesh, only: get_mesh_indices + use nuclide_header use output, only: write_message use particle_header, only: Particle_Base, Particle_CE, Particle_MG use particle_restart_write, only: write_particle_restart @@ -74,7 +75,7 @@ contains integer :: i_nuclide ! index in nuclides array integer :: i_reaction ! index in nuc % reactions array - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc i_nuclide = sample_nuclide(p, 'total ') @@ -193,7 +194,7 @@ contains real(8) :: f real(8) :: prob real(8) :: cutoff - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn ! Get pointer to nuclide @@ -310,7 +311,7 @@ contains real(8) :: f real(8) :: prob real(8) :: cutoff - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn ! Get pointer to nuclide and grid index/interpolation factor @@ -413,7 +414,7 @@ contains real(8) :: v_cm(3) ! velocity of center-of-mass real(8) :: v_t(3) ! velocity of target nucleus real(8) :: uvw_cm(3) ! directional cosines in center-of-mass - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc ! get pointer to nuclide nuc => nuclides(i_nuclide) @@ -738,7 +739,7 @@ contains subroutine sample_target_velocity(nuc, v_target, E, uvw, v_neut, wgt, xs_eff) - type(Nuclide), pointer :: nuc ! target nuclide at temperature T + type(Nuclide_CE), pointer :: nuc ! target nuclide at temperature T real(8), intent(out) :: v_target(3) ! target velocity real(8), intent(in) :: v_neut(3) ! neutron velocity @@ -985,7 +986,7 @@ contains subroutine sample_cxs_target_velocity(nuc, v_target, E, uvw) - type(Nuclide), pointer :: nuc ! target nuclide at temperature + type(Nuclide_CE), pointer :: nuc ! target nuclide at temperature real(8), intent(out) :: v_target(3) real(8), intent(in) :: E real(8), intent(in) :: uvw(3) @@ -1072,7 +1073,7 @@ contains real(8) :: phi ! fission neutron azimuthal angle real(8) :: weight ! weight adjustment for ufs method logical :: in_mesh ! source site in ufs mesh? - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn ! Get pointers @@ -1175,7 +1176,7 @@ contains function sample_fission_energy(nuc, rxn, p) result(E_out) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn class(Particle_Base), intent(inout) :: p ! Particle causing fission real(8) :: E_out ! outgoing E of fission neutron @@ -1304,7 +1305,7 @@ contains !=============================================================================== subroutine inelastic_scatter(nuc, rxn, p) - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn type(Particle_CE), intent(inout) :: p diff --git a/src/sab_header.F90 b/src/sab_header.F90 new file mode 100644 index 0000000000..99b5fb7843 --- /dev/null +++ b/src/sab_header.F90 @@ -0,0 +1,62 @@ +module sab_header + + use constants + + implicit none + +!=============================================================================== +! DISTENERGYSAB contains the secondary energy/angle distributions for inelastic +! thermal scattering collisions which utilize a continuous secondary energy +! representation. +!=============================================================================== + + type DistEnergySab + integer :: n_e_out + real(8), allocatable :: e_out(:) + real(8), allocatable :: e_out_pdf(:) + real(8), allocatable :: e_out_cdf(:) + real(8), allocatable :: mu(:,:) + end type DistEnergySab + +!=============================================================================== +! SALPHABETA contains S(a,b) data for thermal neutron scattering, typically off +! of light isotopes such as water, graphite, Be, etc +!=============================================================================== + + type SAlphaBeta + character(10) :: name ! name of table, e.g. lwtr.10t + real(8) :: awr ! weight of nucleus in neutron masses + real(8) :: kT ! temperature in MeV (k*T) + integer :: n_zaid ! Number of valid zaids + integer, allocatable :: zaid(:) ! List of valid Z and A identifiers, e.g. 6012 + + ! threshold for S(a,b) treatment (usually ~4 eV) + real(8) :: threshold_inelastic + real(8) :: threshold_elastic = ZERO + + ! Inelastic scattering data + integer :: n_inelastic_e_in ! # of incoming E for inelastic + integer :: n_inelastic_e_out ! # of outgoing E for inelastic + integer :: n_inelastic_mu ! # of outgoing angles for inelastic + integer :: secondary_mode ! secondary mode (equal/skewed/continuous) + real(8), allocatable :: inelastic_e_in(:) + real(8), allocatable :: inelastic_sigma(:) + ! The following are used only if secondary_mode is 0 or 1 + real(8), allocatable :: inelastic_e_out(:,:) + real(8), allocatable :: inelastic_mu(:,:,:) + ! The following is used only if secondary_mode is 3 + ! The different implementation is necessary because the continuous + ! representation has a variable number of outgoing energy points for each + ! incoming energy + type(DistEnergySab), allocatable :: inelastic_data(:) ! One for each Ein + + ! Elastic scattering data + integer :: elastic_mode ! elastic mode (discrete/exact) + integer :: n_elastic_e_in ! # of incoming E for elastic + integer :: n_elastic_mu ! # of outgoing angles for elastic + real(8), allocatable :: elastic_e_in(:) + real(8), allocatable :: elastic_P(:) + real(8), allocatable :: elastic_mu(:,:) + end type SAlphaBeta + +end module sab_header diff --git a/src/summary.F90 b/src/summary.F90 index f2c261ec75..0e5a591aa9 100644 --- a/src/summary.F90 +++ b/src/summary.F90 @@ -1,6 +1,6 @@ module summary - use ace_header, only: Reaction, UrrData, Nuclide + use ace_header, only: Reaction, UrrData use constants use endf, only: reaction_name use geometry_header, only: Cell, Universe, Lattice, RectLattice, & @@ -9,6 +9,7 @@ module summary use hdf5_interface use material_header, only: Material use mesh_header, only: RegularMesh + use nuclide_header use output, only: time_stamp use surface_header use string, only: to_str diff --git a/src/tally.F90 b/src/tally.F90 index 248f87c6a7..5336f69bda 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -68,7 +68,7 @@ contains real(8) :: uvw(3) ! particle direction type(Material), pointer :: mat type(Reaction), pointer :: rxn - type(Nuclide), pointer :: nuc + type(Nuclide_CE), pointer :: nuc i = 0 SCORE_LOOP: do q = 1, t % n_user_score_bins From 3310e84d0ae794a7db713cefc30ac706692ec0f0 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 30 Oct 2015 21:17:19 -0400 Subject: [PATCH 005/149] Separated string to simple_string and string; the former has no dependency on error which really reduces circular dependencies. Then, added ability to nuclide and salphabeta to print their own data. This will be useful when multiple nuclide types exist --- src/ace.F90 | 2 +- src/cmfd_data.F90 | 22 +-- src/cmfd_execute.F90 | 22 +-- src/cmfd_input.F90 | 6 +- src/eigenvalue.F90 | 16 +- src/endf.F90 | 2 +- src/geometry.F90 | 2 +- src/initialize.F90 | 3 +- src/input_xml.F90 | 4 +- src/interpolation.F90 | 8 +- src/nuclide_header.F90 | 135 +++++++++++++++- src/output.F90 | 206 +----------------------- src/particle_restart_write.F90 | 2 +- src/physics.F90 | 2 +- src/plot.F90 | 2 +- src/sab_header.F90 | 92 +++++++++++ src/simulation.F90 | 32 ++-- src/source.F90 | 2 +- src/state_point.F90 | 3 +- src/string.F90 | 281 +++------------------------------ src/summary.F90 | 2 +- src/tally.F90 | 2 +- src/track_output.F90 | 2 +- src/tracking.F90 | 2 +- src/trigger.F90 | 2 +- 25 files changed, 324 insertions(+), 530 deletions(-) diff --git a/src/ace.F90 b/src/ace.F90 index a93f722958..729b78b323 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -12,7 +12,7 @@ module ace use output, only: write_message use sab_header, only: SAlphaBeta use set_header, only: SetChar - use string, only: to_str, to_lower + use simple_string, only: to_str, to_lower implicit none diff --git a/src/cmfd_data.F90 b/src/cmfd_data.F90 index 19fe395728..b624e839d7 100644 --- a/src/cmfd_data.F90 +++ b/src/cmfd_data.F90 @@ -49,17 +49,17 @@ contains subroutine compute_xs() - use constants, only: FILTER_MESH, FILTER_ENERGYIN, FILTER_ENERGYOUT, & + use constants, only: FILTER_MESH, FILTER_ENERGYIN, FILTER_ENERGYOUT, & FILTER_SURFACE, IN_RIGHT, OUT_RIGHT, IN_FRONT, & OUT_FRONT, IN_TOP, OUT_TOP, CMFD_NOACCEL, ZERO, & ONE, TINY_BIT - use error, only: fatal_error - use global, only: cmfd, n_cmfd_tallies, cmfd_tallies, meshes,& + use error, only: fatal_error + use global, only: cmfd, n_cmfd_tallies, cmfd_tallies, meshes,& matching_bins - use mesh, only: mesh_indices_to_bin - use mesh_header, only: RegularMesh - use string, only: to_str - use tally_header, only: TallyObject + use mesh, only: mesh_indices_to_bin + use mesh_header, only: RegularMesh + use simple_string, only: to_str + use tally_header, only: TallyObject integer :: nx ! number of mesh cells in x direction integer :: ny ! number of mesh cells in y direction @@ -625,10 +625,10 @@ contains subroutine compute_dhat() - use constants, only: CMFD_NOACCEL, ZERO - use global, only: cmfd, cmfd_coremap, dhat_reset - use output, only: write_message - use string, only: to_str + use constants, only: CMFD_NOACCEL, ZERO + use global, only: cmfd, cmfd_coremap, dhat_reset + use output, only: write_message + use simple_string, only: to_str integer :: nx ! maximum number of cells in x direction integer :: ny ! maximum number of cells in y direction diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90 index 4dfe99d770..af6991e47d 100644 --- a/src/cmfd_execute.F90 +++ b/src/cmfd_execute.F90 @@ -89,9 +89,9 @@ contains subroutine calc_fission_source() - use constants, only: CMFD_NOACCEL, ZERO, TWO - use global, only: cmfd, cmfd_coremap, master, entropy_on, current_batch - use string, only: to_str + use constants, only: CMFD_NOACCEL, ZERO, TWO + use global, only: cmfd, cmfd_coremap, master, entropy_on, current_batch + use simple_string, only: to_str #ifdef MPI use global, only: mpi_err @@ -213,14 +213,14 @@ contains subroutine cmfd_reweight(new_weights) - use constants, only: ZERO, ONE - use error, only: warning, fatal_error - use global, only: meshes, source_bank, work, n_user_meshes, cmfd, & - master - use mesh_header, only: RegularMesh - use mesh, only: count_bank_sites, get_mesh_indices - use search, only: binary_search - use string, only: to_str + use constants, only: ZERO, ONE + use error, only: warning, fatal_error + use global, only: meshes, source_bank, work, n_user_meshes, cmfd, & + master + use mesh_header, only: RegularMesh + use mesh, only: count_bank_sites, get_mesh_indices + use search, only: binary_search + use simple_string, only: to_str #ifdef MPI use global, only: mpi_err diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index dac74c9c39..c15c250e64 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -45,10 +45,10 @@ contains subroutine read_cmfd_xml() use constants, only: ZERO, ONE - use error, only: fatal_error, warning + use error, only: fatal_error, warning use global - use output, only: write_message - use string, only: to_lower + use output, only: write_message + use simple_string, only: to_lower use xml_interface use, intrinsic :: ISO_FORTRAN_ENV diff --git a/src/eigenvalue.F90 b/src/eigenvalue.F90 index 50d6cabc5e..83f8989cc0 100644 --- a/src/eigenvalue.F90 +++ b/src/eigenvalue.F90 @@ -4,16 +4,16 @@ module eigenvalue use message_passing #endif - use constants, only: ZERO - use error, only: fatal_error, warning + use constants, only: ZERO + use error, only: fatal_error, warning use global - use math, only: t_percentile - use mesh, only: count_bank_sites - use mesh_header, only: RegularMesh + use math, only: t_percentile + use mesh, only: count_bank_sites + use mesh_header, only: RegularMesh ! use particle_header, only: Particle_Base - use random_lcg, only: prn, set_particle_seed, prn_skip - use search, only: binary_search - use string, only: to_str + use random_lcg, only: prn, set_particle_seed, prn_skip + use search, only: binary_search + use simple_string, only: to_str implicit none diff --git a/src/endf.F90 b/src/endf.F90 index fb85262b20..6251e989c6 100644 --- a/src/endf.F90 +++ b/src/endf.F90 @@ -1,7 +1,7 @@ module endf use constants - use string, only: to_str + use simple_string, only: to_str implicit none diff --git a/src/geometry.F90 b/src/geometry.F90 index e3058d6e00..ee23a4e36e 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -10,7 +10,7 @@ module geometry Particle_MG use particle_restart_write, only: write_particle_restart use surface_header - use string, only: to_str + use simple_string, only: to_str use tally, only: score_surface_current implicit none diff --git a/src/initialize.F90 b/src/initialize.F90 index 9d63eb4e93..44ec98a882 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -21,7 +21,8 @@ module initialize print_usage, write_xs_summary, print_plot use random_lcg, only: initialize_prng use state_point, only: load_state_point - use string, only: to_str, str_to_int, starts_with, ends_with + use simple_string, only: to_str, starts_with, ends_with + use string, only: str_to_int use summary, only: write_summary use tally_header, only: TallyObject, TallyResult, TallyFilter use tally_initialize, only: configure_tallies diff --git a/src/input_xml.F90 b/src/input_xml.F90 index dda1b90837..a9c5a8e221 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -14,8 +14,8 @@ module input_xml use random_lcg, only: prn use surface_header use stl_vector, only: VectorInt - use string, only: to_lower, to_str, str_to_int, str_to_real, & - starts_with, ends_with, tokenize + use simple_string, only: to_lower, to_str, starts_with, ends_with + use string, only: str_to_int, str_to_real, tokenize use tally_header, only: TallyObject, TallyFilter use tally_initialize, only: add_tallies use xml_interface diff --git a/src/interpolation.F90 b/src/interpolation.F90 index 5c44ed7c3d..03561ba13b 100644 --- a/src/interpolation.F90 +++ b/src/interpolation.F90 @@ -1,10 +1,10 @@ module interpolation use constants - use endf_header, only: Tab1 - use error, only: fatal_error - use search, only: binary_search - use string, only: to_str + use endf_header, only: Tab1 + use error, only: fatal_error + use search, only: binary_search + use simple_string, only: to_str implicit none diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 47baf96e37..cd83402a07 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -1,10 +1,14 @@ module nuclide_header + use, intrinsic :: ISO_FORTRAN_ENV + use ace_header use constants - use list_header, only: ListInt + use endf, only: reaction_name + use list_header, only: ListInt ! use math, only: calc_pn, calc_rn!, expand_harmonic !use scattdata_header + use simple_string ! use xml_interface implicit none @@ -30,8 +34,18 @@ module nuclide_header contains procedure(nuclide_base_clear_), deferred, pass :: clear ! Deallocates Nuclide + procedure(print_nuclide_), deferred, pass :: print ! Writes nuclide info end type Nuclide_Base + abstract interface + subroutine print_nuclide_(this, unit) + import Nuclide_Base + class(Nuclide_Base),intent(in) :: this + integer, optional, intent(in) :: unit + end subroutine print_nuclide_ + + end interface + type, extends(Nuclide_Base) :: Nuclide_CE ! Energy grid information integer :: n_grid ! # of nuclide grid points @@ -89,6 +103,7 @@ module nuclide_header ! Type-Bound procedures contains procedure, pass :: clear => nuclide_ce_clear + procedure, pass :: print => nuclide_ce_print end type Nuclide_CE !=============================================================================== @@ -245,4 +260,122 @@ module nuclide_header end subroutine nuclide_ce_clear +!=============================================================================== +! PRINT_NUCLIDE_* displays information about a continuous-energy neutron +! cross_section table and its reactions and secondary angle/energy distributions +!=============================================================================== + + subroutine nuclide_ce_print(this, unit) + + class(Nuclide_CE), intent(in) :: this + integer, optional, intent(in) :: unit + + integer :: i ! loop index over nuclides + integer :: unit_ ! unit to write to + integer :: size_total ! memory used by nuclide (bytes) + integer :: size_angle_total ! total memory used for angle dist. (bytes) + integer :: size_energy_total ! total memory used for energy dist. (bytes) + integer :: size_xs ! memory used for cross-sections (bytes) + integer :: size_angle ! memory used for an angle distribution (bytes) + integer :: size_energy ! memory used for a energy distributions (bytes) + integer :: size_urr ! memory used for probability tables (bytes) + character(11) :: law ! secondary energy distribution law + type(Reaction), pointer :: rxn => null() + type(UrrData), pointer :: urr => null() + + ! set default unit for writing information + if (present(unit)) then + unit_ = unit + else + unit_ = OUTPUT_UNIT + end if + + ! Initialize totals + size_angle_total = 0 + size_energy_total = 0 + size_urr = 0 + size_xs = 0 + + ! Basic nuclide information + write(unit_,*) 'Nuclide ' // trim(this % name) + write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + write(unit_,*) ' kT = ' // trim(to_str(this % kT)) + write(unit_,*) ' # of grid points = ' // trim(to_str(this % n_grid)) + write(unit_,*) ' Fissionable = ', this % fissionable + write(unit_,*) ' # of fission reactions = ' // trim(to_str(this % n_fission)) + write(unit_,*) ' # of reactions = ' // trim(to_str(this % n_reaction)) + + ! Information on each reaction + write(unit_,*) ' Reaction Q-value COM Law IE size(angle) size(energy)' + do i = 1, this % n_reaction + rxn => this % reactions(i) + + ! Determine size of angle distribution + if (rxn % has_angle_dist) then + size_angle = rxn % adist % n_energy * 16 + size(rxn % adist % data) * 8 + else + size_angle = 0 + end if + + ! Determine size of energy distribution and law + if (rxn % has_energy_dist) then + size_energy = size(rxn % edist % data) * 8 + law = to_str(rxn % edist % law) + else + size_energy = 0 + law = 'None' + end if + + write(unit_,'(3X,A11,1X,F8.3,3X,L1,3X,A4,1X,I6,1X,I11,1X,I11)') & + reaction_name(rxn % MT), rxn % Q_value, rxn % scatter_in_cm, & + law(1:4), rxn % threshold, size_angle, size_energy + + ! Accumulate data size + size_xs = size_xs + (this % n_grid - rxn%threshold + 1) * 8 + size_angle_total = size_angle_total + size_angle + size_energy_total = size_energy_total + size_energy + end do + + ! Add memory required for summary reactions (total, absorption, fission, + ! nu-fission) + size_xs = 8 * this % n_grid * 4 + + ! Write information about URR probability tables + size_urr = 0 + if (this % urr_present) then + urr => this % urr_data + write(unit_,*) ' Unresolved resonance probability table:' + write(unit_,*) ' # of energies = ' // trim(to_str(urr % n_energy)) + write(unit_,*) ' # of probabilities = ' // trim(to_str(urr % n_prob)) + write(unit_,*) ' Interpolation = ' // trim(to_str(urr % interp)) + write(unit_,*) ' Inelastic flag = ' // trim(to_str(urr % inelastic_flag)) + write(unit_,*) ' Absorption flag = ' // trim(to_str(urr % absorption_flag)) + write(unit_,*) ' Multiply by smooth? ', urr % multiply_smooth + write(unit_,*) ' Min energy = ', trim(to_str(urr % energy(1))) + write(unit_,*) ' Max energy = ', trim(to_str(urr % energy(urr % n_energy))) + + ! Calculate memory used by probability tables and add to total + size_urr = urr % n_energy * (urr % n_prob * 6 + 1) * 8 + end if + + ! Calculate total memory + size_total = size_xs + size_angle_total + size_energy_total + size_urr + + ! Write memory used + write(unit_,*) ' Memory Requirements' + write(unit_,*) ' Cross sections = ' // trim(to_str(size_xs)) // ' bytes' + write(unit_,*) ' Secondary angle distributions = ' // & + trim(to_str(size_angle_total)) // ' bytes' + write(unit_,*) ' Secondary energy distributions = ' // & + trim(to_str(size_energy_total)) // ' bytes' + write(unit_,*) ' Probability Tables = ' // & + trim(to_str(size_urr)) // ' bytes' + write(unit_,*) ' Total = ' // trim(to_str(size_total)) // ' bytes' + + ! Blank line at end of nuclide + write(unit_,*) + + end subroutine nuclide_ce_print + end module nuclide_header \ No newline at end of file diff --git a/src/output.F90 b/src/output.F90 index f933a2eb87..3dba183148 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -16,7 +16,7 @@ module output use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use plot_header use sab_header, only: SAlphaBeta - use string, only: to_upper, to_str + use simple_string, only: to_upper, to_str use tally_header, only: TallyObject implicit none @@ -321,206 +321,6 @@ contains end subroutine print_particle -!=============================================================================== -! PRINT_NUCLIDE displays information about a continuous-energy neutron -! cross_section table and its reactions and secondary angle/energy distributions -!=============================================================================== - - subroutine print_nuclide(nuc, unit) - - type(Nuclide_CE), pointer :: nuc - integer, optional :: unit - - integer :: i ! loop index over nuclides - integer :: unit_ ! unit to write to - integer :: size_total ! memory used by nuclide (bytes) - integer :: size_angle_total ! total memory used for angle dist. (bytes) - integer :: size_energy_total ! total memory used for energy dist. (bytes) - integer :: size_xs ! memory used for cross-sections (bytes) - integer :: size_angle ! memory used for an angle distribution (bytes) - integer :: size_energy ! memory used for a energy distributions (bytes) - integer :: size_urr ! memory used for probability tables (bytes) - character(11) :: law ! secondary energy distribution law - type(Reaction), pointer :: rxn => null() - type(UrrData), pointer :: urr => null() - - ! set default unit for writing information - if (present(unit)) then - unit_ = unit - else - unit_ = OUTPUT_UNIT - end if - - ! Initialize totals - size_angle_total = 0 - size_energy_total = 0 - size_urr = 0 - size_xs = 0 - - ! Basic nuclide information - write(unit_,*) 'Nuclide ' // trim(nuc % name) - write(unit_,*) ' zaid = ' // trim(to_str(nuc % zaid)) - write(unit_,*) ' awr = ' // trim(to_str(nuc % awr)) - write(unit_,*) ' kT = ' // trim(to_str(nuc % kT)) - write(unit_,*) ' # of grid points = ' // trim(to_str(nuc % n_grid)) - write(unit_,*) ' Fissionable = ', nuc % fissionable - write(unit_,*) ' # of fission reactions = ' // trim(to_str(nuc % n_fission)) - write(unit_,*) ' # of reactions = ' // trim(to_str(nuc % n_reaction)) - - ! Information on each reaction - write(unit_,*) ' Reaction Q-value COM Law IE size(angle) size(energy)' - do i = 1, nuc % n_reaction - rxn => nuc % reactions(i) - - ! Determine size of angle distribution - if (rxn % has_angle_dist) then - size_angle = rxn % adist % n_energy * 16 + size(rxn % adist % data) * 8 - else - size_angle = 0 - end if - - ! Determine size of energy distribution and law - if (rxn % has_energy_dist) then - size_energy = size(rxn % edist % data) * 8 - law = to_str(rxn % edist % law) - else - size_energy = 0 - law = 'None' - end if - - write(unit_,'(3X,A11,1X,F8.3,3X,L1,3X,A4,1X,I6,1X,I11,1X,I11)') & - reaction_name(rxn % MT), rxn % Q_value, rxn % scatter_in_cm, & - law(1:4), rxn % threshold, size_angle, size_energy - - ! Accumulate data size - size_xs = size_xs + (nuc % n_grid - rxn%threshold + 1) * 8 - size_angle_total = size_angle_total + size_angle - size_energy_total = size_energy_total + size_energy - end do - - ! Add memory required for summary reactions (total, absorption, fission, - ! nu-fission) - size_xs = 8 * nuc % n_grid * 4 - - ! Write information about URR probability tables - size_urr = 0 - if (nuc % urr_present) then - urr => nuc % urr_data - write(unit_,*) ' Unresolved resonance probability table:' - write(unit_,*) ' # of energies = ' // trim(to_str(urr % n_energy)) - write(unit_,*) ' # of probabilities = ' // trim(to_str(urr % n_prob)) - write(unit_,*) ' Interpolation = ' // trim(to_str(urr % interp)) - write(unit_,*) ' Inelastic flag = ' // trim(to_str(urr % inelastic_flag)) - write(unit_,*) ' Absorption flag = ' // trim(to_str(urr % absorption_flag)) - write(unit_,*) ' Multiply by smooth? ', urr % multiply_smooth - write(unit_,*) ' Min energy = ', trim(to_str(urr % energy(1))) - write(unit_,*) ' Max energy = ', trim(to_str(urr % energy(urr % n_energy))) - - ! Calculate memory used by probability tables and add to total - size_urr = urr % n_energy * (urr % n_prob * 6 + 1) * 8 - end if - - ! Calculate total memory - size_total = size_xs + size_angle_total + size_energy_total + size_urr - - ! Write memory used - write(unit_,*) ' Memory Requirements' - write(unit_,*) ' Cross sections = ' // trim(to_str(size_xs)) // ' bytes' - write(unit_,*) ' Secondary angle distributions = ' // & - trim(to_str(size_angle_total)) // ' bytes' - write(unit_,*) ' Secondary energy distributions = ' // & - trim(to_str(size_energy_total)) // ' bytes' - write(unit_,*) ' Probability Tables = ' // & - trim(to_str(size_urr)) // ' bytes' - write(unit_,*) ' Total = ' // trim(to_str(size_total)) // ' bytes' - - ! Blank line at end of nuclide - write(unit_,*) - - end subroutine print_nuclide - -!=============================================================================== -! PRINT_SAB_TABLE displays information about a S(a,b) table containing data -! describing thermal scattering from bound materials such as hydrogen in water. -!=============================================================================== - - subroutine print_sab_table(sab, unit) - - type(SAlphaBeta), pointer :: sab - integer, optional :: unit - - integer :: size_sab ! memory used by S(a,b) table - integer :: unit_ ! unit to write to - integer :: i ! Loop counter for parsing through sab % zaid - integer :: char_count ! Counter for the number of characters on a line - - ! set default unit for writing information - if (present(unit)) then - unit_ = unit - else - unit_ = OUTPUT_UNIT - end if - - ! Basic S(a,b) table information - write(unit_,*) 'S(a,b) Table ' // trim(sab % name) - write(unit_,'(A)',advance="no") ' zaids = ' - ! Initialize the counter based on the above string - char_count = 11 - do i = 1, sab % n_zaid - ! Deal with a line thats too long - if (char_count >= 73) then ! 73 = 80 - (5 ZAID chars + 1 space + 1 comma) - ! End the line - write(unit_,*) "" - ! Add 11 leading blanks - write(unit_,'(A)', advance="no") " " - ! reset the counter to 11 - char_count = 11 - end if - if (i < sab % n_zaid) then - ! Include a comma - write(unit_,'(A)',advance="no") trim(to_str(sab % zaid(i))) // ", " - char_count = char_count + len(trim(to_str(sab % zaid(i)))) + 2 - else - ! Don't include a comma, since we are all done - write(unit_,'(A)',advance="no") trim(to_str(sab % zaid(i))) - end if - - end do - write(unit_,*) "" ! Move to next line - write(unit_,*) ' awr = ' // trim(to_str(sab % awr)) - write(unit_,*) ' kT = ' // trim(to_str(sab % kT)) - - ! Inelastic data - write(unit_,*) ' # of Incoming Energies (Inelastic) = ' // & - trim(to_str(sab % n_inelastic_e_in)) - write(unit_,*) ' # of Outgoing Energies (Inelastic) = ' // & - trim(to_str(sab % n_inelastic_e_out)) - write(unit_,*) ' # of Outgoing Angles (Inelastic) = ' // & - trim(to_str(sab % n_inelastic_mu)) - write(unit_,*) ' Threshold for Inelastic = ' // & - trim(to_str(sab % threshold_inelastic)) - - ! Elastic data - if (sab % n_elastic_e_in > 0) then - write(unit_,*) ' # of Incoming Energies (Elastic) = ' // & - trim(to_str(sab % n_elastic_e_in)) - write(unit_,*) ' # of Outgoing Angles (Elastic) = ' // & - trim(to_str(sab % n_elastic_mu)) - write(unit_,*) ' Threshold for Elastic = ' // & - trim(to_str(sab % threshold_elastic)) - end if - - ! Determine memory used by S(a,b) table and write out - size_sab = 8 * (sab % n_inelastic_e_in * (2 + sab % n_inelastic_e_out * & - (1 + sab % n_inelastic_mu)) + sab % n_elastic_e_in * & - (2 + sab % n_elastic_mu)) - write(unit_,*) ' Memory Used = ' // trim(to_str(size_sab)) // ' bytes' - - ! Blank line at end - write(unit_,*) - - end subroutine print_sab_table - !=============================================================================== ! WRITE_XS_SUMMARY writes information about each nuclide and S(a,b) table to a ! file called cross_sections.out. This file shows the list of reactions as well @@ -550,7 +350,7 @@ contains nuc => nuclides(i) ! Print information about nuclide - call print_nuclide(nuc, unit=unit_xs) + call nuc % print(unit=unit_xs) end do NUCLIDE_LOOP SAB_TABLES_LOOP: do i = 1, n_sab_tables @@ -558,7 +358,7 @@ contains sab => sab_tables(i) ! Print information about S(a,b) table - call print_sab_table(sab, unit=unit_xs) + call sab % print(unit=unit_xs) end do SAB_TABLES_LOOP ! Close cross section summary file diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index 9dff7e5f3b..a7341d71ec 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -4,7 +4,7 @@ module particle_restart_write use global use hdf5_interface use particle_header, only: Particle_Base - use string, only: to_str + use simple_string, only: to_str use hdf5 diff --git a/src/physics.F90 b/src/physics.F90 index b298fde9ce..a24ab8de4d 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -17,7 +17,7 @@ module physics use particle_restart_write, only: write_particle_restart use random_lcg, only: prn use search, only: binary_search - use string, only: to_str + use simple_string, only: to_str implicit none diff --git a/src/plot.F90 b/src/plot.F90 index 6ac2da2c14..e46742ea1a 100644 --- a/src/plot.F90 +++ b/src/plot.F90 @@ -14,7 +14,7 @@ module plot use ppmlib, only: Image, init_image, allocate_image, & deallocate_image, set_pixel use progress_header, only: ProgressBar - use string, only: to_str + use simple_string, only: to_str use hdf5 diff --git a/src/sab_header.F90 b/src/sab_header.F90 index 99b5fb7843..a70a280cfb 100644 --- a/src/sab_header.F90 +++ b/src/sab_header.F90 @@ -1,6 +1,9 @@ module sab_header + use, intrinsic :: ISO_FORTRAN_ENV + use constants + use simple_string, only: to_str implicit none @@ -57,6 +60,95 @@ module sab_header real(8), allocatable :: elastic_e_in(:) real(8), allocatable :: elastic_P(:) real(8), allocatable :: elastic_mu(:,:) + contains + procedure, pass :: print => print_sab_table end type SAlphaBeta + contains + + +!=============================================================================== +! PRINT_SAB_TABLE displays information about a S(a,b) table containing data +! describing thermal scattering from bound materials such as hydrogen in water. +!=============================================================================== + + subroutine print_sab_table(this, unit) + + class(SAlphaBeta), intent(in) :: this + integer, optional, intent(in) :: unit + + integer :: size_sab ! memory used by S(a,b) table + integer :: unit_ ! unit to write to + integer :: i ! Loop counter for parsing through sab % zaid + integer :: char_count ! Counter for the number of characters on a line + + ! set default unit for writing information + if (present(unit)) then + unit_ = unit + else + unit_ = OUTPUT_UNIT + end if + + ! Basic S(a,b) table information + write(unit_,*) 'S(a,b) Table ' // trim(this % name) + write(unit_,'(A)',advance="no") ' zaids = ' + ! Initialize the counter based on the above string + char_count = 11 + do i = 1, this % n_zaid + ! Deal with a line thats too long + if (char_count >= 73) then ! 73 = 80 - (5 ZAID chars + 1 space + 1 comma) + ! End the line + write(unit_,*) "" + ! Add 11 leading blanks + write(unit_,'(A)', advance="no") " " + ! reset the counter to 11 + char_count = 11 + end if + if (i < this % n_zaid) then + ! Include a comma + write(unit_,'(A)',advance="no") trim(to_str(this % zaid(i))) // ", " + char_count = char_count + len(trim(to_str(this % zaid(i)))) + 2 + else + ! Don't include a comma, since we are all done + write(unit_,'(A)',advance="no") trim(to_str(this % zaid(i))) + end if + + end do + write(unit_,*) "" ! Move to next line + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + write(unit_,*) ' kT = ' // trim(to_str(this % kT)) + + ! Inelastic data + write(unit_,*) ' # of Incoming Energies (Inelastic) = ' // & + trim(to_str(this % n_inelastic_e_in)) + write(unit_,*) ' # of Outgoing Energies (Inelastic) = ' // & + trim(to_str(this % n_inelastic_e_out)) + write(unit_,*) ' # of Outgoing Angles (Inelastic) = ' // & + trim(to_str(this % n_inelastic_mu)) + write(unit_,*) ' Threshold for Inelastic = ' // & + trim(to_str(this % threshold_inelastic)) + + ! Elastic data + if (this % n_elastic_e_in > 0) then + write(unit_,*) ' # of Incoming Energies (Elastic) = ' // & + trim(to_str(this % n_elastic_e_in)) + write(unit_,*) ' # of Outgoing Angles (Elastic) = ' // & + trim(to_str(this % n_elastic_mu)) + write(unit_,*) ' Threshold for Elastic = ' // & + trim(to_str(this % threshold_elastic)) + end if + + ! Determine memory used by S(a,b) table and write out + size_sab = 8 * (this % n_inelastic_e_in * (2 + this % n_inelastic_e_out * & + (1 + this % n_inelastic_mu)) + this % n_elastic_e_in * & + (2 + this % n_elastic_mu)) + write(unit_,*) ' Memory Used = ' // trim(to_str(size_sab)) // ' bytes' + + ! Blank line at end + write(unit_,*) + + end subroutine print_sab_table + + + end module sab_header diff --git a/src/simulation.F90 b/src/simulation.F90 index a674a18df4..c31b1d6fa7 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -4,26 +4,26 @@ module simulation use mpi #endif - use cmfd_execute, only: cmfd_init_batch, execute_cmfd - use constants, only: ZERO - use eigenvalue, only: count_source_for_ufs, calculate_average_keff, & - calculate_combined_keff, calculate_generation_keff, & - shannon_entropy, synchronize_bank, keff_generation + use cmfd_execute, only: cmfd_init_batch, execute_cmfd + use constants, only: ZERO + use eigenvalue, only: count_source_for_ufs, calculate_average_keff, & + calculate_combined_keff, calculate_generation_keff, & + shannon_entropy, synchronize_bank, keff_generation #ifdef _OPENMP - use eigenvalue, only: join_bank_from_threads + use eigenvalue, only: join_bank_from_threads #endif use global - use output, only: write_message, header, print_columns, & - print_batch_keff, print_generation + use output, only: write_message, header, print_columns, & + print_batch_keff, print_generation use particle_header, only: Particle_Base - use random_lcg, only: set_particle_seed - use source, only: initialize_source - use state_point, only: write_state_point, write_source_point - use string, only: to_str - use tally, only: synchronize_tallies, setup_active_usertallies, & - reset_result - use trigger, only: check_triggers - use tracking, only: transport + use random_lcg, only: set_particle_seed + use source, only: initialize_source + use state_point, only: write_state_point, write_source_point + use simple_string, only: to_str + use tally, only: synchronize_tallies, setup_active_usertallies, & + reset_result + use trigger, only: check_triggers + use tracking, only: transport implicit none private diff --git a/src/source.F90 b/src/source.F90 index e8cb420083..b83bf766e6 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -12,7 +12,7 @@ module source use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: prn, set_particle_seed, prn_set_stream use state_point, only: read_source_bank, write_source_bank - use string, only: to_str + use simple_string, only: to_str #ifdef MPI use message_passing diff --git a/src/state_point.F90 b/src/state_point.F90 index 046e7e6669..7a414f4574 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -18,7 +18,8 @@ module state_point use global use hdf5_interface use output, only: write_message, time_stamp - use string, only: to_str, zero_padded, count_digits + use simple_string, only: to_str, count_digits + use string, only: zero_padded use tally_header, only: TallyObject use mesh_header, only: RegularMesh use dict_header, only: ElemKeyValueII, ElemKeyValueCI diff --git a/src/string.F90 b/src/string.F90 index 45db59c875..3fbc9e1d79 100644 --- a/src/string.F90 +++ b/src/string.F90 @@ -1,17 +1,14 @@ module string - use constants, only: MAX_WORDS, MAX_LINE_LEN, ERROR_INT, ERROR_REAL, & - OP_LEFT_PAREN, OP_RIGHT_PAREN, OP_COMPLEMENT, OP_INTERSECTION, OP_UNION - use error, only: fatal_error, warning - use global, only: master + use constants, only: MAX_WORDS, MAX_LINE_LEN, ERROR_INT, ERROR_REAL, & + OP_LEFT_PAREN, OP_RIGHT_PAREN, OP_COMPLEMENT, & + OP_INTERSECTION, OP_UNION + use error, only: fatal_error, warning + use global, only: master use stl_vector, only: VectorInt implicit none - interface to_str - module procedure int4_to_str, int8_to_str, real_to_str - end interface - contains !=============================================================================== @@ -182,51 +179,7 @@ contains end function concatenate -!=============================================================================== -! TO_LOWER converts a string to all lower case characters -!=============================================================================== - function to_lower(word) result(word_lower) - - character(*), intent(in) :: word - character(len=len(word)) :: word_lower - - integer :: i - integer :: ic - - do i = 1, len(word) - ic = ichar(word(i:i)) - if (ic >= 65 .and. ic <= 90) then - word_lower(i:i) = char(ic+32) - else - word_lower(i:i) = word(i:i) - end if - end do - - end function to_lower - -!=============================================================================== -! TO_UPPER converts a string to all upper case characters -!=============================================================================== - - function to_upper(word) result(word_upper) - - character(*), intent(in) :: word - character(len=len(word)) :: word_upper - - integer :: i - integer :: ic - - do i = 1, len(word) - ic = ichar(word(i:i)) - if (ic >= 97 .and. ic <= 122) then - word_upper(i:i) = char(ic-32) - else - word_upper(i:i) = word(i:i) - end if - end do - - end function to_upper !=============================================================================== ! ZERO_PADDED returns a string of the input integer padded with zeros to the @@ -234,163 +187,32 @@ contains ! integers. !=============================================================================== -function zero_padded(num, n_digits) result(str) - integer, intent(in) :: num - integer, intent(in) :: n_digits - character(11) :: str + function zero_padded(num, n_digits) result(str) + integer, intent(in) :: num + integer, intent(in) :: n_digits + character(11) :: str - character(8) :: zp_form + character(8) :: zp_form - ! Make sure n_digits is reasonable. 10 digits is the maximum needed for the - ! largest integer(4). - if (n_digits > 10) then - call fatal_error('zero_padded called with an unreasonably large & - &n_digits (>10)') - end if - - ! Write a format string of the form '(In.m)' where n is the max width and - ! m is the min width. If a sign is present, then n must be one greater - ! than m. - if (num < 0) then - write(zp_form, '("(I", I0, ".", I0, ")")') n_digits+1, n_digits - else - write(zp_form, '("(I", I0, ".", I0, ")")') n_digits, n_digits - end if - - ! Format the number. - write(str, zp_form) num -end function zero_padded - -!=============================================================================== -! IS_NUMBER determines whether a string of characters is all 0-9 characters -!=============================================================================== - - function is_number(word) result(number) - - character(*), intent(in) :: word - logical :: number - - integer :: i - integer :: ic - - number = .true. - do i = 1, len_trim(word) - ic = ichar(word(i:i)) - if (ic < 48 .or. ic >= 58) number = .false. - end do - - end function is_number - -!=============================================================================== -! STARTS_WITH determines whether a string starts with a certain -! sequence of characters -!=============================================================================== - - logical function starts_with(str, seq) - - character(*) :: str ! string to check - character(*) :: seq ! sequence of characters - - integer :: i - integer :: i_start - integer :: str_len - integer :: seq_len - - str_len = len_trim(str) - seq_len = len_trim(seq) - - ! determine how many spaces are at beginning of string - i_start = 0 - do i = 1, str_len - if (str(i:i) == ' ' .or. str(i:i) == achar(9)) cycle - i_start = i - exit - end do - - ! Check if string starts with sequence using INDEX intrinsic - if (index(str(1:str_len), seq(1:seq_len)) == i_start) then - starts_with = .true. - else - starts_with = .false. + ! Make sure n_digits is reasonable. 10 digits is the maximum needed for the + ! largest integer(4). + if (n_digits > 10) then + call fatal_error('zero_padded called with an unreasonably large & + &n_digits (>10)') end if - end function starts_with - -!=============================================================================== -! ENDS_WITH determines whether a string ends with a certain sequence -! of characters -!=============================================================================== - - logical function ends_with(str, seq) - - character(*) :: str ! string to check - character(*) :: seq ! sequence of characters - - integer :: i_start - integer :: str_len - integer :: seq_len - - str_len = len_trim(str) - seq_len = len_trim(seq) - - ! determine how many spaces are at beginning of string - i_start = str_len - seq_len + 1 - - ! Check if string starts with sequence using INDEX intrinsic - if (index(str(1:str_len), seq(1:seq_len), .true.) == i_start) then - ends_with = .true. + ! Write a format string of the form '(In.m)' where n is the max width and + ! m is the min width. If a sign is present, then n must be one greater + ! than m. + if (num < 0) then + write(zp_form, '("(I", I0, ".", I0, ")")') n_digits+1, n_digits else - ends_with = .false. + write(zp_form, '("(I", I0, ".", I0, ")")') n_digits, n_digits end if - end function ends_with - -!=============================================================================== -! COUNT_DIGITS returns the number of digits needed to represent the input -! integer. -!=============================================================================== - - function count_digits(num) result(n_digits) - integer, intent(in) :: num - integer :: n_digits - - n_digits = 1 - do while (num / 10**(n_digits) /= 0 .and. abs(num / 10 **(n_digits-1)) /= 1& - &.and. n_digits /= 10) - ! Note that 10 digits is the maximum needed to represent an integer(4) so - ! the loop automatically exits when n_digits = 10. - n_digits = n_digits + 1 - end do - - end function count_digits - -!=============================================================================== -! INT4_TO_STR converts an integer(4) to a string. -!=============================================================================== - - function int4_to_str(num) result(str) - - integer, intent(in) :: num - character(11) :: str - - write (str, '(I11)') num - str = adjustl(str) - - end function int4_to_str - -!=============================================================================== -! INT8_TO_STR converts an integer(8) to a string. -!=============================================================================== - - function int8_to_str(num) result(str) - - integer(8), intent(in) :: num - character(21) :: str - - write (str, '(I21)') num - str = adjustl(str) - - end function int8_to_str + ! Format the number. + write(str, zp_form) num + end function zero_padded !=============================================================================== ! STR_TO_INT converts a string to an integer. @@ -434,59 +256,4 @@ end function zero_padded end function str_to_real -!=============================================================================== -! REAL_TO_STR converts a real(8) to a string based on how large the value is and -! how many significant digits are desired. By default, six significants digits -! are used. -!=============================================================================== - - function real_to_str(num, sig_digits) result(string) - - real(8), intent(in) :: num ! number to convert - integer, optional, intent(in) :: sig_digits ! # of significant digits - character(15) :: string ! string returned - - integer :: decimal ! number of places after decimal - integer :: width ! total field width - real(8) :: num2 ! absolute value of number - character(9) :: fmt ! format specifier for writing number - - ! set default field width - width = 15 - - ! set number of places after decimal - if (present(sig_digits)) then - decimal = sig_digits - else - decimal = 6 - end if - - ! Create format specifier for writing character - num2 = abs(num) - if (num2 == 0.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, 1 - elseif (num2 < 1.0e-1_8) then - write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 - elseif (num2 >= 1.0e-1_8 .and. num2 < 1.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, decimal - elseif (num2 >= 1.0_8 .and. num2 < 10.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-1, 0) - elseif (num2 >= 10.0_8 .and. num2 < 100.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-2, 0) - elseif (num2 >= 100.0_8 .and. num2 < 1000.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-3, 0) - elseif (num2 >= 100.0_8 .and. num2 < 10000.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-4, 0) - elseif (num2 >= 10000.0_8 .and. num2 < 100000.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-5, 0) - else - write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 - end if - - ! Write string and left adjust - write(string, fmt) num - string = adjustl(string) - - end function real_to_str - end module string diff --git a/src/summary.F90 b/src/summary.F90 index 0e5a591aa9..1b0797fc9b 100644 --- a/src/summary.F90 +++ b/src/summary.F90 @@ -12,7 +12,7 @@ module summary use nuclide_header use output, only: time_stamp use surface_header - use string, only: to_str + use simple_string, only: to_str use tally_header, only: TallyObject use hdf5 diff --git a/src/tally.F90 b/src/tally.F90 index 5336f69bda..1954aebb9d 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -14,7 +14,7 @@ module tally use particle_header, only: LocalCoord, Particle_Base, Particle_CE, & Particle_MG use search, only: binary_search - use string, only: to_str + use simple_string, only: to_str use tally_header, only: TallyResult, TallyMapItem, TallyMapElement use fission, only: nu_total, nu_delayed, yield_delayed use interpolation, only: interpolate_tab1 diff --git a/src/track_output.F90 b/src/track_output.F90 index 867cd4a787..ec09932758 100644 --- a/src/track_output.F90 +++ b/src/track_output.F90 @@ -8,7 +8,7 @@ module track_output use global use hdf5_interface use particle_header, only: Particle_Base - use string, only: to_str + use simple_string, only: to_str use hdf5 diff --git a/src/tracking.F90 b/src/tracking.F90 index 8dc8c7772e..fcb746ccc8 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -11,7 +11,7 @@ module tracking use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use physics, only: collision use random_lcg, only: prn - use string, only: to_str + use simple_string, only: to_str use tally, only: score_analog_tally, score_tracklength_tally, & score_collision_tally, score_surface_current use track_output, only: initialize_particle_track, write_particle_track, & diff --git a/src/trigger.F90 b/src/trigger.F90 index 73cb0c7efe..967d74b14e 100644 --- a/src/trigger.F90 +++ b/src/trigger.F90 @@ -6,7 +6,7 @@ module trigger use constants use global - use string, only: to_str + use simple_string, only: to_str use output, only: warning, write_message use mesh, only: mesh_indices_to_bin use mesh_header, only: RegularMesh From 4e84c64620cf4ec9a4bb1acb18e2ed7ec9208a7d Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 30 Oct 2015 21:17:34 -0400 Subject: [PATCH 006/149] Helps if i add simple_string to the commit --- src/simple_string.F90 | 245 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100644 src/simple_string.F90 diff --git a/src/simple_string.F90 b/src/simple_string.F90 new file mode 100644 index 0000000000..a2205ffbc3 --- /dev/null +++ b/src/simple_string.F90 @@ -0,0 +1,245 @@ +module simple_string + + use constants, only: ERROR_REAL, ERROR_INT + + implicit none + + interface to_str + module procedure int4_to_str, int8_to_str, real_to_str + end interface + +contains + +!=============================================================================== +! TO_LOWER converts a string to all lower case characters +!=============================================================================== + + function to_lower(word) result(word_lower) + + character(*), intent(in) :: word + character(len=len(word)) :: word_lower + + integer :: i + integer :: ic + + do i = 1, len(word) + ic = ichar(word(i:i)) + if (ic >= 65 .and. ic <= 90) then + word_lower(i:i) = char(ic+32) + else + word_lower(i:i) = word(i:i) + end if + end do + + end function to_lower + +!=============================================================================== +! TO_UPPER converts a string to all upper case characters +!=============================================================================== + + function to_upper(word) result(word_upper) + + character(*), intent(in) :: word + character(len=len(word)) :: word_upper + + integer :: i + integer :: ic + + do i = 1, len(word) + ic = ichar(word(i:i)) + if (ic >= 97 .and. ic <= 122) then + word_upper(i:i) = char(ic-32) + else + word_upper(i:i) = word(i:i) + end if + end do + + end function to_upper + +!=============================================================================== +! IS_NUMBER determines whether a string of characters is all 0-9 characters +!=============================================================================== + + function is_number(word) result(number) + + character(*), intent(in) :: word + logical :: number + + integer :: i + integer :: ic + + number = .true. + do i = 1, len_trim(word) + ic = ichar(word(i:i)) + if (ic < 48 .or. ic >= 58) number = .false. + end do + + end function is_number + +!=============================================================================== +! STARTS_WITH determines whether a string starts with a certain +! sequence of characters +!=============================================================================== + + logical function starts_with(str, seq) + + character(*) :: str ! string to check + character(*) :: seq ! sequence of characters + + integer :: i + integer :: i_start + integer :: str_len + integer :: seq_len + + str_len = len_trim(str) + seq_len = len_trim(seq) + + ! determine how many spaces are at beginning of string + i_start = 0 + do i = 1, str_len + if (str(i:i) == ' ' .or. str(i:i) == achar(9)) cycle + i_start = i + exit + end do + + ! Check if string starts with sequence using INDEX intrinsic + if (index(str(1:str_len), seq(1:seq_len)) == i_start) then + starts_with = .true. + else + starts_with = .false. + end if + + end function starts_with + +!=============================================================================== +! ENDS_WITH determines whether a string ends with a certain sequence +! of characters +!=============================================================================== + + logical function ends_with(str, seq) + + character(*) :: str ! string to check + character(*) :: seq ! sequence of characters + + integer :: i_start + integer :: str_len + integer :: seq_len + + str_len = len_trim(str) + seq_len = len_trim(seq) + + ! determine how many spaces are at beginning of string + i_start = str_len - seq_len + 1 + + ! Check if string starts with sequence using INDEX intrinsic + if (index(str(1:str_len), seq(1:seq_len), .true.) == i_start) then + ends_with = .true. + else + ends_with = .false. + end if + + end function ends_with + +!=============================================================================== +! COUNT_DIGITS returns the number of digits needed to represent the input +! integer. +!=============================================================================== + + function count_digits(num) result(n_digits) + integer, intent(in) :: num + integer :: n_digits + + n_digits = 1 + do while (num / 10**(n_digits) /= 0 .and. abs(num / 10 **(n_digits-1)) /= 1& + &.and. n_digits /= 10) + ! Note that 10 digits is the maximum needed to represent an integer(4) so + ! the loop automatically exits when n_digits = 10. + n_digits = n_digits + 1 + end do + + end function count_digits + +!=============================================================================== +! INT4_TO_STR converts an integer(4) to a string. +!=============================================================================== + + function int4_to_str(num) result(str) + + integer, intent(in) :: num + character(11) :: str + + write (str, '(I11)') num + str = adjustl(str) + + end function int4_to_str + +!=============================================================================== +! INT8_TO_STR converts an integer(8) to a string. +!=============================================================================== + + function int8_to_str(num) result(str) + + integer(8), intent(in) :: num + character(21) :: str + + write (str, '(I21)') num + str = adjustl(str) + + end function int8_to_str + +!=============================================================================== +! REAL_TO_STR converts a real(8) to a string based on how large the value is and +! how many significant digits are desired. By default, six significants digits +! are used. +!=============================================================================== + + function real_to_str(num, sig_digits) result(string) + + real(8), intent(in) :: num ! number to convert + integer, optional, intent(in) :: sig_digits ! # of significant digits + character(15) :: string ! string returned + + integer :: decimal ! number of places after decimal + integer :: width ! total field width + real(8) :: num2 ! absolute value of number + character(9) :: fmt ! format specifier for writing number + + ! set default field width + width = 15 + + ! set number of places after decimal + if (present(sig_digits)) then + decimal = sig_digits + else + decimal = 6 + end if + + ! Create format specifier for writing character + num2 = abs(num) + if (num2 == 0.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, 1 + elseif (num2 < 1.0e-1_8) then + write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 + elseif (num2 >= 1.0e-1_8 .and. num2 < 1.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, decimal + elseif (num2 >= 1.0_8 .and. num2 < 10.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-1, 0) + elseif (num2 >= 10.0_8 .and. num2 < 100.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-2, 0) + elseif (num2 >= 100.0_8 .and. num2 < 1000.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-3, 0) + elseif (num2 >= 100.0_8 .and. num2 < 10000.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-4, 0) + elseif (num2 >= 10000.0_8 .and. num2 < 100000.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-5, 0) + else + write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 + end if + + ! Write string and left adjust + write(string, fmt) num + string = adjustl(string) + + end function real_to_str + +end module simple_string \ No newline at end of file From 478a2f4de842c885055d25c911a590b958d2451f Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 31 Oct 2015 12:42:49 -0400 Subject: [PATCH 007/149] Added ability to read the meta data for MG cross sections xml file --- src/global.F90 | 47 ++++++++++-- src/initialize.F90 | 3 +- src/input_xml.F90 | 181 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 192 insertions(+), 39 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index 6ac5be3423..adc132e2c0 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -62,40 +62,71 @@ module global ! ENERGY TREATMENT RELATED VARIABLES logical :: run_CE = .true. ! Run in CE mode? + ! ============================================================================ + ! CROSS SECTION RELATED VARIABLES NEEDED REGARDLESS OF CE OR MG + + ! Cross section arrays + type(XsListing), allocatable, target :: xs_listings(:) ! cross_sections.xml listings + + integer :: n_nuclides_total ! Number of nuclide cross section tables + integer :: n_listings ! Number of listings in cross_sections.xml + + ! Dictionaries to look up cross sections and listings + type(DictCharInt) :: nuclide_dict + type(DictCharInt) :: xs_listing_dict + + ! Default xs identifier (e.g. 70c) + character(3):: default_xs + ! ============================================================================ ! CONTINUOUS-ENERGY CROSS SECTION RELATED VARIABLES ! Cross section arrays type(Nuclide_CE), allocatable, target :: nuclides(:) ! Nuclide cross-sections type(SAlphaBeta), allocatable, target :: sab_tables(:) ! S(a,b) tables - type(XsListing), allocatable, target :: xs_listings(:) ! cross_sections.xml listings ! Cross section caches type(NuclideMicroXS), allocatable :: micro_xs(:) ! Cache for each nuclide type(MaterialMacroXS) :: material_xs ! Cache for current material - integer :: n_nuclides_total ! Number of nuclide cross section tables integer :: n_sab_tables ! Number of S(a,b) thermal scattering tables - integer :: n_listings ! Number of listings in cross_sections.xml ! Minimum/maximum energies real(8) :: energy_min_neutron = ZERO real(8) :: energy_max_neutron = INFINITY ! Dictionaries to look up cross sections and listings - type(DictCharInt) :: nuclide_dict type(DictCharInt) :: sab_dict - type(DictCharInt) :: xs_listing_dict ! Unreoslved resonance probablity tables logical :: urr_ptables_on = .true. - ! Default xs identifier (e.g. 70c) - character(3):: default_xs - ! What to assume for expanding natural elements integer :: default_expand = ENDF_BVII1 + ! ============================================================================ + ! MULTI-GROUP CROSS SECTION RELATED VARIABLES + + ! Cross section arrays + ! type(Nuclide_MG), allocatable, target :: nuclides_MG(:) + + ! Number of energy groups + integer :: energy_groups + + ! Energy group structure + real(8), allocatable :: energy_bins(:) + + ! Maximum Data Order + integer :: max_order + + ! Scattering Treatment (if Legendre) + integer :: legendre_mu_points + + ! MGXS for current working particle (equivalent to material_xs, but simpler) + real(8) :: particle_xs(5) + +!$omp threadprivate(particle_xs) + ! ============================================================================ ! TALLY-RELATED VARIABLES diff --git a/src/initialize.F90 b/src/initialize.F90 index 44ec98a882..9a689455bb 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -14,8 +14,7 @@ module initialize use global use hdf5_interface, only: file_open, read_dataset, file_close, hdf5_bank_t,& hdf5_tallyresult_t, hdf5_integer8_t - use input_xml, only: read_input_xml, read_cross_sections_xml, & - cells_in_univ_dict, read_plots_xml + use input_xml, only: read_input_xml, cells_in_univ_dict, read_plots_xml use material_header, only: Material use output, only: title, header, print_version, write_message, & print_usage, write_xs_summary, print_plot diff --git a/src/input_xml.F90 b/src/input_xml.F90 index a9c5a8e221..29fdc11783 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -36,7 +36,13 @@ contains subroutine read_input_xml() call read_settings_xml() - if (run_mode /= MODE_PLOTTING) call read_cross_sections_xml() + if (run_mode /= MODE_PLOTTING) then + if (run_CE) then + call read_ce_cross_sections_xml() + else + call read_mg_cross_sections_xml() + end if + end if call read_geometry_xml() call read_materials_xml() call read_tallies_xml() @@ -97,30 +103,6 @@ contains ! Parse settings.xml file call open_xmldoc(doc, filename) - ! Find cross_sections.xml file -- the first place to look is the - ! settings.xml file. If no file is found there, then we check the - ! CROSS_SECTIONS environment variable - if (run_mode /= MODE_PLOTTING) then - if (.not. check_for_node(doc, "cross_sections") .and. & - run_mode /= MODE_PLOTTING) then - ! No cross_sections.xml file specified in settings.xml, check - ! environment variable - call get_environment_variable("CROSS_SECTIONS", env_variable) - if (len_trim(env_variable) == 0) then - call fatal_error("No cross_sections.xml file was specified in & - &settings.xml or in the CROSS_SECTIONS environment variable. & - &OpenMC needs a cross_sections.xml file to identify where to & - &find ACE cross section libraries. Please consult the user's & - &guide at http://mit-crpg.github.io/openmc for information on & - &how to set up ACE cross section libraries.") - else - path_cross_sections = trim(env_variable) - end if - else - call get_node_value(doc, "cross_sections", path_cross_sections) - end if - end if - ! Find if a multi-group or continuous-energy simulation is desired if (check_for_node(doc, "energy_mode")) then call get_node_value(doc, "energy_mode", temp_str) @@ -132,6 +114,44 @@ contains end if end if + ! Find cross_sections.xml file -- the first place to look is the + ! settings.xml file. If no file is found there, then we check the + ! CROSS_SECTIONS environment variable + if (run_mode /= MODE_PLOTTING) then + if (.not. check_for_node(doc, "cross_sections") .and. & + run_mode /= MODE_PLOTTING) then + ! No cross_sections.xml file specified in settings.xml, check + ! environment variable + if (run_CE) then + call get_environment_variable("CROSS_SECTIONS", env_variable) + if (len_trim(env_variable) == 0) then + call fatal_error("No cross_sections.xml file was specified in & + &settings.xml or in the CROSS_SECTIONS environment variable. & + &OpenMC needs such a file to identify where to & + &find ACE cross section libraries. Please consult the user's & + &guide at http://mit-crpg.github.io/openmc for information on & + &how to set up ACE cross section libraries.") + else + path_cross_sections = trim(env_variable) + end if + else + call get_environment_variable("MG_CROSS_SECTIONS", env_variable) + if (len_trim(env_variable) == 0) then + call fatal_error("No cross_sections.xml file was specified in & + &settings.xml or in the MG_CROSS_SECTIONS environment variable. & + &OpenMC needs such a file to identify where to & + &find the cross section libraries. Please consult the user's & + &guide at http://mit-crpg.github.io/openmc for information on & + &how to set up the cross section libraries.") + else + path_cross_sections = trim(env_variable) + end if + end if + else + call get_node_value(doc, "cross_sections", path_cross_sections) + end if + end if + ! Set output directory if a path has been specified on the ! element if (check_for_node(doc, "output_path")) then @@ -4084,11 +4104,11 @@ contains end subroutine read_plots_xml !=============================================================================== -! READ_CROSS_SECTIONS_XML reads information from a cross_sections.xml file. This -! file contains a listing of the ACE cross sections that may be used. +! READ_*_CROSS_SECTIONS_XML reads information from a cross_sections.xml file. This +! file contains a listing of the CE and MG cross sections that may be used. !=============================================================================== - subroutine read_cross_sections_xml() + subroutine read_ce_cross_sections_xml() integer :: i ! loop index integer :: filetype ! default file type @@ -4243,7 +4263,110 @@ contains ! Close cross sections XML file call close_xmldoc(doc) - end subroutine read_cross_sections_xml + end subroutine read_ce_cross_sections_xml + + subroutine read_mg_cross_sections_xml() + + integer :: i ! loop index + logical :: file_exists ! does cross_sections.xml exist? + type(XsListing), pointer :: listing => null() + type(Node), pointer :: doc => null() + type(Node), pointer :: node_xsdata => null() + type(NodeList), pointer :: node_xsdata_list => null() + ! character(MAX_LINE_LEN) :: temp_str + + ! Check if cross_sections.xml exists + inquire(FILE=path_cross_sections, EXIST=file_exists) + if (.not. file_exists) then + ! Could not find cross_sections.xml file + call fatal_error("Cross sections XML file '" & + &// trim(path_cross_sections) // "' does not exist!") + end if + + call write_message("Reading cross sections XML file...", 5) + + ! Parse cross_sections.xml file + call open_xmldoc(doc, path_cross_sections) + + if (check_for_node(doc, "groups")) then + ! Get neutron group count + call get_node_value(doc, "groups", energy_groups) + else + call fatal_error("groups element must exist!") + end if + + allocate(energy_bins(energy_groups + 1)) + if (check_for_node(doc, "group_structure")) then + ! Get neutron group structure + call get_node_array(doc, "group_structure", energy_bins) + else + call fatal_error("group_structures element must exist!") + end if + + if (check_for_node(doc, "legendre_mu_points")) then + ! Get scattering treatment + call get_node_value(doc, "legendre_mu_points", legendre_mu_points) + if (legendre_mu_points <= 0) then + call fatal_error("legendre_mu_points element must be positive and non-zero!") + end if + legendre_mu_points = -1 * legendre_mu_points + else + ! One will say 'dont do it' + legendre_mu_points = 1 + end if + + ! Get node list of all + call get_node_list(doc, "xsdata", node_xsdata_list) + n_listings = get_list_size(node_xsdata_list) + + ! Allocate xs_listings array + if (n_listings == 0) then + call fatal_error("No XSDATA listings present in cross_sections.xml & + &file!") + else + allocate(xs_listings(n_listings)) + end if + + do i = 1, n_listings + listing => xs_listings(i) + + ! Get pointer to xsdata table XML node + call get_list_item(node_xsdata_list, i, node_xsdata) + + ! copy a number of attributes + call get_node_value(node_xsdata, "name", listing % name) + listing % name = to_lower(listing % name) + listing % alias = listing % name + if (check_for_node(node_xsdata, "alias")) & + call get_node_value(node_xsdata, "alias", listing % alias) + listing % alias = to_lower(listing % alias) + if (check_for_node(node_xsdata, "zaid")) then + call get_node_value(node_xsdata, "zaid", listing % zaid) + else + listing % zaid = 100 + end if + if (check_for_node(node_xsdata, "kT")) & + call get_node_value(node_xsdata, "kT", listing % kT) + if (check_for_node(node_xsdata, "awr")) then + call get_node_value(node_xsdata, "awr", listing % awr) + else + listing % awr = ONE + end if + + ! determine type of cross section + if (ends_with(listing % name, 'c')) then + listing % type = NEUTRON + end if + + ! create dictionary entry for both name and alias + call xs_listing_dict % add_key(to_lower(listing % name), i) + call xs_listing_dict % add_key(to_lower(listing % alias), i) + end do + + ! Close cross sections XML file + call close_xmldoc(doc) + + end subroutine read_mg_cross_sections_xml !=============================================================================== ! EXPAND_NATURAL_ELEMENT converts natural elements specified using an From 52f472c99c9029f3301e2b7b05f26d3c9ed85934 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 1 Nov 2015 13:20:36 -0500 Subject: [PATCH 008/149] Moved maxwell and watt spectra to spectra.F90 from math.F90 to avoid math needing to pull in prn and all that entails (to avoid circular dependencies), added macroxs information for MG data, fixed memory leaks due to allocation of particle at to low a level --- src/ace.F90 | 4 +- src/constants.F90 | 24 +- src/global.F90 | 6 +- src/initialize.F90 | 45 +- src/macroxs_header.F90 | 969 +++++++++++++++++++++++++++++++++++++++ src/math.F90 | 65 ++- src/mgxs_data.F90 | 650 ++++++++++++++++++++++++++ src/nuclide_header.F90 | 465 ++++++++++++++----- src/particle_header.F90 | 95 ++-- src/physics.F90 | 2 +- src/scattdata_header.F90 | 355 ++++++++++++++ src/simulation.F90 | 15 +- src/source.F90 | 18 +- src/spectra.F90 | 58 +++ 14 files changed, 2545 insertions(+), 226 deletions(-) create mode 100644 src/macroxs_header.F90 create mode 100644 src/mgxs_data.F90 create mode 100644 src/scattdata_header.F90 create mode 100644 src/spectra.F90 diff --git a/src/ace.F90 b/src/ace.F90 index 729b78b323..e51c2b3a0e 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -32,7 +32,7 @@ contains ! nuclides and sab_tables arrays !=============================================================================== - subroutine read_xs() + subroutine read_ace_xs() integer :: i ! index in materials array integer :: j ! index over nuclides in material @@ -226,7 +226,7 @@ contains end if end do - end subroutine read_xs + end subroutine read_ace_xs !=============================================================================== ! READ_ACE_TABLE reads a single cross section table in either ASCII or binary diff --git a/src/constants.F90 b/src/constants.F90 index 375c517e76..9bb62f62eb 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -157,9 +157,22 @@ module constants ! Angular distribution type integer, parameter :: & - ANGLE_ISOTROPIC = 1, & ! Isotropic angular distribution - ANGLE_32_EQUI = 2, & ! 32 equiprobable bins - ANGLE_TABULAR = 3 ! Tabular angular distribution + ANGLE_ISOTROPIC = 1, & ! Isotropic angular distribution (CE) + ANGLE_32_EQUI = 2, & ! 32 equiprobable bins (CE) + ANGLE_TABULAR = 3, & ! Tabular angular distribution (CE or MG) + ANGLE_LEGENDRE = 4, & ! Legendre angular distribution (MG) + ANGLE_HISTOGRAM = 5 ! Histogram angular distribution (MG) + + ! Number of mu bins to use when converting Legendres to tabular type + integer, parameter :: DEFAULT_NMU = 33 + + ! Location within pre-computed cross section data (particle_xs) + integer, parameter :: & + TOTAL = 1, & + ABSORB = 2, & + NUFISS = 3, & + FISS = 4, & + SCATT = 5 ! Secondary energy mode for S(a,b) inelastic scattering integer, parameter :: & @@ -203,6 +216,11 @@ module constants ACE_THERMAL = 2, & ! thermal S(a,b) scattering data ACE_DOSIMETRY = 3 ! dosimetry cross sections + ! MGXS Table Types + integer, parameter :: & + ISOTROPIC = 1, & ! Isotropically Weighted Data + ANGLE = 2 ! Data by Angular Bins + ! Fission neutron emission (nu) type integer, parameter :: & NU_NONE = 0, & ! No nu values (non-fissionable) diff --git a/src/global.F90 b/src/global.F90 index adc132e2c0..c5dbec5da9 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -5,6 +5,7 @@ module global use constants use dict_header, only: DictCharInt, DictIntInt use geometry_header, only: Cell, Universe, Lattice, LatticeContainer + use macroxs_header, only: MacroXS_Base, MacroXSContainer use material_header, only: Material use mesh_header, only: RegularMesh use nuclide_header @@ -108,7 +109,10 @@ module global ! MULTI-GROUP CROSS SECTION RELATED VARIABLES ! Cross section arrays - ! type(Nuclide_MG), allocatable, target :: nuclides_MG(:) + type(NuclideMGContainer), allocatable, target :: nuclides_MG(:) + + ! Cross section caches + type(MacroXSContainer), target, allocatable :: macro_xs(:) ! Number of energy groups integer :: energy_groups diff --git a/src/initialize.F90 b/src/initialize.F90 index 9a689455bb..01a8038070 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -1,6 +1,6 @@ module initialize - use ace, only: read_xs, same_nuclide_list + use ace, only: read_ace_xs, same_nuclide_list use bank_header, only: Bank use constants use dict_header, only: DictIntInt, ElemKeyValueII @@ -16,6 +16,7 @@ module initialize hdf5_tallyresult_t, hdf5_integer8_t use input_xml, only: read_input_xml, cells_in_univ_dict, read_plots_xml use material_header, only: Material + use mgxs_data use output, only: title, header, print_version, write_message, & print_usage, write_xs_summary, print_plot use random_lcg, only: initialize_prng @@ -114,23 +115,37 @@ contains ! Read ACE-format cross sections call time_read_xs%start() - call read_xs() + if (run_CE) then + call read_ace_xs() + else + call read_mgxs() + end if call time_read_xs%stop() ! Create linked lists for multiple instances of the same nuclide - call same_nuclide_list() + if (run_CE) then + call same_nuclide_list() + else + call same_nuclide_mg_list() + end if - ! Construct unionized or log energy grid for cross-sections - select case (grid_method) - case (GRID_NUCLIDE) - continue - case (GRID_MAT_UNION) - call time_unionize%start() - call unionized_grid() - call time_unionize%stop() - case (GRID_LOGARITHM) - call logarithmic_grid() - end select + ! Construct information needed for nuclear data + if (run_CE) then + ! Construct unionized or log energy grid for cross-sections + select case (grid_method) + case (GRID_NUCLIDE) + continue + case (GRID_MAT_UNION) + call time_unionize%start() + call unionized_grid() + call time_unionize%stop() + case (GRID_LOGARITHM) + call logarithmic_grid() + end select + else + ! Create material macroscopic data for MGXS + call create_macro_xs() + end if ! Allocate and setup tally stride, matching_bins, and tally maps call configure_tallies() @@ -307,6 +322,8 @@ contains c_loc(tmpb(1)%uvw)), coordinates_t, hdf5_err) call h5tinsert_f(hdf5_bank_t, "E", h5offsetof(c_loc(tmpb(1)), & c_loc(tmpb(1)%E)), H5T_NATIVE_DOUBLE, hdf5_err) + call h5tinsert_f(hdf5_bank_t, "group", h5offsetof(c_loc(tmpb(1)), & + c_loc(tmpb(1)%group)), H5T_NATIVE_INTEGER, hdf5_err) call h5tinsert_f(hdf5_bank_t, "delayed_group", h5offsetof(c_loc(tmpb(1)), & c_loc(tmpb(1)%delayed_group)), H5T_NATIVE_INTEGER, hdf5_err) diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 new file mode 100644 index 0000000000..ed768b2430 --- /dev/null +++ b/src/macroxs_header.F90 @@ -0,0 +1,969 @@ +module macroxs_header + + use constants, only: MAX_FILE_LEN, ZERO, ONE, TWO, PI + use list_header, only: ListInt + use material_header, only: material + use math, only: calc_pn, calc_rn, expand_harmonic + use nuclide_header + use scattdata_header + + implicit none + +!=============================================================================== +! MACROXS_* contains cached macroscopic cross sections for the material a +! particle is traveling through +!=============================================================================== + + type, abstract :: MacroXS_Base + ! Data Order + integer :: order + + ! Type-Bound procedures + contains + procedure(macroxs_init_), deferred, pass :: init ! initializes object + procedure(macroxs_clear_), deferred, pass :: clear ! Deallocates object + procedure(macroxs_size_), deferred, pass :: get_size ! Finds size of object + procedure(macroxs_get_xs_), deferred, pass :: get_xs ! Return xs + end type MacroXS_Base + + abstract interface + subroutine macroxs_init_(this, mat, nuclides, groups, get_kfiss, & + max_order, scatt_type, legendre_mu_points, & + error_code, error_text) + + import MacroXS_Base + import Material + import NuclideMGContainer + import MAX_LINE_LEN + class(MacroXS_Base), intent(inout) :: this ! The MacroXS to initialize + type(Material), pointer, intent(in) :: mat ! base material + type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from + integer, intent(in) :: groups ! Number of E groups + logical, intent(in) :: get_kfiss ! Should we get kfiss data? + integer, intent(in) :: max_order ! Maximum requested order + integer, intent(in) :: scatt_type ! Legendre or Tabular Scatt? + integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + + end subroutine macroxs_init_ + + function macroxs_get_xs_(this, g, xstype, uvw) result(xs) + import MacroXS_Base + class(MacroXS_Base), intent(in) :: this ! The MacroXS to initialize + integer, intent(in) :: g ! Incoming Energy group + character(*) , intent(in) :: xstype ! Cross Section Type + real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8) :: xs ! Resultant xs + + end function macroxs_get_xs_ + + subroutine macroxs_clear_(this) + + import MacroXS_Base + class(MacroXS_Base), intent(inout) :: this ! The MacroXS to clear + + end subroutine macroxs_clear_ + + subroutine macroxs_size_(this, size_total, size_scatt, size_fission) + import MacroXS_Base + class(MacroXS_Base), intent(in) :: this + integer, intent(out) :: size_total ! Total Data Size + integer, intent(out) :: size_scatt ! Scattering Data Size + integer, intent(out) :: size_fission ! Fission Data Size + + end subroutine macroxs_size_ + end interface + + type, extends(MacroXS_Base) :: MacroXS_Iso + ! Microscopic cross sections + real(8), allocatable :: total(:) ! total cross section + real(8), allocatable :: absorption(:) ! absorption cross section + class(ScattData_Base), allocatable :: scatter ! scattering information + real(8), allocatable :: nu_fission(:) ! nu-fission + real(8), allocatable :: k_fission(:) ! kappa-fission + real(8), allocatable :: fission(:) ! fission x/s + real(8), allocatable :: scattxs(:) ! scattering xs + real(8), allocatable :: chi(:,:) ! fission spectra + + ! Type-Bound procedures + contains + procedure, pass :: init => macroxs_iso_init ! inits object + procedure, pass :: clear => macroxs_iso_clear ! Deallocates object + procedure, pass :: get_size => macroxs_iso_size ! Finds size of object + procedure, pass :: get_xs => macroxs_iso_get_xs ! Returns xs + end type MacroXS_Iso + + type, extends(MacroXS_Base) :: MacroXS_Angle + ! Macroscopic cross sections + real(8), allocatable :: total(:,:,:) ! total cross section + real(8), allocatable :: absorption(:,:,:) ! absorption cross section + type(ScattDataContainer), allocatable :: scatter(:,:) ! scattering information + real(8), allocatable :: nu_fission(:,:,:) ! nu-fission + real(8), allocatable :: k_fission(:,:,:) ! kappa-fission + real(8), allocatable :: fission(:,:,:) ! fission x/s + real(8), allocatable :: chi(:,:,:,:) ! fission spectra + real(8), allocatable :: scattxs(:,:,:) ! scattering xs + real(8), allocatable :: polar(:) ! polar angles + real(8), allocatable :: azimuthal(:) ! azimuthal angles + + ! Type-Bound procedures + contains + procedure, pass :: init => macroxs_angle_init ! inits object + procedure, pass :: clear => macroxs_angle_clear ! Deallocates object + procedure, pass :: get_size => macroxs_angle_size ! Finds size of object + procedure, pass :: get_xs => macroxs_angle_get_xs ! Returns xs + end type MacroXS_Angle + +!=============================================================================== +! MACROXSCONTAINER pointer array for storing MacroXS objects. +!=============================================================================== + + type MacroXSContainer + class(MacroXS_Base), allocatable :: obj + end type MacroXSContainer + +contains + +!=============================================================================== +! MACROXS*_INIT sets the MacroXS Data +!=============================================================================== + + subroutine macroxs_iso_init(this, mat, nuclides, groups, get_kfiss, & + max_order, scatt_type, legendre_mu_points, error_code, error_text) + + class(MacroXS_Iso), intent(inout) :: this ! The MacroXS to initialize + type(Material), pointer, intent(in) :: mat ! base material + type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from + integer, intent(in) :: groups ! Number of E groups + logical, intent(in) :: get_kfiss ! Should we get kfiss data? + integer, intent(in) :: max_order ! Maximum requested order + integer, intent(in) :: scatt_type ! How is data presented + integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + + integer :: i ! loop index over nuclides + integer :: gin, gout ! group indices + real(8) :: atom_density ! atom density of a nuclide + ! class(Nuclide_Base), pointer :: nuc ! current nuclide + integer :: imu + real(8) :: norm + integer :: mat_max_order, order, l + real(8), allocatable :: temp_mult(:,:) + real(8), allocatable :: temp_energy(:,:) + real(8), allocatable :: scatt_coeffs(:,:,:) + + ! Initialize error data + error_code = 0 + error_text = '' + + ! If we have tabular only data, then make sure all datasets have same size + if (scatt_type == ANGLE_HISTOGRAM) then + ! Check all scattering data of same size + order = nuclides(mat % nuclide(1)) % obj % order + do i = 2, mat % n_nuclides + if (order /= nuclides(mat % nuclide(i)) % obj % order) then + error_code = 1 + error_text = "All Histogram Scattering Entries Must Be Same Length!" + return + end if + end do + ! Ok, got our order, store it + this % order = order + + ! Allocate stuff for later + allocate(scatt_coeffs(order, groups, groups)) + scatt_coeffs = ZERO + allocate(ScattData_Histogram :: this % scatter) + + else if (scatt_type == ANGLE_TABULAR) then + ! Check all scattering data of same size + order = nuclides(mat % nuclide(1)) % obj % order + do i = 2, mat % n_nuclides + if (order /= nuclides(mat % nuclide(i)) % obj % order) then + error_code = 1 + error_text = "All Tabular Scattering Entries Must Be Same Length!" + return + end if + end do + ! Ok, got our order, store it + this % order = order + + ! Allocate stuff for later + allocate(scatt_coeffs(order, groups, groups)) + scatt_coeffs = ZERO + allocate(ScattData_Histogram :: this % scatter) + + else if (scatt_type == ANGLE_LEGENDRE) then + ! Otherwise find the maximum scattering order + ! Need to determine the maximum scattering order of all data in this material + mat_max_order = 0 + do i = 1, mat % n_nuclides + if (nuclides(mat % nuclide(i)) % obj % order > mat_max_order) then + mat_max_order = nuclides(mat % nuclide(i)) % obj % order + end if + end do + + ! Now need to compare this material maximum scattering order with + ! the problem wide max scatt order and use whichever is lower + order = min(mat_max_order, max_order) + this % order = order + 1 + + ! Now we can allocate our scatt_coeffs object accordingly + allocate(scatt_coeffs(order + 1, groups, groups)) + scatt_coeffs = ZERO + if (legendre_mu_points == 1) then + allocate(ScattData_Legendre :: this % scatter) + else + allocate(ScattData_Tabular :: this % scatter) + end if + end if + + ! Allocate and initialize data within macro_xs(i_mat) object + allocate(this % total(groups)) + this % total = ZERO + allocate(this % absorption(groups)) + this % absorption = ZERO + allocate(this % fission(groups)) + this % fission = ZERO + if (get_kfiss) then + allocate(this % k_fission(groups)) + this % k_fission = ZERO + end if + allocate(this % nu_fission(groups)) + this % nu_fission = ZERO + allocate(this % chi(groups, groups)) + this % chi = ZERO + allocate(temp_energy(groups, groups)) + temp_energy = ZERO + allocate(temp_mult(groups, groups)) + temp_mult = ZERO + allocate(this % scattxs(groups)) + + ! Add contribution from each nuclide in material + do i = 1, mat % n_nuclides + ! Copy atom density of nuclide in material + atom_density = mat % atom_density(i) + + ! Perform our operations which depend upon the type + select type(nuc => nuclides(mat % nuclide(i)) % obj) + type is (Nuclide_Iso) + + ! Add contributions to total, absorption, and fission data (if necessary) + this % total = this % total + atom_density * nuc % total + this % absorption = this % absorption + & + atom_density * nuc % absorption + if (nuc % fissionable) then + if (allocated(nuc % chi)) then + do gin = 1, groups + do gout = 1, groups + this % chi(gout,gin) = this % chi(gout,gin) + atom_density * & + nuc % chi(gout) * nuc % nu_fission(gin,1) + end do + end do + this % nu_fission = this % nu_fission + atom_density * & + nuc % nu_fission(:,1) + else + this % chi = this % chi + atom_density * nuc % nu_fission + do gin = 1, groups + this % nu_fission(gin) = this % nu_fission(gin) + atom_density * & + sum(nuc % nu_fission(:,gin)) + end do + end if + this % fission = this % fission + atom_density * nuc % fission + if (get_kfiss) then + this % k_fission = this % k_fission + atom_density * nuc % k_fission + end if + end if + + ! Now time to do the scattering + do gin = 1, groups + do gout = 1, groups + if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then + ! Transfer matrix + temp_energy(gout,gin) = temp_energy(gout,gin) + atom_density * & + sum(nuc % scatter(gout,gin,:)) + + ! Determine the angular distribution + do imu = 1, order + scatt_coeffs(imu, gout, gin) = scatt_coeffs(imu, gout, gin) + & + nuc % scatter(gout,gin,imu) * & + atom_density + end do + + else if (scatt_type == ANGLE_LEGENDRE) then + ! Transfer matrix + temp_energy(gout,gin) = temp_energy(gout,gin) + atom_density * & + nuc % scatter(gout,gin,1) + + ! Determine the angular distribution coefficients so we can later + ! expand do the complete distribution + do l = 1, min(nuc % order, order) + 1 + scatt_coeffs(l, gout, gin) = scatt_coeffs(l, gout, gin) + & + nuc % scatter(gout,gin,l) * & + atom_density + end do + + end if + + ! Multiplicity matrix + temp_mult(gout,gin) = temp_mult(gout,gin) + atom_density * & + nuc % mult(gout,gin) + end do + end do + type is (Nuclide_Angle) + error_code = 1 + error_text = "Invalid Passing of Nuclide_Angle to MacroXS_Iso Object" + return + end select + end do + + ! Store the scattering xs + if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then + this % scattxs(:) = sum(sum(scatt_coeffs(:,:,:),dim=1),dim=1) + else if (scatt_type == ANGLE_LEGENDRE) then + this % scattxs(:) = sum(scatt_coeffs(1,:,:),dim=1) + end if + + ! Normalize the scatt_coeffs + do gin = 1, groups + do gout = 1, groups + if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then + norm = sum(scatt_coeffs(:,gout,gin)) + else if (scatt_type == ANGLE_LEGENDRE) then + norm = scatt_coeffs(1,gout,gin) + end if + if (norm /= ZERO) then + scatt_coeffs(:, gout, gin) = scatt_coeffs(:, gout,gin) / norm + end if + end do + ! Now normalize temp_energy (outgoing scattering energy probabilities) + norm = sum(temp_energy(:,gin)) + if (norm > ZERO) then + temp_energy(:,gin) = temp_energy(:,gin) / norm + end if + end do + + if (scatt_type == ANGLE_LEGENDRE .and. legendre_mu_points /= 1) then + call this % scatter % init(legendre_mu_points, temp_energy, temp_mult, & + scatt_coeffs) + else + call this % scatter % init(this % order, temp_energy, temp_mult, & + scatt_coeffs) + end if + + ! Now normalize chi + if (mat % fissionable) then + do gin = 1, groups + ! Normalize Chi + norm = sum(this % chi(:,gin)) + if (norm > ZERO) then + this % chi(:,gin) = this % chi(:,gin) / norm + end if + end do + end if + + ! Deallocate temporaries for the next material + deallocate(scatt_coeffs, temp_energy, temp_mult) + + end subroutine macroxs_iso_init + + subroutine macroxs_angle_init(this, mat, nuclides, groups, get_kfiss, & + max_order, scatt_type, legendre_mu_points, error_code, error_text) + + class(MacroXS_Angle), intent(inout) :: this ! The MacroXS to initialize + type(Material), pointer, intent(in) :: mat ! base material + type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from + integer, intent(in) :: groups ! Number of E groups + logical, intent(in) :: get_kfiss ! Should we get kfiss data? + integer, intent(in) :: max_order ! Maximum requested order + integer, intent(in) :: scatt_type ! Legendre or Tabular Scatt? + integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + + integer :: i ! loop index over nuclides + integer :: gin, gout ! group indices + real(8) :: atom_density ! atom density of a nuclide + integer :: ipol, iazi, npol, nazi + integer :: imu + real(8) :: norm + integer :: mat_max_order, order, l + real(8), allocatable :: temp_mult(:,:,:,:) + real(8), allocatable :: temp_energy(:,:,:,:) + real(8), allocatable :: scatt_coeffs(:,:,:,:,:) + + ! Initialize error data + error_code = 0 + error_text = '' + + ! Get the number of each polar and azi angles and make sure all the + ! Nuclide_Angle types have the same number of these angles + npol = -1 + nazi = -1 + do i = 1, mat % n_nuclides + select type(nuc => nuclides(mat % nuclide(i)) % obj) + type is (Nuclide_Angle) + if (npol == -1) then + npol = nuc % Npol + nazi = nuc % Nazi + allocate(this % polar(npol)) + this % polar = nuc % polar + allocate(this % azimuthal(nazi)) + this % azimuthal = nuc % azimuthal + else + if ((npol /= nuc % Npol) .or. (nazi /= nuc % Nazi)) then + error_code = 1 + error_text = "All Angular Data Must Be Same Length!" + end if + end if + end select + end do + + ! If we have tabular only data, then make sure all datasets have same size + if (scatt_type == ANGLE_HISTOGRAM) then + ! Check all scattering data of same size + order = nuclides(mat % nuclide(1)) % obj % order + do i = 2, mat % n_nuclides + if (order /= nuclides(mat % nuclide(i)) % obj % order) then + error_code = 1 + error_text = "All Histogram Scattering Entries Must Be Same Length!" + return + end if + end do + ! Ok, got our order, store it + this % order = order + + ! Allocate stuff for later + allocate(scatt_coeffs(order, groups, groups, nazi, npol)) + scatt_coeffs = ZERO + allocate(this % scatter(nazi, npol)) + do ipol = 1, npol + do iazi = 1, nazi + allocate(ScattData_Histogram :: this % scatter(iazi, ipol) % obj) + end do + end do + + else if (scatt_type == ANGLE_TABULAR) then + ! Check all scattering data of same size + order = nuclides(mat % nuclide(1)) % obj % order + do i = 2, mat % n_nuclides + if (order /= nuclides(mat % nuclide(i)) % obj % order) then + error_code = 1 + error_text = "All Tabular Scattering Entries Must Be Same Length!" + return + end if + end do + ! Ok, got our order, store it + this % order = order + + ! Allocate stuff for later + allocate(scatt_coeffs(order, groups, groups, nazi, npol)) + scatt_coeffs = ZERO + allocate(this % scatter(nazi, npol)) + do ipol = 1, npol + do iazi = 1, nazi + allocate(ScattData_Tabular :: this % scatter(iazi, ipol) % obj) + end do + end do + + else if (scatt_type == ANGLE_LEGENDRE) then + ! Otherwise find the maximum scattering order + ! Need to determine the maximum scattering order of all data in this material + mat_max_order = 0 + do i = 1, mat % n_nuclides + if (nuclides(mat % nuclide(i)) % obj % order > mat_max_order) then + mat_max_order = nuclides(mat % nuclide(i)) % obj % order + end if + end do + + ! Now need to compare this material maximum scattering order with + ! the problem wide max scatt order and use whichever is lower + order = min(mat_max_order, max_order) + this % order = order + 1 + + ! Now we can allocate our scatt_coeffs object accordingly + allocate(scatt_coeffs(order + 1, groups, groups, nazi, npol)) + scatt_coeffs = ZERO + allocate(this % scatter(nazi, npol)) + do ipol = 1, npol + do iazi = 1, nazi + if (legendre_mu_points == 1) then + allocate(ScattData_Legendre :: this % scatter(iazi, ipol) % obj) + else + allocate(ScattData_Tabular :: this % scatter(iazi, ipol) % obj) + end if + end do + end do + end if + + ! Allocate and initialize data within macro_xs(i_mat) object + allocate(this % total(groups,nazi,npol)) + this % total = ZERO + allocate(this % absorption(groups,nazi,npol)) + this % absorption = ZERO + allocate(this % fission(groups,nazi,npol)) + this % fission = ZERO + if (get_kfiss) then + allocate(this % k_fission(groups,nazi,npol)) + this % k_fission = ZERO + end if + allocate(this % nu_fission(groups,nazi,npol)) + this % nu_fission = ZERO + allocate(this % chi(groups, groups, nazi, npol)) + this % chi = ZERO + allocate(temp_energy(groups,groups,nazi,npol)) + temp_energy = ZERO + allocate(temp_mult(groups,groups,nazi,npol)) + temp_mult = ZERO + allocate(this % scattxs(groups,nazi,npol)) + + ! Add contribution from each nuclide in material + do i = 1, mat % n_nuclides + ! Copy atom density of nuclide in material + atom_density = mat % atom_density(i) + + ! Perform our operations which depend upon the type + select type(nuc => nuclides(mat % nuclide(i)) % obj) + type is (Nuclide_Iso) + error_code = 1 + error_text = "Invalid Passing of Nuclide_Iso to MacroXS_Angle Object" + return + type is (Nuclide_Angle) + ! Add contributions to total, absorption, and fission data (if necessary) + this % total = this % total + atom_density * nuc % total + this % absorption = this % absorption + & + atom_density * nuc % absorption + if (nuc % fissionable) then + if (allocated(nuc % chi)) then + do gin = 1, groups + do gout = 1, groups + this % chi(gout,gin,:,:) = this % chi(gout,gin,:,:) + atom_density * & + nuc % chi(gout,:,:) * nuc % nu_fission(gin,1,:,:) + end do + end do + this % nu_fission = this % nu_fission + atom_density * & + nuc % nu_fission(:,1,:,:) + else + this % chi = this % chi + atom_density * nuc % nu_fission + do gin = 1, groups + this % nu_fission(gin,:,:) = this % nu_fission(gin,:,:) + atom_density * & + sum(nuc % nu_fission(:,gin,:,:),dim=1) + end do + end if + this % fission = this % fission + atom_density * nuc % fission + if (get_kfiss) then + this % k_fission = this % k_fission + atom_density * nuc % k_fission + end if + end if + + ! Now time to do the scattering + do gin = 1, groups + do gout = 1, groups + if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then + ! Transfer matrix + temp_energy(gout,gin,:,:) = temp_energy(gout,gin,:,:) + atom_density * & + sum(nuc % scatter(gout,gin,:,:,:),dim=1) + + ! Determine the angular distribution + do imu = 1, order + scatt_coeffs(imu,gout,gin,:,:) = scatt_coeffs(imu,gout,gin,:,:) + & + nuc % scatter(gout,gin,imu,:,:) * & + atom_density + end do + else if (scatt_type == ANGLE_LEGENDRE) then + ! Transfer matrix + temp_energy(gout,gin,:,:) = temp_energy(gout,gin,:,:) + atom_density * & + nuc % scatter(gout,gin,1,:,:) + + ! Determine the angular distribution coefficients so we can later + ! expand do the complete distribution + do l = 1, min(nuc % order, order) + 1 + scatt_coeffs(l, gout, gin,:,:) = scatt_coeffs(l, gout, gin,:,:) + & + nuc % scatter(gout,gin,l,:,:) * & + atom_density + end do + end if + + ! Multiplicity matrix + temp_mult(gout,gin,:,:) = temp_mult(gout,gin,:,:) + atom_density * & + nuc % mult(gout,gin,:,:) + end do + end do + end select + end do + + ! Store the scattering xs + if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then + this % scattxs(:,:,:) = sum(sum(scatt_coeffs(:,:,:,:,:),dim=1),dim=1) + else if (scatt_type == ANGLE_LEGENDRE) then + this % scattxs(:,:,:) = sum(scatt_coeffs(1,:,:,:,:),dim=1) + end if + + ! Normalize the scatt_coeffs + do ipol = 1, npol + do iazi = 1, nazi + do gin = 1, groups + do gout = 1, groups + if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then + norm = sum(scatt_coeffs(:,gout,gin,iazi,ipol)) + else if (scatt_type == ANGLE_LEGENDRE) then + norm = scatt_coeffs(1,gout,gin,iazi,ipol) + end if + if (norm /= ZERO) then + scatt_coeffs(:,gout,gin,iazi,ipol) = & + scatt_coeffs(:,gout,gin,iazi,ipol) / norm + end if + end do + ! Now normalize temp_energy (outgoing scattering energy probabilities) + norm = sum(temp_energy(:,gin,iazi,ipol)) + if (norm > ZERO) then + temp_energy(:,gin,iazi,ipol) = temp_energy(:,gin,iazi,ipol) / norm + end if + end do + + if (scatt_type == ANGLE_LEGENDRE .and. legendre_mu_points /= 1) then + call this % scatter(iazi, ipol) % obj % init(legendre_mu_points, & + temp_energy(:,:,iazi,ipol), temp_mult(:,:,iazi,ipol), & + scatt_coeffs(:,:,:,iazi,ipol)) + else + call this % scatter(iazi, ipol) % obj % init(this % order, & + temp_energy(:,:,iazi,ipol), temp_mult(:,:,iazi,ipol), & + scatt_coeffs(:,:,:,iazi,ipol)) + end if + + end do + end do + + ! Now go through and normalize chi + if (mat % fissionable) then + do ipol = 1, npol + do iazi = 1, nazi + do gin = 1, groups + ! Normalize Chi + norm = sum(this % chi(:,gin,iazi,ipol)) + if (norm > ZERO) then + this % chi(:,gin,iazi,ipol) = this % chi(:,gin,iazi,ipol) / norm + end if + end do + end do + end do + end if + + ! Deallocate temporaries for the next material + deallocate(scatt_coeffs, temp_energy, temp_mult) + + end subroutine macroxs_angle_init + +!=============================================================================== +! MACROXS*_CLEAR resets and deallocates data in MacroXS. +!=============================================================================== + + subroutine macroxs_iso_clear(this) + + class(MacroXS_Iso), intent(inout) :: this ! The MacroXS to clear + + if (allocated(this % total)) then + deallocate(this % total, this % absorption, & + this % nu_fission, this % fission) + end if + + if (allocated(this % k_fission)) then + deallocate(this % k_fission) + end if + + call this % scatter % clear() + + if (allocated(this % chi)) then + deallocate(this % chi) + end if + + end subroutine macroxs_iso_clear + + subroutine macroxs_angle_clear(this) + + class(MacroXS_Angle), intent(inout) :: this ! The MacroXS to clear + integer :: i, j + + if (allocated(this % total)) then + deallocate(this % total, this % absorption, & + this % nu_fission, this % fission) + end if + + if (allocated(this % k_fission)) then + deallocate(this % k_fission) + end if + + do i = 1, size(this % scatter,dim=2) + do j = 1, size(this % scatter,dim=1) + call this % scatter(j,i) % obj % clear() + end do + end do + if (allocated(this % scatter)) then + deallocate(this % scatter) + end if + + if (allocated(this % chi)) then + deallocate(this % chi) + end if + + end subroutine macroxs_angle_clear + +!=============================================================================== +! MACROXS_*_SIZE Finds the size of the data in MacroXS_Base, MacroXS_Iso, +! or MacroXS_Angle +!=============================================================================== + + subroutine macroxs_iso_size(this, size_total, size_scatt, size_fission) + class(MacroXS_Iso), intent(in) :: this + integer, intent(out) :: size_total ! Total Data Size + integer, intent(out) :: size_scatt ! Scattering Data Size + integer, intent(out) :: size_fission ! Fission Data Size + + integer :: groups + + groups = size(this % total, dim=1) + + ! Size Information On Each Reaction + ! Sum up for total, absorption, nu_scatter, nu_fission, fission + size_total = groups * 8 * (1 + 1 + 1 + 1 + 1) + ! Now do k_fission + ! Check k_fission + if (allocated (this % k_fission)) then + size_total = size_total + groups * 8 + end if + + ! Calculate chi data size + size_fission = 0 + if (allocated(this % chi)) then + size_fission = size_fission + 8 * size(this % chi) + end if + + ! Calculate Scatter Data Size + size_scatt = size(this % scatter % energy) + + ! Calculate Total Memory + size_total = size_total + size_fission + size_scatt + + end subroutine macroxs_iso_size + + subroutine macroxs_angle_size(this, size_total, size_scatt, size_fission) + class(MacroXS_Angle), intent(in) :: this + integer, intent(out) :: size_total ! Total Data Size + integer, intent(out) :: size_scatt ! Scattering Data Size + integer, intent(out) :: size_fission ! Fission Data Size + + integer :: groups + integer :: tot_angle + + groups = size(this % total, dim=2) + tot_angle = size(this % total, dim=1) + + ! Size Information On Each Reaction + ! Sum up for total, absorption, nu_scatter, nu_fission, fission + size_total = groups * 8 * (1 + 1 + 1 + 1 + 1) * tot_angle + ! Now do k_fission + ! Check k_fission + if (allocated (this % k_fission)) then + size_total = size_total + groups * 8 * tot_angle + end if + + ! Calculate chi data size + size_fission = 0 + if (allocated(this % chi)) then + size_fission = size_fission + 8 * size(this % chi) + end if + + ! Calculate Scatter Data Size + size_scatt = 0 + + ! Calculate Total Memory + size_total = size_total + size_fission + size_scatt + + end subroutine macroxs_angle_size + +!=============================================================================== +! MACROXS_*_GET_XS returns the requested data type +!=============================================================================== + + function macroxs_iso_get_xs(this, g, xstype, uvw) result(xs) + class(MacroXS_Iso), intent(in) :: this ! The MacroXS to initialize + integer, intent(in) :: g ! Incoming Energy group + character(*) , intent(in) :: xstype ! Type of xs requested + real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8) :: xs ! Requested x/s + + select case(xstype) + case('total') + xs = this % total(g) + case('absorption') + xs = this % absorption(g) + case('fission') + xs = this % fission(g) + case('k_fission') + xs = this % k_fission(g) + case('nu_fission') + xs = this % nu_fission(g) + case('scatter') + xs = this % scattxs(g) + end select + + end function macroxs_iso_get_xs + + function macroxs_angle_get_xs(this, g, xstype, uvw) result(xs) + class(MacroXS_Angle), intent(in) :: this ! The MacroXS to initialize + integer, intent(in) :: g ! Incoming Energy group + character(*) , intent(in) :: xstype ! Type of xs requested + real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8) :: xs ! Requested x/s + + integer :: iazi, ipol + + if (present(uvw)) then + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + select case(xstype) + case('total') + xs = this % total(g,iazi,ipol) + case('absorption') + xs = this % absorption(g,iazi,ipol) + case('fission') + xs = this % fission(g,iazi,ipol) + case('k_fission') + xs = this % k_fission(g,iazi,ipol) + case('nu_fission') + xs = this % nu_fission(g,iazi,ipol) + case('scatter') + xs = this % scattxs(g,iazi,ipol) + end select + end if + + end function macroxs_angle_get_xs + +!=============================================================================== +! THIN_GRID thins an (x,y) set while also thinning an associated y2 +!=============================================================================== + + subroutine thin_grid(xout, yout, yout2, tol, compression, maxerr) + real(8), allocatable, intent(inout) :: xout(:) ! Resultant x grid + real(8), allocatable, intent(inout) :: yout(:) ! Resultant y values + real(8), allocatable, intent(inout) :: yout2(:) ! Secondary y values + real(8), intent(in) :: tol ! Desired fractional error to maintain + real(8), intent(out) :: compression ! Data reduction fraction + real(8), intent(inout) :: maxerr ! Maximum error due to compression + + real(8), allocatable :: xin(:) ! Incoming x grid + real(8), allocatable :: yin(:) ! Incoming y values + real(8), allocatable :: yin2(:) ! Secondary Incoming y values + integer :: k, klo, khi + integer :: all_ok + real(8) :: x1, y1, x2, y2, x, y, testval + integer :: num_keep, remove_it + real(8) :: initial_size + real(8) :: error + real(8) :: x_frac + + initial_size = real(size(xout), 8) + + allocate(xin(size(xout))) + xin = xout + allocate(yin(size(yout))) + yin = yout + allocate(yin2(size(yout2))) + yin2 = yout2 + + all_ok = size(yin) + maxerr = 0.0_8 + + ! This loop will step through each entry in dim==3 and check to see if + ! all of the values in other 2 dims can be replaced with linear interp. + ! If not, the value will be saved to a new array, if so, it will be + ! skipped. + + xout = 0.0_8 + yout = 0.0_8 + + ! Keep first point's data + xout(1) = xin(1) + yout(1) = yin(1) + yout2(1) = yin2(1) + + ! Initialize data + num_keep = 1 + klo = 1 + khi = 3 + k = 2 + do while (khi <= size(xin)) + remove_it = 0 + x1 = xin(klo) + x2 = xin(khi) + x = xin(k) + x_frac = 1.0_8 / (x2 - x1) * (x - x1) ! Linear interp. + + ! Check for removal. Otherwise, it stays. This is accomplished by leaving + ! remove_it as 0, entering the else portion of if(remove_it==all_ok) + y1 = yin(klo) + y2 = yin(khi) + y = yin(k) + + testval = y1 + (y2 - y1) * x_frac + error = abs(testval - y) + if (y /= 0.0_8) then + error = error / y + end if + if (error <= tol) then + remove_it = remove_it + 1 + if (error > maxerr) then + maxerr = abs(testval - y) + end if + end if + ! Now place the point in to the proper bin and advance iterators. + if (remove_it /= 0) then + ! Then don't put it in the new grid but advance iterators + k = k + 1 + khi = khi + 1 + else + ! Put it in new grid and advance iterators accordingly + num_keep = num_keep + 1 + xout(num_keep) = xin(k) + yout(num_keep) = yin(k) + yout2(num_keep) = yin2(k) + klo = k + k = k + 1 + khi = khi + 1 + end if + end do + ! Save the last point's data + num_keep = num_keep + 1 + xout(num_keep) = xin(size(xin)) + yout(num_keep) = yin(size(xin)) + yout2(num_keep) = yin2(size(xin)) + + ! Finally, xout and yout were sized to match xin and yin since we knew + ! they would be no larger than those. Now we must resize these arrays + ! and copy only the useful data in. Will use xin/yin for temp arrays. + xin = xout(1:num_keep) + yin = yout(1:num_keep) + yin2 = yout2(1:num_keep) + + deallocate(xout) + deallocate(yout) + deallocate(yout2) + allocate(xout(num_keep)) + allocate(yout(size(yin))) + allocate(yout2(size(yin2))) + + xout = xin(1:num_keep) + yout = yin(1:num_keep) + yout2 = yin2(1:num_keep) + + ! Clean up + deallocate(xin) + deallocate(yin) + deallocate(yin2) + + compression = (initial_size - real(size(xout),8)) / initial_size + + end subroutine thin_grid + +end module macroxs_header diff --git a/src/math.F90 b/src/math.F90 index 6b96baa0d9..9ca7a30c7c 100644 --- a/src/math.F90 +++ b/src/math.F90 @@ -1,7 +1,6 @@ module math use constants - use random_lcg, only: prn implicit none @@ -558,51 +557,43 @@ contains end function calc_rn !=============================================================================== -! MAXWELL_SPECTRUM samples an energy from the Maxwell fission distribution based -! on a direct sampling scheme. The probability distribution function for a -! Maxwellian is given as p(x) = 2/(T*sqrt(pi))*sqrt(x/T)*exp(-x/T). This PDF can -! be sampled using rule C64 in the Monte Carlo Sampler LA-9721-MS. +! EXPAND_HARMONIC expands a given series of harmonics !=============================================================================== + pure function expand_harmonic(data, order, uvw) result(val) + real(8), intent(in) :: data(:) + integer, intent(in) :: order + real(8), intent(in) :: uvw(3) + real(8) :: val - function maxwell_spectrum(T) result(E_out) + integer :: l, lm_lo, lm_hi - real(8), intent(in) :: T ! tabulated function of incoming E - real(8) :: E_out ! sampled energy + val = data(1) + lm_lo = 2 + lm_hi = 4 + do l = 1, order - 1 + val = val + sqrt(TWO * real(l,8) + ONE) * & + dot_product(calc_rn(l,uvw), data(lm_lo:lm_hi)) + lm_lo = lm_hi + 1 + lm_hi = lm_lo + 2 * (l + 1) + end do - real(8) :: r1, r2, r3 ! random numbers - real(8) :: c ! cosine of pi/2*r3 - - r1 = prn() - r2 = prn() - r3 = prn() - - ! determine cosine of pi/2*r - c = cos(PI/TWO*r3) - - ! determine outgoing energy - E_out = -T*(log(r1) + log(r2)*c*c) - - end function maxwell_spectrum + end function expand_harmonic !=============================================================================== -! WATT_SPECTRUM samples the outgoing energy from a Watt energy-dependent fission -! spectrum. Although fitted parameters exist for many nuclides, generally the -! continuous tabular distributions (LAW 4) should be used in lieu of the Watt -! spectrum. This direct sampling scheme is an unpublished scheme based on the -! original Watt spectrum derivation (See F. Brown's MC lectures). +! EVALUATE_LEGENDRE !=============================================================================== + pure function evaluate_legendre(data, x) result(val) + real(8), intent(in) :: data(:) + real(8), intent(in) :: x + real(8) :: val - function watt_spectrum(a, b) result(E_out) + integer :: l - real(8), intent(in) :: a ! Watt parameter a - real(8), intent(in) :: b ! Watt parameter b - real(8) :: E_out ! energy of emitted neutron + val = 0.5_8 * data(1) + do l = 1, size(data) - 1 + val = val + (real(l,8) + 0.5_8) * data(l + 1) * calc_pn(l,x) + end do - real(8) :: w ! sampled from Maxwellian - - w = maxwell_spectrum(a) - E_out = w + a*a*b/4. + (TWO*prn() - ONE)*sqrt(a*a*b*w) - - end function watt_spectrum + end function evaluate_legendre end module math diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 new file mode 100644 index 0000000000..64c5dcce7d --- /dev/null +++ b/src/mgxs_data.F90 @@ -0,0 +1,650 @@ +module mgxs_data + +use constants + use error, only: fatal_error, warning + use global + use list_header, only: ListInt + use macroxs_header + use material_header, only: Material + use nuclide_header + use output, only: write_message + use set_header, only: SetChar + use simple_string, only: to_lower + use xml_interface + + implicit none + +contains + +!=============================================================================== +! READ_XS reads all the cross sections for the problem and stores them in +! nuclides and sab_tables arrays +!=============================================================================== + + subroutine read_mgxs() + + integer :: i ! index in materials array + integer :: j ! index over nuclides in material + integer :: i_listing ! index in xs_listings array + integer :: i_nuclide ! index in nuclides + character(12) :: name ! name of isotope, e.g. 92235.03c + character(12) :: alias ! alias of isotope, e.g. U-235.03c + integer :: representation ! Data representation + type(Material), pointer :: mat + class(Nuclide_MG), pointer :: nuc + type(SetChar) :: already_read + type(Node), pointer :: doc => null() + type(Node), pointer :: node_xsdata + type(NodeList), pointer :: node_xsdata_list => null() + logical :: file_exists + integer :: error_code + character(MAX_LINE_LEN) :: error_text, temp_str + logical :: get_kfiss + integer :: l + + ! Check if cross_sections.xml exists + inquire(FILE=path_cross_sections, EXIST=file_exists) + if (.not. file_exists) then + ! Could not find cross_sections.xml file + call fatal_error("Cross sections XML file '" & + &// trim(path_cross_sections) // "' does not exist!") + end if + + call write_message("Loading Cross Section Data...", 5) + + ! Parse cross_sections.xml file + call open_xmldoc(doc, path_cross_sections) + + ! Get node list of all + call get_node_list(doc, "xsdata", node_xsdata_list) + n_listings = get_list_size(node_xsdata_list) + + ! allocate arrays for ACE table storage and cross section cache + allocate(nuclides_MG(n_nuclides_total)) + + ! Find out if we need kappa fission (are there any k_fiss tallies?) + get_kfiss = .false. + do i = 1, n_tallies + do l = 1, tallies(i) % n_score_bins + if (tallies(i) % score_bins(l) == SCORE_KAPPA_FISSION) then + get_kfiss = .true. + exit + end if + end do + if (get_kfiss) & + exit + end do + + ! ========================================================================== + ! READ ALL ACE CROSS SECTION TABLES + + ! Loop over all files + MATERIAL_LOOP: do i = 1, n_materials + mat => materials(i) + + NUCLIDE_LOOP: do j = 1, mat % n_nuclides + name = mat % names(j) + + if (.not. already_read % contains(name)) then + i_listing = xs_listing_dict % get_key(to_lower(name)) + i_nuclide = mat % nuclide(j) + name = xs_listings(i_listing) % name + alias = xs_listings(i_listing) % alias + + ! Keep track of what listing is associated with this nuclide + nuc => nuclides_MG(i_nuclide) % obj + + ! Get pointer to xsdata table XML node + call get_list_item(node_xsdata_list, i_listing, node_xsdata) + + call write_message("Loading " // trim(name) // " Data...", 5) + + ! First find out the data representation + if (check_for_node(node_xsdata, "representation")) then + call get_node_value(node_xsdata, "representation", temp_str) + temp_str = trim(to_lower(temp_str)) + if (temp_str == 'isotropic' .or. temp_str == 'iso') then + representation = ISOTROPIC + else if (temp_str == 'angle') then + representation = ANGLE + else + call fatal_error("Invalid Data Representation!") + end if + else + ! Default to isotropic representation + representation = ISOTROPIC + end if + + ! Now allocate accordingly + select case(representation) + case(ISOTROPIC) + allocate(Nuclide_Iso :: nuclides_MG(i_nuclide) % obj) + case(ANGLE) + allocate(Nuclide_Angle :: nuclides_MG(i_nuclide) % obj) + end select + + ! Now read in the data specific to the type we just declared + call nuclide_mg_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & + energy_groups, get_kfiss, error_code, & + error_text) + + ! Handle any errors + if (error_code /= 0) then + call fatal_error(trim(error_text)) + end if + + ! Add name and alias to dictionary + call already_read % add(name) + call already_read % add(alias) + end if + end do NUCLIDE_LOOP + end do MATERIAL_LOOP + + ! Avoid some valgrind leak errors + call already_read % clear() + + ! Loop around material + MATERIAL_LOOP3: do i = 1, n_materials + + ! Get material + mat => materials(i) + + ! Loop around nuclides in material + NUCLIDE_LOOP2: do j = 1, mat % n_nuclides + ! Get nuclide + nuc => nuclides_MG(mat % nuclide(j)) % obj + if (nuc % fissionable) then + mat % fissionable = .true. + end if + if (mat % fissionable) then + exit NUCLIDE_LOOP2 + end if + + end do NUCLIDE_LOOP2 + end do MATERIAL_LOOP3 + + end subroutine read_mgxs + +!=============================================================================== +! SAME_NUCLIDE_LIST creates a linked list for each nuclide containing the +! indices in the nuclides array of all other instances of that nuclide. For +! example, the same nuclide may exist at multiple temperatures resulting +! in multiple entries in the nuclides array for a single zaid number. +!=============================================================================== + + subroutine same_nuclide_mg_list() + + integer :: i ! index in nuclides array + integer :: j ! index in nuclides array + + do i = 1, n_nuclides_total + do j = 1, n_nuclides_total + if (nuclides_MG(i) % obj % zaid == nuclides_MG(j) % obj % zaid) then + call nuclides_MG(i) % obj % nuc_list % append(j) + end if + end do + end do + + end subroutine same_nuclide_mg_list + +!=============================================================================== +! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed +!=============================================================================== + + subroutine nuclide_mg_init(this, node_xsdata, groups, get_kfiss, & + error_code, error_text) + class(Nuclide_MG), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + + character(MAX_LINE_LEN) :: temp_str + + ! Initialize error data + error_code = 0 + error_text = '' + + ! Load the data + if (check_for_node(node_xsdata, "awr")) then + call get_node_value(node_xsdata, "awr", this % awr) + else + this % awr = ONE + end if + if (check_for_node(node_xsdata, "zaid")) then + call get_node_value(node_xsdata, "zaid", this % zaid) + else + this % zaid = -1 + end if + if (check_for_node(node_xsdata, "scatt_type")) then + call get_node_value(node_xsdata, "scatt_type", temp_str) + temp_str = trim(to_lower(temp_str)) + if (temp_str == 'legendre') then + this % scatt_type = ANGLE_LEGENDRE + else if (temp_str == 'tabular') then + this % scatt_type = ANGLE_HISTOGRAM + else + error_code = 1 + error_text = "Invalid Scatt Type Option!" + return + end if + else + this % scatt_type = ANGLE_LEGENDRE + end if + if (check_for_node(node_xsdata, "order")) then + call get_node_value(node_xsdata, "order", this % order) + else + error_code = 1 + error_text = "Order Must Be Provided!" + return + end if + if (check_for_node(node_xsdata, "fissionable")) then + call get_node_value(node_xsdata, "fissionable", temp_str) + temp_str = to_lower(temp_str) + if (trim(temp_str) == 'true' .or. trim(temp_str) == '1') then + this % fissionable = .true. + else + this % fissionable = .false. + end if + else + error_code = 1 + error_text = "Fissionable element must be set!" + return + end if + + select type(this) + type is (Nuclide_Iso) + call nuclide_iso_init(this, node_xsdata, groups, get_kfiss, & + error_code, error_text) + type is (Nuclide_Angle) + call nuclide_angle_init(this, node_xsdata, groups, get_kfiss, & + error_code, error_text) + end select + + end subroutine nuclide_mg_init + + subroutine nuclide_iso_init(this, node_xsdata, groups, get_kfiss, & + error_code, error_text) + class(Nuclide_Iso), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + + real(8), allocatable :: temp_arr(:) + integer :: arr_len + integer :: order_dim + + ! Load the more specific data + if (this % fissionable) then + allocate(this % fission(groups)) + + if (check_for_node(node_xsdata, "chi")) then + ! Get chi + allocate(this % chi(groups)) + call get_node_array(node_xsdata, "chi", this % chi) + + ! Get nu_fission (as a vector) + if (check_for_node(node_xsdata, "nu_fission")) then + allocate(temp_arr(groups * 1)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, 1)) + this % nu_fission = reshape(temp_arr, (/groups, 1/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "If fissionable, must provide nu_fission!" + return + end if + + else + ! Get nu_fission (as a matrix) + if (check_for_node(node_xsdata, "nu_fission")) then + + allocate(temp_arr(groups*groups)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, groups)) + this % nu_fission = reshape(temp_arr, (/groups, groups/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "If fissionable, must provide nu_fission!" + return + end if + end if + if (check_for_node(node_xsdata, "fission")) then + call get_node_array(node_xsdata, "fission", this % fission) + else + error_code = 1 + error_text = "If fissionable, must provide fission!" + return + end if + if (get_kfiss) then + allocate(this % k_fission(groups)) + if (check_for_node(node_xsdata, "k_fission")) then + call get_node_array(node_xsdata, "k_fission", this % k_fission) + else + error_code = 1 + error_text = "k_fission data missing, required due to kappa-fission& + & tallies in tallies.xml file!" + return + end if + end if + end if + + allocate(this % absorption(groups)) + if (check_for_node(node_xsdata, "absorption")) then + call get_node_array(node_xsdata, "absorption", this % absorption) + else + error_code = 1 + error_text = "Must provide absorption!" + return + end if + + if (this % scatt_type == ANGLE_LEGENDRE) then + order_dim = this % order + 1 + else if (this % scatt_type == ANGLE_HISTOGRAM) then + order_dim = this % order + end if + + allocate(this % scatter(groups, groups, order_dim)) + if (check_for_node(node_xsdata, "scatter")) then + allocate(temp_arr(groups * groups * order_dim)) + call get_node_array(node_xsdata, "scatter", temp_arr) + this % scatter = reshape(temp_arr, (/groups, groups, order_dim/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "Must provide scatter!" + return + end if + + + allocate(this % total(groups)) + if (check_for_node(node_xsdata, "total")) then + call get_node_array(node_xsdata, "total", this % total) + else + this % total = this % absorption + sum(this%scatter(:,:,1),dim=1) + end if + + ! Get Mult Data + allocate(this % mult(groups, groups)) + if (check_for_node(node_xsdata, "multiplicity")) then + arr_len = get_arraysize_double(node_xsdata, "multiplicity") + if (arr_len == groups * groups) then + allocate(temp_arr(arr_len)) + call get_node_array(node_xsdata, "multiplicity", temp_arr) + this % mult = reshape(temp_arr, (/groups, groups/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "Multiplicity Length Not Same as number of groups squared!" + return + end if + else + this % mult = ONE + end if + + end subroutine nuclide_iso_init + + subroutine nuclide_angle_init(this, node_xsdata, groups, get_kfiss, & + error_code, error_text) + class(Nuclide_Angle), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + + real(8), allocatable :: temp_arr(:) + integer :: arr_len + real(8) :: dangle + integer :: iangle + integer :: order_dim + + if (this % scatt_type == ANGLE_LEGENDRE) then + order_dim = this % order + 1 + else if (this % scatt_type == ANGLE_HISTOGRAM) then + order_dim = this % order + end if + + if (check_for_node(node_xsdata, "num_polar")) then + call get_node_value(node_xsdata, "num_polar", this % Npol) + else + error_code = 1 + error_text = "num_polar Must Be Provided!" + return + end if + + if (check_for_node(node_xsdata, "num_azimuthal")) then + call get_node_value(node_xsdata, "num_azimuthal", this % Nazi) + else + error_code = 1 + error_text = "num_azimuthal Must Be Provided!" + return + end if + + ! Load angle data, if present (else equally spaced) + allocate(this % polar(this % Npol)) + allocate(this % azimuthal(this % Nazi)) + if (check_for_node(node_xsdata, "polar")) then + error_code = 1 + error_text = "User-Specified polar angle bins not yet supported!" + return + call get_node_array(node_xsdata, "polar", this % polar) + else + dangle = PI / (real(this % Npol,8)) + do iangle = 1, this % Npol + this % polar(iangle) = (real(iangle,8) - 0.5_8) * dangle + end do + end if + if (check_for_node(node_xsdata, "azimuthal")) then + error_code = 1 + error_text = "User-Specified azimuthal angle bins not yet supported!" + return + call get_node_array(node_xsdata, "azimuthal", this % azimuthal) + else + dangle = TWO * PI / (real(this % Nazi,8)) + do iangle = 1, this % Nazi + this % azimuthal(iangle) = -PI + (real(iangle,8) - 0.5_8) * dangle + end do + end if + + ! Load the more specific data + if (this % fissionable) then + + if (check_for_node(node_xsdata, "chi")) then + ! Get chi + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "chi", temp_arr) + allocate(this % chi(groups, this % Nazi, this % Npol)) + this % chi = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + + ! Get nu_fission (as a vector) + if (check_for_node(node_xsdata, "nu_fission")) then + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, 1, this % Nazi, this % Npol)) + this % nu_fission = reshape(temp_arr, (/groups, 1, this % Nazi, & + this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "If fissionable, must provide nu_fission!" + return + end if + + else + ! Get nu_fission (as a matrix) + if (check_for_node(node_xsdata, "nu_fission")) then + + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, groups, this % Nazi, this % Npol)) + this % nu_fission = reshape(temp_arr, (/groups, groups, & + this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "If fissionable, must provide nu_fission!" + return + end if + end if + if (check_for_node(node_xsdata, "fission")) then + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "fission", temp_arr) + allocate(this % fission(groups, this % Nazi, this % Npol)) + this % fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "If fissionable, must provide fission!" + return + end if + if (get_kfiss) then + if (check_for_node(node_xsdata, "k_fission")) then + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "k_fission", temp_arr) + allocate(this % k_fission(groups, this % Nazi, this % Npol)) + this % k_fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "k_fission data missing, required due to kappa-fission& + & tallies in tallies.xml file!" + return + end if + end if + end if + + if (check_for_node(node_xsdata, "absorption")) then + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "absorption", temp_arr) + allocate(this % absorption(groups, this % Nazi, this % Npol)) + this % absorption = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "Must provide absorption!" + return + end if + + allocate(this % scatter(groups, groups, order_dim, this % Nazi, this % Npol)) + if (check_for_node(node_xsdata, "scatter")) then + allocate(temp_arr(groups * groups * order_dim * this % Nazi * this%Npol)) + call get_node_array(node_xsdata, "scatter", temp_arr) + this % scatter = reshape(temp_arr, (/groups, groups, order_dim, & + this%Nazi,this%Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "Must provide scatter!" + return + end if + + if (check_for_node(node_xsdata, "total")) then + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "total", temp_arr) + allocate(this % total(groups, this % Nazi, this % Npol)) + this % total = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + this % total = this % absorption + sum(this%scatter(:,:,1,:,:),dim=1) + end if + + ! Get Mult Data + allocate(this % mult(groups, groups, this % Nazi, this % Npol)) + if (check_for_node(node_xsdata, "multiplicity")) then + arr_len = get_arraysize_double(node_xsdata, "multiplicity") + if (arr_len == groups * groups * this % Nazi * this % Npol) then + allocate(temp_arr(arr_len)) + call get_node_array(node_xsdata, "multiplicity", temp_arr) + this % mult = reshape(temp_arr, (/groups, groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "Multiplicity Length Does Not Match!" + return + end if + else + this % mult = ONE + end if + + end subroutine nuclide_angle_init + + +!=============================================================================== +! CREATE_MACRO_XS generates the macroscopic x/s from the microscopic input data +!=============================================================================== + + subroutine create_macro_xs() + integer :: i_mat ! index in materials array + integer :: i ! loop index over nuclides + integer :: l ! Loop over score bins + type(Material), pointer :: mat ! current material + logical :: get_kfiss + integer :: error_code + character(MAX_LINE_LEN) :: error_text + integer :: representation + integer :: scatt_type + + ! Find out if we need kappa fission (are there any k_fiss tallies?) + get_kfiss = .false. + do i = 1, n_tallies + do l = 1, tallies(i) % n_score_bins + if (tallies(i) % score_bins(l) == SCORE_KAPPA_FISSION) then + get_kfiss = .true. + exit + end if + end do + if (get_kfiss) & + exit + end do + + allocate(macro_xs(n_materials)) + + do i_mat = 1, n_materials + mat => materials(i_mat) + + ! Check to see how our nuclides are represented + ! For now assume all are the same type + ! Therefore type(nuclides(1) % obj) dictates type(macroxs) + ! At the same time, we will find the scattering type, as that will dictate + ! how we allocate the scatter object within macroxs + scatt_type = ANGLE_LEGENDRE + select type(nuc => nuclides_MG(1) % obj) + type is (Nuclide_Iso) + representation = ISOTROPIC + if (nuc % scatt_type == ANGLE_HISTOGRAM) then + scatt_type = ANGLE_HISTOGRAM + end if + type is (Nuclide_Angle) + representation = ANGLE + if (nuc % scatt_type == ANGLE_HISTOGRAM) then + scatt_type = ANGLE_HISTOGRAM + end if + end select + + ! Now allocate accordingly + select case(representation) + case(ISOTROPIC) + allocate(MacroXS_Iso :: macro_xs(i_mat) % obj) + case(ANGLE) + allocate(MacroXS_Angle :: macro_xs(i_mat) % obj) + end select + + call macro_xs(i_mat) % obj % init(mat, nuclides_MG, energy_groups, & + get_kfiss, max_order, scatt_type, & + legendre_mu_points, error_code, & + error_text) + ! Handle any errors + if (error_code /= 0) then + call fatal_error(trim(error_text)) + end if + end do + end subroutine create_macro_xs + +end module mgxs_data \ No newline at end of file diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index cd83402a07..2910f63b19 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -9,7 +9,6 @@ module nuclide_header ! use math, only: calc_pn, calc_rn!, expand_harmonic !use scattdata_header use simple_string - ! use xml_interface implicit none @@ -106,13 +105,90 @@ module nuclide_header procedure, pass :: print => nuclide_ce_print end type Nuclide_CE -!=============================================================================== -! NUCLIDECONTAINER pointer array for storing Nuclides + type, abstract, extends(Nuclide_Base) :: Nuclide_MG + ! Scattering Order Information + integer :: order ! Order of data (Scattering for Nuclide_Iso, + ! Number of angles for all in Nuclide_Angle) + integer :: scatt_type ! either legendre or tabular. + + ! Type-Bound procedures + contains + procedure(nuclide_mg_get_xs_), deferred, pass :: get_xs ! Get the xs + end type Nuclide_MG + + abstract interface + function nuclide_mg_get_xs_(this, g, xstype, gout, uvw) result(xs) + import Nuclide_MG + class(Nuclide_MG), intent(in) :: this + integer, intent(in) :: g ! Incoming Energy group + character(*), intent(in) :: xstype ! Cross Section Type + integer, optional, intent(in) :: gout ! Outgoing Group + real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8) :: xs ! Resultant xs + end function nuclide_mg_get_xs_ + end interface + + !=============================================================================== +! NUCLIDE_ISO contains the base MGXS data for a nuclide specifically for +! isotropically weighted MGXS !=============================================================================== - type NuclideContainer - class(Nuclide_Base), pointer :: obj - end type NuclideContainer + type, extends(Nuclide_MG) :: Nuclide_Iso + + ! Microscopic cross sections + real(8), allocatable :: total(:) ! total cross section + real(8), allocatable :: absorption(:) ! absorption cross section + real(8), allocatable :: scatter(:,:,:) ! scattering information + real(8), allocatable :: nu_fission(:,:) ! fission matrix (Gout x Gin) + real(8), allocatable :: k_fission(:) ! kappa-fission + real(8), allocatable :: fission(:) ! neutron production + real(8), allocatable :: chi(:) ! Fission Spectra + real(8), allocatable :: mult(:,:) ! Scatter multiplicity (Gout x Gin) + + ! Type-Bound procedures + contains + procedure, pass :: clear => nuclide_iso_clear ! Deallocates Nuclide + procedure, pass :: print => nuclide_iso_print ! Writes nuclide info + procedure, pass :: get_xs => nuclide_iso_get_xs ! Gets Size of Data w/in Object + end type Nuclide_Iso + +!=============================================================================== +! NUCLIDE_ANGLE contains the base MGXS data for a nuclide specifically for +! explicit angle-dependent weighted MGXS +!=============================================================================== + + type, extends(Nuclide_MG) :: Nuclide_Angle + + ! Microscopic cross sections. Dimensions are: (Npol, Nazi, Nl, Ng, Ng) + real(8), allocatable :: total(:,:,:) ! total cross section + real(8), allocatable :: absorption(:,:,:) ! absorption cross section + real(8), allocatable :: scatter(:,:,:,:,:) ! scattering information + real(8), allocatable :: nu_fission(:,:,:,:) ! fission matrix (Gout x Gin) + real(8), allocatable :: k_fission(:,:,:) ! kappa-fission + real(8), allocatable :: fission(:,:,:) ! neutron production + real(8), allocatable :: chi(:,:,:) ! Fission Spectra + real(8), allocatable :: mult(:,:,:,:) ! Scatter multiplicity (Gout x Gin) + + ! In all cases, right-most indices are theta, phi + integer :: Npol ! Number of polar angles + integer :: Nazi ! Number of azimuthal angles + real(8), allocatable :: polar(:) ! polar angles + real(8), allocatable :: azimuthal(:) ! azimuthal angles + + ! Type-Bound procedures + contains + procedure, pass :: clear => nuclide_angle_clear ! Deallocates Nuclide + procedure, pass :: print => nuclide_angle_print ! Gets Size of Data w/in Object + procedure, pass :: get_xs => nuclide_angle_get_xs ! Gets Size of Data w/in Object + end type Nuclide_Angle + +!=============================================================================== +! NUCLIDEMGCONTAINER pointer array for storing Nuclides +!=============================================================================== + + type NuclideMGContainer + class(Nuclide_MG), pointer :: obj + end type NuclideMGContainer !=============================================================================== ! NUCLIDE0K temporarily contains all 0K cross section data and other parameters @@ -193,7 +269,6 @@ module nuclide_header contains - !=============================================================================== ! NUCLIDE_*_CLEAR resets and deallocates data in Nuclide_Base, Nuclide_Iso ! or Nuclide_Angle @@ -260,122 +335,304 @@ module nuclide_header end subroutine nuclide_ce_clear + subroutine nuclide_iso_clear(this) + + class(Nuclide_Iso), intent(inout) :: this ! The Nuclide object to clear + + ! Clear the base object + call nuclide_base_clear_(this) + + ! Cler the extended information + if (allocated(this % total)) then + deallocate(this % total, this % absorption, this % scatter) + end if + if (allocated(this % fission)) then + deallocate(this % fission, this % nu_fission) + end if + if (allocated(this % k_fission)) then + deallocate(this % k_fission) + end if + if (allocated(this % chi)) then + deallocate(this % chi) + end if + if (allocated(this % mult)) then + deallocate(this % mult) + end if + + end subroutine nuclide_iso_clear + + subroutine nuclide_angle_clear(this) + + class(Nuclide_Angle), intent(inout) :: this ! The Nuclide object to clear + + ! Clear the base object + call nuclide_base_clear_(this) + + ! Cler the extended information + if (allocated(this % total)) then + deallocate(this % total, this % absorption, this % scatter) + end if + if (allocated(this % fission)) then + deallocate(this % fission, this % nu_fission) + end if + if (allocated(this % k_fission)) then + deallocate(this % k_fission) + end if + if (allocated(this % chi)) then + deallocate(this % chi) + end if + + if (allocated(this % polar)) then + deallocate(this % polar) + end if + if (allocated(this % azimuthal)) then + deallocate(this % azimuthal) + end if + if (allocated(this % mult)) then + deallocate(this % mult) + end if + + end subroutine nuclide_angle_clear + !=============================================================================== ! PRINT_NUCLIDE_* displays information about a continuous-energy neutron ! cross_section table and its reactions and secondary angle/energy distributions !=============================================================================== - subroutine nuclide_ce_print(this, unit) + subroutine nuclide_ce_print(this, unit) - class(Nuclide_CE), intent(in) :: this - integer, optional, intent(in) :: unit + class(Nuclide_CE), intent(in) :: this + integer, optional, intent(in) :: unit - integer :: i ! loop index over nuclides - integer :: unit_ ! unit to write to - integer :: size_total ! memory used by nuclide (bytes) - integer :: size_angle_total ! total memory used for angle dist. (bytes) - integer :: size_energy_total ! total memory used for energy dist. (bytes) - integer :: size_xs ! memory used for cross-sections (bytes) - integer :: size_angle ! memory used for an angle distribution (bytes) - integer :: size_energy ! memory used for a energy distributions (bytes) - integer :: size_urr ! memory used for probability tables (bytes) - character(11) :: law ! secondary energy distribution law - type(Reaction), pointer :: rxn => null() - type(UrrData), pointer :: urr => null() + integer :: i ! loop index over nuclides + integer :: unit_ ! unit to write to + integer :: size_total ! memory used by nuclide (bytes) + integer :: size_angle_total ! total memory used for angle dist. (bytes) + integer :: size_energy_total ! total memory used for energy dist. (bytes) + integer :: size_xs ! memory used for cross-sections (bytes) + integer :: size_angle ! memory used for an angle distribution (bytes) + integer :: size_energy ! memory used for a energy distributions (bytes) + integer :: size_urr ! memory used for probability tables (bytes) + character(11) :: law ! secondary energy distribution law + type(Reaction), pointer :: rxn => null() + type(UrrData), pointer :: urr => null() - ! set default unit for writing information - if (present(unit)) then - unit_ = unit - else - unit_ = OUTPUT_UNIT - end if - - ! Initialize totals - size_angle_total = 0 - size_energy_total = 0 - size_urr = 0 - size_xs = 0 - - ! Basic nuclide information - write(unit_,*) 'Nuclide ' // trim(this % name) - write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) - write(unit_,*) ' awr = ' // trim(to_str(this % awr)) - write(unit_,*) ' kT = ' // trim(to_str(this % kT)) - write(unit_,*) ' # of grid points = ' // trim(to_str(this % n_grid)) - write(unit_,*) ' Fissionable = ', this % fissionable - write(unit_,*) ' # of fission reactions = ' // trim(to_str(this % n_fission)) - write(unit_,*) ' # of reactions = ' // trim(to_str(this % n_reaction)) - - ! Information on each reaction - write(unit_,*) ' Reaction Q-value COM Law IE size(angle) size(energy)' - do i = 1, this % n_reaction - rxn => this % reactions(i) - - ! Determine size of angle distribution - if (rxn % has_angle_dist) then - size_angle = rxn % adist % n_energy * 16 + size(rxn % adist % data) * 8 + ! set default unit for writing information + if (present(unit)) then + unit_ = unit else - size_angle = 0 + unit_ = OUTPUT_UNIT end if - ! Determine size of energy distribution and law - if (rxn % has_energy_dist) then - size_energy = size(rxn % edist % data) * 8 - law = to_str(rxn % edist % law) - else - size_energy = 0 - law = 'None' + ! Initialize totals + size_angle_total = 0 + size_energy_total = 0 + size_urr = 0 + size_xs = 0 + + ! Basic nuclide information + write(unit_,*) 'Nuclide ' // trim(this % name) + write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + write(unit_,*) ' kT = ' // trim(to_str(this % kT)) + write(unit_,*) ' # of grid points = ' // trim(to_str(this % n_grid)) + write(unit_,*) ' Fissionable = ', this % fissionable + write(unit_,*) ' # of fission reactions = ' // trim(to_str(this % n_fission)) + write(unit_,*) ' # of reactions = ' // trim(to_str(this % n_reaction)) + + ! Information on each reaction + write(unit_,*) ' Reaction Q-value COM Law IE size(angle) size(energy)' + do i = 1, this % n_reaction + rxn => this % reactions(i) + + ! Determine size of angle distribution + if (rxn % has_angle_dist) then + size_angle = rxn % adist % n_energy * 16 + size(rxn % adist % data) * 8 + else + size_angle = 0 + end if + + ! Determine size of energy distribution and law + if (rxn % has_energy_dist) then + size_energy = size(rxn % edist % data) * 8 + law = to_str(rxn % edist % law) + else + size_energy = 0 + law = 'None' + end if + + write(unit_,'(3X,A11,1X,F8.3,3X,L1,3X,A4,1X,I6,1X,I11,1X,I11)') & + reaction_name(rxn % MT), rxn % Q_value, rxn % scatter_in_cm, & + law(1:4), rxn % threshold, size_angle, size_energy + + ! Accumulate data size + size_xs = size_xs + (this % n_grid - rxn%threshold + 1) * 8 + size_angle_total = size_angle_total + size_angle + size_energy_total = size_energy_total + size_energy + end do + + ! Add memory required for summary reactions (total, absorption, fission, + ! nu-fission) + size_xs = 8 * this % n_grid * 4 + + ! Write information about URR probability tables + size_urr = 0 + if (this % urr_present) then + urr => this % urr_data + write(unit_,*) ' Unresolved resonance probability table:' + write(unit_,*) ' # of energies = ' // trim(to_str(urr % n_energy)) + write(unit_,*) ' # of probabilities = ' // trim(to_str(urr % n_prob)) + write(unit_,*) ' Interpolation = ' // trim(to_str(urr % interp)) + write(unit_,*) ' Inelastic flag = ' // trim(to_str(urr % inelastic_flag)) + write(unit_,*) ' Absorption flag = ' // trim(to_str(urr % absorption_flag)) + write(unit_,*) ' Multiply by smooth? ', urr % multiply_smooth + write(unit_,*) ' Min energy = ', trim(to_str(urr % energy(1))) + write(unit_,*) ' Max energy = ', trim(to_str(urr % energy(urr % n_energy))) + + ! Calculate memory used by probability tables and add to total + size_urr = urr % n_energy * (urr % n_prob * 6 + 1) * 8 end if - write(unit_,'(3X,A11,1X,F8.3,3X,L1,3X,A4,1X,I6,1X,I11,1X,I11)') & - reaction_name(rxn % MT), rxn % Q_value, rxn % scatter_in_cm, & - law(1:4), rxn % threshold, size_angle, size_energy + ! Calculate total memory + size_total = size_xs + size_angle_total + size_energy_total + size_urr - ! Accumulate data size - size_xs = size_xs + (this % n_grid - rxn%threshold + 1) * 8 - size_angle_total = size_angle_total + size_angle - size_energy_total = size_energy_total + size_energy - end do + ! Write memory used + write(unit_,*) ' Memory Requirements' + write(unit_,*) ' Cross sections = ' // trim(to_str(size_xs)) // ' bytes' + write(unit_,*) ' Secondary angle distributions = ' // & + trim(to_str(size_angle_total)) // ' bytes' + write(unit_,*) ' Secondary energy distributions = ' // & + trim(to_str(size_energy_total)) // ' bytes' + write(unit_,*) ' Probability Tables = ' // & + trim(to_str(size_urr)) // ' bytes' + write(unit_,*) ' Total = ' // trim(to_str(size_total)) // ' bytes' - ! Add memory required for summary reactions (total, absorption, fission, - ! nu-fission) - size_xs = 8 * this % n_grid * 4 + ! Blank line at end of nuclide + write(unit_,*) - ! Write information about URR probability tables - size_urr = 0 - if (this % urr_present) then - urr => this % urr_data - write(unit_,*) ' Unresolved resonance probability table:' - write(unit_,*) ' # of energies = ' // trim(to_str(urr % n_energy)) - write(unit_,*) ' # of probabilities = ' // trim(to_str(urr % n_prob)) - write(unit_,*) ' Interpolation = ' // trim(to_str(urr % interp)) - write(unit_,*) ' Inelastic flag = ' // trim(to_str(urr % inelastic_flag)) - write(unit_,*) ' Absorption flag = ' // trim(to_str(urr % absorption_flag)) - write(unit_,*) ' Multiply by smooth? ', urr % multiply_smooth - write(unit_,*) ' Min energy = ', trim(to_str(urr % energy(1))) - write(unit_,*) ' Max energy = ', trim(to_str(urr % energy(urr % n_energy))) + end subroutine nuclide_ce_print - ! Calculate memory used by probability tables and add to total - size_urr = urr % n_energy * (urr % n_prob * 6 + 1) * 8 - end if + subroutine nuclide_iso_print(this, unit) - ! Calculate total memory - size_total = size_xs + size_angle_total + size_energy_total + size_urr + class(Nuclide_Iso), intent(in) :: this + integer, optional, intent(in) :: unit - ! Write memory used - write(unit_,*) ' Memory Requirements' - write(unit_,*) ' Cross sections = ' // trim(to_str(size_xs)) // ' bytes' - write(unit_,*) ' Secondary angle distributions = ' // & - trim(to_str(size_angle_total)) // ' bytes' - write(unit_,*) ' Secondary energy distributions = ' // & - trim(to_str(size_energy_total)) // ' bytes' - write(unit_,*) ' Probability Tables = ' // & - trim(to_str(size_urr)) // ' bytes' - write(unit_,*) ' Total = ' // trim(to_str(size_total)) // ' bytes' - ! Blank line at end of nuclide - write(unit_,*) + end subroutine nuclide_iso_print - end subroutine nuclide_ce_print + subroutine nuclide_angle_print(this, unit) - end module nuclide_header \ No newline at end of file + class(Nuclide_Angle), intent(in) :: this + integer, optional, intent(in) :: unit + + + end subroutine nuclide_angle_print + +!=============================================================================== +! NUCLIDE_*_GET_XS Returns the requested data type +!=============================================================================== + + function nuclide_iso_get_xs(this, g, xstype, gout, uvw) result(xs) + class(Nuclide_Iso), intent(in) :: this + integer, intent(in) :: g ! Incoming Energy group + character(*), intent(in) :: xstype ! Cross Section Type + integer, optional, intent(in) :: gout ! Outgoing Group + real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8) :: xs ! Resultant xs + + if (present(gout)) then + select case(xstype) + case('mult') + xs = this % mult(gout,g) + case('nu_fission') + xs = this % nu_fission(gout,g) + end select + else + select case(xstype) + case('total') + xs = this % total(g) + case('absorption') + xs = this % absorption(g) + case('fission') + xs = this % fission(g) + case('k_fission') + xs = this % k_fission(g) + case('chi') + xs = this % chi(g) + case('scatter') + xs = this % total(g) - this % absorption(g) + end select + end if + end function nuclide_iso_get_xs + + function nuclide_angle_get_xs(this, g, xstype, gout, uvw) result(xs) + class(Nuclide_Angle), intent(in) :: this + integer, intent(in) :: g ! Incoming Energy group + character(*), intent(in) :: xstype ! Cross Section Type + integer, optional, intent(in) :: gout ! Outgoing Group + real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8) :: xs ! Resultant xs + + integer :: i_pol, i_azi + + call find_angle(this % polar, this % azimuthal, uvw, i_azi, i_pol) + + if (present(gout)) then + select case(xstype) + case('mult') + xs = this % mult(gout,g,i_azi,i_pol) + case('nu_fission') + xs = this % nu_fission(gout,g,i_azi,i_pol) + case('chi') + xs = this % chi(gout,i_azi,i_pol) + end select + else + select case(xstype) + case('total') + xs = this % total(g,i_azi,i_pol) + case('absorption') + xs = this % absorption(g,i_azi,i_pol) + case('fission') + xs = this % fission(g,i_azi,i_pol) + case('k_fission') + xs = this % k_fission(g,i_azi,i_pol) + case('chi') + xs = this % chi(g,i_azi,i_pol) + case('scatter') + xs = this % total(g,i_azi,i_pol) - this % absorption(g,i_azi,i_pol) + end select + end if + + end function nuclide_angle_get_xs + +!=============================================================================== +! find_angle finds the closest angle on the data grid and returns that index +!=============================================================================== + + subroutine find_angle(polar, azimuthal, uvw, i_azi, i_pol) + real(8), intent(in) :: polar(:) ! Polar angles [0,pi] + real(8), intent(in) :: azimuthal(:) ! Azi. angles [-pi,pi] + real(8), intent(in) :: uvw(3) ! Direction of motion + integer, intent(inout) :: i_pol ! Closest polar bin + integer, intent(inout) :: i_azi ! Closest azi bin + + real(8) my_pol, my_azi, dangle + + ! Convert uvw to polar and azi + + my_pol = acos(uvw(3)) + my_azi = atan2(uvw(2), uvw(1)) + + ! Quick and clear (but slower): + ! i_pol = minloc(abs(polar - my_pol),dim=1) + ! i_azi = minloc(abs(azimuthal - my_azi),dim=1) + + ! Fast search for equi-binned angles + dangle = PI / (real(size(polar),8)) + i_pol = floor(my_pol / dangle + ONE) + dangle = TWO * PI / (real(size(azimuthal),8)) + i_azi = floor((my_azi + PI) / dangle + ONE) + + end subroutine find_angle + +end module nuclide_header \ No newline at end of file diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 40d7499015..f661e73c14 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -88,10 +88,10 @@ module particle_header type(Bank) :: secondary_bank(MAX_SECONDARY) contains - procedure :: initialize => initialize_particle - procedure :: clear => clear_particle - procedure(initialize_from_source_), deferred, pass :: initialize_from_source - procedure(create_secondary_), deferred, pass :: create_secondary + procedure, pass :: initialize => initialize_particle + procedure, pass :: clear => clear_particle + procedure, pass :: initialize_from_source => initialize_from_source_base + procedure, pass :: create_secondary => create_secondary_base end type Particle_Base type, extends(Particle_Base) :: Particle_CE @@ -114,31 +114,6 @@ module particle_header procedure :: create_secondary => create_secondary_mg end type Particle_MG - abstract interface - -!=============================================================================== -! INITIALIZE_FROM_SOURCE_ returns .true. if the given lattice indices fit within the -! bounds of the lattice. Returns false otherwise. - - subroutine initialize_from_source_(this, src) - import Particle_Base - import Bank - class(Particle_Base), intent(inout) :: this - type(Bank), intent(in) :: src - end subroutine initialize_from_source_ - -!=============================================================================== -! CREATE_SECONDARY_ Generates a secondary particle from this - - subroutine create_secondary_(this, uvw, type) - import Particle_Base - class(Particle_Base), intent(inout) :: this - real(8), intent(in) :: uvw(3) - integer, intent(in) :: type - end subroutine create_secondary_ - - end interface - contains !=============================================================================== @@ -217,9 +192,9 @@ contains ! fission, or simply as a secondary particle. !=============================================================================== - subroutine initialize_from_source_ce(this, src) - class(Particle_CE), intent(inout) :: this - type(Bank), intent(in) :: src + subroutine initialize_from_source_base(this, src) + class(Particle_Base), intent(inout) :: this + type(Bank), intent(in) :: src ! set defaults call this % initialize() @@ -231,6 +206,17 @@ contains this % coord(1) % uvw = src % uvw this % last_xyz = src % xyz this % last_uvw = src % uvw + + end subroutine initialize_from_source_base + + subroutine initialize_from_source_ce(this, src) + class(Particle_CE), intent(inout) :: this + type(Bank), intent(in) :: src + + ! set defaults a nd init base + call initialize_from_source_base(this, src) + + ! copy attributes from source bank site this % E = src % E this % last_E = src % E @@ -240,16 +226,10 @@ contains class(Particle_MG), intent(inout) :: this type(Bank), intent(in) :: src - ! set defaults - call this % initialize() + ! set defaults and init base + call initialize_from_source_base(this, src) ! copy attributes from source bank site - this % wgt = src % wgt - this % last_wgt = src % wgt - this % coord(1) % xyz = src % xyz - this % coord(1) % uvw = src % uvw - this % last_xyz = src % xyz - this % last_uvw = src % uvw this % g = src % g this % last_g = src % g @@ -260,10 +240,10 @@ contains ! the secondary bank and increments the number of sites in the secondary bank. !=============================================================================== - subroutine create_secondary_ce(this, uvw, type) - class(Particle_CE), intent(inout) :: this - real(8), intent(in) :: uvw(3) - integer, intent(in) :: type + subroutine create_secondary_base(this, uvw, type) + class(Particle_Base), intent(inout) :: this + real(8), intent(in) :: uvw(3) + integer, intent(in) :: type integer :: n @@ -277,9 +257,19 @@ contains this % secondary_bank(n) % wgt = this % wgt this % secondary_bank(n) % xyz(:) = this % coord(1) % xyz this % secondary_bank(n) % uvw(:) = uvw - this % secondary_bank(n) % E = this % E this % n_secondary = n + end subroutine create_secondary_base + + subroutine create_secondary_ce(this, uvw, type) + class(Particle_CE), intent(inout) :: this + real(8), intent(in) :: uvw(3) + integer, intent(in) :: type + + call create_secondary_base(this, uvw, type) + + this % secondary_bank(this % n_secondary) % E = this % E + end subroutine create_secondary_ce subroutine create_secondary_mg(this, uvw, type) @@ -287,20 +277,9 @@ contains real(8), intent(in) :: uvw(3) integer, intent(in) :: type - integer :: n + call create_secondary_base(this, uvw, type) - ! Check to make sure that the hard-limit on secondary particles is not - ! exceeded. - if (this % n_secondary == MAX_SECONDARY) then - call fatal_error("Too many secondary particles created.") - end if - - n = this % n_secondary + 1 - this % secondary_bank(n) % wgt = this % wgt - this % secondary_bank(n) % xyz(:) = this % coord(1) % xyz - this % secondary_bank(n) % uvw(:) = uvw - this % secondary_bank(n) % g = this % g - this % n_secondary = n + this % secondary_bank(this % n_secondary) % g = this % g end subroutine create_secondary_mg diff --git a/src/physics.F90 b/src/physics.F90 index a24ab8de4d..9bbed576dc 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -9,7 +9,6 @@ module physics use global use interpolation, only: interpolate_tab1 use material_header, only: Material - use math, only: maxwell_spectrum, watt_spectrum use mesh, only: get_mesh_indices use nuclide_header use output, only: write_message @@ -18,6 +17,7 @@ module physics use random_lcg, only: prn use search, only: binary_search use simple_string, only: to_str + use spectra implicit none diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 new file mode 100644 index 0000000000..63a428717b --- /dev/null +++ b/src/scattdata_header.F90 @@ -0,0 +1,355 @@ +module scattdata_header + + use math + use constants + + implicit none + +!=============================================================================== +! SCATTDATA contains all the data to describe the scattering energy and +! angular distribution +!=============================================================================== + + type, abstract :: ScattData_Base + ! p0 matrix on its own for sampling energy + real(8), allocatable :: energy(:,:) ! (Gout x Gin) + real(8), allocatable :: mult(:,:) ! (Gout x Gin) + real(8), allocatable :: data(:,:,:) ! (Order/Nmu x Gout x Gin) + + ! Type-Bound procedures + contains + procedure(init_), deferred, pass :: init ! Initializes ScattData + procedure(calc_f_), deferred, pass :: calc_f ! Calculates f, given mu + procedure(clear_), deferred, pass :: clear ! Deallocates ScattData + end type ScattData_Base + + abstract interface + subroutine init_(this, order, energy, mult, coeffs) + import ScattData_Base + class(ScattData_Base), intent(inout) :: this ! Object to work on + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use + end subroutine init_ + + pure function calc_f_(this, gin, gout, mu) result(f) + import ScattData_Base + class(ScattData_Base), intent(in) :: this ! The ScattData to evaluate + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) + + end function calc_f_ + + subroutine clear_(this) + import ScattData_Base + class(ScattData_Base), intent(inout) :: this ! The ScattData to clear + end subroutine clear_ + end interface + + type, extends(ScattData_Base) :: ScattData_Legendre + contains + procedure, pass :: init => scattdata_legendre_init + procedure, pass :: calc_f => scattdata_legendre_calc_f + procedure, pass :: clear => scattdata_legendre_clear + end type ScattData_Legendre + + type, extends(ScattData_Base) :: ScattData_Histogram + real(8), allocatable :: mu(:) ! Mu bins + real(8) :: dmu ! Mu spacing + contains + procedure, pass :: init => scattdata_histogram_init + procedure, pass :: calc_f => scattdata_histogram_calc_f + procedure, pass :: clear => scattdata_histogram_clear + end type ScattData_Histogram + + type, extends(ScattData_Base) :: ScattData_Tabular + real(8), allocatable :: mu(:) ! Mu bins + real(8) :: dmu ! Mu spacing + real(8), allocatable :: fmu(:,:,:) ! PDF of f(mu) + contains + procedure, pass :: init => scattdata_tabular_init + procedure, pass :: calc_f => scattdata_tabular_calc_f + procedure, pass :: clear => scattdata_tabular_clear + end type ScattData_Tabular + +!=============================================================================== +! SCATTDATACONTAINER allocatable array for storing ScattData Objects (for angle) +!=============================================================================== + + type ScattDataContainer + class(ScattData_Base), allocatable :: obj + end type ScattDataContainer + +contains + +!=============================================================================== +! SCATTDATA_INIT builds the scattdata object +!=============================================================================== + + subroutine scattdata_base_init(this, order, energy, mult) + class(ScattData_Base), intent(inout) :: this ! Object to work on + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + + integer :: groups + + groups = size(energy, dim=1) + + allocate(this % energy(groups, groups)) + this % energy = energy + allocate(this % mult(groups, groups)) + this % mult = mult + allocate(this % data(order, groups, groups)) + this % data = ZERO + + end subroutine scattdata_base_init + + subroutine scattdata_legendre_init(this, order, energy, mult, coeffs) + class(ScattData_Legendre), intent(inout) :: this ! Object to work on + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use + + call scattdata_base_init(this, order, energy, mult) + + this % data = coeffs + + end subroutine scattdata_legendre_init + + subroutine scattdata_histogram_init(this, order, energy, mult, coeffs) + class(ScattData_Histogram), intent(inout) :: this ! Object to work on + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use + + integer :: imu, gin, gout, groups + real(8) :: norm + + groups = size(energy,dim=1) + + call scattdata_base_init(this, order, energy, mult) + + allocate(this % mu(order)) + this % dmu = TWO / (real(order,8)) + this % mu(1) = -ONE + do imu = 2, order + this % mu(imu) = -ONE + (imu - 1) * this % dmu + end do + + ! Best to integrate this histogram so we can avoid rejection sampling + do gin = 1, groups + do gout = 1, groups + if (energy(gout,gin) > ZERO) then + ! Integrate the histogram + this % data(1,gout,gin) = this % dmu * coeffs(1,gout,gin) + do imu = 2, order + this % data(imu,gout,gin) = this % dmu * coeffs(imu,gout,gin) + & + this % data(imu-1,gout,gin) + end do + ! Now make sure integral norms to zero + norm = this % data(order,gout,gin) + if (norm > ZERO) then + this % data(:,gout,gin) = this % data(:,gout,gin) / norm + end if + end if + end do + end do + + end subroutine scattdata_histogram_init + + subroutine scattdata_tabular_init(this, order, energy, mult, coeffs) + class(ScattData_Tabular), intent(inout) :: this ! Object to work on + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use + + integer :: imu, gin, gout, groups + real(8) :: norm + logical :: legendre_flag + integer :: this_order + + if (order < 0) then + legendre_flag = .true. + this_order = -1 * order + else + legendre_flag = .false. + this_order = order + end if + + groups = size(energy,dim=1) + + call scattdata_base_init(this, this_order, energy, mult) + + allocate(this % mu(this_order)) + this % dmu = TWO / (real(this_order,8) - 1) + do imu = 1, this_order - 1 + this % mu(imu) = -ONE + real(imu - 1, 8) * this % dmu + end do + this % mu(this_order) = ONE + + ! Best to integrate this histogram so we can avoid rejection sampling + allocate(this % fmu(this_order,groups,groups)) + do gin = 1, groups + do gout = 1, groups + if (energy(gout,gin) > ZERO) then + if (legendre_flag) then + ! Coeffs are legendre coeffs. Need to build f(mu) then integrate + ! and store the integral in this % data + ! Ensure the coeffs are normalized + norm = ONE / coeffs(1,gout,gin) + do imu = 1, this_order + this % fmu(imu,gout,gin) = evaluate_legendre(norm * coeffs(:,gout,gin), this % mu(imu)) + ! Force positivity + if (this % fmu(imu,gout,gin) < ZERO) then + this % fmu(imu,gout,gin) = ZERO + end if + end do + else + ! Coeffs contain f(mu), put in f(mu) to save duplicate. + this % fmu(:,gout,gin) = this % data(:,gout,gin) + end if + + ! Re-normalize fmu for numerical integration issues and in case + ! the negative fix-up introduced un-normalized data + norm = ZERO + do imu = 2, this_order + norm = norm + 0.5_8 * this % dmu * (this % fmu(imu-1,gout,gin) + this % fmu(imu,gout,gin)) + end do + if (norm > ZERO) then + this % fmu(:,gout,gin) = this % fmu(:,gout,gin) / norm + end if + + ! Now create CDF from fmu with trapezoidal rule + this % data(1,gout,gin) = ZERO + do imu = 2, this_order - 1 + this % data(imu,gout,gin) = this % data(imu-1,gout,gin) + & + 0.5_8 * this % dmu * (this % fmu(imu-1,gout,gin) + this % fmu(imu,gout,gin)) + end do + this % data(this_order,gout,gin) = ONE + end if + end do + end do + + end subroutine scattdata_tabular_init + +!=============================================================================== +! SCATTDATA_CLEAR resets and deallocates data in ScattData. +!=============================================================================== + + subroutine scattdata_base_clear(this) + class(ScattData_Base), intent(inout) :: this + + if (allocated(this % energy)) then + deallocate(this % energy) + end if + + if (allocated(this % mult)) then + deallocate(this % mult) + end if + + if (allocated(this % data)) then + deallocate(this % data) + end if + + end subroutine scattdata_base_clear + + subroutine scattdata_legendre_clear(this) + class(ScattData_Legendre), intent(inout) :: this + + call scattdata_base_clear(this) + + end subroutine scattdata_legendre_clear + + subroutine scattdata_histogram_clear(this) + class(ScattData_Histogram), intent(inout) :: this + + call scattdata_base_clear(this) + + if (allocated(this % mu)) then + deallocate(this % mu) + end if + + end subroutine scattdata_histogram_clear + + subroutine scattdata_tabular_clear(this) + class(ScattData_Tabular), intent(inout) :: this + + call scattdata_base_clear(this) + + if (allocated(this % mu)) then + deallocate(this % mu) + end if + + end subroutine scattdata_tabular_clear + +!=============================================================================== +! SCATTDATA_*_CALC_F Calculates the value of f given mu (and gin,gout pair) +!=============================================================================== + + pure function scattdata_legendre_calc_f(this, gin, gout, mu) result(f) + class(ScattData_Legendre), intent(in) :: this ! The ScattData to evaluate + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) + + ! Plug mu in to the legendre expansion and go from there + f = evaluate_legendre(this % data(:, gout, gin), mu) + + end function scattdata_legendre_calc_f + + pure function scattdata_histogram_calc_f(this, gin, gout, mu) result(f) + class(ScattData_Histogram), intent(in) :: this ! The ScattData to evaluate + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) + + integer :: imu + + ! Find mu bin + imu = floor((mu + ONE)/ this % dmu + ONE) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % data, dim=1)) then + imu = imu - 1 + end if + + ! Use histogram interpolation to find f(mu) + f = this % data(imu, gout, gin) + + end function scattdata_histogram_calc_f + + pure function scattdata_tabular_calc_f(this, gin, gout, mu) result(f) + class(ScattData_Tabular), intent(in) :: this ! The ScattData to evaluate + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) + + integer :: imu + real(8) :: r + + ! Find mu bin + imu = floor((mu + ONE)/ this % dmu + ONE) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % data, dim=1)) then + imu = imu - 1 + end if + + ! ! Now interpolate to find f(mu) + r = (mu - this % mu(imu)) / (this % mu(imu + 1) - this % mu(imu)) + f = (ONE - r) * this % data(imu, gout, gin) + & + r * this % data(imu + 1, gout, gin) + + end function scattdata_tabular_calc_f + + + +end module scattdata_header \ No newline at end of file diff --git a/src/simulation.F90 b/src/simulation.F90 index c31b1d6fa7..088a764f79 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -15,7 +15,7 @@ module simulation use global use output, only: write_message, header, print_columns, & print_batch_keff, print_generation - use particle_header, only: Particle_Base + use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: set_particle_seed use source, only: initialize_source use state_point, only: write_state_point, write_source_point @@ -42,6 +42,12 @@ contains class(Particle_Base), pointer :: p integer(8) :: i_work + if (run_CE) then + allocate(Particle_CE :: p) + else + allocate(Particle_MG :: p) + end if + if (.not. restart_run) call initialize_source() ! Display header @@ -116,6 +122,9 @@ contains ! Clear particle call p % clear() + if (associated(p)) & + deallocate(p) + end subroutine run_simulation !=============================================================================== @@ -124,8 +133,8 @@ contains subroutine initialize_history(p, index_source) - class(Particle_Base), intent(inout) :: p - integer(8), intent(in) :: index_source + class(Particle_Base), pointer, intent(inout) :: p + integer(8), intent(in) :: index_source integer(8) :: particle_seed ! unique index for particle integer :: i diff --git a/src/source.F90 b/src/source.F90 index b83bf766e6..53ed2e9a3d 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -7,12 +7,13 @@ module source use geometry_header, only: BASE_UNIVERSE use global use hdf5_interface, only: file_create, file_open, file_close, read_dataset - use math, only: maxwell_spectrum, watt_spectrum use output, only: write_message use particle_header, only: Particle_Base, Particle_CE, Particle_MG use random_lcg, only: prn, set_particle_seed, prn_set_stream - use state_point, only: read_source_bank, write_source_bank + use search, only: binary_search use simple_string, only: to_str + use spectra + use state_point, only: read_source_bank, write_source_bank #ifdef MPI use message_passing @@ -108,7 +109,7 @@ contains real(8) :: a ! Arbitrary parameter 'a' real(8) :: b ! Arbitrary parameter 'b' logical :: found ! Does the source particle exist within geometry? - class(Particle_Base), pointer :: p ! Temporary particle for using find_cell + type(Particle_CE) :: p ! Temporary particle for using find_cell integer, save :: num_resamples = 0 ! Number of resamples encountered ! Set weight to one by default @@ -241,6 +242,17 @@ contains call fatal_error("No energy distribution specified for external source!") end select + ! If running in MG, convert site%E to group + if (.not. run_CE) then + if (site%E <= energy_bins(1)) then + site%g = 1 + else if (site%E > energy_bins(energy_groups + 1)) then + site%g = energy_groups + else + site%g = binary_search(energy_bins, energy_groups + 1, site%E) + end if + end if + ! Set the random number generator back to the tracking stream. call prn_set_stream(STREAM_TRACKING) diff --git a/src/spectra.F90 b/src/spectra.F90 new file mode 100644 index 0000000000..acdde78206 --- /dev/null +++ b/src/spectra.F90 @@ -0,0 +1,58 @@ +module spectra + +use constants, only: ONE, TWO, PI +use random_lcg, only: prn + +implicit none + +contains + +!=============================================================================== +! MAXWELL_SPECTRUM samples an energy from the Maxwell fission distribution based +! on a direct sampling scheme. The probability distribution function for a +! Maxwellian is given as p(x) = 2/(T*sqrt(pi))*sqrt(x/T)*exp(-x/T). This PDF can +! be sampled using rule C64 in the Monte Carlo Sampler LA-9721-MS. +!=============================================================================== + + function maxwell_spectrum(T) result(E_out) + + real(8), intent(in) :: T ! tabulated function of incoming E + real(8) :: E_out ! sampled energy + + real(8) :: r1, r2, r3 ! random numbers + real(8) :: c ! cosine of pi/2*r3 + + r1 = prn() + r2 = prn() + r3 = prn() + + ! determine cosine of pi/2*r + c = cos(PI/TWO*r3) + + ! determine outgoing energy + E_out = -T*(log(r1) + log(r2)*c*c) + + end function maxwell_spectrum + +!=============================================================================== +! WATT_SPECTRUM samples the outgoing energy from a Watt energy-dependent fission +! spectrum. Although fitted parameters exist for many nuclides, generally the +! continuous tabular distributions (LAW 4) should be used in lieu of the Watt +! spectrum. This direct sampling scheme is an unpublished scheme based on the +! original Watt spectrum derivation (See F. Brown's MC lectures). +!=============================================================================== + + function watt_spectrum(a, b) result(E_out) + + real(8), intent(in) :: a ! Watt parameter a + real(8), intent(in) :: b ! Watt parameter b + real(8) :: E_out ! energy of emitted neutron + + real(8) :: w ! sampled from Maxwellian + + w = maxwell_spectrum(a) + E_out = w + a*a*b/4.0_8 + (TWO*prn() - ONE)*sqrt(a*a*b*w) + + end function watt_spectrum + +end module spectra \ No newline at end of file From 76921b005ec810724603a0ef7f0032695aeeea62 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 1 Nov 2015 13:44:29 -0500 Subject: [PATCH 009/149] Got to the point where the physics needs to be differentiated. CE answer still consistent with develop branchs answer --- src/constants.F90 | 8 -- src/global.F90 | 13 +-- src/initialize.F90 | 4 +- src/macroxs.F90 | 243 +++++++++++++++++++++++++++++++++++++++++++++ src/tracking.F90 | 8 ++ 5 files changed, 257 insertions(+), 19 deletions(-) create mode 100644 src/macroxs.F90 diff --git a/src/constants.F90 b/src/constants.F90 index 9bb62f62eb..b7eb1d0bec 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -166,14 +166,6 @@ module constants ! Number of mu bins to use when converting Legendres to tabular type integer, parameter :: DEFAULT_NMU = 33 - ! Location within pre-computed cross section data (particle_xs) - integer, parameter :: & - TOTAL = 1, & - ABSORB = 2, & - NUFISS = 3, & - FISS = 4, & - SCATT = 5 - ! Secondary energy mode for S(a,b) inelastic scattering integer, parameter :: & SAB_SECONDARY_EQUAL = 0, & ! Equally-likely outgoing energy bins diff --git a/src/global.F90 b/src/global.F90 index c5dbec5da9..57b242ab22 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -72,6 +72,10 @@ module global integer :: n_nuclides_total ! Number of nuclide cross section tables integer :: n_listings ! Number of listings in cross_sections.xml + ! Cross section caches + type(NuclideMicroXS), allocatable :: micro_xs(:) ! Cache for each nuclide + type(MaterialMacroXS) :: material_xs ! Cache for current material + ! Dictionaries to look up cross sections and listings type(DictCharInt) :: nuclide_dict type(DictCharInt) :: xs_listing_dict @@ -86,10 +90,6 @@ module global type(Nuclide_CE), allocatable, target :: nuclides(:) ! Nuclide cross-sections type(SAlphaBeta), allocatable, target :: sab_tables(:) ! S(a,b) tables - ! Cross section caches - type(NuclideMicroXS), allocatable :: micro_xs(:) ! Cache for each nuclide - type(MaterialMacroXS) :: material_xs ! Cache for current material - integer :: n_sab_tables ! Number of S(a,b) thermal scattering tables ! Minimum/maximum energies @@ -126,11 +126,6 @@ module global ! Scattering Treatment (if Legendre) integer :: legendre_mu_points - ! MGXS for current working particle (equivalent to material_xs, but simpler) - real(8) :: particle_xs(5) - -!$omp threadprivate(particle_xs) - ! ============================================================================ ! TALLY-RELATED VARIABLES diff --git a/src/initialize.F90 b/src/initialize.F90 index 01a8038070..5793b67226 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -322,8 +322,8 @@ contains c_loc(tmpb(1)%uvw)), coordinates_t, hdf5_err) call h5tinsert_f(hdf5_bank_t, "E", h5offsetof(c_loc(tmpb(1)), & c_loc(tmpb(1)%E)), H5T_NATIVE_DOUBLE, hdf5_err) - call h5tinsert_f(hdf5_bank_t, "group", h5offsetof(c_loc(tmpb(1)), & - c_loc(tmpb(1)%group)), H5T_NATIVE_INTEGER, hdf5_err) + call h5tinsert_f(hdf5_bank_t, "g", h5offsetof(c_loc(tmpb(1)), & + c_loc(tmpb(1)%g)), H5T_NATIVE_INTEGER, hdf5_err) call h5tinsert_f(hdf5_bank_t, "delayed_group", h5offsetof(c_loc(tmpb(1)), & c_loc(tmpb(1)%delayed_group)), H5T_NATIVE_INTEGER, hdf5_err) diff --git a/src/macroxs.F90 b/src/macroxs.F90 new file mode 100644 index 0000000000..799d3115b8 --- /dev/null +++ b/src/macroxs.F90 @@ -0,0 +1,243 @@ +module macroxs + + use constants + use macroxs_header, only: MacroXS_Base, MacroXS_Iso, MacroXS_Angle, & + expand_harmonic + use math + use nuclide_header, only: find_angle, MaterialMacroXS + use random_lcg, only: prn + use scattdata_header + use search + + implicit none + +contains + +!=============================================================================== +! UPDATE_XS stores the xs to work with +!=============================================================================== + + subroutine calculate_mgxs(this, gin, uvw, xs) + class(MacroXS_Base), intent(in) :: this + integer, intent(in) :: gin ! Incoming neutron group + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + type(MaterialMacroXS), intent(inout) :: xs + + integer :: iazi, ipol + + select type(this) + type is (MacroXS_Iso) + xs % total = this % total(gin) + xs % elastic = this % scattxs(gin) + xs % absorption = this % absorption(gin) + xs % fission = this % fission(gin) + xs % nu_fission = this % nu_fission(gin) + + type is (MacroXS_Angle) + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + xs % total = this % total(gin, iazi, ipol) + xs % elastic = this % scattxs(gin, iazi, ipol) + xs % absorption = this % absorption(gin, iazi, ipol) + xs % fission = this % fission(gin, iazi, ipol) + xs % nu_fission = this % nu_fission(gin, iazi, ipol) + end select + + end subroutine calculate_mgxs + + +!=============================================================================== +! SAMPLE_FISSION_ENERGY acts as a templating code for macroxs_*_sample_fission_energy +!=============================================================================== + + function sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXS_Base), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group + + select type(this) + type is (MacroXS_Iso) + gout = macroxs_iso_sample_fission_energy(this, gin, uvw) + type is (MacroXS_Angle) + gout = macroxs_angle_sample_fission_energy(this, gin, uvw) + end select + + end function sample_fission_energy + +!=============================================================================== +! MACROXS_*_SAMPLE_FISSION_ENERGY samples the outgoing energy and mu from a scatter event. +! Implemented as % scatter. +!=============================================================================== + + function macroxs_iso_sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXS_Iso), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % chi(gout,gin) + end do + + end function macroxs_iso_sample_fission_energy + + function macroxs_angle_sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXS_Angle), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + integer :: iazi, ipol + + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % chi(gout,gin,iazi,ipol) + end do + + end function macroxs_angle_sample_fission_energy + +!=============================================================================== +! SAMPLE_SCATTER acts as a templating code for macroxs_*_sample_scatter +!=============================================================================== + + subroutine sample_scatter(this, uvw, gin, gout, mu, wgt) + class(MacroXS_Base), intent(in) :: this + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + integer :: iazi, ipol ! Angular indices + + select type(this) + type is (MacroXS_Iso) + call macroxs_sample_scatter(this % scatter, gin, gout, mu, wgt) + type is (MacroXS_Angle) + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + call macroxs_sample_scatter(this % scatter(iazi,ipol) % obj,gin,gout,mu,wgt) + end select + + end subroutine sample_scatter + +!=============================================================================== +! MACROXS_SAMPLE_SCATTER performs the work with ScattData to sample outgoing +! energy and change in angle. +!=============================================================================== + + subroutine macroxs_sample_scatter(scatt, gin, gout, mu, wgt) + Class(ScattData_Base), intent(in) :: scatt ! Scattering Object to Use + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + integer :: imu + real(8) :: u, f, M + real(8) :: mu0, frac, mu1 + real(8) :: c_k, c_k1, p0, p1 + integer :: k, NP, samples + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + scatt % energy(gout,gin) + end do + + select type (scatt) + type is (ScattData_Histogram) + xi = prn() + if (xi < scatt % data(1,gout,gin)) then + imu = 1 + else + imu = binary_search(scatt % data(:,gout,gin), & + size(scatt % data(:,gout,gin)), xi) + end if + + ! Randomly select a mu in this bin. + mu = prn() * scatt % dmu + scatt % mu(imu) + + type is (ScattData_Tabular) + ! determine outgoing cosine bin + NP = size(scatt % data(:,gout,gin)) + xi = prn() + + c_k = scatt % data(1,gout,gin) + do k = 1, NP - 1 + c_k1 = scatt % data(k+1,gout,gin) + if (xi < c_k1) exit + c_k = c_k1 + end do + + ! check to make sure k is <= NP - 1 + k = min(k, NP - 1) + + p0 = scatt % fmu(k,gout,gin) + mu0 = scatt % mu(k) + ! Linear-linear interpolation to find mu value w/in bin. + p1 = scatt % fmu(k+1,gout,gin) + mu1 = scatt % mu(k+1) + + frac = (p1 - p0)/(mu1 - mu0) + + if (frac == ZERO) then + mu = mu0 + (xi - c_k)/p0 + else + mu = mu0 + (sqrt(max(ZERO, p0*p0 + TWO*frac*(xi - c_k))) - p0)/frac + end if + + if (mu <= -ONE) then + mu = -ONE + else if (mu >= ONE) then + mu = ONE + end if + + type is (ScattData_Legendre) + ! Now we can sample mu using the legendre representation of the scattering + ! kernel in data(1:this % order) + + ! Do with rejection sampling + ! Set upper bound (instead of searching for max - though this is inefficient) + M = 4.0_8 + samples = 0 + do + mu = TWO * prn() - ONE + f = scatt % calc_f(gin,gout,mu) + if (f > ZERO) then + u = prn() * M + if (u <= f) then + exit + end if + end if + samples = samples + 1 + if (samples > MAX_SAMPLE) then + ! Exit with an isotropic event. + exit + end if + end do + end select + + wgt = wgt * scatt % mult(gout,gin) + + end subroutine macroxs_sample_scatter + +end module macroxs \ No newline at end of file diff --git a/src/tracking.F90 b/src/tracking.F90 index fcb746ccc8..2ffa45ee0d 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -7,6 +7,7 @@ module tracking cross_lattice, check_cell_overlap use geometry_header, only: Universe, BASE_UNIVERSE use global + use macroxs, only: calculate_mgxs use output, only: write_message use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use physics, only: collision @@ -53,6 +54,8 @@ contains total_weight = total_weight + p % wgt ! Force calculation of cross-sections by setting last energy to zero + ! This is a penalty incurred by MG solver, but id rather have penalties + ! applied there over the CE Solver (i.e., by putting an if-block here) micro_xs % last_E = ZERO ! Prepare to write out particle track. @@ -86,6 +89,11 @@ contains select type(p) type is (Particle_CE) if (p % material /= p % last_material) call calculate_xs(p) + type is (Particle_MG) + if ((p % material /= p % last_material) .or. (p % g /= p % last_g)) then + call calculate_mgxs(macro_xs(p % material) % obj, p % g, & + p % coord(1) % uvw, material_xs) + end if end select ! Find the distance to the nearest boundary From 608aa3569fb90cb9abc0c72e70e9a4ff2775d299 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 1 Nov 2015 14:23:37 -0500 Subject: [PATCH 010/149] Added code for MG physics; included pulling out physics independent info from physics.f90 and putting in physics_common.F90 --- src/particle_header.F90 | 40 +++++++ src/physics.F90 | 253 ++++++++++++++------------------------- src/physics_common.F90 | 82 +++++++++++++ src/physics_mg.F90 | 254 ++++++++++++++++++++++++++++++++++++++++ src/tracking.F90 | 3 + 5 files changed, 470 insertions(+), 162 deletions(-) create mode 100644 src/physics_common.F90 create mode 100644 src/physics_mg.F90 diff --git a/src/particle_header.F90 b/src/particle_header.F90 index f661e73c14..85d83cd3d3 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -92,8 +92,16 @@ module particle_header procedure, pass :: clear => clear_particle procedure, pass :: initialize_from_source => initialize_from_source_base procedure, pass :: create_secondary => create_secondary_base + procedure(collision_), deferred, pass :: pre_collision end type Particle_Base + abstract interface + subroutine collision_(this) + import Particle_Base + class(Particle_Base), intent(inout) :: this + end subroutine collision_ + end interface + type, extends(Particle_Base) :: Particle_CE ! Energy Data real(8) :: E ! post-collision energy @@ -102,6 +110,7 @@ module particle_header contains procedure :: initialize_from_source => initialize_from_source_ce procedure :: create_secondary => create_secondary_ce + procedure :: pre_collision => pre_collision_ce end type Particle_CE type, extends(Particle_Base) :: Particle_MG @@ -112,6 +121,7 @@ module particle_header contains procedure :: initialize_from_source => initialize_from_source_mg procedure :: create_secondary => create_secondary_mg + procedure :: pre_collision => pre_collision_mg end type Particle_MG contains @@ -283,4 +293,34 @@ contains end subroutine create_secondary_mg +!=============================================================================== +! PRE_COLLISION_* Updates pre-collision particle properties +!=============================================================================== + + subroutine pre_collision_ce(this) + class(Particle_CE), intent(inout) :: this + + ! Store pre-collision particle properties + this % last_wgt = this % wgt + this % last_E = this % E + this % last_uvw = this % coord(1) % uvw + + ! Add to collision counter for particle + this % n_collision = this % n_collision + 1 + + end subroutine pre_collision_ce + + subroutine pre_collision_mg(this) + class(Particle_MG), intent(inout) :: this + + ! Store pre-collision particle properties + this % last_wgt = this % wgt + this % last_g = this % g + this % last_uvw = this % coord(1) % uvw + + ! Add to collision counter for particle + this % n_collision = this % n_collision + 1 + + end subroutine pre_collision_mg + end module particle_header diff --git a/src/physics.F90 b/src/physics.F90 index 9bbed576dc..0b0509e1c5 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -12,8 +12,9 @@ module physics use mesh, only: get_mesh_indices use nuclide_header use output, only: write_message - use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use particle_header, only: Particle_CE use particle_restart_write, only: write_particle_restart + use physics_common use random_lcg, only: prn use search, only: binary_search use simple_string, only: to_str @@ -124,8 +125,8 @@ contains function sample_nuclide(p, base) result(i_nuclide) - class(Particle_Base), intent(in) :: p - character(7), intent(in) :: base ! which reaction to sample based on + type(Particle_CE), intent(in) :: p + character(7), intent(in) :: base ! which reaction to sample based on integer :: i_nuclide integer :: i @@ -241,8 +242,8 @@ contains subroutine absorption(p, i_nuclide) - class(Particle_Base), intent(inout) :: p - integer, intent(in) :: i_nuclide + type(Particle_CE), intent(inout) :: p + integer, intent(in) :: i_nuclide if (survival_biasing) then ! Determine weight absorbed in survival biasing @@ -276,27 +277,6 @@ contains end subroutine absorption -!=============================================================================== -! RUSSIAN_ROULETTE -!=============================================================================== - - subroutine russian_roulette(p) - - class(Particle_Base), intent(inout) :: p - - if (p % wgt < weight_cutoff) then - if (prn() < p % wgt / weight_survive) then - p % wgt = weight_survive - p % last_wgt = p % wgt - else - p % wgt = ZERO - p % last_wgt = ZERO - p % alive = .false. - end if - end if - - end subroutine russian_roulette - !=============================================================================== ! SCATTER !=============================================================================== @@ -1060,9 +1040,9 @@ contains subroutine create_fission_sites(p, i_nuclide, i_reaction) - class(Particle_Base), intent(inout) :: p - integer, intent(in) :: i_nuclide - integer, intent(in) :: i_reaction + type(Particle_CE), intent(inout) :: p + integer, intent(in) :: i_nuclide + integer, intent(in) :: i_reaction integer :: nu_d(MAX_DELAYED_GROUPS) ! number of delayed neutrons born integer :: i ! loop index @@ -1176,10 +1156,10 @@ contains function sample_fission_energy(nuc, rxn, p) result(E_out) - type(Nuclide_CE), pointer :: nuc - type(Reaction), pointer :: rxn - class(Particle_Base), intent(inout) :: p ! Particle causing fission - real(8) :: E_out ! outgoing E of fission neutron + type(Nuclide_CE), pointer :: nuc + type(Reaction), pointer :: rxn + type(Particle_CE), intent(inout) :: p ! Particle causing fission + real(8) :: E_out ! outgoing E of fission neutron integer :: j ! index on nu energy grid / precursor group integer :: lc ! index before start of energies/nu values @@ -1196,106 +1176,103 @@ contains real(8) :: prob ! cumulative probability type(DistEnergy), pointer :: edist - select type(p) - type is (Particle_CE) - ! Determine total nu - nu_t = nu_total(nuc, p % E) + ! Determine total nu + nu_t = nu_total(nuc, p % E) - ! Determine delayed nu - nu_d = nu_delayed(nuc, p % E) + ! Determine delayed nu + nu_d = nu_delayed(nuc, p % E) - ! Determine delayed neutron fraction - beta = nu_d / nu_t + ! Determine delayed neutron fraction + beta = nu_d / nu_t - if (prn() < beta) then - ! ==================================================================== - ! DELAYED NEUTRON SAMPLED + if (prn() < beta) then + ! ==================================================================== + ! DELAYED NEUTRON SAMPLED - ! sampled delayed precursor group - xi = prn() - lc = 1 - prob = ZERO - do j = 1, nuc % n_precursor - ! determine number of interpolation regions and energies - NR = int(nuc % nu_d_precursor_data(lc + 1)) - NE = int(nuc % nu_d_precursor_data(lc + 2 + 2*NR)) + ! sampled delayed precursor group + xi = prn() + lc = 1 + prob = ZERO + do j = 1, nuc % n_precursor + ! determine number of interpolation regions and energies + NR = int(nuc % nu_d_precursor_data(lc + 1)) + NE = int(nuc % nu_d_precursor_data(lc + 2 + 2*NR)) - ! determine delayed neutron precursor yield for group j - yield = interpolate_tab1(nuc % nu_d_precursor_data( & - lc+1:lc+2+2*NR+2*NE), p % E) + ! determine delayed neutron precursor yield for group j + yield = interpolate_tab1(nuc % nu_d_precursor_data( & + lc+1:lc+2+2*NR+2*NE), p % E) - ! Check if this group is sampled - prob = prob + yield - if (xi < prob) exit + ! Check if this group is sampled + prob = prob + yield + if (xi < prob) exit - ! advance pointer - lc = lc + 2 + 2*NR + 2*NE + 1 - end do + ! advance pointer + lc = lc + 2 + 2*NR + 2*NE + 1 + end do - ! if the sum of the probabilities is slightly less than one and the - ! random number is greater, j will be greater than nuc % - ! n_precursor -- check for this condition - j = min(j, nuc % n_precursor) + ! if the sum of the probabilities is slightly less than one and the + ! random number is greater, j will be greater than nuc % + ! n_precursor -- check for this condition + j = min(j, nuc % n_precursor) - ! set the delayed group for the particle born from fission - p % delayed_group = j + ! set the delayed group for the particle born from fission + p % delayed_group = j - ! select energy distribution for group j - law = nuc % nu_d_edist(j) % law - edist => nuc % nu_d_edist(j) + ! select energy distribution for group j + law = nuc % nu_d_edist(j) % law + edist => nuc % nu_d_edist(j) - ! sample from energy distribution - n_sample = 0 - do - if (law == 44 .or. law == 61) then - call sample_energy(edist, p % E, E_out, mu) - else - call sample_energy(edist, p % E, E_out) - end if + ! sample from energy distribution + n_sample = 0 + do + if (law == 44 .or. law == 61) then + call sample_energy(edist, p % E, E_out, mu) + else + call sample_energy(edist, p % E, E_out) + end if - ! resample if energy is greater than maximum neutron energy - if (E_out < energy_max_neutron) exit + ! resample if energy is greater than maximum neutron energy + if (E_out < energy_max_neutron) exit - ! check for large number of resamples - n_sample = n_sample + 1 - if (n_sample == MAX_SAMPLE) then - ! call write_particle_restart(p) - call fatal_error("Resampled energy distribution maximum number of " & - &// "times for nuclide " // nuc % name) - end if - end do + ! check for large number of resamples + n_sample = n_sample + 1 + if (n_sample == MAX_SAMPLE) then + ! call write_particle_restart(p) + call fatal_error("Resampled energy distribution maximum number of " & + &// "times for nuclide " // nuc % name) + end if + end do - else - ! ==================================================================== - ! PROMPT NEUTRON SAMPLED + else + ! ==================================================================== + ! PROMPT NEUTRON SAMPLED - ! set the delayed group for the particle born from fission to 0 - p % delayed_group = 0 + ! set the delayed group for the particle born from fission to 0 + p % delayed_group = 0 - ! sample from prompt neutron energy distribution - law = rxn % edist % law - n_sample = 0 - do - if (law == 44 .or. law == 61) then - call sample_energy(rxn%edist, p % E, E_out, prob) - else - call sample_energy(rxn%edist, p % E, E_out) - end if + ! sample from prompt neutron energy distribution + law = rxn % edist % law + n_sample = 0 + do + if (law == 44 .or. law == 61) then + call sample_energy(rxn%edist, p % E, E_out, prob) + else + call sample_energy(rxn%edist, p % E, E_out) + end if - ! resample if energy is greater than maximum neutron energy - if (E_out < energy_max_neutron) exit + ! resample if energy is greater than maximum neutron energy + if (E_out < energy_max_neutron) exit - ! check for large number of resamples - n_sample = n_sample + 1 - if (n_sample == MAX_SAMPLE) then - ! call write_particle_restart(p) - call fatal_error("Resampled energy distribution maximum number of " & - &// "times for nuclide " // nuc % name) - end if - end do + ! check for large number of resamples + n_sample = n_sample + 1 + if (n_sample == MAX_SAMPLE) then + ! call write_particle_restart(p) + call fatal_error("Resampled energy distribution maximum number of " & + &// "times for nuclide " // nuc % name) + end if + end do - end if - end select + end if end function sample_fission_energy @@ -1511,55 +1488,7 @@ contains end function sample_angle -!=============================================================================== -! ROTATE_ANGLE rotates direction cosines through a polar angle whose cosine is -! mu and through an azimuthal angle sampled uniformly. Note that this is done -! with direct sampling rather than rejection as is done in MCNP and SERPENT. -!=============================================================================== - function rotate_angle(uvw0, mu) result(uvw) - - real(8), intent(in) :: uvw0(3) ! directional cosine - real(8), intent(in) :: mu ! cosine of angle in lab or CM - real(8) :: uvw(3) ! rotated directional cosine - - real(8) :: phi ! azimuthal angle - real(8) :: sinphi ! sine of azimuthal angle - real(8) :: cosphi ! cosine of azimuthal angle - real(8) :: a ! sqrt(1 - mu^2) - real(8) :: b ! sqrt(1 - w^2) - real(8) :: u0 ! original cosine in x direction - real(8) :: v0 ! original cosine in y direction - real(8) :: w0 ! original cosine in z direction - - ! Copy original directional cosines - u0 = uvw0(1) - v0 = uvw0(2) - w0 = uvw0(3) - - ! Sample azimuthal angle in [0,2pi) - phi = TWO * PI * prn() - - ! Precompute factors to save flops - sinphi = sin(phi) - cosphi = cos(phi) - a = sqrt(max(ZERO, ONE - mu*mu)) - b = sqrt(max(ZERO, ONE - w0*w0)) - - ! Need to treat special case where sqrt(1 - w**2) is close to zero by - ! expanding about the v component rather than the w component - if (b > 1e-10) then - uvw(1) = mu*u0 + a*(u0*w0*cosphi - v0*sinphi)/b - uvw(2) = mu*v0 + a*(v0*w0*cosphi + u0*sinphi)/b - uvw(3) = mu*w0 - a*b*cosphi - else - b = sqrt(ONE - v0*v0) - uvw(1) = mu*u0 + a*(u0*v0*cosphi + w0*sinphi)/b - uvw(2) = mu*v0 - a*b*cosphi - uvw(3) = mu*w0 + a*(v0*w0*cosphi - u0*sinphi)/b - end if - - end function rotate_angle !=============================================================================== ! SAMPLE_ENERGY samples an outgoing energy distribution, either for a secondary diff --git a/src/physics_common.F90 b/src/physics_common.F90 new file mode 100644 index 0000000000..fbd85cc625 --- /dev/null +++ b/src/physics_common.F90 @@ -0,0 +1,82 @@ +module physics_common + + use constants + use global, only: weight_cutoff, weight_survive + use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use random_lcg, only: prn + + implicit none + +contains + +!=============================================================================== +! RUSSIAN_ROULETTE +!=============================================================================== + + subroutine russian_roulette(p) + + class(Particle_Base), intent(inout) :: p + + if (p % wgt < weight_cutoff) then + if (prn() < p % wgt / weight_survive) then + p % wgt = weight_survive + p % last_wgt = p % wgt + else + p % wgt = ZERO + p % last_wgt = ZERO + p % alive = .false. + end if + end if + + end subroutine russian_roulette + +!=============================================================================== +! ROTATE_ANGLE rotates direction cosines through a polar angle whose cosine is +! mu and through an azimuthal angle sampled uniformly. Note that this is done +! with direct sampling rather than rejection as is done in MCNP and SERPENT. +!=============================================================================== + + function rotate_angle(uvw0, mu) result(uvw) + + real(8), intent(in) :: uvw0(3) ! directional cosine + real(8), intent(in) :: mu ! cosine of angle in lab or CM + real(8) :: uvw(3) ! rotated directional cosine + + real(8) :: phi ! azimuthal angle + real(8) :: sinphi ! sine of azimuthal angle + real(8) :: cosphi ! cosine of azimuthal angle + real(8) :: a ! sqrt(1 - mu^2) + real(8) :: b ! sqrt(1 - w^2) + real(8) :: u0 ! original cosine in x direction + real(8) :: v0 ! original cosine in y direction + real(8) :: w0 ! original cosine in z direction + + ! Copy original directional cosines + u0 = uvw0(1) + v0 = uvw0(2) + w0 = uvw0(3) + + ! Sample azimuthal angle in [0,2pi) + phi = TWO * PI * prn() + + ! Precompute factors to save flops + sinphi = sin(phi) + cosphi = cos(phi) + a = sqrt(max(ZERO, ONE - mu*mu)) + b = sqrt(max(ZERO, ONE - w0*w0)) + + ! Need to treat special case where sqrt(1 - w**2) is close to zero by + ! expanding about the v component rather than the w component + if (b > 1e-10) then + uvw(1) = mu*u0 + a*(u0*w0*cosphi - v0*sinphi)/b + uvw(2) = mu*v0 + a*(v0*w0*cosphi + u0*sinphi)/b + uvw(3) = mu*w0 - a*b*cosphi + else + b = sqrt(ONE - v0*v0) + uvw(1) = mu*u0 + a*(u0*v0*cosphi + w0*sinphi)/b + uvw(2) = mu*v0 - a*b*cosphi + uvw(3) = mu*w0 + a*(v0*w0*cosphi - u0*sinphi)/b + end if + + end function rotate_angle +end module physics_common \ No newline at end of file diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 new file mode 100644 index 0000000000..c53661086a --- /dev/null +++ b/src/physics_mg.F90 @@ -0,0 +1,254 @@ +module physics_mg + ! This module contains the multi-group specific physics routines so as to not + ! hinder performance of the CE versions with multiple if-thens. + + use constants + use error, only: fatal_error, warning + use global + use interpolation, only: interpolate_tab1 + use macroxs_header, only: MacroXS_Base, MacroXSContainer + use macroxs, only: sample_fission_energy, sample_scatter + use material_header, only: Material + use mesh, only: get_mesh_indices + ! use nuclide_header, only: Nuclide_MG, NuclideMGContainer + use output, only: write_message + use particle_header, only: Particle_Base, Particle_MG + use particle_restart_write, only: write_particle_restart + use physics_common + use random_lcg, only: prn + use scattdata_header + use search, only: binary_search + use simple_string, only: to_str + + implicit none + +contains + +!=============================================================================== +! COLLISION_MG samples a nuclide and reaction and then calls the appropriate +! routine for that reaction +!=============================================================================== + + subroutine collision_mg(p) + + type(Particle_MG), intent(inout) :: p + + ! Store pre-collision particle properties + p % last_wgt = p % wgt + p % last_g = p % g + p % last_uvw = p % coord(1) % uvw + + ! Add to collision counter for particle + p % n_collision = p % n_collision + 1 + + ! Sample nuclide/reaction for the material the particle is in + call sample_reaction(p) + + ! Display information about collision + if (verbosity >= 10 .or. trace) then + call write_message(" " // "Energy Group = " // trim(to_str(p % g))) + end if + + end subroutine collision_mg + +!=============================================================================== +! SAMPLE_REACTION samples a nuclide based on the macroscopic cross sections for +! each nuclide within a material and then samples a reaction for that nuclide +! and calls the appropriate routine to process the physics. Note that there is +! special logic when suvival biasing is turned on since fission and +! disappearance are treated implicitly. +!=============================================================================== + + subroutine sample_reaction(p) + + type(Particle_MG), intent(inout) :: p + + type(Material), pointer :: mat + + mat => materials(p % material) + + ! Create fission bank sites. Note that while a fission reaction is sampled, + ! it never actually "happens", i.e. the weight of the particle does not + ! change when sampling fission sites. The following block handles all + ! absorption (including fission) + + if (mat % fissionable .and. run_mode == MODE_EIGENVALUE) then + call create_fission_sites(p) + end if + + ! If survival biasing is being used, the following subroutine adjusts the + ! weight of the particle. Otherwise, it checks to see if absorption occurs + + if (material_xs % absorption > ZERO) then + call absorption(p) + else + p % absorb_wgt = ZERO + end if + if (.not. p % alive) return + + ! Sample a scattering reaction and determine the secondary energy of the + ! exiting neutron + call scatter(p) + + ! Play russian roulette if survival biasing is turned on + + if (survival_biasing) then + call russian_roulette(p) + if (.not. p % alive) return + end if + + end subroutine sample_reaction + +!=============================================================================== +! ABSORPTION +!=============================================================================== + + subroutine absorption(p) + + type(Particle_MG), intent(inout) :: p + + if (survival_biasing) then + ! Determine weight absorbed in survival biasing + p % absorb_wgt = (p % wgt * & + material_xs % absorption / material_xs % total) + + ! Adjust weight of particle by probability of absorption + p % wgt = p % wgt - p % absorb_wgt + p % last_wgt = p % wgt + + ! Score implicit absorption estimate of keff +!$omp atomic + global_tallies(K_ABSORPTION) % value = & + global_tallies(K_ABSORPTION) % value + p % absorb_wgt * & + material_xs % nu_fission / material_xs % absorption + else + ! See if disappearance reaction happens + if (material_xs % absorption > prn() * material_xs % total) then + ! Score absorption estimate of keff +!$omp atomic + global_tallies(K_ABSORPTION) % value = & + global_tallies(K_ABSORPTION) % value + p % wgt * & + material_xs % nu_fission / material_xs % absorption + + p % alive = .false. + p % event = EVENT_ABSORB + end if + end if + + end subroutine absorption + +!=============================================================================== +! SCATTER +!=============================================================================== + + subroutine scatter(p) + + type(Particle_MG), intent(inout) :: p + + call sample_scatter(macro_xs(p % material) % obj, p % coord(1) % uvw, & + p % last_g, p % g, p % mu, p % wgt) + + p % coord(1) % uvw = rotate_angle(p % coord(1) % uvw, p % mu) + + ! Set event component + p % event = EVENT_SCATTER + + end subroutine scatter + +!=============================================================================== +! CREATE_FISSION_SITES determines the average total, prompt, and delayed +! neutrons produced from fission and creates appropriate bank sites. +!=============================================================================== + + subroutine create_fission_sites(p) + + type(Particle_MG), intent(inout) :: p + + integer :: i ! loop index + integer :: nu ! actual number of neutrons produced + integer :: ijk(3) ! indices in ufs mesh + real(8) :: nu_t ! total nu + real(8) :: mu ! fission neutron angular cosine + real(8) :: phi ! fission neutron azimuthal angle + real(8) :: weight ! weight adjustment for ufs method + logical :: in_mesh ! source site in ufs mesh? + class(MacroXS_Base), pointer :: xs + + ! Get Pointers + xs => macro_xs(p % material) % obj + ! TODO: Heat generation from fission + + ! If uniform fission source weighting is turned on, we increase of decrease + ! the expected number of fission sites produced + + if (ufs) then + ! Determine indices on ufs mesh for current location + call get_mesh_indices(ufs_mesh, p % coord(1) % xyz, ijk, in_mesh) + if (.not. in_mesh) then + call write_particle_restart(p) + call fatal_error("Source site outside UFS mesh!") + end if + + if (source_frac(1,ijk(1),ijk(2),ijk(3)) /= ZERO) then + weight = ufs_mesh % volume_frac / source_frac(1,ijk(1),ijk(2),ijk(3)) + else + weight = ONE + end if + else + weight = ONE + end if + + ! Determine expected number of neutrons produced + nu_t = p % wgt / keff * weight * & + material_xs % nu_fission / material_xs % total + ! Sample number of neutrons produced + if (prn() > nu_t - int(nu_t)) then + nu = int(nu_t) + else + nu = int(nu_t) + 1 + end if + + ! Check for fission bank size getting hit + if (n_bank + nu > size(fission_bank)) then + if (master) call warning("Maximum number of sites in fission bank & + &reached. This can result in irreproducible results using different & + &numbers of processes/threads.") + end if + + ! Bank source neutrons + if (nu == 0 .or. n_bank == size(fission_bank)) return + p % fission = .true. ! Fission neutrons will be banked + do i = int(n_bank,4) + 1, int(min(n_bank + nu, int(size(fission_bank),8)),4) + ! Bank source neutrons by copying particle data + fission_bank(i) % xyz = p % coord(1) % xyz + + ! Set weight of fission bank site + fission_bank(i) % wgt = ONE/weight + + ! Sample cosine of angle -- fission neutrons are always emitted + ! isotropically. Sometimes in ACE data, fission reactions actually have + ! an angular distribution listed, but for those that do, it's simply just + ! a uniform distribution in mu + mu = TWO * prn() - ONE + + ! Sample azimuthal angle uniformly in [0,2*pi) + phi = TWO*PI*prn() + fission_bank(i) % uvw(1) = mu + fission_bank(i) % uvw(2) = sqrt(ONE - mu*mu) * cos(phi) + fission_bank(i) % uvw(3) = sqrt(ONE - mu*mu) * sin(phi) + + ! Sample secondary energy distribution for fission reaction and set energy + ! in fission bank + fission_bank(i) % g = sample_fission_energy(xs, p % g, fission_bank(i) % uvw) + end do + + ! increment number of bank sites + n_bank = min(n_bank + nu, int(size(fission_bank),8)) + + ! Store total weight banked for analog fission tallies + p % n_bank = nu + p % wgt_bank = nu/weight + + end subroutine create_fission_sites + +end module physics_mg diff --git a/src/tracking.F90 b/src/tracking.F90 index 2ffa45ee0d..3ca75e3381 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -11,6 +11,7 @@ module tracking use output, only: write_message use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG use physics, only: collision + use physics_mg, only: collision_mg use random_lcg, only: prn use simple_string, only: to_str use tally, only: score_analog_tally, score_tracklength_tally, & @@ -170,6 +171,8 @@ contains select type(p) type is (Particle_CE) call collision(p) + type is (Particle_MG) + call collision_mg(p) end select ! Score collision estimator tallies -- this is done after a collision From 9d2c3e283665dfde8f2fe5bb787697be8264f3a8 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 1 Nov 2015 14:44:17 -0500 Subject: [PATCH 011/149] Able to calculate MG version, not getting right answer yet. --- src/ace.F90 | 2 +- src/input_xml.F90 | 2 +- src/mgxs_data.F90 | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ace.F90 b/src/ace.F90 index e51c2b3a0e..917876556c 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -28,7 +28,7 @@ module ace contains !=============================================================================== -! READ_XS reads all the cross sections for the problem and stores them in +! READ_CE_XS reads all the cross sections for the problem and stores them in ! nuclides and sab_tables arrays !=============================================================================== diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 29fdc11783..1ed4cc01ee 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -4311,7 +4311,7 @@ contains end if legendre_mu_points = -1 * legendre_mu_points else - ! One will say 'dont do it' + ! One means 'don't expand scattering moments to a table, sample via legendre' legendre_mu_points = 1 end if diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 64c5dcce7d..3c80116c82 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -62,6 +62,8 @@ contains ! allocate arrays for ACE table storage and cross section cache allocate(nuclides_MG(n_nuclides_total)) + allocate(micro_xs(1)) + ! Find out if we need kappa fission (are there any k_fiss tallies?) get_kfiss = .false. do i = 1, n_tallies From d1b48a9a1f27817473309f6717a9d6c9a58b3ad5 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 1 Nov 2015 15:17:38 -0500 Subject: [PATCH 012/149] Oh, easy fix to get the right answer with MG code. Yay! Have one remaining problem before moving to the next stage. That is that I am having OpenMP issues with both the CE and MG versions. By the way, the next step is to implement the MG for tallies, and to move on to making sure all output is good to go. --- src/global.F90 | 16 ++++++++++++++++ src/input_xml.F90 | 12 ++++++++++++ src/mgxs_data.F90 | 2 -- src/physics_mg.F90 | 3 --- src/tracking.F90 | 6 +++--- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index 57b242ab22..37e442adc6 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -477,6 +477,22 @@ contains deallocate(nuclides_0K) end if + if (allocated(nuclides_MG)) then + ! First call the clear routines + do i = 1, size(nuclides_MG) + call nuclides_MG(i) % obj % clear() + end do + deallocate(nuclides_MG) + end if + + if (allocated(macro_xs)) then + ! First call the clear routines + do i = 1, size(macro_xs) + call macro_xs(i) % obj % clear() + end do + deallocate(macro_xs) + end if + if (allocated(sab_tables)) deallocate(sab_tables) if (allocated(xs_listings)) deallocate(xs_listings) if (allocated(micro_xs)) deallocate(micro_xs) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 1ed4cc01ee..64639b8941 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -152,6 +152,18 @@ contains end if end if + if (.not. run_CE) then + ! Scattering Treatments + if (check_for_node(doc, "max_order")) then + call get_node_value(doc, "max_order", max_order) + else + ! Set to default of largest int, which means to use whatever is contained in library + max_order = huge(0) + end if + else + max_order = 0 + end if + ! Set output directory if a path has been specified on the ! element if (check_for_node(doc, "output_path")) then diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 3c80116c82..64c5dcce7d 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -62,8 +62,6 @@ contains ! allocate arrays for ACE table storage and cross section cache allocate(nuclides_MG(n_nuclides_total)) - allocate(micro_xs(1)) - ! Find out if we need kappa fission (are there any k_fiss tallies?) get_kfiss = .false. do i = 1, n_tallies diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index c53661086a..2aa7e2ee28 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -5,19 +5,16 @@ module physics_mg use constants use error, only: fatal_error, warning use global - use interpolation, only: interpolate_tab1 use macroxs_header, only: MacroXS_Base, MacroXSContainer use macroxs, only: sample_fission_energy, sample_scatter use material_header, only: Material use mesh, only: get_mesh_indices - ! use nuclide_header, only: Nuclide_MG, NuclideMGContainer use output, only: write_message use particle_header, only: Particle_Base, Particle_MG use particle_restart_write, only: write_particle_restart use physics_common use random_lcg, only: prn use scattdata_header - use search, only: binary_search use simple_string, only: to_str implicit none diff --git a/src/tracking.F90 b/src/tracking.F90 index 3ca75e3381..5ba7eb0ac6 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -55,9 +55,9 @@ contains total_weight = total_weight + p % wgt ! Force calculation of cross-sections by setting last energy to zero - ! This is a penalty incurred by MG solver, but id rather have penalties - ! applied there over the CE Solver (i.e., by putting an if-block here) - micro_xs % last_E = ZERO + if (run_CE) then + micro_xs % last_E = ZERO + end if ! Prepare to write out particle track. if (p % write_track) then From a989df44c0925ab73efba56ecc5abcae8ee86931 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 1 Nov 2015 20:08:38 -0500 Subject: [PATCH 013/149] A few fixes related to MG and use of p % coord. Still have no idea whats up with the OpenMP issues --- src/physics_mg.F90 | 8 +++++--- src/simulation.F90 | 2 +- src/tracking.F90 | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 2aa7e2ee28..ca7aebdb36 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -142,10 +142,12 @@ contains type(Particle_MG), intent(inout) :: p - call sample_scatter(macro_xs(p % material) % obj, p % coord(1) % uvw, & - p % last_g, p % g, p % mu, p % wgt) + call sample_scatter(macro_xs(p % material) % obj, & + p % coord(p % n_coord) % uvw, p % last_g, p % g, & + p % mu, p % wgt) - p % coord(1) % uvw = rotate_angle(p % coord(1) % uvw, p % mu) + p % coord(p % n_coord) % uvw = rotate_angle(p % coord(p % n_coord) % uvw, & + p % mu) ! Set event component p % event = EVENT_SCATTER diff --git a/src/simulation.F90 b/src/simulation.F90 index 088a764f79..41330858ff 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -40,7 +40,7 @@ contains subroutine run_simulation() class(Particle_Base), pointer :: p - integer(8) :: i_work + integer(8) :: i_work if (run_CE) then allocate(Particle_CE :: p) diff --git a/src/tracking.F90 b/src/tracking.F90 index 5ba7eb0ac6..17fc9ab3fa 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -93,7 +93,7 @@ contains type is (Particle_MG) if ((p % material /= p % last_material) .or. (p % g /= p % last_g)) then call calculate_mgxs(macro_xs(p % material) % obj, p % g, & - p % coord(1) % uvw, material_xs) + p % coord(p % n_coord) % uvw, material_xs) end if end select From abd227ba323aa2dc4ed549df66824fe321d5718c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 2 Nov 2015 05:28:36 -0500 Subject: [PATCH 014/149] Added in generation of nuclidic xs to make tallying easier. It may end up being the case I need to have a separate tally routine, or at least score_general, for MG and CE. If that is the case, this new nuclidic xs info may not be needed. --- src/macroxs.F90 | 58 ++++++++++++++++++++++++++++++++---------- src/nuclide_header.F90 | 44 +++++++++++++++++++++----------- src/tracking.F90 | 16 +++++++----- 3 files changed, 82 insertions(+), 36 deletions(-) diff --git a/src/macroxs.F90 b/src/macroxs.F90 index 799d3115b8..bfbf83e5c9 100644 --- a/src/macroxs.F90 +++ b/src/macroxs.F90 @@ -3,8 +3,10 @@ module macroxs use constants use macroxs_header, only: MacroXS_Base, MacroXS_Iso, MacroXS_Angle, & expand_harmonic + use material_header, only: Material use math - use nuclide_header, only: find_angle, MaterialMacroXS + use nuclide_header, only: find_angle, MaterialMacroXS, NuclideMicroXS, & + Nuclide_MG, NuclideMGContainer use random_lcg, only: prn use scattdata_header use search @@ -17,31 +19,59 @@ contains ! UPDATE_XS stores the xs to work with !=============================================================================== - subroutine calculate_mgxs(this, gin, uvw, xs) + subroutine calculate_mgxs(this, mat, nuclides, gin, uvw, xs, micro_xs) class(MacroXS_Base), intent(in) :: this - integer, intent(in) :: gin ! Incoming neutron group - real(8), intent(in) :: uvw(3) ! Incoming neutron direction + type(Material), intent(in) :: mat ! Material of interest + type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides + integer, intent(in) :: gin ! Incoming neutron group + real(8), intent(in) :: uvw(3) ! Incoming neutron direction type(MaterialMacroXS), intent(inout) :: xs + type(NuclideMicroXS), intent(inout) :: micro_xs(:) integer :: iazi, ipol + integer :: i, i_nuclide + class(Nuclide_MG), pointer :: nuc select type(this) type is (MacroXS_Iso) - xs % total = this % total(gin) - xs % elastic = this % scattxs(gin) - xs % absorption = this % absorption(gin) - xs % fission = this % fission(gin) - xs % nu_fission = this % nu_fission(gin) + xs % total = this % total(gin) + xs % elastic = this % scattxs(gin) + xs % absorption = this % absorption(gin) + xs % fission = this % fission(gin) + xs % nu_fission = this % nu_fission(gin) + xs % kappa_fission = this % k_fission(gin) type is (MacroXS_Angle) call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) - xs % total = this % total(gin, iazi, ipol) - xs % elastic = this % scattxs(gin, iazi, ipol) - xs % absorption = this % absorption(gin, iazi, ipol) - xs % fission = this % fission(gin, iazi, ipol) - xs % nu_fission = this % nu_fission(gin, iazi, ipol) + xs % total = this % total(gin, iazi, ipol) + xs % elastic = this % scattxs(gin, iazi, ipol) + xs % absorption = this % absorption(gin, iazi, ipol) + xs % fission = this % fission(gin, iazi, ipol) + xs % nu_fission = this % nu_fission(gin, iazi, ipol) + xs % kappa_fission = this % k_fission(gin, iazi, ipol) end select + ! Place nuclidic xs in micro_xs for tallying purposes + do i = 1, mat % n_nuclides + ! Determine microscopic cross section for this nuclide + i_nuclide = mat % nuclide(i) + + nuc => nuclides(i_nuclide) % obj + micro_xs(i_nuclide) % total = nuc % get_xs(gin, 'total', & + I_AZI=iazi, I_POL=ipol) + micro_xs(i_nuclide) % elastic = nuc % get_xs(gin, 'scatter', & + I_AZI=iazi, I_POL=ipol) + micro_xs(i_nuclide) % absorption = nuc % get_xs(gin, 'absorption', & + I_AZI=iazi, I_POL=ipol) + micro_xs(i_nuclide) % fission = nuc % get_xs(gin, 'fission', & + I_AZI=iazi, I_POL=ipol) + micro_xs(i_nuclide) % nu_fission = nuc % get_xs(gin, 'nu_fission', & + I_AZI=iazi, I_POL=ipol) + micro_xs(i_nuclide) % kappa_fission = nuc % get_xs(gin, 'k_fission', & + I_AZI=iazi, I_POL=ipol) + + end do + end subroutine calculate_mgxs diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 2910f63b19..6f502c11ea 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -117,13 +117,16 @@ module nuclide_header end type Nuclide_MG abstract interface - function nuclide_mg_get_xs_(this, g, xstype, gout, uvw) result(xs) + function nuclide_mg_get_xs_(this, g, xstype, gout, uvw, i_azi, i_pol) & + result(xs) import Nuclide_MG class(Nuclide_MG), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group real(8), optional, intent(in) :: uvw(3) ! Requested Angle + integer, optional, intent(in) :: i_azi ! Azimuthal Index + integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs end function nuclide_mg_get_xs_ end interface @@ -532,12 +535,15 @@ module nuclide_header ! NUCLIDE_*_GET_XS Returns the requested data type !=============================================================================== - function nuclide_iso_get_xs(this, g, xstype, gout, uvw) result(xs) + function nuclide_iso_get_xs(this, g, xstype, gout, uvw, i_azi, i_pol) & + result(xs) class(Nuclide_Iso), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group - character(*), intent(in) :: xstype ! Cross Section Type + character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group real(8), optional, intent(in) :: uvw(3) ! Requested Angle + integer, optional, intent(in) :: i_azi ! Azimuthal Index + integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs if (present(gout)) then @@ -565,41 +571,49 @@ module nuclide_header end if end function nuclide_iso_get_xs - function nuclide_angle_get_xs(this, g, xstype, gout, uvw) result(xs) + function nuclide_angle_get_xs(this, g, xstype, gout, uvw, i_azi, i_pol) & + result(xs) class(Nuclide_Angle), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group real(8), optional, intent(in) :: uvw(3) ! Requested Angle + integer, optional, intent(in) :: i_azi ! Azimuthal Index + integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs - integer :: i_pol, i_azi + integer :: i_azi_, i_pol_ - call find_angle(this % polar, this % azimuthal, uvw, i_azi, i_pol) + if (present(i_azi) .and. present(i_pol)) then + i_azi_ = i_azi + i_pol_ = i_pol + else + call find_angle(this % polar, this % azimuthal, uvw, i_azi_, i_pol_) + end if if (present(gout)) then select case(xstype) case('mult') - xs = this % mult(gout,g,i_azi,i_pol) + xs = this % mult(gout,g,i_azi_,i_pol_) case('nu_fission') - xs = this % nu_fission(gout,g,i_azi,i_pol) + xs = this % nu_fission(gout,g,i_azi_,i_pol_) case('chi') - xs = this % chi(gout,i_azi,i_pol) + xs = this % chi(gout,i_azi_,i_pol_) end select else select case(xstype) case('total') - xs = this % total(g,i_azi,i_pol) + xs = this % total(g,i_azi_,i_pol_) case('absorption') - xs = this % absorption(g,i_azi,i_pol) + xs = this % absorption(g,i_azi_,i_pol_) case('fission') - xs = this % fission(g,i_azi,i_pol) + xs = this % fission(g,i_azi_,i_pol_) case('k_fission') - xs = this % k_fission(g,i_azi,i_pol) + xs = this % k_fission(g,i_azi_,i_pol_) case('chi') - xs = this % chi(g,i_azi,i_pol) + xs = this % chi(g,i_azi_,i_pol_) case('scatter') - xs = this % total(g,i_azi,i_pol) - this % absorption(g,i_azi,i_pol) + xs = this % total(g,i_azi_,i_pol_) - this % absorption(g,i_azi_,i_pol_) end select end if diff --git a/src/tracking.F90 b/src/tracking.F90 index 17fc9ab3fa..1960089c79 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -83,18 +83,20 @@ contains if (check_overlaps) call check_cell_overlap(p) - ! Calculate microscopic and macroscopic cross sections -- note: if the - ! material is the same as the last material and the energy of the - ! particle hasn't changed, we don't need to lookup cross sections again. + ! Calculate microscopic and macroscopic cross sections select type(p) type is (Particle_CE) + ! If the material is the same as the last material and the energy of the + ! particle hasn't changed, we don't need to lookup cross sections again. if (p % material /= p % last_material) call calculate_xs(p) type is (Particle_MG) - if ((p % material /= p % last_material) .or. (p % g /= p % last_g)) then - call calculate_mgxs(macro_xs(p % material) % obj, p % g, & - p % coord(p % n_coord) % uvw, material_xs) - end if + ! Since the MGXS can be angle dependent, this needs to be done + ! After every collision for the MGXS mode + call calculate_mgxs(macro_xs(p % material) % obj, & + materials(p % material), nuclides_MG, p % g, & + p % coord(p % n_coord) % uvw, material_xs, & + micro_xs) end select ! Find the distance to the nearest boundary From f2c3121c1c16319b70cd1ecec612a2692eb8df98 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 2 Nov 2015 21:10:41 -0500 Subject: [PATCH 015/149] Ok new strategy. Removed Particle_Base as abstract and Particle_CE and Particle_MG as extended types. Now, since the memory overhead is low (2 ints per thread), I combined Particle_CE and Particle_MG. This will make life significantly easier when I attack tally.F90, and also fixes my OpenMP issue. Whew. --- src/cross_section.F90 | 4 +- src/eigenvalue.F90 | 1 - src/geometry.F90 | 21 +++-- src/macroxs.F90 | 8 +- src/mgxs_data.F90 | 3 + src/nuclide_header.F90 | 28 ++++-- src/output.F90 | 11 ++- src/particle_header.F90 | 150 +++++++-------------------------- src/particle_restart.F90 | 22 ++--- src/particle_restart_write.F90 | 5 +- src/physics.F90 | 20 ++--- src/physics_common.F90 | 4 +- src/physics_mg.F90 | 12 +-- src/plot.F90 | 16 ++-- src/simulation.F90 | 21 ++--- src/source.F90 | 4 +- src/tally.F90 | 50 +++++------ src/track_output.F90 | 6 +- src/tracking.F90 | 34 +++----- 19 files changed, 160 insertions(+), 260 deletions(-) diff --git a/src/cross_section.F90 b/src/cross_section.F90 index 4e75970733..509fc71d5f 100644 --- a/src/cross_section.F90 +++ b/src/cross_section.F90 @@ -9,7 +9,7 @@ module cross_section use list_header, only: ListElemInt use material_header, only: Material use nuclide_header - use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use particle_header, only: Particle use random_lcg, only: prn use sab_header, only: SAlphaBeta use search, only: binary_search @@ -29,7 +29,7 @@ contains subroutine calculate_xs(p) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p integer :: i ! loop index over nuclides integer :: i_nuclide ! index into nuclides array diff --git a/src/eigenvalue.F90 b/src/eigenvalue.F90 index 83f8989cc0..7ed6c34f01 100644 --- a/src/eigenvalue.F90 +++ b/src/eigenvalue.F90 @@ -10,7 +10,6 @@ module eigenvalue use math, only: t_percentile use mesh, only: count_bank_sites use mesh_header, only: RegularMesh - ! use particle_header, only: Particle_Base use random_lcg, only: prn, set_particle_seed, prn_skip use search, only: binary_search use simple_string, only: to_str diff --git a/src/geometry.F90 b/src/geometry.F90 index ee23a4e36e..7675c70dc1 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -6,8 +6,7 @@ module geometry &RectLattice, HexLattice use global use output, only: write_message - use particle_header, only: LocalCoord, Particle_Base, Particle_CE, & - Particle_MG + use particle_header, only: LocalCoord, Particle use particle_restart_write, only: write_particle_restart use surface_header use simple_string, only: to_str @@ -33,7 +32,7 @@ contains pure function cell_contains(c, p) result(in_cell) type(Cell), intent(in) :: c - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p logical :: in_cell if (c%simple) then @@ -45,7 +44,7 @@ contains pure function simple_cell_contains(c, p) result(in_cell) type(Cell), intent(in) :: c - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p logical :: in_cell integer :: i @@ -79,7 +78,7 @@ contains pure function complex_cell_contains(c, p) result(in_cell) type(Cell), intent(in) :: c - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p logical :: in_cell integer :: i @@ -140,7 +139,7 @@ contains subroutine check_cell_overlap(p) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p integer :: i ! cell loop index on a level integer :: j ! coordinate level index @@ -188,7 +187,7 @@ contains recursive subroutine find_cell(p, found, search_cells) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p logical, intent(inout) :: found integer, optional :: search_cells(:) integer :: i ! index over cells @@ -340,7 +339,7 @@ contains !=============================================================================== subroutine cross_surface(p, last_cell) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p integer, intent(in) :: last_cell ! last cell particle was in real(8) :: u ! x-component of direction @@ -502,7 +501,7 @@ contains subroutine cross_lattice(p, lattice_translation) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p integer, intent(in) :: lattice_translation(3) integer :: j integer :: i_xyz(3) ! indices in lattice @@ -575,7 +574,7 @@ contains subroutine distance_to_boundary(p, dist, surface_crossed, lattice_translation, & next_level) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p real(8), intent(out) :: dist integer, intent(out) :: surface_crossed integer, intent(out) :: lattice_translation(3) @@ -955,7 +954,7 @@ contains subroutine handle_lost_particle(p, message) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p character(*) :: message ! Print warning and write lost particle file diff --git a/src/macroxs.F90 b/src/macroxs.F90 index bfbf83e5c9..14980cc6a7 100644 --- a/src/macroxs.F90 +++ b/src/macroxs.F90 @@ -39,7 +39,9 @@ contains xs % absorption = this % absorption(gin) xs % fission = this % fission(gin) xs % nu_fission = this % nu_fission(gin) - xs % kappa_fission = this % k_fission(gin) + if (allocated(this % k_fission)) then + xs % kappa_fission = this % k_fission(gin) + end if type is (MacroXS_Angle) call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) @@ -48,7 +50,9 @@ contains xs % absorption = this % absorption(gin, iazi, ipol) xs % fission = this % fission(gin, iazi, ipol) xs % nu_fission = this % nu_fission(gin, iazi, ipol) - xs % kappa_fission = this % k_fission(gin, iazi, ipol) + if (allocated(this % k_fission)) then + xs % kappa_fission = this % k_fission(gin, iazi, ipol) + end if end select ! Place nuclidic xs in micro_xs for tallying purposes diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 64c5dcce7d..d51dfd603e 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -61,6 +61,9 @@ contains ! allocate arrays for ACE table storage and cross section cache allocate(nuclides_MG(n_nuclides_total)) +!$omp parallel + allocate(micro_xs(n_nuclides_total)) +!$omp end parallel ! Find out if we need kappa fission (are there any k_fiss tallies?) get_kfiss = .false. diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 6f502c11ea..1a16c3f5ea 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -546,6 +546,13 @@ module nuclide_header integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs + xs = ZERO + + if ((xstype == 'nu_fission' .or. xstype == 'fission' .or. xstype =='chi' & + .or. xstype =='k_fission') .and. (.not. this % fissionable)) then + return + end if + if (present(gout)) then select case(xstype) case('mult') @@ -562,7 +569,9 @@ module nuclide_header case('fission') xs = this % fission(g) case('k_fission') - xs = this % k_fission(g) + if (allocated(this % k_fission)) then + xs = this % k_fission(g) + end if case('chi') xs = this % chi(g) case('scatter') @@ -584,6 +593,13 @@ module nuclide_header integer :: i_azi_, i_pol_ + xs = ZERO + + if ((xstype == 'nu_fission' .or. xstype == 'fission' .or. xstype =='chi' & + .or. xstype =='k_fission') .and. (.not. this % fissionable)) then + return + end if + if (present(i_azi) .and. present(i_pol)) then i_azi_ = i_azi i_pol_ = i_pol @@ -609,7 +625,9 @@ module nuclide_header case('fission') xs = this % fission(g,i_azi_,i_pol_) case('k_fission') - xs = this % k_fission(g,i_azi_,i_pol_) + if (allocated(this % k_fission)) then + xs = this % k_fission(g,i_azi_,i_pol_) + end if case('chi') xs = this % chi(g,i_azi_,i_pol_) case('scatter') @@ -637,11 +655,7 @@ module nuclide_header my_pol = acos(uvw(3)) my_azi = atan2(uvw(2), uvw(1)) - ! Quick and clear (but slower): - ! i_pol = minloc(abs(polar - my_pol),dim=1) - ! i_azi = minloc(abs(azimuthal - my_azi),dim=1) - - ! Fast search for equi-binned angles + ! Search for equi-binned angles dangle = PI / (real(size(polar),8)) i_pol = floor(my_pol / dangle + ONE) dangle = TWO * PI / (real(size(azimuthal),8)) diff --git a/src/output.F90 b/src/output.F90 index 3dba183148..30039e1181 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -13,7 +13,7 @@ module output use mesh_header, only: RegularMesh use mesh, only: mesh_indices_to_bin, bin_to_mesh_indices use nuclide_header - use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG + use particle_header, only: LocalCoord, Particle use plot_header use sab_header, only: SAlphaBeta use simple_string, only: to_upper, to_str @@ -253,7 +253,7 @@ contains subroutine print_particle(p) - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p integer :: i ! index for coordinate levels type(Cell), pointer :: c @@ -310,12 +310,11 @@ contains ! Display weight, energy, grid index, and interpolation factor write(ou,*) ' Weight = ' // to_str(p % wgt) - select type(p) - type is (Particle_CE) + if (run_CE) then write(ou,*) ' Energy = ' // to_str(p % E) - type is (Particle_MG) + else write(ou,*) ' Energy Group = ' // to_str(p % g) - end select + end if write(ou,*) ' Delayed Group = ' // to_str(p % delayed_group) write(ou,*) diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 85d83cd3d3..3acf02a4af 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -38,7 +38,7 @@ module particle_header ! geometry !=============================================================================== - type, abstract :: Particle_Base + type Particle ! Basic data integer(8) :: id ! Unique ID integer :: type ! Particle type (n, p, e, etc) @@ -47,6 +47,12 @@ module particle_header integer :: n_coord ! number of current coordinates type(LocalCoord) :: coord(MAX_COORD) ! coordinates for all levels + ! Energy Data + real(8) :: E ! post-collision energy + real(8) :: last_E ! pre-collision energy + integer :: g ! post-collision energy group (MG only) + integer :: last_g ! pre-collision energy group (MG only) + ! Other physical data real(8) :: wgt ! particle weight real(8) :: mu ! angle of scatter @@ -90,39 +96,9 @@ module particle_header contains procedure, pass :: initialize => initialize_particle procedure, pass :: clear => clear_particle - procedure, pass :: initialize_from_source => initialize_from_source_base - procedure, pass :: create_secondary => create_secondary_base - procedure(collision_), deferred, pass :: pre_collision - end type Particle_Base - - abstract interface - subroutine collision_(this) - import Particle_Base - class(Particle_Base), intent(inout) :: this - end subroutine collision_ - end interface - - type, extends(Particle_Base) :: Particle_CE - ! Energy Data - real(8) :: E ! post-collision energy - real(8) :: last_E ! pre-collision energy - - contains - procedure :: initialize_from_source => initialize_from_source_ce - procedure :: create_secondary => create_secondary_ce - procedure :: pre_collision => pre_collision_ce - end type Particle_CE - - type, extends(Particle_Base) :: Particle_MG - ! Energy Data - integer :: g ! post-collision energy group - integer :: last_g ! pre-collision energy group - - contains - procedure :: initialize_from_source => initialize_from_source_mg - procedure :: create_secondary => create_secondary_mg - procedure :: pre_collision => pre_collision_mg - end type Particle_MG + procedure, pass :: initialize_from_source => initialize_from_source + procedure, pass :: create_secondary => create_secondary + end type Particle contains @@ -133,7 +109,7 @@ contains subroutine initialize_particle(this) - class(Particle_Base) :: this + class(Particle) :: this ! Clear coordinate lists call this % clear() @@ -169,7 +145,7 @@ contains subroutine clear_particle(this) - class(Particle_Base) :: this + class(Particle) :: this integer :: i ! remove any coordinate levels @@ -202,9 +178,10 @@ contains ! fission, or simply as a secondary particle. !=============================================================================== - subroutine initialize_from_source_base(this, src) - class(Particle_Base), intent(inout) :: this - type(Bank), intent(in) :: src + subroutine initialize_from_source(this, src, run_CE) + class(Particle), intent(inout) :: this + type(Bank), intent(in) :: src + logical, intent(in) :: run_CE ! set defaults call this % initialize() @@ -216,44 +193,25 @@ contains this % coord(1) % uvw = src % uvw this % last_xyz = src % xyz this % last_uvw = src % uvw - - end subroutine initialize_from_source_base - - subroutine initialize_from_source_ce(this, src) - class(Particle_CE), intent(inout) :: this - type(Bank), intent(in) :: src - - ! set defaults a nd init base - call initialize_from_source_base(this, src) - - ! copy attributes from source bank site this % E = src % E this % last_E = src % E + if (.not. run_CE) then + this % g = src % g + this % last_g = src % g + end if - end subroutine initialize_from_source_ce - - subroutine initialize_from_source_mg(this, src) - class(Particle_MG), intent(inout) :: this - type(Bank), intent(in) :: src - - ! set defaults and init base - call initialize_from_source_base(this, src) - - ! copy attributes from source bank site - this % g = src % g - this % last_g = src % g - - end subroutine initialize_from_source_mg + end subroutine initialize_from_source !=============================================================================== ! CREATE_SECONDARY stores the current phase space attributes of the particle in ! the secondary bank and increments the number of sites in the secondary bank. !=============================================================================== - subroutine create_secondary_base(this, uvw, type) - class(Particle_Base), intent(inout) :: this - real(8), intent(in) :: uvw(3) - integer, intent(in) :: type + subroutine create_secondary(this, uvw, type, run_CE) + class(Particle), intent(inout) :: this + real(8), intent(in) :: uvw(3) + integer, intent(in) :: type + logical, intent(in) :: run_CE integer :: n @@ -268,59 +226,11 @@ contains this % secondary_bank(n) % xyz(:) = this % coord(1) % xyz this % secondary_bank(n) % uvw(:) = uvw this % n_secondary = n - - end subroutine create_secondary_base - - subroutine create_secondary_ce(this, uvw, type) - class(Particle_CE), intent(inout) :: this - real(8), intent(in) :: uvw(3) - integer, intent(in) :: type - - call create_secondary_base(this, uvw, type) - this % secondary_bank(this % n_secondary) % E = this % E + if (.not. run_CE) then + this % secondary_bank(this % n_secondary) % g = this % g + end if - end subroutine create_secondary_ce - - subroutine create_secondary_mg(this, uvw, type) - class(Particle_MG), intent(inout) :: this - real(8), intent(in) :: uvw(3) - integer, intent(in) :: type - - call create_secondary_base(this, uvw, type) - - this % secondary_bank(this % n_secondary) % g = this % g - - end subroutine create_secondary_mg - -!=============================================================================== -! PRE_COLLISION_* Updates pre-collision particle properties -!=============================================================================== - - subroutine pre_collision_ce(this) - class(Particle_CE), intent(inout) :: this - - ! Store pre-collision particle properties - this % last_wgt = this % wgt - this % last_E = this % E - this % last_uvw = this % coord(1) % uvw - - ! Add to collision counter for particle - this % n_collision = this % n_collision + 1 - - end subroutine pre_collision_ce - - subroutine pre_collision_mg(this) - class(Particle_MG), intent(inout) :: this - - ! Store pre-collision particle properties - this % last_wgt = this % wgt - this % last_g = this % g - this % last_uvw = this % coord(1) % uvw - - ! Add to collision counter for particle - this % n_collision = this % n_collision + 1 - - end subroutine pre_collision_mg + end subroutine create_secondary end module particle_header diff --git a/src/particle_restart.F90 b/src/particle_restart.F90 index fc3eb4393e..9d49a4f977 100644 --- a/src/particle_restart.F90 +++ b/src/particle_restart.F90 @@ -8,7 +8,7 @@ module particle_restart use global use hdf5_interface, only: file_open, file_close, read_dataset use output, only: write_message, print_particle - use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use particle_header, only: Particle use random_lcg, only: set_particle_seed use tracking, only: transport @@ -28,7 +28,7 @@ contains integer(8) :: particle_seed integer :: previous_run_mode - class(Particle_Base), pointer :: p + type(Particle) :: p ! Set verbosity high verbosity = 10 @@ -66,7 +66,7 @@ contains !=============================================================================== subroutine read_particle_restart(p, previous_run_mode) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p integer, intent(inout) :: previous_run_mode integer :: int_scalar @@ -96,12 +96,8 @@ contains end select call read_dataset(file_id, 'id', p%id) call read_dataset(file_id, 'weight', p%wgt) - select type(p) - type is (Particle_CE) - call read_dataset(file_id, 'energy', p%E) - type is (Particle_MG) - call read_dataset(file_id, 'energy_group', p%g) - end select + call read_dataset(file_id, 'energy', p%E) + call read_dataset(file_id, 'energy_group', p%g) call read_dataset(file_id, 'xyz', p%coord(1)%xyz) call read_dataset(file_id, 'uvw', p%coord(1)%uvw) @@ -109,12 +105,8 @@ contains p%last_wgt = p%wgt p%last_xyz = p%coord(1)%xyz p%last_uvw = p%coord(1)%uvw - select type(p) - type is (Particle_CE) - p%last_E = p%E - type is (Particle_MG) - p%last_g = p%g - end select + p%last_E = p%E + p%last_g = p%g ! Close hdf5 file call file_close(file_id) diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index a7341d71ec..324e96bc7a 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -3,7 +3,7 @@ module particle_restart_write use bank_header, only: Bank use global use hdf5_interface - use particle_header, only: Particle_Base + use particle_header, only: Particle use simple_string, only: to_str use hdf5 @@ -19,7 +19,7 @@ contains !=============================================================================== subroutine write_particle_restart(p) - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p integer(HID_T) :: file_id character(MAX_FILE_LEN) :: filename @@ -57,6 +57,7 @@ contains call write_dataset(file_id, 'id', p%id) call write_dataset(file_id, 'weight', src%wgt) call write_dataset(file_id, 'energy', src%E) + call write_dataset(file_id, 'energy_group', src%g) call write_dataset(file_id, 'xyz', src%xyz) call write_dataset(file_id, 'uvw', src%uvw) diff --git a/src/physics.F90 b/src/physics.F90 index 0b0509e1c5..3ea28c2281 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -12,7 +12,7 @@ module physics use mesh, only: get_mesh_indices use nuclide_header use output, only: write_message - use particle_header, only: Particle_CE + use particle_header, only: Particle use particle_restart_write, only: write_particle_restart use physics_common use random_lcg, only: prn @@ -34,7 +34,7 @@ contains subroutine collision(p) - type(Particle_CE), intent(inout) :: p + type(Particle), intent(inout) :: p ! Store pre-collision particle properties p % last_wgt = p % wgt @@ -72,7 +72,7 @@ contains subroutine sample_reaction(p) - type(Particle_CE), intent(inout) :: p + type(Particle), intent(inout) :: p integer :: i_nuclide ! index in nuclides array integer :: i_reaction ! index in nuc % reactions array @@ -125,7 +125,7 @@ contains function sample_nuclide(p, base) result(i_nuclide) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p character(7), intent(in) :: base ! which reaction to sample based on integer :: i_nuclide @@ -242,7 +242,7 @@ contains subroutine absorption(p, i_nuclide) - type(Particle_CE), intent(inout) :: p + type(Particle), intent(inout) :: p integer, intent(in) :: i_nuclide if (survival_biasing) then @@ -283,7 +283,7 @@ contains subroutine scatter(p, i_nuclide) - type(Particle_CE), intent(inout) :: p + type(Particle), intent(inout) :: p integer, intent(in) :: i_nuclide integer :: i @@ -1040,7 +1040,7 @@ contains subroutine create_fission_sites(p, i_nuclide, i_reaction) - type(Particle_CE), intent(inout) :: p + type(Particle), intent(inout) :: p integer, intent(in) :: i_nuclide integer, intent(in) :: i_reaction @@ -1158,7 +1158,7 @@ contains type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn - type(Particle_CE), intent(inout) :: p ! Particle causing fission + type(Particle), intent(inout) :: p ! Particle causing fission real(8) :: E_out ! outgoing E of fission neutron integer :: j ! index on nu energy grid / precursor group @@ -1284,7 +1284,7 @@ contains subroutine inelastic_scatter(nuc, rxn, p) type(Nuclide_CE), pointer :: nuc type(Reaction), pointer :: rxn - type(Particle_CE), intent(inout) :: p + type(Particle), intent(inout) :: p integer :: i ! loop index integer :: law ! secondary energy distribution law @@ -1355,7 +1355,7 @@ contains p % wgt = yield * p % wgt else do i = 1, rxn % multiplicity - 1 - call p % create_secondary(p % coord(1) % uvw, NEUTRON) + call p % create_secondary(p % coord(1) % uvw, NEUTRON, run_CE) end do end if diff --git a/src/physics_common.F90 b/src/physics_common.F90 index fbd85cc625..7d5b1cea8b 100644 --- a/src/physics_common.F90 +++ b/src/physics_common.F90 @@ -2,7 +2,7 @@ module physics_common use constants use global, only: weight_cutoff, weight_survive - use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use particle_header, only: Particle use random_lcg, only: prn implicit none @@ -15,7 +15,7 @@ contains subroutine russian_roulette(p) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p if (p % wgt < weight_cutoff) then if (prn() < p % wgt / weight_survive) then diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index ca7aebdb36..9866b48d20 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -10,7 +10,7 @@ module physics_mg use material_header, only: Material use mesh, only: get_mesh_indices use output, only: write_message - use particle_header, only: Particle_Base, Particle_MG + use particle_header, only: Particle use particle_restart_write, only: write_particle_restart use physics_common use random_lcg, only: prn @@ -28,7 +28,7 @@ contains subroutine collision_mg(p) - type(Particle_MG), intent(inout) :: p + type(Particle), intent(inout) :: p ! Store pre-collision particle properties p % last_wgt = p % wgt @@ -58,7 +58,7 @@ contains subroutine sample_reaction(p) - type(Particle_MG), intent(inout) :: p + type(Particle), intent(inout) :: p type(Material), pointer :: mat @@ -102,7 +102,7 @@ contains subroutine absorption(p) - type(Particle_MG), intent(inout) :: p + type(Particle), intent(inout) :: p if (survival_biasing) then ! Determine weight absorbed in survival biasing @@ -140,7 +140,7 @@ contains subroutine scatter(p) - type(Particle_MG), intent(inout) :: p + type(Particle), intent(inout) :: p call sample_scatter(macro_xs(p % material) % obj, & p % coord(p % n_coord) % uvw, p % last_g, p % g, & @@ -161,7 +161,7 @@ contains subroutine create_fission_sites(p) - type(Particle_MG), intent(inout) :: p + type(Particle), intent(inout) :: p integer :: i ! loop index integer :: nu ! actual number of neutrons produced diff --git a/src/plot.F90 b/src/plot.F90 index e46742ea1a..518cc4f0cf 100644 --- a/src/plot.F90 +++ b/src/plot.F90 @@ -9,7 +9,7 @@ module plot use mesh, only: get_mesh_indices use mesh_header, only: RegularMesh use output, only: write_message - use particle_header, only: LocalCoord, Particle_Base + use particle_header, only: LocalCoord, Particle use plot_header use ppmlib, only: Image, init_image, allocate_image, & deallocate_image, set_pixel @@ -56,7 +56,7 @@ contains subroutine position_rgb(p, pl, rgb, id) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p type(ObjectPlot), pointer, intent(in) :: pl integer, intent(out) :: rgb(3) integer, intent(out) :: id @@ -123,9 +123,9 @@ contains real(8) :: in_pixel real(8) :: out_pixel real(8) :: xyz(3) - type(Image) :: img - class(Particle_Base), pointer :: p - type(ProgressBar) :: progress + type(Image) :: img + type(Particle) :: p + type(ProgressBar) :: progress ! Initialize and allocate space for image call init_image(img) @@ -362,9 +362,9 @@ contains integer(HSIZE_T) :: offset(3) real(8) :: vox(3) ! x, y, and z voxel widths real(8) :: ll(3) ! lower left starting point for each sweep direction - class(Particle_Base), pointer :: p - type(ProgressBar) :: progress - type(c_ptr) :: f_ptr + type(Particle) :: p + type(ProgressBar) :: progress + type(c_ptr) :: f_ptr ! compute voxel widths in each direction vox = pl % width/dble(pl % pixels) diff --git a/src/simulation.F90 b/src/simulation.F90 index 41330858ff..d1b96d8b08 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -15,7 +15,7 @@ module simulation use global use output, only: write_message, header, print_columns, & print_batch_keff, print_generation - use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use particle_header, only: Particle use random_lcg, only: set_particle_seed use source, only: initialize_source use state_point, only: write_state_point, write_source_point @@ -39,14 +39,8 @@ contains subroutine run_simulation() - class(Particle_Base), pointer :: p - integer(8) :: i_work - - if (run_CE) then - allocate(Particle_CE :: p) - else - allocate(Particle_MG :: p) - end if + type(Particle) :: p + integer(8) :: i_work if (.not. restart_run) call initialize_source() @@ -122,9 +116,6 @@ contains ! Clear particle call p % clear() - if (associated(p)) & - deallocate(p) - end subroutine run_simulation !=============================================================================== @@ -133,14 +124,14 @@ contains subroutine initialize_history(p, index_source) - class(Particle_Base), pointer, intent(inout) :: p - integer(8), intent(in) :: index_source + type(Particle), intent(inout) :: p + integer(8), intent(in) :: index_source integer(8) :: particle_seed ! unique index for particle integer :: i ! set defaults - call p % initialize_from_source(source_bank(index_source)) + call p % initialize_from_source(source_bank(index_source), run_CE) ! set identifier for particle p % id = work_index(rank) + index_source diff --git a/src/source.F90 b/src/source.F90 index 53ed2e9a3d..38df80e8ce 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -8,7 +8,7 @@ module source use global use hdf5_interface, only: file_create, file_open, file_close, read_dataset use output, only: write_message - use particle_header, only: Particle_Base, Particle_CE, Particle_MG + use particle_header, only: Particle use random_lcg, only: prn, set_particle_seed, prn_set_stream use search, only: binary_search use simple_string, only: to_str @@ -109,7 +109,7 @@ contains real(8) :: a ! Arbitrary parameter 'a' real(8) :: b ! Arbitrary parameter 'b' logical :: found ! Does the source particle exist within geometry? - type(Particle_CE) :: p ! Temporary particle for using find_cell + type(Particle) :: p ! Temporary particle for using find_cell integer, save :: num_resamples = 0 ! Number of resamples encountered ! Set weight to one by default diff --git a/src/tally.F90 b/src/tally.F90 index 640cb9f58d..6ec0dee19c 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -11,8 +11,7 @@ module tally mesh_intersects_2d, mesh_intersects_3d use mesh_header, only: RegularMesh use output, only: header - use particle_header, only: LocalCoord, Particle_Base, Particle_CE, & - Particle_MG + use particle_header, only: LocalCoord, Particle use search, only: binary_search use simple_string, only: to_str use tally_header, only: TallyResult, TallyMapItem, TallyMapElement @@ -38,7 +37,7 @@ contains subroutine score_general(p, t, start_index, filter_index, i_nuclide, & atom_density, flux) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p type(TallyObject), pointer, intent(inout) :: t integer, intent(in) :: start_index integer, intent(in) :: i_nuclide @@ -838,7 +837,7 @@ contains subroutine score_all_nuclides(p, i_tally, flux, filter_index) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p integer, intent(in) :: i_tally real(8), intent(in) :: flux integer, intent(in) :: filter_index @@ -892,7 +891,7 @@ contains subroutine score_analog_tally(p) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p integer :: i integer :: i_tally @@ -1000,7 +999,7 @@ contains subroutine score_fission_eout(p, t, i_score) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p type(TallyObject), pointer :: t integer, intent(in) :: i_score ! index for score @@ -1062,7 +1061,7 @@ contains subroutine score_fission_delayed_eout(p, t, i_score) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p type(TallyObject), intent(inout) :: t integer, intent(in) :: i_score ! index for score @@ -1188,7 +1187,7 @@ contains subroutine score_tracklength_tally(p, distance) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p real(8), intent(in) :: distance integer :: i @@ -1301,7 +1300,7 @@ contains subroutine score_tl_on_mesh(p, i_tally, d_track) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p integer, intent(in) :: i_tally real(8), intent(in) :: d_track @@ -1586,7 +1585,7 @@ contains subroutine score_collision_tally(p) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p integer :: i integer :: i_tally @@ -1695,7 +1694,7 @@ contains subroutine get_scoring_bins(p, i_tally, found_bin) - type(Particle_CE), intent(in) :: p + type(Particle), intent(in) :: p integer, intent(in) :: i_tally logical, intent(out) :: found_bin @@ -1905,7 +1904,7 @@ contains subroutine score_surface_current(p) - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p integer :: i integer :: i_tally @@ -1970,22 +1969,19 @@ contains uvw = p % coord(1) % uvw ! determine incoming energy bin - select type(p) - type is (Particle_CE) - j = t % find_filter(FILTER_ENERGYIN) - if (j > 0) then - n = t % filters(j) % n_bins - ! check if energy of the particle is within energy bins - if (p % E < t % filters(j) % real_bins(1) .or. & - p % E > t % filters(j) % real_bins(n + 1)) then - cycle - end if - - ! search to find incoming energy bin - matching_bins(j) = binary_search(t % filters(j) % real_bins, & - n + 1, p % E) + j = t % find_filter(FILTER_ENERGYIN) + if (j > 0) then + n = t % filters(j) % n_bins + ! check if energy of the particle is within energy bins + if (p % E < t % filters(j) % real_bins(1) .or. & + p % E > t % filters(j) % real_bins(n + 1)) then + cycle end if - end select + + ! search to find incoming energy bin + matching_bins(j) = binary_search(t % filters(j) % real_bins, & + n + 1, p % E) + end if ! ======================================================================= ! SPECIAL CASES WHERE TWO INDICES ARE THE SAME diff --git a/src/track_output.F90 b/src/track_output.F90 index ec09932758..87dbfbfa44 100644 --- a/src/track_output.F90 +++ b/src/track_output.F90 @@ -7,7 +7,7 @@ module track_output use global use hdf5_interface - use particle_header, only: Particle_Base + use particle_header, only: Particle use simple_string, only: to_str use hdf5 @@ -43,7 +43,7 @@ contains !=============================================================================== subroutine write_particle_track(p) - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p real(8), allocatable :: new_coords(:, :) integer :: i @@ -93,7 +93,7 @@ contains !=============================================================================== subroutine finalize_particle_track(p) - class(Particle_Base), intent(in) :: p + type(Particle), intent(in) :: p integer :: i integer :: n_particle_tracks diff --git a/src/tracking.F90 b/src/tracking.F90 index 1960089c79..c761cd5337 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -9,7 +9,7 @@ module tracking use global use macroxs, only: calculate_mgxs use output, only: write_message - use particle_header, only: LocalCoord, Particle_Base, Particle_CE, Particle_MG + use particle_header, only: LocalCoord, Particle use physics, only: collision use physics_mg, only: collision_mg use random_lcg, only: prn @@ -29,7 +29,7 @@ contains subroutine transport(p) - class(Particle_Base), intent(inout) :: p + type(Particle), intent(inout) :: p integer :: j ! coordinate level integer :: next_level ! next coordinate level to check @@ -84,20 +84,18 @@ contains if (check_overlaps) call check_cell_overlap(p) ! Calculate microscopic and macroscopic cross sections - - select type(p) - type is (Particle_CE) + if (run_CE) then ! If the material is the same as the last material and the energy of the ! particle hasn't changed, we don't need to lookup cross sections again. if (p % material /= p % last_material) call calculate_xs(p) - type is (Particle_MG) + else ! Since the MGXS can be angle dependent, this needs to be done ! After every collision for the MGXS mode call calculate_mgxs(macro_xs(p % material) % obj, & materials(p % material), nuclides_MG, p % g, & p % coord(p % n_coord) % uvw, material_xs, & micro_xs) - end select + end if ! Find the distance to the nearest boundary call distance_to_boundary(p, d_boundary, surface_crossed, & @@ -120,10 +118,7 @@ contains ! Score track-length tallies if (active_tracklength_tallies % size() > 0) then - select type(p) - type is (Particle_CE) - call score_tracklength_tally(p, distance) - end select + call score_tracklength_tally(p, distance) end if @@ -170,21 +165,17 @@ contains ! Clear surface component p % surface = NONE - select type(p) - type is (Particle_CE) + if (run_CE) then call collision(p) - type is (Particle_MG) + else call collision_mg(p) - end select + end if ! Score collision estimator tallies -- this is done after a collision ! has occurred rather than before because we need information on the ! outgoing energy for any tallies with an outgoing energy filter - select type(p) - type is (Particle_CE) - if (active_collision_tallies % size() > 0) call score_collision_tally(p) - if (active_analog_tallies % size() > 0) call score_analog_tally(p) - end select + if (active_collision_tallies % size() > 0) call score_collision_tally(p) + if (active_analog_tallies % size() > 0) call score_analog_tally(p) ! Reset banked weight during collision p % n_bank = 0 @@ -226,7 +217,8 @@ contains ! Check for secondary particles if this particle is dead if (.not. p % alive) then if (p % n_secondary > 0) then - call p % initialize_from_source(p % secondary_bank(p % n_secondary)) + call p % initialize_from_source(p % secondary_bank(p % n_secondary), & + run_CE) p % n_secondary = p % n_secondary - 1 ! Enter new particle in particle track file From d7ee342b124a85251a4ad646b134d5002936af92 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 2 Nov 2015 21:18:27 -0500 Subject: [PATCH 016/149] Added code to apply an energy value to the particle when given a group (uses group energy midpoint). This will be useful so that I do not have to change lots of downstream code like CMFD and also will be a future compatability aid. --- src/global.F90 | 1 + src/input_xml.F90 | 5 +++++ src/particle_header.F90 | 2 ++ src/physics_mg.F90 | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/src/global.F90 b/src/global.F90 index 37e442adc6..737aef51f8 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -119,6 +119,7 @@ module global ! Energy group structure real(8), allocatable :: energy_bins(:) + real(8), allocatable :: energy_bin_midpoints(:) ! Maximum Data Order integer :: max_order diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 64639b8941..fd8d5f50f5 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -4315,6 +4315,11 @@ contains call fatal_error("group_structures element must exist!") end if + allocate(energy_bin_midpoints(energy_groups)) + do i = 1, energy_groups + energy_bin_midpoints(i) = 0.5_8 * (energy_bins(i) + energy_bins(i + 1)) + end do + if (check_for_node(doc, "legendre_mu_points")) then ! Get scattering treatment call get_node_value(doc, "legendre_mu_points", legendre_mu_points) diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 3acf02a4af..9c0ddfde0d 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -132,6 +132,8 @@ contains this % fission = .false. this % delayed_group = 0 this % n_delayed_bank(:) = 0 + ! Initialize this % g so there is always at least some initialized value + this % g = 1 ! Set up base level coordinates this % coord(1) % universe = BASE_UNIVERSE diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 9866b48d20..7d3448aeaa 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -32,6 +32,7 @@ contains ! Store pre-collision particle properties p % last_wgt = p % wgt + p % last_E = p % E p % last_g = p % g p % last_uvw = p % coord(1) % uvw @@ -146,6 +147,9 @@ contains p % coord(p % n_coord) % uvw, p % last_g, p % g, & p % mu, p % wgt) + ! Update energy value for downstream compatability (in tallying) + p % E = energy_bin_midpoints(p % g) + p % coord(p % n_coord) % uvw = rotate_angle(p % coord(p % n_coord) % uvw, & p % mu) From 8870310492cc3cf32ec3107e7ca00307907bbea7 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 3 Nov 2015 05:06:46 -0500 Subject: [PATCH 017/149] Fine tuning tallies. Got nu-scatter guys to use correct data. Seems like last hurdle is to get the nu fission score done --- src/input_xml.F90 | 76 +++++++++++++++--- src/macroxs_header.F90 | 21 ++++- src/tally.F90 | 174 +++++++++++++++++++++++++---------------- 3 files changed, 192 insertions(+), 79 deletions(-) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index fd8d5f50f5..0c26b841a9 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2573,6 +2573,15 @@ contains else n_words = get_arraysize_integer(node_filt, "bins") end if + else if (temp_str == 'energy' .or. temp_str == 'energyout' .and. & + .not. run_CE) then + ! For MG calculations, dont require the user to put in all the + ! group boundaries, as there could be many. Assume that if no & + ! bins are entered that that means they want group-wise results. + n_words = -1 + call warning("Energy bins not set in filter on tally " & + &// trim(to_str(t % id))) + else call fatal_error("Bins not set in filter on tally " & &// trim(to_str(t % id))) @@ -2683,28 +2692,55 @@ contains ! Set type of filter t % filters(j) % type = FILTER_ENERGYIN - ! Set number of bins - t % filters(j) % n_bins = n_words - 1 + if (n_words > 0) then + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 - ! Allocate and store bins - allocate(t % filters(j) % real_bins(n_words)) - call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + else if (n_words == -1) then + ! Set number of bins + t % filters(j) % n_bins = energy_groups + + ! Allocate and store bins + allocate(t % filters(j) % real_bins(energy_groups)) + t % filters(j) % real_bins = energy_bins + end if case ('energyout') ! Set type of filter t % filters(j) % type = FILTER_ENERGYOUT - ! Set number of bins - t % filters(j) % n_bins = n_words - 1 + if (n_words > 0) then + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 - ! Allocate and store bins - allocate(t % filters(j) % real_bins(n_words)) - call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + else if (n_words == -1) then + ! Set number of bins + t % filters(j) % n_bins = energy_groups + + ! Allocate and store bins + allocate(t % filters(j) % real_bins(energy_groups)) + t % filters(j) % real_bins = energy_bins + end if ! Set to analog estimator t % estimator = ESTIMATOR_ANALOG case ('delayedgroup') + ! Check to see if running in MG mode, because if so, the current + ! system isnt set up yet to support delayed group data and thus + ! these tallies + if (.not. run_CE) then + call fatal_error("delayedgroup filter on tally " & + // trim(to_str(t % id)) // " not yet supported& + & for multi-group mode.") + end if + ! Set type of filter t % filters(j) % type = FILTER_DELAYEDGROUP @@ -3219,6 +3255,12 @@ contains case ('n4n', '(n,4n)') t % score_bins(j) = N_4N + ! Disallow for MG mode since data not present + if (.not. run_CE) then + call fatal_error("Cannot tally (n,4n) reaction rate in & + &multi-group mode") + end if + case ('absorption') t % score_bins(j) = SCORE_ABSORPTION if (t % find_filter(FILTER_ENERGYOUT) > 0) then @@ -3243,6 +3285,12 @@ contains ! Set tally estimator to analog t % estimator = ESTIMATOR_ANALOG end if + + ! Disallow for MG mode since data not present + if (.not. run_CE) then + call fatal_error("Cannot tally delayed nu-fission rate in & + &multi-group mode") + end if case ('kappa-fission') t % score_bins(j) = SCORE_KAPPA_FISSION case ('inverse-velocity') @@ -3398,6 +3446,14 @@ contains end if end select + + ! Do a check at the end (instead of for every case) to make sure + ! the tallies are compatible with MG mode where we have less detailed + ! nuclear data + if (.not. run_CE .and. t % score_bins(j) > 0) then + call fatal_error("Cannot tally " // trim(score_name) // & + " reaction rate in multi-group mode") + end if end do t % n_score_bins = n_scores diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index ed768b2430..d33de9241f 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -48,11 +48,12 @@ module macroxs_header end subroutine macroxs_init_ - function macroxs_get_xs_(this, g, xstype, uvw) result(xs) + function macroxs_get_xs_(this, g, xstype, gout, uvw) result(xs) import MacroXS_Base class(MacroXS_Base), intent(in) :: this ! The MacroXS to initialize integer, intent(in) :: g ! Incoming Energy group character(*) , intent(in) :: xstype ! Cross Section Type + integer, optional, intent(in) :: gout ! Outgoing Energy group real(8), optional, intent(in) :: uvw(3) ! Requested Angle real(8) :: xs ! Resultant xs @@ -787,10 +788,11 @@ contains ! MACROXS_*_GET_XS returns the requested data type !=============================================================================== - function macroxs_iso_get_xs(this, g, xstype, uvw) result(xs) + function macroxs_iso_get_xs(this, g, xstype, gout, uvw) result(xs) class(MacroXS_Iso), intent(in) :: this ! The MacroXS to initialize integer, intent(in) :: g ! Incoming Energy group character(*) , intent(in) :: xstype ! Type of xs requested + integer, optional, intent(in) :: gout ! Outgoing Energy group real(8), optional, intent(in) :: uvw(3) ! Requested Angle real(8) :: xs ! Requested x/s @@ -807,14 +809,21 @@ contains xs = this % nu_fission(g) case('scatter') xs = this % scattxs(g) + case('mult') + if (present(gout)) then + xs = this % scatter % mult(gout,g) + else + xs = sum(this % scatter % mult(:,g)) + end if end select end function macroxs_iso_get_xs - function macroxs_angle_get_xs(this, g, xstype, uvw) result(xs) + function macroxs_angle_get_xs(this, g, xstype, gout,uvw) result(xs) class(MacroXS_Angle), intent(in) :: this ! The MacroXS to initialize integer, intent(in) :: g ! Incoming Energy group character(*) , intent(in) :: xstype ! Type of xs requested + integer, optional, intent(in) :: gout ! Outgoing Energy group real(8), optional, intent(in) :: uvw(3) ! Requested Angle real(8) :: xs ! Requested x/s @@ -835,6 +844,12 @@ contains xs = this % nu_fission(g,iazi,ipol) case('scatter') xs = this % scattxs(g,iazi,ipol) + case('mult') + if (present(gout)) then + xs = this % scatter(iazi,ipol) % obj % mult(gout,g) + else + xs = sum(this % scatter(iazi,ipol) % obj % mult(:,g)) + end if end select end if diff --git a/src/tally.F90 b/src/tally.F90 index 6ec0dee19c..3a258c9d3d 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -201,29 +201,43 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & - (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then - ! Don't waste time on very common reactions we know have multiplicities - ! of one. - score = p % last_wgt - else - do m = 1, nuclides(p % event_nuclide) % n_reaction - ! Check if this is the desired MT - if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then - ! Found the reaction, set our pointer and move on with life - rxn => nuclides(p % event_nuclide) % reactions(m) - exit - end if - end do - - ! Get multiplicity and apply to score - if (rxn % multiplicity_with_E) then - ! Then the multiplicity was already incorporated in to p % wgt - ! per the scattering routine, - score = p % wgt + if (run_CE) then + if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & + (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then + ! Don't waste time on very common reactions we know have multiplicities + ! of one. + score = p % last_wgt else - ! Grab the multiplicity from the rxn - score = p % last_wgt * rxn % multiplicity + do m = 1, nuclides(p % event_nuclide) % n_reaction + ! Check if this is the desired MT + if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then + ! Found the reaction, set our pointer and move on with life + rxn => nuclides(p % event_nuclide) % reactions(m) + exit + end if + end do + + ! Get multiplicity and apply to score + if (rxn % multiplicity_with_E) then + ! Then the multiplicity was already incorporated in to p % wgt + ! per the scattering routine, + score = p % wgt + else + ! Grab the multiplicity from the rxn + score = p % last_wgt * rxn % multiplicity + end if + end if + else + if (i_nuclide > 0) then + score = p % last_wgt * & + nuclides_MG(p % event_nuclide) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % coord(1) % uvw) + else + score = p % last_wgt * & + macro_xs(p % material) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % coord(1) % uvw) end if end if @@ -238,29 +252,43 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & - (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then - ! Don't waste time on very common reactions we know have multiplicities - ! of one. - score = p % last_wgt - else - do m = 1, nuclides(p % event_nuclide) % n_reaction - ! Check if this is the desired MT - if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then - ! Found the reaction, set our pointer and move on with life - rxn => nuclides(p % event_nuclide) % reactions(m) - exit - end if - end do - - ! Get multiplicity and apply to score - if (rxn % multiplicity_with_E) then - ! Then the multiplicity was already incorporated in to p % wgt - ! per the scattering routine, - score = p % wgt + if (run_CE) then + if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & + (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then + ! Don't waste time on very common reactions we know have multiplicities + ! of one. + score = p % last_wgt else - ! Grab the multiplicity from the rxn - score = p % last_wgt * rxn % multiplicity + do m = 1, nuclides(p % event_nuclide) % n_reaction + ! Check if this is the desired MT + if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then + ! Found the reaction, set our pointer and move on with life + rxn => nuclides(p % event_nuclide) % reactions(m) + exit + end if + end do + + ! Get multiplicity and apply to score + if (rxn % multiplicity_with_E) then + ! Then the multiplicity was already incorporated in to p % wgt + ! per the scattering routine, + score = p % wgt + else + ! Grab the multiplicity from the rxn + score = p % last_wgt * rxn % multiplicity + end if + end if + else + if (i_nuclide > 0) then + score = p % last_wgt * & + nuclides_MG(p % event_nuclide) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % coord(1) % uvw) + else + score = p % last_wgt * & + macro_xs(p % material) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % coord(1) % uvw) end if end if @@ -275,29 +303,43 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & - (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then - ! Don't waste time on very common reactions we know have multiplicities - ! of one. - score = p % last_wgt - else - do m = 1, nuclides(p % event_nuclide) % n_reaction - ! Check if this is the desired MT - if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then - ! Found the reaction, set our pointer and move on with life - rxn => nuclides(p % event_nuclide) % reactions(m) - exit - end if - end do - - ! Get multiplicity and apply to score - if (rxn % multiplicity_with_E) then - ! Then the multiplicity was already incorporated in to p % wgt - ! per the scattering routine, - score = p % wgt + if (run_CE) then + if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & + (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then + ! Don't waste time on very common reactions we know have multiplicities + ! of one. + score = p % last_wgt else - ! Grab the multiplicity from the rxn - score = p % last_wgt * rxn % multiplicity + do m = 1, nuclides(p % event_nuclide) % n_reaction + ! Check if this is the desired MT + if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then + ! Found the reaction, set our pointer and move on with life + rxn => nuclides(p % event_nuclide) % reactions(m) + exit + end if + end do + + ! Get multiplicity and apply to score + if (rxn % multiplicity_with_E) then + ! Then the multiplicity was already incorporated in to p % wgt + ! per the scattering routine, + score = p % wgt + else + ! Grab the multiplicity from the rxn + score = p % last_wgt * rxn % multiplicity + end if + end if + else + if (i_nuclide > 0) then + score = p % last_wgt * & + nuclides_MG(p % event_nuclide) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % coord(1) % uvw) + else + score = p % last_wgt * & + macro_xs(p % material) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % coord(1) % uvw) end if end if From 8d736c7badaa97af957a2eea7a03fde3fecfc694 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 4 Nov 2015 21:09:24 -0500 Subject: [PATCH 018/149] Separated some tally routines, implemented function pointers, removed nuclidic micro_xs calculation for MG mode. made MG closer in speed to the versionof OpenMGMC. --- src/initialize.F90 | 4 + src/input_xml.F90 | 16 +- src/macroxs.F90 | 28 +- src/nuclide_header.F90 | 21 +- src/tally.F90 | 891 +++++++++++++++++++++++++++++++++++------ src/tracking.F90 | 6 +- 6 files changed, 807 insertions(+), 159 deletions(-) diff --git a/src/initialize.F90 b/src/initialize.F90 index 5793b67226..128759e429 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -26,6 +26,7 @@ module initialize use summary, only: write_summary use tally_header, only: TallyObject, TallyResult, TallyFilter use tally_initialize, only: configure_tallies + use tally, only: init_tally_routines #ifdef MPI use message_passing @@ -150,6 +151,9 @@ contains ! Allocate and setup tally stride, matching_bins, and tally maps call configure_tallies() + ! Set up tally procedure pointers + call init_tally_routines() + ! Determine how much work each processor should do call calculate_work() diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 0c26b841a9..65c840ce25 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2569,18 +2569,24 @@ contains if (temp_str == 'energy' .or. temp_str == 'energyout' .or. & temp_str == 'mu' .or. temp_str == 'polar' .or. & temp_str == 'azimuthal') then - n_words = get_arraysize_double(node_filt, "bins") + ! If in MG mode, fail if user provides bins, as we are only + ! allowing for all groups + if (.not. run_CE .and. (temp_str == 'energy' .or. & + temp_str == 'energyout')) then + call fatal_error("No energy or energyout bins needed on tally " & + &// trim(to_str(t % id))) + else + n_words = get_arraysize_double(node_filt, "bins") + end if else n_words = get_arraysize_integer(node_filt, "bins") end if - else if (temp_str == 'energy' .or. temp_str == 'energyout' .and. & - .not. run_CE) then + else if (.not. run_CE .and. (temp_str == 'energy' .or. & + temp_str == 'energyout')) then ! For MG calculations, dont require the user to put in all the ! group boundaries, as there could be many. Assume that if no & ! bins are entered that that means they want group-wise results. n_words = -1 - call warning("Energy bins not set in filter on tally " & - &// trim(to_str(t % id))) else call fatal_error("Bins not set in filter on tally " & diff --git a/src/macroxs.F90 b/src/macroxs.F90 index 14980cc6a7..ac66d6b2ac 100644 --- a/src/macroxs.F90 +++ b/src/macroxs.F90 @@ -19,18 +19,13 @@ contains ! UPDATE_XS stores the xs to work with !=============================================================================== - subroutine calculate_mgxs(this, mat, nuclides, gin, uvw, xs, micro_xs) + subroutine calculate_mgxs(this, gin, uvw, xs) class(MacroXS_Base), intent(in) :: this - type(Material), intent(in) :: mat ! Material of interest - type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides integer, intent(in) :: gin ! Incoming neutron group real(8), intent(in) :: uvw(3) ! Incoming neutron direction type(MaterialMacroXS), intent(inout) :: xs - type(NuclideMicroXS), intent(inout) :: micro_xs(:) integer :: iazi, ipol - integer :: i, i_nuclide - class(Nuclide_MG), pointer :: nuc select type(this) type is (MacroXS_Iso) @@ -55,27 +50,6 @@ contains end if end select - ! Place nuclidic xs in micro_xs for tallying purposes - do i = 1, mat % n_nuclides - ! Determine microscopic cross section for this nuclide - i_nuclide = mat % nuclide(i) - - nuc => nuclides(i_nuclide) % obj - micro_xs(i_nuclide) % total = nuc % get_xs(gin, 'total', & - I_AZI=iazi, I_POL=ipol) - micro_xs(i_nuclide) % elastic = nuc % get_xs(gin, 'scatter', & - I_AZI=iazi, I_POL=ipol) - micro_xs(i_nuclide) % absorption = nuc % get_xs(gin, 'absorption', & - I_AZI=iazi, I_POL=ipol) - micro_xs(i_nuclide) % fission = nuc % get_xs(gin, 'fission', & - I_AZI=iazi, I_POL=ipol) - micro_xs(i_nuclide) % nu_fission = nuc % get_xs(gin, 'nu_fission', & - I_AZI=iazi, I_POL=ipol) - micro_xs(i_nuclide) % kappa_fission = nuc % get_xs(gin, 'k_fission', & - I_AZI=iazi, I_POL=ipol) - - end do - end subroutine calculate_mgxs diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 1a16c3f5ea..3e320ab273 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -6,7 +6,7 @@ module nuclide_header use constants use endf, only: reaction_name use list_header, only: ListInt - ! use math, only: calc_pn, calc_rn!, expand_harmonic + use math, only: evaluate_legendre !use scattdata_header use simple_string @@ -117,7 +117,7 @@ module nuclide_header end type Nuclide_MG abstract interface - function nuclide_mg_get_xs_(this, g, xstype, gout, uvw, i_azi, i_pol) & + function nuclide_mg_get_xs_(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) import Nuclide_MG class(Nuclide_MG), intent(in) :: this @@ -125,6 +125,7 @@ module nuclide_header character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8), optional, intent(in) :: mu ! Change in angle integer, optional, intent(in) :: i_azi ! Azimuthal Index integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs @@ -535,13 +536,14 @@ module nuclide_header ! NUCLIDE_*_GET_XS Returns the requested data type !=============================================================================== - function nuclide_iso_get_xs(this, g, xstype, gout, uvw, i_azi, i_pol) & + function nuclide_iso_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) class(Nuclide_Iso), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group real(8), optional, intent(in) :: uvw(3) ! Requested Angle + real(8), optional, intent(in) :: mu ! Change in angle integer, optional, intent(in) :: i_azi ! Azimuthal Index integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs @@ -559,6 +561,11 @@ module nuclide_header xs = this % mult(gout,g) case('nu_fission') xs = this % nu_fission(gout,g) + case('f_mu') + xs = evaluate_legendre(this % scatter(gout,g,:), mu) + case('f_mu/mult') + xs = evaluate_legendre(this % scatter(gout,g,:), mu) / & + this % mult(gout,g) end select else select case(xstype) @@ -580,12 +587,13 @@ module nuclide_header end if end function nuclide_iso_get_xs - function nuclide_angle_get_xs(this, g, xstype, gout, uvw, i_azi, i_pol) & + function nuclide_angle_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) class(Nuclide_Angle), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group + real(8), optional, intent(in) :: mu ! Change in angle real(8), optional, intent(in) :: uvw(3) ! Requested Angle integer, optional, intent(in) :: i_azi ! Azimuthal Index integer, optional, intent(in) :: i_pol ! Polar Index @@ -615,6 +623,11 @@ module nuclide_header xs = this % nu_fission(gout,g,i_azi_,i_pol_) case('chi') xs = this % chi(gout,i_azi_,i_pol_) + case('f_mu') + xs = evaluate_legendre(this % scatter(gout,g,:,i_azi_,i_pol_), mu) + case('f_mu/mult') + xs = evaluate_legendre(this % scatter(gout,g,:,i_azi_,i_pol_), mu) / & + this % mult(gout,g,i_azi_,i_pol_) end select else select case(xstype) diff --git a/src/tally.F90 b/src/tally.F90 index 3a258c9d3d..ed7165e1cd 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -5,7 +5,7 @@ module tally use error, only: fatal_error use geometry_header use global - use math, only: t_percentile, calc_pn, calc_rn + use math, only: t_percentile, calc_pn, calc_rn, evaluate_legendre use mesh, only: get_mesh_bin, bin_to_mesh_indices, & get_mesh_indices, mesh_indices_to_bin, & mesh_intersects_2d, mesh_intersects_3d @@ -25,17 +25,59 @@ module tally implicit none integer :: position(N_FILTER_TYPES - 3) = 0 ! Tally map positioning array + + procedure(score_general_intfc), pointer :: score_general => null() + procedure(get_scoring_bins_intfc), pointer :: get_scoring_bins => null() + + abstract interface + subroutine score_general_intfc(p, t, start_index, filter_index, i_nuclide, & + atom_density, flux) + import Particle + import TallyObject + type(Particle), intent(in) :: p + type(TallyObject), pointer, intent(inout) :: t + integer, intent(in) :: start_index + integer, intent(in) :: i_nuclide + integer, intent(in) :: filter_index ! for % results + real(8), intent(in) :: flux ! flux estimate + real(8), intent(in) :: atom_density ! atom/b-cm + end subroutine score_general_intfc + + subroutine get_scoring_bins_intfc(p, i_tally, found_bin) + import Particle + type(Particle), intent(in) :: p + integer, intent(in) :: i_tally + logical, intent(out) :: found_bin + end subroutine get_scoring_bins_intfc + + end interface + !$omp threadprivate(position) contains !=============================================================================== -! SCORE_GENERAL adds scores to the tally array for the given filter and nuclide. -! This will work for either analog or tracklength tallies. Note that +! INIT_TALLY_ROUTINES Sets the procedure pointers needed for minimizing code +! with the CE and MG modes. +!=============================================================================== + + subroutine init_tally_routines() + if (run_CE) then + score_general => score_general_ce + get_scoring_bins => get_scoring_bins_ce + else + score_general => score_general_mg + get_scoring_bins => get_scoring_bins_mg + end if + end subroutine init_tally_routines + +!=============================================================================== +! SCORE_GENERAL* adds scores to the tally array for the given filter and +! nuclide. This will work for either analog or tracklength tallies. Note that ! atom_density and flux are not used for analog tallies. !=============================================================================== - subroutine score_general(p, t, start_index, filter_index, i_nuclide, & + subroutine score_general_ce(p, t, start_index, filter_index, i_nuclide, & atom_density, flux) type(Particle), intent(in) :: p type(TallyObject), pointer, intent(inout) :: t @@ -48,8 +90,6 @@ contains integer :: i ! loop index for scoring bins integer :: l ! loop index for nuclides in material integer :: m ! loop index for reactions - integer :: n ! loop index for legendre order - integer :: num_nm ! Number of N,M orders in harmonic integer :: q ! loop index for scoring bins integer :: i_nuc ! index in nuclides array (from material) integer :: i_energy ! index in nuclide energy grid @@ -64,7 +104,6 @@ contains real(8) :: score ! analog tally score real(8) :: macro_total ! material macro total xs real(8) :: macro_scatt ! material macro scatt xs - real(8) :: uvw(3) ! particle direction type(Material), pointer :: mat type(Reaction), pointer :: rxn type(Nuclide_CE), pointer :: nuc @@ -201,43 +240,29 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - if (run_CE) then - if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & - (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then - ! Don't waste time on very common reactions we know have multiplicities - ! of one. - score = p % last_wgt - else - do m = 1, nuclides(p % event_nuclide) % n_reaction - ! Check if this is the desired MT - if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then - ! Found the reaction, set our pointer and move on with life - rxn => nuclides(p % event_nuclide) % reactions(m) - exit - end if - end do - - ! Get multiplicity and apply to score - if (rxn % multiplicity_with_E) then - ! Then the multiplicity was already incorporated in to p % wgt - ! per the scattering routine, - score = p % wgt - else - ! Grab the multiplicity from the rxn - score = p % last_wgt * rxn % multiplicity - end if - end if + if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & + (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then + ! Don't waste time on very common reactions we know have multiplicities + ! of one. + score = p % last_wgt else - if (i_nuclide > 0) then - score = p % last_wgt * & - nuclides_MG(p % event_nuclide) % obj % get_xs(p % g, 'mult', & - p % last_g, & - p % coord(1) % uvw) + do m = 1, nuclides(p % event_nuclide) % n_reaction + ! Check if this is the desired MT + if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then + ! Found the reaction, set our pointer and move on with life + rxn => nuclides(p % event_nuclide) % reactions(m) + exit + end if + end do + + ! Get multiplicity and apply to score + if (rxn % multiplicity_with_E) then + ! Then the multiplicity was already incorporated in to p % wgt + ! per the scattering routine, + score = p % wgt else - score = p % last_wgt * & - macro_xs(p % material) % obj % get_xs(p % g, 'mult', & - p % last_g, & - p % coord(1) % uvw) + ! Grab the multiplicity from the rxn + score = p % last_wgt * rxn % multiplicity end if end if @@ -252,43 +277,29 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - if (run_CE) then - if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & - (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then - ! Don't waste time on very common reactions we know have multiplicities - ! of one. - score = p % last_wgt - else - do m = 1, nuclides(p % event_nuclide) % n_reaction - ! Check if this is the desired MT - if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then - ! Found the reaction, set our pointer and move on with life - rxn => nuclides(p % event_nuclide) % reactions(m) - exit - end if - end do - - ! Get multiplicity and apply to score - if (rxn % multiplicity_with_E) then - ! Then the multiplicity was already incorporated in to p % wgt - ! per the scattering routine, - score = p % wgt - else - ! Grab the multiplicity from the rxn - score = p % last_wgt * rxn % multiplicity - end if - end if + if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & + (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then + ! Don't waste time on very common reactions we know have multiplicities + ! of one. + score = p % last_wgt else - if (i_nuclide > 0) then - score = p % last_wgt * & - nuclides_MG(p % event_nuclide) % obj % get_xs(p % g, 'mult', & - p % last_g, & - p % coord(1) % uvw) + do m = 1, nuclides(p % event_nuclide) % n_reaction + ! Check if this is the desired MT + if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then + ! Found the reaction, set our pointer and move on with life + rxn => nuclides(p % event_nuclide) % reactions(m) + exit + end if + end do + + ! Get multiplicity and apply to score + if (rxn % multiplicity_with_E) then + ! Then the multiplicity was already incorporated in to p % wgt + ! per the scattering routine, + score = p % wgt else - score = p % last_wgt * & - macro_xs(p % material) % obj % get_xs(p % g, 'mult', & - p % last_g, & - p % coord(1) % uvw) + ! Grab the multiplicity from the rxn + score = p % last_wgt * rxn % multiplicity end if end if @@ -303,43 +314,29 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - if (run_CE) then - if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & - (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then - ! Don't waste time on very common reactions we know have multiplicities - ! of one. - score = p % last_wgt - else - do m = 1, nuclides(p % event_nuclide) % n_reaction - ! Check if this is the desired MT - if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then - ! Found the reaction, set our pointer and move on with life - rxn => nuclides(p % event_nuclide) % reactions(m) - exit - end if - end do - - ! Get multiplicity and apply to score - if (rxn % multiplicity_with_E) then - ! Then the multiplicity was already incorporated in to p % wgt - ! per the scattering routine, - score = p % wgt - else - ! Grab the multiplicity from the rxn - score = p % last_wgt * rxn % multiplicity - end if - end if + if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. & + (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then + ! Don't waste time on very common reactions we know have multiplicities + ! of one. + score = p % last_wgt else - if (i_nuclide > 0) then - score = p % last_wgt * & - nuclides_MG(p % event_nuclide) % obj % get_xs(p % g, 'mult', & - p % last_g, & - p % coord(1) % uvw) + do m = 1, nuclides(p % event_nuclide) % n_reaction + ! Check if this is the desired MT + if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then + ! Found the reaction, set our pointer and move on with life + rxn => nuclides(p % event_nuclide) % reactions(m) + exit + end if + end do + + ! Get multiplicity and apply to score + if (rxn % multiplicity_with_E) then + ! Then the multiplicity was already incorporated in to p % wgt + ! per the scattering routine, + score = p % wgt else - score = p % last_wgt * & - macro_xs(p % material) % obj % get_xs(p % g, 'mult', & - p % last_g, & - p % coord(1) % uvw) + ! Grab the multiplicity from the rxn + score = p % last_wgt * rxn % multiplicity end if end if @@ -431,7 +428,7 @@ contains ! neutrons were emitted with different energies, multiple ! outgoing energy bins may have been scored to. The following ! logic treats this special case and results to multiple bins - call score_fission_eout(p, t, score_index) + call score_fission_eout_ce(p, t, score_index) cycle SCORE_LOOP end if end if @@ -776,10 +773,430 @@ contains !######################################################################### ! Expand score if necessary and add to tally results. + call expand_and_score(p, t, score_index, filter_index, score_bin, & + score, i) + + end do SCORE_LOOP + end subroutine score_general_ce + + subroutine score_general_mg(p, t, start_index, filter_index, i_nuclide, & + atom_density, flux) + type(Particle), intent(in) :: p + type(TallyObject), pointer, intent(inout) :: t + integer, intent(in) :: start_index + integer, intent(in) :: i_nuclide + integer, intent(in) :: filter_index ! for % results + real(8), intent(in) :: flux ! flux estimate + real(8), intent(in) :: atom_density ! atom/b-cm + + integer :: i ! loop index for scoring bins + integer :: q ! loop index for scoring bins + integer :: score_bin ! scoring bin, e.g. SCORE_FLUX + integer :: score_index ! scoring bin index + real(8) :: score ! analog tally score + real(8) :: macro_total ! material macro total xs + real(8) :: macro_scatt ! material macro scatt xs + real(8) :: micro_abs ! nuclidic microscopic abs + class(Nuclide_MG), pointer :: nuc + + nuc => nuclides_MG(i_nuclide) % obj + + i = 0 + SCORE_LOOP: do q = 1, t % n_user_score_bins + i = i + 1 + + ! determine what type of score bin + score_bin = t % score_bins(i) + + ! determine scoring bin index + score_index = start_index + i + + !######################################################################### + ! Determine appropirate scoring value. select case(score_bin) + case (SCORE_FLUX, SCORE_FLUX_YN) + if (t % estimator == ESTIMATOR_ANALOG) then + ! All events score to a flux bin. We actually use a collision + ! estimator in place of an analog one since there is no way to count + ! 'events' exactly for the flux + if (survival_biasing) then + ! We need to account for the fact that some weight was already + ! absorbed + score = p % last_wgt + p % absorb_wgt + else + score = p % last_wgt + end if + score = score / material_xs % total + + else + ! For flux, we need no cross section + score = flux + end if + + + case (SCORE_TOTAL, SCORE_TOTAL_YN) + if (t % estimator == ESTIMATOR_ANALOG) then + ! All events will score to the total reaction rate. We can just + ! use the weight of the particle entering the collision as the + ! score + if (survival_biasing) then + ! We need to account for the fact that some weight was already + ! absorbed + score = p % last_wgt + p % absorb_wgt + else + score = p % last_wgt + end if + + else + if (i_nuclide > 0) then + score = nuc % get_xs(p % g, 'total', UVW=p % coord(i) % uvw) * & + atom_density * flux + else + score = material_xs % total * flux + end if + end if + + + case (SCORE_INVERSE_VELOCITY) + if (t % estimator == ESTIMATOR_ANALOG) then + ! All events score to an inverse velocity bin. We actually use a + ! collision estimator in place of an analog one since there is no way + ! to count 'events' exactly for the inverse velocity + if (survival_biasing) then + ! We need to account for the fact that some weight was already + ! absorbed + score = p % last_wgt + p % absorb_wgt + else + score = p % last_wgt + end if + score = score / material_xs % total & + / (sqrt(TWO * p % E / (MASS_NEUTRON_MEV)) * C_LIGHT) + + else + ! For inverse velocity, we need no cross section + score = flux / (sqrt(TWO * p % E / (MASS_NEUTRON_MEV)) * C_LIGHT) + end if + + + case (SCORE_SCATTER, SCORE_SCATTER_N) + if (t % estimator == ESTIMATOR_ANALOG) then + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP + ! Since only scattering events make it here, again we can use + ! the weight entering the collision as the estimator for the + ! reaction rate + score = p % last_wgt + + else + ! Note SCORE_SCATTER_N not available for tracklength/collision. + if (i_nuclide > 0) then + score = nuc % get_xs(p % g, 'scatter', UVW=p % coord(i) % uvw) * & + atom_density * flux + else + ! Get the scattering x/s (stored in % elastic) + score = material_xs % elastic * flux + end if + end if + + if (i_nuclide > 0) then + score = score * nuc % get_xs(p % g, 'f_mu/mult', p % last_g, & + p % last_uvw, p % mu) + else + score = score / & + macro_xs(p % material) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % last_uvw) + end if + + + case (SCORE_SCATTER_PN) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) then + i = i + t % moment_order(i) + cycle SCORE_LOOP + end if + ! Since only scattering events make it here, again we can use + ! the weight entering the collision as the estimator for the + ! reaction rate + score = p % last_wgt + + if (i_nuclide > 0) then + score = score * nuc % get_xs(p % g, 'f_mu/mult', p % last_g, & + p % last_uvw, p % mu) + else + score = score / & + macro_xs(p % material) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % last_uvw) + end if + + + case (SCORE_SCATTER_YN) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) then + i = i + (t % moment_order(i) + 1)**2 - 1 + cycle SCORE_LOOP + end if + ! Since only scattering events make it here, again we can use + ! the weight entering the collision as the estimator for the + ! reaction rate + score = p % last_wgt + + if (i_nuclide > 0) then + score = score * nuc % get_xs(p % g, 'f_mu/mult', p % last_g, & + p % last_uvw, p % mu) + else + score = score / & + macro_xs(p % material) % obj % get_xs(p % g, 'mult', & + p % last_g, & + p % last_uvw) + end if + + + case (SCORE_NU_SCATTER, SCORE_NU_SCATTER_N) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP + ! For scattering production, we need to use the pre-collision + ! weight times the multiplicity as the estimate for the number of + ! neutrons exiting a reaction with neutrons in the exit channel + score = p % wgt * nuc % get_xs(p % g, 'f_mu', p % last_g, & + p % last_uvw, p % mu) + + + case (SCORE_NU_SCATTER_PN) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) then + i = i + t % moment_order(i) + cycle SCORE_LOOP + end if + ! For scattering production, we need to use the pre-collision + ! weight times the multiplicity as the estimate for the number of + ! neutrons exiting a reaction with neutrons in the exit channel + score = p % wgt * nuc % get_xs(p % g, 'f_mu', p % last_g, & + p % last_uvw, p % mu) + + + case (SCORE_NU_SCATTER_YN) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) then + i = i + (t % moment_order(i) + 1)**2 - 1 + cycle SCORE_LOOP + end if + ! For scattering production, we need to use the pre-collision + ! weight times the multiplicity as the estimate for the number of + ! neutrons exiting a reaction with neutrons in the exit channel + score = p % wgt * nuc % get_xs(p % g, 'f_mu', p % last_g, & + p % last_uvw, p % mu) + + + case (SCORE_TRANSPORT) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP + ! get material macros + macro_total = material_xs % total + macro_scatt = material_xs % elastic + ! Score total rate - p1 scatter rate Note estimator needs to be + ! adjusted since tallying is only occuring when a scatter has + ! happened. Effectively this means multiplying the estimator by + ! total/scatter macro + score = (macro_total - p % mu * macro_scatt) * (ONE / macro_scatt) + + + case (SCORE_N_1N) + ! Only analog estimators are available. + ! Skip any event where the particle didn't scatter + if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP + ! Skip any events where weight of particle changed + if (p % wgt /= p % last_wgt) cycle SCORE_LOOP + ! All events that reach this point are (n,1n) reactions + score = p % last_wgt + + + case (SCORE_ABSORPTION) + if (t % estimator == ESTIMATOR_ANALOG) then + if (survival_biasing) then + ! No absorption events actually occur if survival biasing is on -- + ! just use weight absorbed in survival biasing + score = p % absorb_wgt + else + ! Skip any event where the particle wasn't absorbed + if (p % event == EVENT_SCATTER) cycle SCORE_LOOP + ! All fission and absorption events will contribute here, so we + ! can just use the particle's weight entering the collision + score = p % last_wgt + end if + + else + if (i_nuclide > 0) then + score = nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) & + * atom_density * flux + else + score = material_xs % absorption * flux + end if + end if + + + case (SCORE_FISSION) + if (t % estimator == ESTIMATOR_ANALOG) then + if (survival_biasing) then + ! No fission events occur if survival biasing is on -- need to + ! calculate fraction of absorptions that would have resulted in + ! fission + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + if (micro_abs > ZERO) then + score = p % absorb_wgt * & + nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) & + / micro_abs + else + score = ZERO + end if + else + ! Skip any non-absorption events + if (p % event == EVENT_SCATTER) cycle SCORE_LOOP + ! All fission events will contribute, so again we can use + ! particle's weight entering the collision as the estimate for the + ! fission reaction rate + score = p % last_wgt & + * nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) & + / nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + end if + + else + if (i_nuclide > 0) then + score = nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) * & + atom_density * flux + else + score = material_xs % fission * flux + end if + end if + + + case (SCORE_NU_FISSION) + if (t % estimator == ESTIMATOR_ANALOG) then + if (survival_biasing .or. p % fission) then + if (t % find_filter(FILTER_ENERGYOUT) > 0) then + ! Normally, we only need to make contributions to one scoring + ! bin. However, in the case of fission, since multiple fission + ! neutrons were emitted with different energies, multiple + ! outgoing energy bins may have been scored to. The following + ! logic treats this special case and results to multiple bins + call score_fission_eout_mg(p, t, score_index) + cycle SCORE_LOOP + end if + end if + if (survival_biasing) then + ! No fission events occur if survival biasing is on -- need to + ! calculate fraction of absorptions that would have resulted in + ! nu-fission + if (micro_xs(p % event_nuclide) % absorption > ZERO) then + score = p % absorb_wgt * & + nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) / & + nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + else + score = ZERO + end if + else + ! Skip any non-fission events + if (.not. p % fission) cycle SCORE_LOOP + ! If there is no outgoing energy filter, than we only need to + ! score to one bin. For the score to be 'analog', we need to + ! score the number of particles that were banked in the fission + ! bank. Since this was weighted by 1/keff, we multiply by keff + ! to get the proper score. + score = keff * p % wgt_bank + end if + + else + if (i_nuclide > 0) then + score = nuc % get_xs(p % g, 'nu_fission', UVW=p % coord(1) % uvw) & + * atom_density * flux + else + score = material_xs % nu_fission * flux + end if + end if + + + case (SCORE_KAPPA_FISSION) + if (t % estimator == ESTIMATOR_ANALOG) then + if (survival_biasing) then + ! No fission events occur if survival biasing is on -- need to + ! calculate fraction of absorptions that would have resulted in + ! fission scale by kappa-fission + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + if (micro_abs > ZERO) then + score = p % absorb_wgt * & + nuc % get_xs(p % g, 'k_fission', UVW=p % coord(1) % uvw) / & + micro_abs + else + score = ZERO + end if + else + ! Skip any non-absorption events + if (p % event == EVENT_SCATTER) cycle SCORE_LOOP + ! All fission events will contribute, so again we can use + ! particle's weight entering the collision as the estimate for + ! the fission energy production rate + score = p % last_wgt * & + nuc % get_xs(p % g, 'k_fission', UVW=p % coord(1) % uvw) / & + nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + end if + + else + if (i_nuclide > 0) then + score = nuc % get_xs(p % g, 'k_fission', UVW=p % coord(1) % uvw) & + * atom_density * flux + else + score = material_xs % kappa_fission * flux + end if + end if + + + case (SCORE_EVENTS) + ! Simply count number of scoring events + score = ONE + + end select + + !######################################################################### + ! Expand score if necessary and add to tally results. + call expand_and_score(p, t, score_index, filter_index, score_bin, & + score, i) + + end do SCORE_LOOP + end subroutine score_general_mg + +!=============================================================================== +! EXPAND_AND_SCORE takes a previously determined score value and adjusts it +! if necessary (for functional expansion weighting), and then adds the resultant +! value to the tally results array. +!=============================================================================== + + subroutine expand_and_score(p, t, score_index, filter_index, score_bin, & + score, i) + type(Particle), intent(in) :: p + type(TallyObject), pointer, intent(inout) :: t + integer, intent(inout) :: score_index + integer, intent(in) :: filter_index ! for % results + integer, intent(in) :: score_bin ! score of concern + real(8), intent(inout) :: score ! data to score + integer, intent(inout) :: i ! Working index + + integer :: num_nm ! Number of N,M orders in harmonic + integer :: n ! Moment loop index + real(8) :: uvw(3) + + select case(score_bin) + + case (SCORE_SCATTER_N, SCORE_NU_SCATTER_N) ! Find the scattering order for a singly requested moment, and ! store its moment contribution. @@ -869,8 +1286,8 @@ contains end select - end do SCORE_LOOP - end subroutine score_general + + end subroutine expand_and_score !=============================================================================== ! SCORE_ALL_NUCLIDES tallies individual nuclide reaction rates specifically when @@ -1039,7 +1456,7 @@ contains ! neutrons produced with different energies. !=============================================================================== - subroutine score_fission_eout(p, t, i_score) + subroutine score_fission_eout_ce(p, t, i_score) type(Particle), intent(in) :: p type(TallyObject), pointer :: t @@ -1092,7 +1509,58 @@ contains ! reset outgoing energy bin and score index matching_bins(i) = bin_energyout - end subroutine score_fission_eout + end subroutine score_fission_eout_ce + + subroutine score_fission_eout_mg(p, t, i_score) + + type(Particle), intent(in) :: p + type(TallyObject), pointer :: t + integer, intent(in) :: i_score ! index for score + + integer :: i ! index of outgoing energy filter + integer :: n ! number of energies on filter + integer :: k ! loop index for bank sites + integer :: bin_energyout ! original outgoing energy bin + integer :: i_filter ! index for matching filter bin combination + real(8) :: score ! actual score + integer :: gout ! energy group of fission bank site + + ! save original outgoing energy bin and score index + i = t % find_filter(FILTER_ENERGYOUT) + bin_energyout = matching_bins(i) + + ! Get number of energies on filter + n = size(t % filters(i) % int_bins) + + ! Since the creation of fission sites is weighted such that it is + ! expected to create n_particles sites, we need to multiply the + ! score by keff to get the true nu-fission rate. Otherwise, the sum + ! of all nu-fission rates would be ~1.0. + + ! loop over number of particles banked + do k = 1, p % n_bank + ! determine score based on bank site weight and keff + score = keff * fission_bank(n_bank - p % n_bank + k) % wgt + + ! determine outgoing energy from fission bank + gout = fission_bank(n_bank - p % n_bank + k) % g + + ! change outgoing energy bin + matching_bins(i) = gout + + ! determine scoring index + i_filter = sum((matching_bins(1:t%n_filters) - 1) * t % stride) + 1 + + ! Add score to tally +!$omp atomic + t % results(i_score, i_filter) % value = & + t % results(i_score, i_filter) % value + score + end do + + ! reset outgoing energy bin and score index + matching_bins(i) = bin_energyout + + end subroutine score_fission_eout_mg !=============================================================================== ! SCORE_FISSION_DELAYED_EOUT handles a special case where we need to store @@ -1734,7 +2202,7 @@ contains ! for a tally based on the particle's current attributes. !=============================================================================== - subroutine get_scoring_bins(p, i_tally, found_bin) + subroutine get_scoring_bins_ce(p, i_tally, found_bin) type(Particle), intent(in) :: p integer, intent(in) :: i_tally @@ -1937,7 +2405,192 @@ contains end do FILTER_LOOP - end subroutine get_scoring_bins + end subroutine get_scoring_bins_ce + + subroutine get_scoring_bins_mg(p, i_tally, found_bin) + + type(Particle), intent(in) :: p + integer, intent(in) :: i_tally + logical, intent(out) :: found_bin + + integer :: i ! loop index for filters + integer :: j + integer :: n ! number of bins for single filter + integer :: offset ! offset for distribcell + integer :: g ! particle energy group + real(8) :: theta, phi ! Polar and Azimuthal Angles, respectively + type(TallyObject), pointer :: t + type(RegularMesh), pointer :: m + + found_bin = .true. + t => tallies(i_tally) + matching_bins(1:t%n_filters) = 1 + + FILTER_LOOP: do i = 1, t % n_filters + + select case (t % filters(i) % type) + case (FILTER_MESH) + ! determine mesh bin + m => meshes(t % filters(i) % int_bins(1)) + + ! Determine if we're in the mesh first + call get_mesh_bin(m, p % coord(1) % xyz, matching_bins(i)) + + case (FILTER_UNIVERSE) + ! determine next universe bin + ! TODO: Account for multiple universes when performing this filter + matching_bins(i) = get_next_bin(FILTER_UNIVERSE, & + p % coord(p % n_coord) % universe, i_tally) + + case (FILTER_MATERIAL) + if (p % material == MATERIAL_VOID) then + matching_bins(i) = NO_BIN_FOUND + else + matching_bins(i) = get_next_bin(FILTER_MATERIAL, & + p % material, i_tally) + endif + + case (FILTER_CELL) + ! determine next cell bin + do j = 1, p % n_coord + position(FILTER_CELL) = 0 + matching_bins(i) = get_next_bin(FILTER_CELL, & + p % coord(j) % cell, i_tally) + if (matching_bins(i) /= NO_BIN_FOUND) exit + end do + + case (FILTER_DISTRIBCELL) + ! determine next distribcell bin + matching_bins(i) = NO_BIN_FOUND + offset = 0 + do j = 1, p % n_coord + if (cells(p % coord(j) % cell) % type == CELL_FILL) then + offset = offset + cells(p % coord(j) % cell) % & + offset(t % filters(i) % offset) + elseif(cells(p % coord(j) % cell) % type == CELL_LATTICE) then + if (lattices(p % coord(j + 1) % lattice) % obj & + % are_valid_indices([& + p % coord(j + 1) % lattice_x, & + p % coord(j + 1) % lattice_y, & + p % coord(j + 1) % lattice_z])) then + offset = offset + lattices(p % coord(j + 1) % lattice) % obj % & + offset(t % filters(i) % offset, & + p % coord(j + 1) % lattice_x, & + p % coord(j + 1) % lattice_y, & + p % coord(j + 1) % lattice_z) + end if + end if + if (t % filters(i) % int_bins(1) == p % coord(j) % cell) then + matching_bins(i) = offset + 1 + exit + end if + end do + + case (FILTER_CELLBORN) + ! determine next cellborn bin + matching_bins(i) = get_next_bin(FILTER_CELLBORN, & + p % cell_born, i_tally) + + case (FILTER_SURFACE) + ! determine next surface bin + matching_bins(i) = get_next_bin(FILTER_SURFACE, & + p % surface, i_tally) + + case (FILTER_ENERGYIN) + ! make sure the correct energy is used + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + g = p % g + else + g = p % last_g + end if + + ! Since all groups are filters, the filter bin is the group + matching_bins(i) = g + + case (FILTER_ENERGYOUT) + ! Since all groups are filters, the filter bin is the group + matching_bins(i) = p % g + + case (FILTER_DELAYEDGROUP) + + if (survival_biasing .and. t % find_filter(FILTER_ENERGYOUT) <= 0) then + matching_bins(i) = 1 + elseif (active_tracklength_tallies % size() > 0) then + matching_bins(i) = 1 + else + if (p % delayed_group == 0) then + matching_bins = NO_BIN_FOUND + else + matching_bins(i) = p % delayed_group + end if + end if + + case (FILTER_MU) + ! determine mu bin + n = t % filters(i) % n_bins + + ! check if particle is within mu bins + if (p % mu < t % filters(i) % real_bins(1) .or. & + p % mu > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find mu bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, p % mu) + end if + + case (FILTER_POLAR) + ! make sure the correct direction vector is used + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + theta = acos(p % coord(1) % uvw(3)) + else + theta = acos(p % last_uvw(3)) + end if + + ! determine polar angle bin + n = t % filters(i) % n_bins + + ! check if particle is within polar angle bins + if (theta < t % filters(i) % real_bins(1) .or. & + theta > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find polar angle bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, theta) + end if + + case (FILTER_AZIMUTHAL) + ! make sure the correct direction vector is used + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + phi = atan2(p % coord(1) % uvw(2), p % coord(1) % uvw(1)) + else + phi = atan2(p % last_uvw(2), p % last_uvw(1)) + end if + ! determine mu bin + n = t % filters(i) % n_bins + + ! check if particle is within azimuthal angle bins + if (phi < t % filters(i) % real_bins(1) .or. & + phi > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find azimuthal angle bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, phi) + end if + + end select + + ! If the current filter didn't match, exit this subroutine + if (matching_bins(i) == NO_BIN_FOUND) then + found_bin = .false. + return + end if + + end do FILTER_LOOP + + end subroutine get_scoring_bins_mg !=============================================================================== ! SCORE_SURFACE_CURRENT tallies surface crossings in a mesh tally by manually diff --git a/src/tracking.F90 b/src/tracking.F90 index c761cd5337..028ec3ee6c 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -91,10 +91,8 @@ contains else ! Since the MGXS can be angle dependent, this needs to be done ! After every collision for the MGXS mode - call calculate_mgxs(macro_xs(p % material) % obj, & - materials(p % material), nuclides_MG, p % g, & - p % coord(p % n_coord) % uvw, material_xs, & - micro_xs) + call calculate_mgxs(macro_xs(p % material) % obj, p % g, & + p % coord(p % n_coord) % uvw, material_xs) end if ! Find the distance to the nearest boundary From d32556fe89ccd79d954a144d4f2ff426a443c9eb Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 5 Nov 2015 04:47:51 -0500 Subject: [PATCH 019/149] Added support of tallying scatter-*n info with histogram based input. --- src/nuclide_header.F90 | 64 +++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 3e320ab273..9d79bbe22d 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -548,6 +548,9 @@ module nuclide_header integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs + integer :: imu + real(8) :: dmu, r, f + xs = ZERO if ((xstype == 'nu_fission' .or. xstype == 'fission' .or. xstype =='chi' & @@ -561,11 +564,31 @@ module nuclide_header xs = this % mult(gout,g) case('nu_fission') xs = this % nu_fission(gout,g) - case('f_mu') - xs = evaluate_legendre(this % scatter(gout,g,:), mu) - case('f_mu/mult') - xs = evaluate_legendre(this % scatter(gout,g,:), mu) / & - this % mult(gout,g) + case('f_mu', 'f_mu/mult') + if (this % scatt_type == ANGLE_LEGENDRE) then + xs = evaluate_legendre(this % scatter(gout,g,:), mu) + else + dmu = TWO / real(this % order) + ! Find mu bin algebraically, knowing that the spacing is equal + f = (mu + ONE) / dmu + ONE + imu = floor(f) + ! But save the amount that mu is past the previous index + ! so we can use interpolation later. + f = f - real(imu) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % scatter, dim=3)) then + imu = imu - 1 + end if + + ! Now intepolate to find f(mu) + r = f / dmu + xs = (ONE - r) * this % scatter(gout, g, imu) + & + r * this % scatter(gout, g, imu+1) + end if + if (xstype == 'f_mu/mult') then + xs = xs / this % mult(gout,g) + end if + end select else select case(xstype) @@ -600,6 +623,8 @@ module nuclide_header real(8) :: xs ! Resultant xs integer :: i_azi_, i_pol_ + integer :: imu + real(8) :: dmu, r, f xs = ZERO @@ -623,11 +648,30 @@ module nuclide_header xs = this % nu_fission(gout,g,i_azi_,i_pol_) case('chi') xs = this % chi(gout,i_azi_,i_pol_) - case('f_mu') - xs = evaluate_legendre(this % scatter(gout,g,:,i_azi_,i_pol_), mu) - case('f_mu/mult') - xs = evaluate_legendre(this % scatter(gout,g,:,i_azi_,i_pol_), mu) / & - this % mult(gout,g,i_azi_,i_pol_) + case('f_mu', 'f_mu/mult') + if (this % scatt_type == ANGLE_LEGENDRE) then + xs = evaluate_legendre(this % scatter(gout,g,:,i_azi_,i_pol_), mu) + else + dmu = TWO / real(this % order) + ! Find mu bin algebraically, knowing that the spacing is equal + f = (mu + ONE) / dmu + ONE + imu = floor(f) + ! But save the amount that mu is past the previous index + ! so we can use interpolation later. + f = f - real(imu) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % scatter, dim=3)) then + imu = imu - 1 + end if + + ! Now intepolate to find f(mu) + r = f / dmu + xs = (ONE - r) * this % scatter(gout,g,imu,i_azi_,i_pol_) + & + r * this % scatter(gout,g,imu+1,i_azi_,i_pol_) + end if + if (xstype == 'f_mu/mult') then + xs = xs / this % mult(gout,g,i_azi_,i_pol_) + end if end select else select case(xstype) From 60d418adf07371dcc65d3ba2f671cfcd2c169413 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 5 Nov 2015 05:20:39 -0500 Subject: [PATCH 020/149] Added printing of xs data to mg types and fixed some summary bugs --- src/mgxs_data.F90 | 12 +++-- src/nuclide_header.F90 | 99 ++++++++++++++++++++++++++++++++++++++++++ src/output.F90 | 31 +++++++------ src/summary.F90 | 6 ++- src/tally.F90 | 3 +- 5 files changed, 126 insertions(+), 25 deletions(-) diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index d51dfd603e..39abff1b23 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -31,7 +31,6 @@ contains character(12) :: alias ! alias of isotope, e.g. U-235.03c integer :: representation ! Data representation type(Material), pointer :: mat - class(Nuclide_MG), pointer :: nuc type(SetChar) :: already_read type(Node), pointer :: doc => null() type(Node), pointer :: node_xsdata @@ -94,9 +93,6 @@ contains name = xs_listings(i_listing) % name alias = xs_listings(i_listing) % alias - ! Keep track of what listing is associated with this nuclide - nuc => nuclides_MG(i_nuclide) % obj - ! Get pointer to xsdata table XML node call get_list_item(node_xsdata_list, i_listing, node_xsdata) @@ -131,6 +127,9 @@ contains energy_groups, get_kfiss, error_code, & error_text) + ! Keep track of what listing is associated with this nuclide + nuclides_MG(i_nuclide) % obj % listing = i_listing + ! Handle any errors if (error_code /= 0) then call fatal_error(trim(error_text)) @@ -154,9 +153,8 @@ contains ! Loop around nuclides in material NUCLIDE_LOOP2: do j = 1, mat % n_nuclides - ! Get nuclide - nuc => nuclides_MG(mat % nuclide(j)) % obj - if (nuc % fissionable) then + ! Is this fissionable? + if (nuclides_MG(mat % nuclide(j)) % obj % fissionable) then mat % fissionable = .true. end if if (mat % fissionable) then diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 9d79bbe22d..910b2ecf39 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -516,11 +516,74 @@ module nuclide_header end subroutine nuclide_ce_print + subroutine nuclide_mg_print(this, unit_) + class(Nuclide_MG), intent(in) :: this + integer, intent(in) :: unit_ + + character(MAX_LINE_LEN) :: temp_str + + ! Basic nuclide information + write(unit_,*) 'Nuclide ' // trim(this % name) + write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + write(unit_,*) ' kT = ' // trim(to_str(this % kT)) + if (this % scatt_type == ANGLE_LEGENDRE) then + temp_str = "Legendre" + write(unit_,*) ' Scattering Type = ' // trim(temp_str) + write(unit_,*) ' # of Scatter Moments = ' // & + trim(to_str(this % order - 1)) + else if (this % scatt_type == ANGLE_HISTOGRAM) then + temp_str = "Histogram" + write(unit_,*) ' Scattering Type = ' // trim(temp_str) + write(unit_,*) ' # of Scatter Bins = ' // & + trim(to_str(this % order)) + else if (this % scatt_type == ANGLE_TABULAR) then + temp_str = "Tabular" + write(unit_,*) ' Scattering Type = ' // trim(temp_str) + write(unit_,*) ' # of Scatter Points = ' // trim(to_str(this % order)) + end if + write(unit_,*) ' Fissionable = ', this % fissionable + + end subroutine nuclide_mg_print + subroutine nuclide_iso_print(this, unit) class(Nuclide_Iso), intent(in) :: this integer, optional, intent(in) :: unit + integer :: unit_ ! unit to write to + integer :: size_total, size_scattmat, size_mgxs + character(MAX_LINE_LEN) :: temp_str + + ! set default unit for writing information + if (present(unit)) then + unit_ = unit + else + unit_ = OUTPUT_UNIT + end if + + ! Write Basic Nuclide Information + call nuclide_mg_print(this, unit_) + + ! Determine size of mgxs and scattering matrices + size_scattmat = (size(this % scatter) + size(this % mult)) * 8 + size_mgxs = size(this % total) + size(this % absorption) + & + size(this % nu_fission) + size(this % k_fission) + & + size(this % fission) + size(this % chi) + size_mgxs = size_mgxs * 8 + + ! Calculate total memory + size_total = size_scattmat + size_mgxs + + ! Write memory used + write(unit_,*) ' Memory Requirements' + write(unit_,*) ' Cross sections = ' // trim(to_str(size_mgxs)) // ' bytes' + write(unit_,*) ' Scattering Matrices = ' // & + trim(to_str(size_scattmat)) // ' bytes' + write(unit_,*) ' Total = ' // trim(to_str(size_total)) // ' bytes' + + ! Blank line at end of nuclide + write(unit_,*) end subroutine nuclide_iso_print @@ -529,6 +592,42 @@ module nuclide_header class(Nuclide_Angle), intent(in) :: this integer, optional, intent(in) :: unit + integer :: unit_ ! unit to write to + integer :: size_total, size_scattmat, size_mgxs + character(MAX_LINE_LEN) :: temp_str + + ! set default unit for writing information + if (present(unit)) then + unit_ = unit + else + unit_ = OUTPUT_UNIT + end if + + ! Write Basic Nuclide Information + call nuclide_mg_print(this, unit_) + write(unit_,*) ' # of Polar Angles = ' // trim(to_str(this % Npol)) + write(unit_,*) ' # of Azimuthal Angles = ' // trim(to_str(this % Nazi)) + + ! Determine size of mgxs and scattering matrices + size_scattmat = (size(this % scatter) + size(this % mult)) * 8 + size_mgxs = size(this % total) + size(this % absorption) + & + size(this % nu_fission) + size(this % k_fission) + & + size(this % fission) + size(this % chi) + size_mgxs = size_mgxs * 8 + + ! Calculate total memory + size_total = size_scattmat + size_mgxs + + ! Write memory used + write(unit_,*) ' Memory Requirements' + write(unit_,*) ' Cross sections = ' // trim(to_str(size_mgxs)) // ' bytes' + write(unit_,*) ' Scattering Matrices = ' // & + trim(to_str(size_scattmat)) // ' bytes' + write(unit_,*) ' Total = ' // trim(to_str(size_total)) // ' bytes' + + ! Blank line at end of nuclide + write(unit_,*) + end subroutine nuclide_angle_print diff --git a/src/output.F90 b/src/output.F90 index 30039e1181..8076a91dfc 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -332,8 +332,6 @@ contains integer :: i ! loop index integer :: unit_xs ! cross_sections.out file unit character(MAX_FILE_LEN) :: path ! path of summary file - type(Nuclide_CE), pointer :: nuc => null() - type(SAlphaBeta), pointer :: sab => null() ! Create filename for log file path = trim(path_output) // "cross_sections.out" @@ -344,21 +342,22 @@ contains ! Write header call header("CROSS SECTION TABLES", unit=unit_xs) - NUCLIDE_LOOP: do i = 1, n_nuclides_total - ! Get pointer to nuclide - nuc => nuclides(i) + if (run_CE) then + NUCLIDE_LOOP: do i = 1, n_nuclides_total + ! Print information about nuclide + call nuclides(i) % print(unit=unit_xs) + end do NUCLIDE_LOOP - ! Print information about nuclide - call nuc % print(unit=unit_xs) - end do NUCLIDE_LOOP - - SAB_TABLES_LOOP: do i = 1, n_sab_tables - ! Get pointer to S(a,b) table - sab => sab_tables(i) - - ! Print information about S(a,b) table - call sab % print(unit=unit_xs) - end do SAB_TABLES_LOOP + SAB_TABLES_LOOP: do i = 1, n_sab_tables + ! Print information about S(a,b) table + call sab_tables(i) % print(unit=unit_xs) + end do SAB_TABLES_LOOP + else + NUCLIDE_MG_LOOP: do i = 1, n_nuclides_total + ! Print information about nuclide + call nuclides_mg(i) % obj % print(unit=unit_xs) + end do NUCLIDE_MG_LOOP + end if ! Close cross section summary file close(unit_xs) diff --git a/src/summary.F90 b/src/summary.F90 index 1b0797fc9b..078099dbd0 100644 --- a/src/summary.F90 +++ b/src/summary.F90 @@ -454,7 +454,11 @@ contains ! Copy ZAID for each nuclide to temporary array allocate(nucnames(m%n_nuclides)) do j = 1, m%n_nuclides - i_list = nuclides(m%nuclide(j))%listing + if (run_CE) then + i_list = nuclides(m%nuclide(j))%listing + else + i_list = nuclides_MG(m%nuclide(j))%obj%listing + end if nucnames(j) = xs_listings(i_list)%alias end do diff --git a/src/tally.F90 b/src/tally.F90 index ed7165e1cd..7ad701b168 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -799,7 +799,8 @@ contains real(8) :: micro_abs ! nuclidic microscopic abs class(Nuclide_MG), pointer :: nuc - nuc => nuclides_MG(i_nuclide) % obj + if (i_nuclide > 0) & + nuc => nuclides_MG(i_nuclide) % obj i = 0 SCORE_LOOP: do q = 1, t % n_user_score_bins From fdf0f78258f13f15f19e150e79b2868fa83b19e4 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 5 Nov 2015 06:49:09 -0500 Subject: [PATCH 021/149] Added in data like zaid and name to the mg nuclide itself --- src/mgxs_data.F90 | 11 ++++++----- src/nuclide_header.F90 | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 39abff1b23..086bc6b95d 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -1,9 +1,8 @@ module mgxs_data use constants - use error, only: fatal_error, warning + use error, only: fatal_error use global - use list_header, only: ListInt use macroxs_header use material_header, only: Material use nuclide_header @@ -208,10 +207,12 @@ contains error_text = '' ! Load the data - if (check_for_node(node_xsdata, "awr")) then - call get_node_value(node_xsdata, "awr", this % awr) + call get_node_value(node_xsdata, "name", this % name) + this % name = to_lower(this % name) + if (check_for_node(node_xsdata, "kT")) then + call get_node_value(node_xsdata, "kT", this % kT) else - this % awr = ONE + this % kT = ZERO end if if (check_for_node(node_xsdata, "zaid")) then call get_node_value(node_xsdata, "zaid", this % zaid) diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 910b2ecf39..e8c8eb13f5 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -524,8 +524,10 @@ module nuclide_header ! Basic nuclide information write(unit_,*) 'Nuclide ' // trim(this % name) - write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) - write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + if (this % zaid > 0) then + ! Dont print if data was macroscopic and thus zaid would be nonsense + write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) + end if write(unit_,*) ' kT = ' // trim(to_str(this % kT)) if (this % scatt_type == ANGLE_LEGENDRE) then temp_str = "Legendre" From d26546001a50a8a6c05d49e6bf7998fd13be61d5 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 6 Nov 2015 05:29:27 -0500 Subject: [PATCH 022/149] Added tabular nuclide data inputting capability, revised legendre_mu_points input format, and added calc_f routine to nuclide_mg types --- src/global.F90 | 5 +- src/input_xml.F90 | 16 +--- src/macroxs_header.F90 | 86 +---------------- src/mgxs_data.F90 | 54 +++++++++-- src/nuclide_header.F90 | 193 ++++++++++++++++++++++++++++----------- src/physics_mg.F90 | 2 +- src/scattdata_header.F90 | 32 +++---- 7 files changed, 204 insertions(+), 184 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index 737aef51f8..700f43ddc0 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -119,14 +119,11 @@ module global ! Energy group structure real(8), allocatable :: energy_bins(:) - real(8), allocatable :: energy_bin_midpoints(:) + real(8), allocatable :: energy_bin_avg(:) ! Maximum Data Order integer :: max_order - ! Scattering Treatment (if Legendre) - integer :: legendre_mu_points - ! ============================================================================ ! TALLY-RELATED VARIABLES diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 65c840ce25..3cf26b49b6 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -4377,23 +4377,11 @@ contains call fatal_error("group_structures element must exist!") end if - allocate(energy_bin_midpoints(energy_groups)) + allocate(energy_bin_avg(energy_groups)) do i = 1, energy_groups - energy_bin_midpoints(i) = 0.5_8 * (energy_bins(i) + energy_bins(i + 1)) + energy_bin_avg(i) = 0.5_8 * (energy_bins(i) + energy_bins(i + 1)) end do - if (check_for_node(doc, "legendre_mu_points")) then - ! Get scattering treatment - call get_node_value(doc, "legendre_mu_points", legendre_mu_points) - if (legendre_mu_points <= 0) then - call fatal_error("legendre_mu_points element must be positive and non-zero!") - end if - legendre_mu_points = -1 * legendre_mu_points - else - ! One means 'don't expand scattering moments to a table, sample via legendre' - legendre_mu_points = 1 - end if - ! Get node list of all call get_node_list(doc, "xsdata", node_xsdata_list) n_listings = get_list_size(node_xsdata_list) diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index d33de9241f..602db4a3b6 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -22,7 +22,6 @@ module macroxs_header contains procedure(macroxs_init_), deferred, pass :: init ! initializes object procedure(macroxs_clear_), deferred, pass :: clear ! Deallocates object - procedure(macroxs_size_), deferred, pass :: get_size ! Finds size of object procedure(macroxs_get_xs_), deferred, pass :: get_xs ! Return xs end type MacroXS_Base @@ -66,14 +65,6 @@ module macroxs_header end subroutine macroxs_clear_ - subroutine macroxs_size_(this, size_total, size_scatt, size_fission) - import MacroXS_Base - class(MacroXS_Base), intent(in) :: this - integer, intent(out) :: size_total ! Total Data Size - integer, intent(out) :: size_scatt ! Scattering Data Size - integer, intent(out) :: size_fission ! Fission Data Size - - end subroutine macroxs_size_ end interface type, extends(MacroXS_Base) :: MacroXS_Iso @@ -91,7 +82,6 @@ module macroxs_header contains procedure, pass :: init => macroxs_iso_init ! inits object procedure, pass :: clear => macroxs_iso_clear ! Deallocates object - procedure, pass :: get_size => macroxs_iso_size ! Finds size of object procedure, pass :: get_xs => macroxs_iso_get_xs ! Returns xs end type MacroXS_Iso @@ -112,7 +102,6 @@ module macroxs_header contains procedure, pass :: init => macroxs_angle_init ! inits object procedure, pass :: clear => macroxs_angle_clear ! Deallocates object - procedure, pass :: get_size => macroxs_angle_size ! Finds size of object procedure, pass :: get_xs => macroxs_angle_get_xs ! Returns xs end type MacroXS_Angle @@ -194,7 +183,7 @@ contains ! Allocate stuff for later allocate(scatt_coeffs(order, groups, groups)) scatt_coeffs = ZERO - allocate(ScattData_Histogram :: this % scatter) + allocate(ScattData_Tabular :: this % scatter) else if (scatt_type == ANGLE_LEGENDRE) then ! Otherwise find the maximum scattering order @@ -711,79 +700,6 @@ contains end subroutine macroxs_angle_clear -!=============================================================================== -! MACROXS_*_SIZE Finds the size of the data in MacroXS_Base, MacroXS_Iso, -! or MacroXS_Angle -!=============================================================================== - - subroutine macroxs_iso_size(this, size_total, size_scatt, size_fission) - class(MacroXS_Iso), intent(in) :: this - integer, intent(out) :: size_total ! Total Data Size - integer, intent(out) :: size_scatt ! Scattering Data Size - integer, intent(out) :: size_fission ! Fission Data Size - - integer :: groups - - groups = size(this % total, dim=1) - - ! Size Information On Each Reaction - ! Sum up for total, absorption, nu_scatter, nu_fission, fission - size_total = groups * 8 * (1 + 1 + 1 + 1 + 1) - ! Now do k_fission - ! Check k_fission - if (allocated (this % k_fission)) then - size_total = size_total + groups * 8 - end if - - ! Calculate chi data size - size_fission = 0 - if (allocated(this % chi)) then - size_fission = size_fission + 8 * size(this % chi) - end if - - ! Calculate Scatter Data Size - size_scatt = size(this % scatter % energy) - - ! Calculate Total Memory - size_total = size_total + size_fission + size_scatt - - end subroutine macroxs_iso_size - - subroutine macroxs_angle_size(this, size_total, size_scatt, size_fission) - class(MacroXS_Angle), intent(in) :: this - integer, intent(out) :: size_total ! Total Data Size - integer, intent(out) :: size_scatt ! Scattering Data Size - integer, intent(out) :: size_fission ! Fission Data Size - - integer :: groups - integer :: tot_angle - - groups = size(this % total, dim=2) - tot_angle = size(this % total, dim=1) - - ! Size Information On Each Reaction - ! Sum up for total, absorption, nu_scatter, nu_fission, fission - size_total = groups * 8 * (1 + 1 + 1 + 1 + 1) * tot_angle - ! Now do k_fission - ! Check k_fission - if (allocated (this % k_fission)) then - size_total = size_total + groups * 8 * tot_angle - end if - - ! Calculate chi data size - size_fission = 0 - if (allocated(this % chi)) then - size_fission = size_fission + 8 * size(this % chi) - end if - - ! Calculate Scatter Data Size - size_scatt = 0 - - ! Calculate Total Memory - size_total = size_total + size_fission + size_scatt - - end subroutine macroxs_angle_size - !=============================================================================== ! MACROXS_*_GET_XS returns the requested data type !=============================================================================== diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 086bc6b95d..e3ea314d6c 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -200,7 +200,9 @@ contains integer, intent(inout) :: error_code ! Code signifying error character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + type(Node), pointer :: node_legendre_mu character(MAX_LINE_LEN) :: temp_str + logical :: enable_leg_mu ! Initialize error data error_code = 0 @@ -224,8 +226,10 @@ contains temp_str = trim(to_lower(temp_str)) if (temp_str == 'legendre') then this % scatt_type = ANGLE_LEGENDRE - else if (temp_str == 'tabular') then + else if (temp_str == 'histogram') then this % scatt_type = ANGLE_HISTOGRAM + else if (temp_str == 'tabular') then + this % scatt_type = ANGLE_TABULAR else error_code = 1 error_text = "Invalid Scatt Type Option!" @@ -234,6 +238,7 @@ contains else this % scatt_type = ANGLE_LEGENDRE end if + if (check_for_node(node_xsdata, "order")) then call get_node_value(node_xsdata, "order", this % order) else @@ -241,6 +246,37 @@ contains error_text = "Order Must Be Provided!" return end if + + ! Get scattering treatment + if (check_for_node(node_xsdata, "tabular_legendre")) then + call get_node_ptr(node_xsdata, "tabular_legendre", node_legendre_mu) + if (check_for_node(node_legendre_mu, "enable")) then + call get_node_value(node_legendre_mu, "enable", temp_str) + temp_str = trim(to_lower(temp_str)) + if (temp_str == 'true' .or. temp_str == '1') then + enable_leg_mu = .true. + elseif (temp_str == 'false' .or. temp_str == '0') then + enable_leg_mu = .false. + else + call fatal_error("Unrecognized tabular_legendre/enable: " // temp_str) + end if + else + enable_leg_mu = .false. + this % legendre_mu_points = 1 + end if + if (enable_leg_mu .and. & + check_for_node(node_legendre_mu, "num_points")) then + call get_node_value(node_legendre_mu, "num_points", & + this % legendre_mu_points) + if (this % legendre_mu_points <= 0) then + call fatal_error("num_points element must be positive and non-zero!") + end if + this % legendre_mu_points = -1 * this % legendre_mu_points + end if + else + this % legendre_mu_points = 1 + end if + if (check_for_node(node_xsdata, "fissionable")) then call get_node_value(node_xsdata, "fissionable", temp_str) temp_str = to_lower(temp_str) @@ -349,6 +385,8 @@ contains order_dim = this % order + 1 else if (this % scatt_type == ANGLE_HISTOGRAM) then order_dim = this % order + else if (this % scatt_type == ANGLE_TABULAR) then + order_dim = this % order end if allocate(this % scatter(groups, groups, order_dim)) @@ -410,6 +448,8 @@ contains order_dim = this % order + 1 else if (this % scatt_type == ANGLE_HISTOGRAM) then order_dim = this % order + else if (this % scatt_type == ANGLE_TABULAR) then + order_dim = this % order end if if (check_for_node(node_xsdata, "num_polar")) then @@ -592,6 +632,7 @@ contains character(MAX_LINE_LEN) :: error_text integer :: representation integer :: scatt_type + integer :: legendre_mu_points ! Find out if we need kappa fission (are there any k_fiss tallies?) get_kfiss = .false. @@ -612,23 +653,18 @@ contains mat => materials(i_mat) ! Check to see how our nuclides are represented - ! For now assume all are the same type + ! Assume all are the same type ! Therefore type(nuclides(1) % obj) dictates type(macroxs) ! At the same time, we will find the scattering type, as that will dictate ! how we allocate the scatter object within macroxs - scatt_type = ANGLE_LEGENDRE + legendre_mu_points = nuclides_MG(1) % obj % legendre_mu_points select type(nuc => nuclides_MG(1) % obj) type is (Nuclide_Iso) representation = ISOTROPIC - if (nuc % scatt_type == ANGLE_HISTOGRAM) then - scatt_type = ANGLE_HISTOGRAM - end if type is (Nuclide_Angle) representation = ANGLE - if (nuc % scatt_type == ANGLE_HISTOGRAM) then - scatt_type = ANGLE_HISTOGRAM - end if end select + scatt_type = nuclides_MG(1) % obj % scatt_type ! Now allocate accordingly select case(representation) diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index e8c8eb13f5..ad143facb9 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -107,13 +107,16 @@ module nuclide_header type, abstract, extends(Nuclide_Base) :: Nuclide_MG ! Scattering Order Information - integer :: order ! Order of data (Scattering for Nuclide_Iso, - ! Number of angles for all in Nuclide_Angle) - integer :: scatt_type ! either legendre or tabular. - - ! Type-Bound procedures + integer :: order ! Order of data (Scattering for Nuclide_Iso, + ! Number of angles for all in Nuclide_Angle) + integer :: scatt_type ! either legendre, histogram, or tabular. + integer :: legendre_mu_points ! Number of tabular points to use to represent + ! Legendre distribs, -1 if sample with the + ! Legendres themselves +! Type-Bound procedures contains - procedure(nuclide_mg_get_xs_), deferred, pass :: get_xs ! Get the xs + procedure(nuclide_mg_get_xs_), deferred, pass :: get_xs ! Get the xs + procedure(nuclide_calc_f_), deferred, pass :: calc_f ! Calculates f, given mu end type Nuclide_MG abstract interface @@ -130,6 +133,19 @@ module nuclide_header integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs end function nuclide_mg_get_xs_ + + pure function nuclide_calc_f_(this, gin, gout, mu, uvw, i_azi, i_pol) result(f) + import Nuclide_MG + class(Nuclide_MG), intent(in) :: this + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8), intent(in), optional :: uvw(3) ! Direction vector + integer, intent(in), optional :: i_azi ! Incoming Energy Group + integer, intent(in), optional :: i_pol ! Outgoing Energy Group + real(8) :: f ! Return value of f(mu) + + end function nuclide_calc_f_ end interface !=============================================================================== @@ -151,9 +167,10 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclide_iso_clear ! Deallocates Nuclide - procedure, pass :: print => nuclide_iso_print ! Writes nuclide info - procedure, pass :: get_xs => nuclide_iso_get_xs ! Gets Size of Data w/in Object + procedure, pass :: clear => nuclide_iso_clear ! Deallocates Nuclide + procedure, pass :: print => nuclide_iso_print ! Writes nuclide info + procedure, pass :: get_xs => nuclide_iso_get_xs ! Gets Size of Data w/in Object + procedure, pass :: calc_f => nuclide_mg_iso_calc_f ! Calcs f given mu end type Nuclide_Iso !=============================================================================== @@ -181,9 +198,10 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclide_angle_clear ! Deallocates Nuclide - procedure, pass :: print => nuclide_angle_print ! Gets Size of Data w/in Object - procedure, pass :: get_xs => nuclide_angle_get_xs ! Gets Size of Data w/in Object + procedure, pass :: clear => nuclide_angle_clear ! Deallocates Nuclide + procedure, pass :: print => nuclide_angle_print ! Gets Size of Data w/in Object + procedure, pass :: get_xs => nuclide_angle_get_xs ! Gets Size of Data w/in Object + procedure, pass :: calc_f => nuclide_mg_angle_calc_f ! Calcs f given mu end type Nuclide_Angle !=============================================================================== @@ -533,7 +551,7 @@ module nuclide_header temp_str = "Legendre" write(unit_,*) ' Scattering Type = ' // trim(temp_str) write(unit_,*) ' # of Scatter Moments = ' // & - trim(to_str(this % order - 1)) + trim(to_str(this % order)) else if (this % scatt_type == ANGLE_HISTOGRAM) then temp_str = "Histogram" write(unit_,*) ' Scattering Type = ' // trim(temp_str) @@ -666,30 +684,10 @@ module nuclide_header case('nu_fission') xs = this % nu_fission(gout,g) case('f_mu', 'f_mu/mult') - if (this % scatt_type == ANGLE_LEGENDRE) then - xs = evaluate_legendre(this % scatter(gout,g,:), mu) - else - dmu = TWO / real(this % order) - ! Find mu bin algebraically, knowing that the spacing is equal - f = (mu + ONE) / dmu + ONE - imu = floor(f) - ! But save the amount that mu is past the previous index - ! so we can use interpolation later. - f = f - real(imu) - ! Adjust so interpolation works on the last bin if necessary - if (imu == size(this % scatter, dim=3)) then - imu = imu - 1 - end if - - ! Now intepolate to find f(mu) - r = f / dmu - xs = (ONE - r) * this % scatter(gout, g, imu) + & - r * this % scatter(gout, g, imu+1) - end if + xs = this % calc_f(g, gout, mu) if (xstype == 'f_mu/mult') then xs = xs / this % mult(gout,g) end if - end select else select case(xstype) @@ -750,26 +748,7 @@ module nuclide_header case('chi') xs = this % chi(gout,i_azi_,i_pol_) case('f_mu', 'f_mu/mult') - if (this % scatt_type == ANGLE_LEGENDRE) then - xs = evaluate_legendre(this % scatter(gout,g,:,i_azi_,i_pol_), mu) - else - dmu = TWO / real(this % order) - ! Find mu bin algebraically, knowing that the spacing is equal - f = (mu + ONE) / dmu + ONE - imu = floor(f) - ! But save the amount that mu is past the previous index - ! so we can use interpolation later. - f = f - real(imu) - ! Adjust so interpolation works on the last bin if necessary - if (imu == size(this % scatter, dim=3)) then - imu = imu - 1 - end if - - ! Now intepolate to find f(mu) - r = f / dmu - xs = (ONE - r) * this % scatter(gout,g,imu,i_azi_,i_pol_) + & - r * this % scatter(gout,g,imu+1,i_azi_,i_pol_) - end if + xs = this % calc_f(g, gout, mu, I_AZI=i_azi_, I_POL=i_pol_) if (xstype == 'f_mu/mult') then xs = xs / this % mult(gout,g,i_azi_,i_pol_) end if @@ -796,10 +775,114 @@ module nuclide_header end function nuclide_angle_get_xs !=============================================================================== +! NUCLIDE_*_CALC_F Finds the value of f(mu), the scattering probability, given mu +!=============================================================================== + + pure function nuclide_mg_iso_calc_f(this, gin, gout, mu, uvw, i_azi, i_pol) & + result(f) + class(Nuclide_Iso), intent(in) :: this + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8), intent(in), optional :: uvw(3) ! Direction vector + integer, intent(in), optional :: i_azi ! Incoming Energy Group + integer, intent(in), optional :: i_pol ! Outgoing Energy Group + real(8) :: f ! Return value of f(mu) + + real(8) :: dmu, r + integer :: imu + + if (this % scatt_type == ANGLE_LEGENDRE) then + f = evaluate_legendre(this % scatter(gout,gin,:), mu) + else if (this % scatt_type == ANGLE_TABULAR) then + dmu = TWO / (real(this % order) - 1) + ! Find mu bin algebraically, knowing that the spacing is equal + f = (mu + ONE) / dmu + ONE + imu = floor(f) + ! But save the amount that mu is past the previous index + ! so we can use interpolation later. + f = f - real(imu) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % scatter, dim=3)) then + imu = imu - 1 + end if + + ! Now intepolate to find f(mu) + r = f / dmu + f = (ONE - r) * this % scatter(gout,gin,imu) + & + r * this % scatter(gout,gin,imu+1) + else ! (ANGLE_HISTOGRAM) + dmu = TWO / real(this % order) + ! Find mu bin algebraically, knowing that the spacing is equal + imu = floor((mu + ONE) / dmu + ONE) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % scatter, dim=3)) then + imu = imu - 1 + end if + f = this % scatter(gout, gin, imu) + + end if + + end function nuclide_mg_iso_calc_f + + pure function nuclide_mg_angle_calc_f(this, gin, gout, mu, uvw, i_azi, & + i_pol) result(f) + class(Nuclide_Angle), intent(in) :: this + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8), intent(in), optional :: uvw(3) ! Direction vector + integer, intent(in), optional :: i_azi ! Incoming Energy Group + integer, intent(in), optional :: i_pol ! Outgoing Energy Group + real(8) :: f ! Return value of f(mu) + + real(8) :: dmu, r + integer :: imu + integer :: i_azi_, i_pol_ + if (present(i_azi) .and. present(i_pol)) then + i_azi_ = i_azi + i_pol_ = i_pol + else if (present(uvw)) then + call find_angle(this % polar, this % azimuthal, uvw, i_azi_, i_pol_) + end if + + if (this % scatt_type == ANGLE_LEGENDRE) then + f = evaluate_legendre(this % scatter(gout,gin,:,i_azi_,i_pol_), mu) + else if (this % scatt_type == ANGLE_TABULAR) then + dmu = TWO / (real(this % order) - 1) + ! Find mu bin algebraically, knowing that the spacing is equal + f = (mu + ONE) / dmu + ONE + imu = floor(f) + ! But save the amount that mu is past the previous index + ! so we can use interpolation later. + f = f - real(imu) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % scatter, dim=3)) then + imu = imu - 1 + end if + + ! Now intepolate to find f(mu) + r = f / dmu + f = (ONE - r) * this % scatter(gout,gin,imu,i_azi_,i_pol_) + & + r * this % scatter(gout,gin,imu+1,i_azi_,i_pol_) + else ! (ANGLE_HISTOGRAM) + dmu = TWO / real(this % order) + ! Find mu bin algebraically, knowing that the spacing is equal + imu = floor((mu + ONE) / dmu + ONE) + ! Adjust so interpolation works on the last bin if necessary + if (imu == size(this % scatter, dim=3)) then + imu = imu - 1 + end if + f = this % scatter(gout, gin, imu,i_azi_,i_pol_) + + end if + + end function nuclide_mg_angle_calc_f +!=============================================================================== ! find_angle finds the closest angle on the data grid and returns that index !=============================================================================== - subroutine find_angle(polar, azimuthal, uvw, i_azi, i_pol) + pure subroutine find_angle(polar, azimuthal, uvw, i_azi, i_pol) real(8), intent(in) :: polar(:) ! Polar angles [0,pi] real(8), intent(in) :: azimuthal(:) ! Azi. angles [-pi,pi] real(8), intent(in) :: uvw(3) ! Direction of motion diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 7d3448aeaa..198dbf2cf5 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -148,7 +148,7 @@ contains p % mu, p % wgt) ! Update energy value for downstream compatability (in tallying) - p % E = energy_bin_midpoints(p % g) + p % E = energy_bin_avg(p % g) p % coord(p % n_coord) % uvw = rotate_angle(p % coord(p % n_coord) % uvw, & p % mu) diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index 63a428717b..29ab616e0a 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -188,9 +188,9 @@ contains call scattdata_base_init(this, this_order, energy, mult) allocate(this % mu(this_order)) - this % dmu = TWO / (real(this_order,8) - 1) + this % dmu = TWO / (real(this_order) - 1) do imu = 1, this_order - 1 - this % mu(imu) = -ONE + real(imu - 1, 8) * this % dmu + this % mu(imu) = -ONE + real(imu - 1) * this % dmu end do this % mu(this_order) = ONE @@ -220,7 +220,7 @@ contains ! the negative fix-up introduced un-normalized data norm = ZERO do imu = 2, this_order - norm = norm + 0.5_8 * this % dmu * (this % fmu(imu-1,gout,gin) + this % fmu(imu,gout,gin)) + norm = norm + HALF * this % dmu * (this % fmu(imu-1,gout,gin) + this % fmu(imu,gout,gin)) end do if (norm > ZERO) then this % fmu(:,gout,gin) = this % fmu(:,gout,gin) / norm @@ -230,7 +230,7 @@ contains this % data(1,gout,gin) = ZERO do imu = 2, this_order - 1 this % data(imu,gout,gin) = this % data(imu-1,gout,gin) + & - 0.5_8 * this % dmu * (this % fmu(imu-1,gout,gin) + this % fmu(imu,gout,gin)) + HALF * this % dmu * (this % fmu(imu-1,gout,gin) + this % fmu(imu,gout,gin)) end do this % data(this_order,gout,gin) = ONE end if @@ -295,10 +295,10 @@ contains pure function scattdata_legendre_calc_f(this, gin, gout, mu) result(f) class(ScattData_Legendre), intent(in) :: this ! The ScattData to evaluate - integer, intent(in) :: gin ! Incoming Energy Group - integer, intent(in) :: gout ! Outgoing Energy Group - real(8), intent(in) :: mu ! Angle of interest - real(8) :: f ! Return value of f(mu) + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) ! Plug mu in to the legendre expansion and go from there f = evaluate_legendre(this % data(:, gout, gin), mu) @@ -307,10 +307,10 @@ contains pure function scattdata_histogram_calc_f(this, gin, gout, mu) result(f) class(ScattData_Histogram), intent(in) :: this ! The ScattData to evaluate - integer, intent(in) :: gin ! Incoming Energy Group - integer, intent(in) :: gout ! Outgoing Energy Group - real(8), intent(in) :: mu ! Angle of interest - real(8) :: f ! Return value of f(mu) + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) integer :: imu @@ -328,10 +328,10 @@ contains pure function scattdata_tabular_calc_f(this, gin, gout, mu) result(f) class(ScattData_Tabular), intent(in) :: this ! The ScattData to evaluate - integer, intent(in) :: gin ! Incoming Energy Group - integer, intent(in) :: gout ! Outgoing Energy Group - real(8), intent(in) :: mu ! Angle of interest - real(8) :: f ! Return value of f(mu) + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) integer :: imu real(8) :: r From 7497efb15359a0b225ae8c62c4098853a9425775 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 7 Nov 2015 12:33:10 -0500 Subject: [PATCH 023/149] Removed update to last_E since we dont need that in MG mode --- src/physics_mg.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 198dbf2cf5..1da3619063 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -32,7 +32,6 @@ contains ! Store pre-collision particle properties p % last_wgt = p % wgt - p % last_E = p % E p % last_g = p % g p % last_uvw = p % coord(1) % uvw @@ -150,6 +149,7 @@ contains ! Update energy value for downstream compatability (in tallying) p % E = energy_bin_avg(p % g) + ! Convert change in angle (mu) to new direction p % coord(p % n_coord) % uvw = rotate_angle(p % coord(p % n_coord) % uvw, & p % mu) From 39445f059fa673d53ded657ab8cb83b7e1bddca1 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 7 Nov 2015 14:06:38 -0500 Subject: [PATCH 024/149] Fixed p%coord(?) bug where i had the wrong coordinate index, showed up in the c5g7 problems with their lattices and thus n_coord was not 1. Also added c5g7 example problems. --- examples/xml/multigroup/c5g7/2d/cmfd.xml | 20 + examples/xml/multigroup/c5g7/2d/geometry.xml | 118 ++++++ examples/xml/multigroup/c5g7/2d/materials.xml | 1 + examples/xml/multigroup/c5g7/2d/plots.xml | 29 ++ examples/xml/multigroup/c5g7/2d/settings.xml | 50 +++ examples/xml/multigroup/c5g7/2d/tallies.xml | 25 ++ examples/xml/multigroup/c5g7/3d/geometry.xml | 138 +++++++ examples/xml/multigroup/c5g7/3d/materials.xml | 1 + examples/xml/multigroup/c5g7/3d/plots.xml | 42 ++ examples/xml/multigroup/c5g7/3d/settings.xml | 49 +++ examples/xml/multigroup/c5g7/3d/tallies.xml | 33 ++ examples/xml/multigroup/c5g7/data.xml | 383 ++++++++++++++++++ examples/xml/multigroup/c5g7/materials.xml | 54 +++ examples/xml/multigroup/c5g7/pin/geometry.xml | 16 + .../xml/multigroup/c5g7/pin/materials.xml | 1 + examples/xml/multigroup/c5g7/pin/plots.xml | 28 ++ examples/xml/multigroup/c5g7/pin/settings.xml | 46 +++ examples/xml/multigroup/c5g7/pin/tallies.xml | 16 + src/mgxs_data.F90 | 4 +- src/physics_mg.F90 | 6 +- 20 files changed, 1054 insertions(+), 6 deletions(-) create mode 100644 examples/xml/multigroup/c5g7/2d/cmfd.xml create mode 100644 examples/xml/multigroup/c5g7/2d/geometry.xml create mode 120000 examples/xml/multigroup/c5g7/2d/materials.xml create mode 100644 examples/xml/multigroup/c5g7/2d/plots.xml create mode 100644 examples/xml/multigroup/c5g7/2d/settings.xml create mode 100644 examples/xml/multigroup/c5g7/2d/tallies.xml create mode 100644 examples/xml/multigroup/c5g7/3d/geometry.xml create mode 120000 examples/xml/multigroup/c5g7/3d/materials.xml create mode 100644 examples/xml/multigroup/c5g7/3d/plots.xml create mode 100644 examples/xml/multigroup/c5g7/3d/settings.xml create mode 100644 examples/xml/multigroup/c5g7/3d/tallies.xml create mode 100644 examples/xml/multigroup/c5g7/data.xml create mode 100644 examples/xml/multigroup/c5g7/materials.xml create mode 100644 examples/xml/multigroup/c5g7/pin/geometry.xml create mode 120000 examples/xml/multigroup/c5g7/pin/materials.xml create mode 100644 examples/xml/multigroup/c5g7/pin/plots.xml create mode 100644 examples/xml/multigroup/c5g7/pin/settings.xml create mode 100644 examples/xml/multigroup/c5g7/pin/tallies.xml diff --git a/examples/xml/multigroup/c5g7/2d/cmfd.xml b/examples/xml/multigroup/c5g7/2d/cmfd.xml new file mode 100644 index 0000000000..22b1e9042f --- /dev/null +++ b/examples/xml/multigroup/c5g7/2d/cmfd.xml @@ -0,0 +1,20 @@ + + + + 1 + true + jfnk + + 0.0 0.0 -100.0 + 64.26 64.26 100.0 + 6 6 1 + + 2 2 2 2 1 1 + 2 2 2 2 1 1 + 2 2 2 2 1 1 + 2 2 2 2 1 1 + 1 1 1 1 1 1 + 1 1 1 1 1 1 + + + diff --git a/examples/xml/multigroup/c5g7/2d/geometry.xml b/examples/xml/multigroup/c5g7/2d/geometry.xml new file mode 100644 index 0000000000..3b43562f37 --- /dev/null +++ b/examples/xml/multigroup/c5g7/2d/geometry.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 17 17 + -10.71 -10.71 + 1.26 1.26 + + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 + 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 6 1 1 6 1 1 5 1 1 6 1 1 6 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 + 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + + + + + + 0 + 17 17 + -10.71 -10.71 + 1.26 1.26 + + 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 + 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 + 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 + 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 + 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 6 4 4 6 4 4 5 4 4 6 4 4 6 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 + 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 + 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 + 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 + 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 + 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + + + + + + + + + + + + + + + 0 + 3 3 + 0.0 0.0 + 21.42 21.42 + + 10 11 12 + 11 10 12 + 12 12 12 + + + + + + + diff --git a/examples/xml/multigroup/c5g7/2d/materials.xml b/examples/xml/multigroup/c5g7/2d/materials.xml new file mode 120000 index 0000000000..c3825cffc5 --- /dev/null +++ b/examples/xml/multigroup/c5g7/2d/materials.xml @@ -0,0 +1 @@ +/home/nelsonag/cases/c5g7/materials.xml \ No newline at end of file diff --git a/examples/xml/multigroup/c5g7/2d/plots.xml b/examples/xml/multigroup/c5g7/2d/plots.xml new file mode 100644 index 0000000000..a38f73f4e3 --- /dev/null +++ b/examples/xml/multigroup/c5g7/2d/plots.xml @@ -0,0 +1,29 @@ + + + + + 1 + mat + material + 32.13 32.13 0 + 64.26 64.26 + slice + 1000 1000 + + + + + 2 + cell + cell + 32.13 32.13 0 + 64.26 64.26 + slice + 1000 1000 + + + diff --git a/examples/xml/multigroup/c5g7/2d/settings.xml b/examples/xml/multigroup/c5g7/2d/settings.xml new file mode 100644 index 0000000000..189adc6c96 --- /dev/null +++ b/examples/xml/multigroup/c5g7/2d/settings.xml @@ -0,0 +1,50 @@ + + + multi-group + + + 2500 + 500 + 1000 + + + + 0.0 21.42 -100 + 42.84 64.26 100 + 34 34 1 + + + + + + + 0.0 21.42 -100 + 42.84 64.26 100 + + + + + + + 2000 + true + + + + true + true + true + + + false + + ../data.xml + + diff --git a/examples/xml/multigroup/c5g7/2d/tallies.xml b/examples/xml/multigroup/c5g7/2d/tallies.xml new file mode 100644 index 0000000000..8b21bf524a --- /dev/null +++ b/examples/xml/multigroup/c5g7/2d/tallies.xml @@ -0,0 +1,25 @@ + + + + + + + flux + + + + + fission + + + + 1 + regular + 0.0 0.0 -100.0 + 64.26 64.26 100.0 + 51 51 1 + + + false + + diff --git a/examples/xml/multigroup/c5g7/3d/geometry.xml b/examples/xml/multigroup/c5g7/3d/geometry.xml new file mode 100644 index 0000000000..b7766b32a0 --- /dev/null +++ b/examples/xml/multigroup/c5g7/3d/geometry.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 17 17 + -10.71 -10.71 + 1.26 1.26 + + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 + 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 6 1 1 6 1 1 5 1 1 6 1 1 6 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 + 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + + + + + + 0 + 17 17 + -10.71 -10.71 + 1.26 1.26 + + 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 + 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 + 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 + 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 + 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 6 4 4 6 4 4 5 4 4 6 4 4 6 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 + 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 + 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 + 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 + 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 + 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 + 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + + + + + + + + + + + + + + + + 3 3 + 0.0 0.0 + 21.42 21.42 + + 10 11 12 + 11 10 12 + 12 12 12 + + + + + + + + + + + + 3 3 + 0.0 0.0 + 21.42 21.42 + + 13 13 13 + 13 13 13 + 13 13 13 + + + + + + + + \ No newline at end of file diff --git a/examples/xml/multigroup/c5g7/3d/materials.xml b/examples/xml/multigroup/c5g7/3d/materials.xml new file mode 120000 index 0000000000..c344223b66 --- /dev/null +++ b/examples/xml/multigroup/c5g7/3d/materials.xml @@ -0,0 +1 @@ +../materials.xml \ No newline at end of file diff --git a/examples/xml/multigroup/c5g7/3d/plots.xml b/examples/xml/multigroup/c5g7/3d/plots.xml new file mode 100644 index 0000000000..caab977866 --- /dev/null +++ b/examples/xml/multigroup/c5g7/3d/plots.xml @@ -0,0 +1,42 @@ + + + + + 1 + mat + material + 32.13 32.13 107.1 + 64.26 214.2 + slice + 1000 1000 + + xz + + + + 2 + cell + cell + 32.13 32.13 107.1 + 64.26 214.2 + slice + 1000 1000 + xz + + + + 3 + mat_xy + material + 32.13 32.13 107.1 + 64.26 64.26 + slice + 1000 1000 + xy + + + diff --git a/examples/xml/multigroup/c5g7/3d/settings.xml b/examples/xml/multigroup/c5g7/3d/settings.xml new file mode 100644 index 0000000000..b67b882908 --- /dev/null +++ b/examples/xml/multigroup/c5g7/3d/settings.xml @@ -0,0 +1,49 @@ + + + multi-group + + + 2000 + 500 + 1000 + + + + 0.0 21.42 0.0 + 42.84 64.26 192.78 + 34 34 54 + + + + + + + 0.0 21.42 0.0 + 42.84 64.26 192.78 + + + + + + + 2000 + + + + true + true + true + + + false + + ../data.xml + + diff --git a/examples/xml/multigroup/c5g7/3d/tallies.xml b/examples/xml/multigroup/c5g7/3d/tallies.xml new file mode 100644 index 0000000000..e3826ccb63 --- /dev/null +++ b/examples/xml/multigroup/c5g7/3d/tallies.xml @@ -0,0 +1,33 @@ + + + + + + + flux + + + + + fission + + + + 1 + rectangular + 0.0 0.0 0.0 + 64.26 64.26 214.2 + 51 51 60 + + + + 2 + rectangular + 0.0 21.42 0.0 + 42.84 64.26 192.78 + 34 34 54 + + + false + + diff --git a/examples/xml/multigroup/c5g7/data.xml b/examples/xml/multigroup/c5g7/data.xml new file mode 100644 index 0000000000..ec85d4b593 --- /dev/null +++ b/examples/xml/multigroup/c5g7/data.xml @@ -0,0 +1,383 @@ + + + + 7 + + 1E-11 0.0635E-6 10.0E-6 1.0E-4 1.0E-3 0.5 1.0 20.0 + + + + + + UO2.71c + UO2.71c + 2.53E-8 + 0 + true + + isotropic + + + + 8.0248E-03 3.7174E-03 2.6769E-02 9.6236E-02 3.0020E-02 1.1126E-01 2.8278E-01 + + + + 2.005998E-02 2.027303E-03 1.570599E-02 4.518301E-02 4.334208E-02 2.020901E-01 5.257105E-01 + + + + 5.8791E-01 4.1176E-01 3.3906E-04 1.1761E-07 0.0000E+00 0.0000E+00 0.0000E+00 + + + 7.21206E-03 8.19301E-04 6.45320E-03 1.85648E-02 1.78084E-02 8.30348E-02 2.16004E-01 + + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 0.1275370 0.0423780 0.0000094 0.0000000 0.0000000 0.0000000 0.0000000 + 0.0000000 0.3244560 0.0016314 0.0000000 0.0000000 0.0000000 0.0000000 + 0.0000000 0.0000000 0.4509400 0.0026792 0.0000000 0.0000000 0.0000000 + 0.0000000 0.0000000 0.0000000 0.4525650 0.0055664 0.0000000 0.0000000 + 0.0000000 0.0000000 0.0000000 0.0001253 0.2714010 0.0102550 0.0000000 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0012968 0.2658020 0.0168090 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0000000 0.0085458 0.2730800 + + + + + 0.1779492 0.3298048 0.4803882 0.5543674000000001 0.3118013 0.39516779999999996 0.5644058 + + + + + + + MOX1.71c + MOX1.71c + 2.53E-8 + 0 + true + + + + 8.4339E-03 3.7577E-03 2.7970E-02 1.0421E-01 1.3994E-01 4.0918E-01 4.0935E-01 + + + + 1.27888062E-02 8.95701528E-03 7.37557218E-06 2.55837033E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.49041240E-03 1.04385401E-03 8.59552023E-07 2.98153464E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 9.56411400E-03 6.69850756E-03 5.51582469E-06 1.91327830E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 3.84928781E-02 2.69596154E-02 2.21996483E-05 7.70040890E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.80629998E-02 1.26509513E-02 1.04173100E-05 3.61346022E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 3.91930789E-01 2.74500216E-01 2.26034688E-04 7.84048241E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 4.19762096E-01 2.93992687E-01 2.42085585E-04 8.39724109E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + + + + 7.62704E-03 8.76898E-04 5.69835E-03 2.28872E-02 1.07635E-02 2.32757E-01 2.48968E-01 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 1.27537000E-01 4.23780000E-02 9.43740000E-06 5.51630000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 3.24456000E-01 1.63140000E-03 3.14270000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 4.50940000E-01 2.67920000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.52565000E-01 5.56640000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.25250000E-04 2.71401000E-01 1.02550000E-02 1.00210000E-08 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.29680000E-03 2.65802000E-01 1.68090000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.54580000E-03 2.73080000E-01 + + + + 0.1783583429163 0.3298451031427 0.4815892 0.5623414 0.421721260021 0.6930878 0.6909757999999999 + + + + + + + MOX2.71c + MOX2.71c + 2.53E-8 + 0 + true + + + + 0.0090657 0.0042967 0.032881 0.12203 0.18298 0.56846 0.58521 + + + + 1.40004593E-02 9.80563205E-03 8.07435789E-06 2.80075866E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 2.26856185E-03 1.58885378E-03 1.30832709E-06 4.53820413E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.41886199E-02 9.93741584E-03 8.18287404E-06 2.83839974E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 5.54788444E-02 3.88562347E-02 3.19958106E-05 1.10984111E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 2.69085702E-02 1.88462058E-02 1.55187355E-05 5.38299559E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 5.45687127E-01 3.82187973E-01 3.14709185E-04 1.09163414E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 6.13307712E-01 4.29548032E-01 3.53707392E-04 1.22690752E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + + + + 0.00825446 0.00132565 0.00842156 0.032873 0.0159636 0.323794 0.362803 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 1.30457000E-01 4.17920000E-02 8.51050000E-06 5.13290000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 3.28428000E-01 1.64360000E-03 2.20170000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 4.58371000E-01 2.53310000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.63709000E-01 5.47660000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.76190000E-04 2.82313000E-01 8.72890000E-03 9.00160000E-09 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 2.27600000E-03 2.49751000E-01 1.31140000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.86450000E-03 2.59529000E-01 + + + + 0.1813232156329 0.3343683022017 0.4937851 0.5912156 0.47419809900160004 0.833601 0.8536035 + + + + + + + MOX3.71c + MOX3.71c + 2.53E-8 + 0 + true + + + + 9.48620000E-03 4.65560000E-03 3.62400000E-02 1.32720000E-01 2.08400000E-01 6.58700000E-01 6.90170000E-01 + + + + 1.48071013E-02 1.03705874E-02 8.53956516E-06 2.96212546E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 2.78640474E-03 1.95154023E-03 1.60697792E-06 5.57413653E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.73304404E-02 1.21378819E-02 9.99482763E-06 3.46691346E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 6.59928975E-02 4.62200600E-02 3.80594850E-05 1.32017225E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 3.25131926E-02 2.27715674E-02 1.87510386E-05 6.50418701E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 6.32002662E-01 4.42641588E-01 3.64489161E-04 1.26430632E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 7.28595687E-01 5.10293344E-01 4.20196380E-04 1.45753838E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + + + + 8.67209000E-03 1.62426000E-03 1.02716000E-02 3.90447000E-02 1.92576000E-02 3.74888000E-01 4.30599000E-01 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 1.31504000E-01 4.20460000E-02 8.69720000E-06 5.19380000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 3.30403000E-01 1.64630000E-03 2.60060000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 4.61792000E-01 2.47490000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.68021000E-01 5.43300000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.85970000E-04 2.85771000E-01 8.39730000E-03 8.92800000E-09 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 2.39160000E-03 2.47614000E-01 1.23220000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.96810000E-03 2.56093000E-01 + + + + 1.83044902E-01 3.36704903E-01 5.00506900E-01 6.06174000E-01 5.02754279E-01 9.21027600E-01 9.55231100E-01 + + + + + + + FC.71c + FC.71c + 2.53E-8 + 0 + true + + + + 5.1132E-04 7.5813E-05 3.1643E-04 1.1675E-03 3.3977E-03 9.1886E-03 2.3244E-02 + + + + 1.323401E-08 1.434500E-08 1.128599E-06 1.276299E-05 3.538502E-07 1.740099E-06 5.063302E-06 + + + + 5.8791E-01 4.1176E-01 3.3906E-04 1.1761E-07 0.0000E+00 0.0000E+00 0.0000E+00 + + + + 4.79002E-09 5.82564E-09 4.63719E-07 5.24406E-06 1.45390E-07 7.14972E-07 2.08041E-06 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 6.61659000E-02 5.90700000E-02 2.83340000E-04 1.46220000E-06 2.06420000E-08 0.00000000E00 0.00000000E00 + 0.00000000E00 2.40377000E-01 5.24350000E-02 2.49900000E-04 1.92390000E-05 2.98750000E-06 4.21400000E-07 + 0.00000000E00 0.00000000E00 1.83425000E-01 9.22880000E-02 6.93650000E-03 1.07900000E-03 2.05430000E-04 + 0.00000000E00 0.00000000E00 0.00000000E00 7.90769000E-02 1.69990000E-01 2.58600000E-02 4.92560000E-03 + 0.00000000E00 0.00000000E00 0.00000000E00 3.73400000E-05 9.97570000E-02 2.06790000E-01 2.44780000E-02 + 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 9.17420000E-04 3.16774000E-01 2.38760000E-01 + 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 4.97930000E-02 1.09910000E00 + + + + 1.26032048E-01 2.93160367E-01 2.84250824E-01 2.81025244E-01 3.34460185E-01 5.65640735E-01 1.17213908E00 + + + + + + + GT.71c + GT.71c + 2.53E-8 + 0 + false + + + + 5.11320000E-04 7.58010000E-05 3.15720000E-04 1.15820000E-03 3.39750000E-03 9.18780000E-03 2.32420000E-02 + + + + + + 6.61659000E-02 5.90700000E-02 2.83340000E-04 1.46220000E-06 2.06420000E-08 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 2.40377000E-01 5.24350000E-02 2.49900000E-04 1.92390000E-05 2.98750000E-06 4.21400000E-07 + 0.00000000E+00 0.00000000E+00 1.83297000E-01 9.23970000E-02 6.94460000E-03 1.08030000E-03 2.05670000E-04 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 7.88511000E-02 1.70140000E-01 2.58810000E-02 4.92970000E-03 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 3.73330000E-05 9.97372000E-02 2.06790000E-01 2.44780000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 9.17260000E-04 3.16765000E-01 2.38770000E-01 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.97920000E-02 1.09912000E+00 + + + + 1.26032043E-01 2.93160349E-01 2.84240290E-01 2.80960000E-01 3.34440033E-01 5.65640060E-01 1.17215400E+00 + + + + + + LWTR.71c + LWTR.71c + 2.53E-8 + 0 + false + + + + 6.0105E-04 1.5793E-05 3.3716E-04 1.9406E-03 5.7416E-03 1.5001E-02 3.7239E-02 + + + + + + 0.0444777 0.1134000 0.0007235 0.0000037 0.0000001 0.0000000 0.0000000 + 0.0000000 0.2823340 0.1299400 0.0006234 0.0000480 0.0000074 0.0000010 + 0.0000000 0.0000000 0.3452560 0.2245700 0.0169990 0.0026443 0.0005034 + 0.0000000 0.0000000 0.0000000 0.0910284 0.4155100 0.0637320 0.0121390 + 0.0000000 0.0000000 0.0000000 0.0000714 0.1391380 0.5118200 0.0612290 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0022157 0.6999130 0.5373200 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0000000 0.1324400 2.4807000 + + + + 0.15920605 0.41296959299999997 0.59030986 0.5843499999999999 0.7180000000000001 1.2544497000000001 2.650379 + + + + + + + CR.71c + CR.71c + 2.53E-8 + 0 + false + + + + 1.70490000E-03 8.36224000E-03 8.37901000E-02 3.97797000E-01 6.98763000E-01 9.29508000E-01 1.17836000E+00 + + + + + + 1.70563000E-01 4.44012000E-02 9.83670000E-05 1.27786000E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 4.71050000E-01 6.85480000E-04 3.91395000E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 8.01859000E-01 7.20132000E-04 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 5.70752000E-01 1.46015000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 6.55562000E-05 2.07838000E-01 3.81486000E-03 3.69760000E-09 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.02427000E-03 2.02465000E-01 4.75290000E-03 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 3.53043000E-03 6.58597000E-01 + + + + 2.16767595E-01 4.80097720E-01 8.86369232E-01 9.70009150E-01 9.10481420E-01 1.13775017E+00 1.84048743E+00 + + + diff --git a/examples/xml/multigroup/c5g7/materials.xml b/examples/xml/multigroup/c5g7/materials.xml new file mode 100644 index 0000000000..930fc09085 --- /dev/null +++ b/examples/xml/multigroup/c5g7/materials.xml @@ -0,0 +1,54 @@ + + + + 71c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/xml/multigroup/c5g7/pin/geometry.xml b/examples/xml/multigroup/c5g7/pin/geometry.xml new file mode 100644 index 0000000000..94c70cb340 --- /dev/null +++ b/examples/xml/multigroup/c5g7/pin/geometry.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/examples/xml/multigroup/c5g7/pin/materials.xml b/examples/xml/multigroup/c5g7/pin/materials.xml new file mode 120000 index 0000000000..c3825cffc5 --- /dev/null +++ b/examples/xml/multigroup/c5g7/pin/materials.xml @@ -0,0 +1 @@ +/home/nelsonag/cases/c5g7/materials.xml \ No newline at end of file diff --git a/examples/xml/multigroup/c5g7/pin/plots.xml b/examples/xml/multigroup/c5g7/pin/plots.xml new file mode 100644 index 0000000000..cbb8e532c1 --- /dev/null +++ b/examples/xml/multigroup/c5g7/pin/plots.xml @@ -0,0 +1,28 @@ + + + + + 1 + mat + material + 0 0 0 + 1.26 1.26 + slice + 1000 1000 + + + + + + + + 2 + cell + cell + 0 0 0 + 1.26 1.26 + slice + 1000 1000 + + + diff --git a/examples/xml/multigroup/c5g7/pin/settings.xml b/examples/xml/multigroup/c5g7/pin/settings.xml new file mode 100644 index 0000000000..46c0bd2264 --- /dev/null +++ b/examples/xml/multigroup/c5g7/pin/settings.xml @@ -0,0 +1,46 @@ + + + + multi-group + + + + 2000 + 500 + 1000 + + + + + + + -0.63 -0.63 -1E50 + 0.63 0.63 1E50 + + + + + + + 2000 + true + + + + true + true + true + + + false + + ../data.xml + + diff --git a/examples/xml/multigroup/c5g7/pin/tallies.xml b/examples/xml/multigroup/c5g7/pin/tallies.xml new file mode 100644 index 0000000000..727584a627 --- /dev/null +++ b/examples/xml/multigroup/c5g7/pin/tallies.xml @@ -0,0 +1,16 @@ + + + + + + + flux + + + + + + scatter + + + diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index e3ea314d6c..c9830f8d0f 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -261,8 +261,8 @@ contains call fatal_error("Unrecognized tabular_legendre/enable: " // temp_str) end if else - enable_leg_mu = .false. - this % legendre_mu_points = 1 + enable_leg_mu = .true. + this % legendre_mu_points = 33 end if if (enable_leg_mu .and. & check_for_node(node_legendre_mu, "num_points")) then diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 1da3619063..6ac2b44464 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -88,7 +88,6 @@ contains call scatter(p) ! Play russian roulette if survival biasing is turned on - if (survival_biasing) then call russian_roulette(p) if (.not. p % alive) return @@ -143,15 +142,14 @@ contains type(Particle), intent(inout) :: p call sample_scatter(macro_xs(p % material) % obj, & - p % coord(p % n_coord) % uvw, p % last_g, p % g, & + p % coord(1) % uvw, p % last_g, p % g, & p % mu, p % wgt) ! Update energy value for downstream compatability (in tallying) p % E = energy_bin_avg(p % g) ! Convert change in angle (mu) to new direction - p % coord(p % n_coord) % uvw = rotate_angle(p % coord(p % n_coord) % uvw, & - p % mu) + p % coord(1) % uvw = rotate_angle(p % coord(1) % uvw, p % mu) ! Set event component p % event = EVENT_SCATTER From c571a4b12629699250f8c19c3a95f6ba2b15c6eb Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 7 Nov 2015 14:23:20 -0500 Subject: [PATCH 025/149] Got cmfd working, not sure about with feedback just yet --- examples/xml/multigroup/c5g7/2d/cmfd.xml | 6 +++--- examples/xml/multigroup/c5g7/2d/settings.xml | 4 ++-- src/tally.F90 | 15 ++++++++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/examples/xml/multigroup/c5g7/2d/cmfd.xml b/examples/xml/multigroup/c5g7/2d/cmfd.xml index 22b1e9042f..1b1e523b10 100644 --- a/examples/xml/multigroup/c5g7/2d/cmfd.xml +++ b/examples/xml/multigroup/c5g7/2d/cmfd.xml @@ -1,9 +1,9 @@ - 1 - true - jfnk + 2 + false + power 0.0 0.0 -100.0 64.26 64.26 100.0 diff --git a/examples/xml/multigroup/c5g7/2d/settings.xml b/examples/xml/multigroup/c5g7/2d/settings.xml index 189adc6c96..faed7cd7fc 100644 --- a/examples/xml/multigroup/c5g7/2d/settings.xml +++ b/examples/xml/multigroup/c5g7/2d/settings.xml @@ -33,7 +33,7 @@ - 2000 + 2500 true @@ -43,7 +43,7 @@ true - false + true ../data.xml diff --git a/src/tally.F90 b/src/tally.F90 index 7ad701b168..6b3e7a7934 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -966,8 +966,11 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - score = p % wgt * nuc % get_xs(p % g, 'f_mu', p % last_g, & + score = p % wgt + if (i_nuclide > 0) then + score = score * nuc % get_xs(p % g, 'f_mu', p % last_g, & p % last_uvw, p % mu) + end if case (SCORE_NU_SCATTER_PN) @@ -980,8 +983,11 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - score = p % wgt * nuc % get_xs(p % g, 'f_mu', p % last_g, & + score = p % wgt + if (i_nuclide > 0) then + score = score * nuc % get_xs(p % g, 'f_mu', p % last_g, & p % last_uvw, p % mu) + end if case (SCORE_NU_SCATTER_YN) @@ -994,8 +1000,11 @@ contains ! For scattering production, we need to use the pre-collision ! weight times the multiplicity as the estimate for the number of ! neutrons exiting a reaction with neutrons in the exit channel - score = p % wgt * nuc % get_xs(p % g, 'f_mu', p % last_g, & + score = p % wgt + if (i_nuclide > 0) then + score = score * nuc % get_xs(p % g, 'f_mu', p % last_g, & p % last_uvw, p % mu) + end if case (SCORE_TRANSPORT) From 2262045e633340dff9b05f185b4e66a91d22635a Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 8 Nov 2015 14:12:33 -0500 Subject: [PATCH 026/149] Changes to get tallying on better footing, moved C5G7 problem to higher subdir in examples --- .../xml/{multigroup => }/c5g7/2d/cmfd.xml | 5 +- .../xml/{multigroup => }/c5g7/2d/geometry.xml | 0 .../{multigroup => }/c5g7/2d/materials.xml | 0 .../xml/{multigroup => }/c5g7/2d/plots.xml | 0 .../xml/{multigroup => }/c5g7/2d/settings.xml | 12 +- .../xml/{multigroup => }/c5g7/2d/tallies.xml | 0 .../xml/{multigroup => }/c5g7/3d/geometry.xml | 0 .../{multigroup => }/c5g7/3d/materials.xml | 0 .../xml/{multigroup => }/c5g7/3d/plots.xml | 0 .../xml/{multigroup => }/c5g7/3d/settings.xml | 2 - .../xml/{multigroup => }/c5g7/3d/tallies.xml | 0 examples/xml/{multigroup => }/c5g7/data.xml | 0 .../xml/{multigroup => }/c5g7/materials.xml | 0 .../{multigroup => }/c5g7/pin/geometry.xml | 0 .../{multigroup => }/c5g7/pin/materials.xml | 0 .../xml/{multigroup => }/c5g7/pin/plots.xml | 0 .../{multigroup => }/c5g7/pin/settings.xml | 0 .../xml/{multigroup => }/c5g7/pin/tallies.xml | 0 src/cmfd_input.F90 | 19 ++- src/geometry.F90 | 4 +- src/input_xml.F90 | 8 ++ src/particle_header.F90 | 4 +- src/physics_mg.F90 | 1 + src/tally.F90 | 128 +++++++++++------- src/tally_header.F90 | 4 + 25 files changed, 123 insertions(+), 64 deletions(-) rename examples/xml/{multigroup => }/c5g7/2d/cmfd.xml (69%) rename examples/xml/{multigroup => }/c5g7/2d/geometry.xml (100%) rename examples/xml/{multigroup => }/c5g7/2d/materials.xml (100%) rename examples/xml/{multigroup => }/c5g7/2d/plots.xml (100%) rename examples/xml/{multigroup => }/c5g7/2d/settings.xml (76%) rename examples/xml/{multigroup => }/c5g7/2d/tallies.xml (100%) rename examples/xml/{multigroup => }/c5g7/3d/geometry.xml (100%) rename examples/xml/{multigroup => }/c5g7/3d/materials.xml (100%) rename examples/xml/{multigroup => }/c5g7/3d/plots.xml (100%) rename examples/xml/{multigroup => }/c5g7/3d/settings.xml (97%) rename examples/xml/{multigroup => }/c5g7/3d/tallies.xml (100%) rename examples/xml/{multigroup => }/c5g7/data.xml (100%) rename examples/xml/{multigroup => }/c5g7/materials.xml (100%) rename examples/xml/{multigroup => }/c5g7/pin/geometry.xml (100%) rename examples/xml/{multigroup => }/c5g7/pin/materials.xml (100%) rename examples/xml/{multigroup => }/c5g7/pin/plots.xml (100%) rename examples/xml/{multigroup => }/c5g7/pin/settings.xml (100%) rename examples/xml/{multigroup => }/c5g7/pin/tallies.xml (100%) diff --git a/examples/xml/multigroup/c5g7/2d/cmfd.xml b/examples/xml/c5g7/2d/cmfd.xml similarity index 69% rename from examples/xml/multigroup/c5g7/2d/cmfd.xml rename to examples/xml/c5g7/2d/cmfd.xml index 1b1e523b10..aa3deb4b67 100644 --- a/examples/xml/multigroup/c5g7/2d/cmfd.xml +++ b/examples/xml/c5g7/2d/cmfd.xml @@ -2,12 +2,12 @@ 2 - false - power + true 0.0 0.0 -100.0 64.26 64.26 100.0 6 6 1 + 2 2 2 2 1 1 2 2 2 2 1 1 @@ -16,5 +16,6 @@ 1 1 1 1 1 1 1 1 1 1 1 1 + 1 0 0 1 1 1 diff --git a/examples/xml/multigroup/c5g7/2d/geometry.xml b/examples/xml/c5g7/2d/geometry.xml similarity index 100% rename from examples/xml/multigroup/c5g7/2d/geometry.xml rename to examples/xml/c5g7/2d/geometry.xml diff --git a/examples/xml/multigroup/c5g7/2d/materials.xml b/examples/xml/c5g7/2d/materials.xml similarity index 100% rename from examples/xml/multigroup/c5g7/2d/materials.xml rename to examples/xml/c5g7/2d/materials.xml diff --git a/examples/xml/multigroup/c5g7/2d/plots.xml b/examples/xml/c5g7/2d/plots.xml similarity index 100% rename from examples/xml/multigroup/c5g7/2d/plots.xml rename to examples/xml/c5g7/2d/plots.xml diff --git a/examples/xml/multigroup/c5g7/2d/settings.xml b/examples/xml/c5g7/2d/settings.xml similarity index 76% rename from examples/xml/multigroup/c5g7/2d/settings.xml rename to examples/xml/c5g7/2d/settings.xml index faed7cd7fc..2ad738704a 100644 --- a/examples/xml/multigroup/c5g7/2d/settings.xml +++ b/examples/xml/c5g7/2d/settings.xml @@ -6,17 +6,11 @@ in an eigenvalue calculation mode --> - 2500 + 2000 500 - 1000 + 1000 - - 0.0 21.42 -100 - 42.84 64.26 100 - 34 34 1 - - - 2500 + 2000 true diff --git a/examples/xml/multigroup/c5g7/2d/tallies.xml b/examples/xml/c5g7/2d/tallies.xml similarity index 100% rename from examples/xml/multigroup/c5g7/2d/tallies.xml rename to examples/xml/c5g7/2d/tallies.xml diff --git a/examples/xml/multigroup/c5g7/3d/geometry.xml b/examples/xml/c5g7/3d/geometry.xml similarity index 100% rename from examples/xml/multigroup/c5g7/3d/geometry.xml rename to examples/xml/c5g7/3d/geometry.xml diff --git a/examples/xml/multigroup/c5g7/3d/materials.xml b/examples/xml/c5g7/3d/materials.xml similarity index 100% rename from examples/xml/multigroup/c5g7/3d/materials.xml rename to examples/xml/c5g7/3d/materials.xml diff --git a/examples/xml/multigroup/c5g7/3d/plots.xml b/examples/xml/c5g7/3d/plots.xml similarity index 100% rename from examples/xml/multigroup/c5g7/3d/plots.xml rename to examples/xml/c5g7/3d/plots.xml diff --git a/examples/xml/multigroup/c5g7/3d/settings.xml b/examples/xml/c5g7/3d/settings.xml similarity index 97% rename from examples/xml/multigroup/c5g7/3d/settings.xml rename to examples/xml/c5g7/3d/settings.xml index b67b882908..51241492d5 100644 --- a/examples/xml/multigroup/c5g7/3d/settings.xml +++ b/examples/xml/c5g7/3d/settings.xml @@ -42,8 +42,6 @@ true - false - ../data.xml diff --git a/examples/xml/multigroup/c5g7/3d/tallies.xml b/examples/xml/c5g7/3d/tallies.xml similarity index 100% rename from examples/xml/multigroup/c5g7/3d/tallies.xml rename to examples/xml/c5g7/3d/tallies.xml diff --git a/examples/xml/multigroup/c5g7/data.xml b/examples/xml/c5g7/data.xml similarity index 100% rename from examples/xml/multigroup/c5g7/data.xml rename to examples/xml/c5g7/data.xml diff --git a/examples/xml/multigroup/c5g7/materials.xml b/examples/xml/c5g7/materials.xml similarity index 100% rename from examples/xml/multigroup/c5g7/materials.xml rename to examples/xml/c5g7/materials.xml diff --git a/examples/xml/multigroup/c5g7/pin/geometry.xml b/examples/xml/c5g7/pin/geometry.xml similarity index 100% rename from examples/xml/multigroup/c5g7/pin/geometry.xml rename to examples/xml/c5g7/pin/geometry.xml diff --git a/examples/xml/multigroup/c5g7/pin/materials.xml b/examples/xml/c5g7/pin/materials.xml similarity index 100% rename from examples/xml/multigroup/c5g7/pin/materials.xml rename to examples/xml/c5g7/pin/materials.xml diff --git a/examples/xml/multigroup/c5g7/pin/plots.xml b/examples/xml/c5g7/pin/plots.xml similarity index 100% rename from examples/xml/multigroup/c5g7/pin/plots.xml rename to examples/xml/c5g7/pin/plots.xml diff --git a/examples/xml/multigroup/c5g7/pin/settings.xml b/examples/xml/c5g7/pin/settings.xml similarity index 100% rename from examples/xml/multigroup/c5g7/pin/settings.xml rename to examples/xml/c5g7/pin/settings.xml diff --git a/examples/xml/multigroup/c5g7/pin/tallies.xml b/examples/xml/c5g7/pin/tallies.xml similarity index 100% rename from examples/xml/multigroup/c5g7/pin/tallies.xml rename to examples/xml/c5g7/pin/tallies.xml diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index c15c250e64..4588444d05 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -52,7 +52,7 @@ contains use xml_interface use, intrinsic :: ISO_FORTRAN_ENV - integer :: i + integer :: i, g integer :: ng integer :: n_params integer, allocatable :: iarray(:) @@ -102,6 +102,23 @@ contains if(.not.allocated(cmfd%egrid)) allocate(cmfd%egrid(ng)) call get_node_array(node_mesh, "energy", cmfd%egrid) cmfd % indices(4) = ng - 1 ! sets energy group dimension + ! If using MG mode, check to see if these egrid points at least match + ! the MG Data breakpoints + if (.not. run_CE) then + do i = 1, ng + found = .false. + do g = 1, energy_groups + 1 + if (cmfd%egrid(i) == energy_bins(g)) then + found = .true. + exit + end if + end do + if (.not. found) then + call fatal_error("CMFD energy mesh boundaries must align with& + & boundaries of multi-group data!") + end if + end do + end if else if(.not.allocated(cmfd % egrid)) allocate(cmfd % egrid(2)) cmfd % egrid = [ ZERO, 20.0_8 ] diff --git a/src/geometry.F90 b/src/geometry.F90 index 7675c70dc1..a8348d4188 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -199,6 +199,7 @@ contains type(Cell), pointer :: c ! pointer to cell class(Lattice), pointer :: lat ! pointer to lattice type(Universe), pointer :: univ ! universe to search in + real(8) :: new_xyz(3) ! perturbed location used to look for cell do j = p % n_coord + 1, MAX_COORD call p % coord(j) % reset() @@ -285,7 +286,8 @@ contains lat => lattices(c % fill) % obj ! Determine lattice indices - i_xyz = lat % get_indices(p % coord(j) % xyz + TINY_BIT * p % coord(j) % uvw) + new_xyz = p % coord(j) % xyz + TINY_BIT * p % coord(j) % uvw + i_xyz = lat % get_indices(new_xyz) ! Store lower level coordinates p % coord(j + 1) % xyz = lat % get_local_xyz(p % coord(j) % xyz, i_xyz) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 3cf26b49b6..06e1c154e8 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2705,6 +2705,8 @@ contains ! Allocate and store bins allocate(t % filters(j) % real_bins(n_words)) call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + + if (.not. run_CE) t % energy_matches_groups = .false. else if (n_words == -1) then ! Set number of bins t % filters(j) % n_bins = energy_groups @@ -2712,6 +2714,8 @@ contains ! Allocate and store bins allocate(t % filters(j) % real_bins(energy_groups)) t % filters(j) % real_bins = energy_bins + + if (.not. run_CE) t % energy_matches_groups = .true. end if case ('energyout') @@ -2725,6 +2729,8 @@ contains ! Allocate and store bins allocate(t % filters(j) % real_bins(n_words)) call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + + if (.not. run_CE) t % energyout_matches_groups = .false. else if (n_words == -1) then ! Set number of bins t % filters(j) % n_bins = energy_groups @@ -2732,6 +2738,8 @@ contains ! Allocate and store bins allocate(t % filters(j) % real_bins(energy_groups)) t % filters(j) % real_bins = energy_bins + + if (.not. run_CE) t % energyout_matches_groups = .true. end if ! Set to analog estimator diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 9c0ddfde0d..ff6e4d15cc 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -198,8 +198,8 @@ contains this % E = src % E this % last_E = src % E if (.not. run_CE) then - this % g = src % g - this % last_g = src % g + this % g = src % g + this % last_g = src % g end if end subroutine initialize_from_source diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 6ac2b44464..38e144e625 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -241,6 +241,7 @@ contains ! Sample secondary energy distribution for fission reaction and set energy ! in fission bank fission_bank(i) % g = sample_fission_energy(xs, p % g, fission_bank(i) % uvw) + fission_bank(i) % E = energy_bin_avg(fission_bank(i) % g) end do ! increment number of bank sites diff --git a/src/tally.F90 b/src/tally.F90 index 6b3e7a7934..848a6cb7eb 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -799,8 +799,7 @@ contains real(8) :: micro_abs ! nuclidic microscopic abs class(Nuclide_MG), pointer :: nuc - if (i_nuclide > 0) & - nuc => nuclides_MG(i_nuclide) % obj + if (i_nuclide > 0) nuc => nuclides_MG(i_nuclide) % obj i = 0 SCORE_LOOP: do q = 1, t % n_user_score_bins @@ -1047,7 +1046,7 @@ contains else if (i_nuclide > 0) then - score = nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) & + score = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) & * atom_density * flux else score = material_xs % absorption * flux @@ -1061,10 +1060,10 @@ contains ! No fission events occur if survival biasing is on -- need to ! calculate fraction of absorptions that would have resulted in ! fission - micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) if (micro_abs > ZERO) then score = p % absorb_wgt * & - nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) & + nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) & / micro_abs else score = ZERO @@ -1076,13 +1075,13 @@ contains ! particle's weight entering the collision as the estimate for the ! fission reaction rate score = p % last_wgt & - * nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) & - / nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + * nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) & + / nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) end if else if (i_nuclide > 0) then - score = nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) * & + score = nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) * & atom_density * flux else score = material_xs % fission * flux @@ -1107,10 +1106,11 @@ contains ! No fission events occur if survival biasing is on -- need to ! calculate fraction of absorptions that would have resulted in ! nu-fission - if (micro_xs(p % event_nuclide) % absorption > ZERO) then + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) + if (micro_abs > ZERO) then score = p % absorb_wgt * & - nuc % get_xs(p % g, 'fission', UVW=p % coord(1) % uvw) / & - nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) / & + micro_abs else score = ZERO end if @@ -1127,7 +1127,7 @@ contains else if (i_nuclide > 0) then - score = nuc % get_xs(p % g, 'nu_fission', UVW=p % coord(1) % uvw) & + score = nuc % get_xs(p % g, 'nu_fission', UVW=p % coord(i) % uvw) & * atom_density * flux else score = material_xs % nu_fission * flux @@ -1141,10 +1141,10 @@ contains ! No fission events occur if survival biasing is on -- need to ! calculate fraction of absorptions that would have resulted in ! fission scale by kappa-fission - micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) if (micro_abs > ZERO) then score = p % absorb_wgt * & - nuc % get_xs(p % g, 'k_fission', UVW=p % coord(1) % uvw) / & + nuc % get_xs(p % g, 'k_fission', UVW=p % coord(i) % uvw) / & micro_abs else score = ZERO @@ -1156,13 +1156,13 @@ contains ! particle's weight entering the collision as the estimate for ! the fission energy production rate score = p % last_wgt * & - nuc % get_xs(p % g, 'k_fission', UVW=p % coord(1) % uvw) / & - nuc % get_xs(p % g, 'absorption', UVW=p % coord(1) % uvw) + nuc % get_xs(p % g, 'k_fission', UVW=p % coord(i) % uvw) / & + nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) end if else if (i_nuclide > 0) then - score = nuc % get_xs(p % g, 'k_fission', UVW=p % coord(1) % uvw) & + score = nuc % get_xs(p % g, 'k_fission', UVW=p % coord(i) % uvw) & * atom_density * flux else score = material_xs % kappa_fission * flux @@ -1534,13 +1534,14 @@ contains integer :: i_filter ! index for matching filter bin combination real(8) :: score ! actual score integer :: gout ! energy group of fission bank site + real(8) :: E_out ! save original outgoing energy bin and score index i = t % find_filter(FILTER_ENERGYOUT) bin_energyout = matching_bins(i) ! Get number of energies on filter - n = size(t % filters(i) % int_bins) + n = size(t % filters(i) % real_bins) ! Since the creation of fission sites is weighted such that it is ! expected to create n_particles sites, we need to multiply the @@ -1552,11 +1553,23 @@ contains ! determine score based on bank site weight and keff score = keff * fission_bank(n_bank - p % n_bank + k) % wgt - ! determine outgoing energy from fission bank - gout = fission_bank(n_bank - p % n_bank + k) % g + if (t % energyout_matches_groups) then + ! determine outgoing energy from fission bank + gout = fission_bank(n_bank - p % n_bank + k) % g - ! change outgoing energy bin - matching_bins(i) = gout + ! change outgoing energy bin + matching_bins(i) = gout + else + ! determine outgoing energy from fission bank + E_out = fission_bank(n_bank - p % n_bank + k) % E + + ! check if outgoing energy is within specified range on filter + if (E_out < t % filters(i) % real_bins(1) .or. & + E_out > t % filters(i) % real_bins(n)) cycle + + ! change outgoing energy bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, n, E_out) + end if ! determine scoring index i_filter = sum((matching_bins(1:t%n_filters) - 1) * t % stride) + 1 @@ -2427,8 +2440,8 @@ contains integer :: j integer :: n ! number of bins for single filter integer :: offset ! offset for distribcell - integer :: g ! particle energy group real(8) :: theta, phi ! Polar and Azimuthal Angles, respectively + real(8) :: E type(TallyObject), pointer :: t type(RegularMesh), pointer :: m @@ -2507,34 +2520,55 @@ contains p % surface, i_tally) case (FILTER_ENERGYIN) - ! make sure the correct energy is used - if (t % estimator == ESTIMATOR_TRACKLENGTH) then - g = p % g - else - g = p % last_g - end if - - ! Since all groups are filters, the filter bin is the group - matching_bins(i) = g - - case (FILTER_ENERGYOUT) - ! Since all groups are filters, the filter bin is the group - matching_bins(i) = p % g - - case (FILTER_DELAYEDGROUP) - - if (survival_biasing .and. t % find_filter(FILTER_ENERGYOUT) <= 0) then - matching_bins(i) = 1 - elseif (active_tracklength_tallies % size() > 0) then - matching_bins(i) = 1 - else - if (p % delayed_group == 0) then - matching_bins = NO_BIN_FOUND + if (t % energy_matches_groups) then + ! make sure the correct energy group is used + ! Since all groups are filters, the filter bin is the group + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + matching_bins(i) = p % g else - matching_bins(i) = p % delayed_group + matching_bins(i) = p % last_g + end if + else + ! make sure the correct energy is used + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + E = p % E + else + E = p % last_E + end if + n = t % filters(i) % n_bins + + ! check if energy of the particle is within energy bins + if (E < t % filters(i) % real_bins(1) .or. & + E > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find incoming energy bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, E) end if end if + + case (FILTER_ENERGYOUT) + if (t % energyout_matches_groups) then + ! Since all groups are filters, the filter bin is the group + matching_bins(i) = p % g + else + ! determine outgoing energy bin + n = t % filters(i) % n_bins + + ! check if energy of the particle is within energy bins + if (p % E < t % filters(i) % real_bins(1) .or. & + p % E > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find incoming energy bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, p % E) + end if + end if + + case (FILTER_MU) ! determine mu bin n = t % filters(i) % n_bins diff --git a/src/tally_header.F90 b/src/tally_header.F90 index 01dcd9bdb5..c592f80d70 100644 --- a/src/tally_header.F90 +++ b/src/tally_header.F90 @@ -130,6 +130,10 @@ module tally_header integer :: n_triggers = 0 ! # of triggers type(TriggerObject), allocatable :: triggers(:) ! Array of triggers + ! Multi-Group Specific Information To Enable Rapid Tallying + logical :: energy_matches_groups = .false. + logical :: energyout_matches_groups = .false. + ! Type-Bound procedures contains procedure :: clear => tallyobject_clear ! Deallocates TallyObject From 4561edfac7bfd6ea1a0fc6be5bd06bcbf6e766f5 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 8 Nov 2015 20:21:47 -0500 Subject: [PATCH 027/149] Fixed formatting issues --- src/input_xml.F90 | 50 +++++++++++++++++++++--------------------- src/macroxs_header.F90 | 40 ++++++++++++++++----------------- src/mesh.F90 | 10 ++++----- src/mgxs_data.F90 | 12 +++++----- src/nuclide_header.F90 | 4 ++-- src/physics_mg.F90 | 1 + 6 files changed, 59 insertions(+), 58 deletions(-) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 06e1c154e8..c75886b475 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -1963,8 +1963,8 @@ contains ! Check to ensure material has at least one nuclide if ((.not. check_for_node(node_mat, "nuclide") .and. & - .not. check_for_node(node_mat, "element")) .and. & - (.not. check_for_node(node_mat, "macroscopic"))) then + .not. check_for_node(node_mat, "element")) .and. & + (.not. check_for_node(node_mat, "macroscopic"))) then call fatal_error("No macroscopic data, nuclides or natural elements & &specified on material " // trim(to_str(mat % id))) end if @@ -2001,7 +2001,7 @@ contains ! store full name call get_node_value(node_nuc, "name", temp_str) if (check_for_node(node_nuc, "xs")) & - call get_node_value(node_nuc, "xs", name) + call get_node_value(node_nuc, "xs", name) name = trim(temp_str) // "." // trim(name) name = to_lower(name) @@ -2014,7 +2014,7 @@ contains call list_density % append(ONE) else call fatal_error("Units can only be macro for macroscopic data " & - &// trim(name)) + &// trim(name)) end if else @@ -2045,7 +2045,7 @@ contains ! store full name call get_node_value(node_nuc, "name", temp_str) if (check_for_node(node_nuc, "xs")) & - call get_node_value(node_nuc, "xs", name) + call get_node_value(node_nuc, "xs", name) name = trim(temp_str) // "." // trim(name) name = to_lower(name) @@ -2058,7 +2058,7 @@ contains call list_density % append(ONE) else if (.not.check_for_node(node_nuc, "ao") .and. & - .not.check_for_node(node_nuc, "wo")) then + .not.check_for_node(node_nuc, "wo")) then call fatal_error("No atom or weight percent specified for nuclide " & &// trim(name)) elseif (check_for_node(node_nuc, "ao") .and. & @@ -2572,7 +2572,7 @@ contains ! If in MG mode, fail if user provides bins, as we are only ! allowing for all groups if (.not. run_CE .and. (temp_str == 'energy' .or. & - temp_str == 'energyout')) then + temp_str == 'energyout')) then call fatal_error("No energy or energyout bins needed on tally " & &// trim(to_str(t % id))) else @@ -4360,9 +4360,9 @@ contains ! Check if cross_sections.xml exists inquire(FILE=path_cross_sections, EXIST=file_exists) if (.not. file_exists) then - ! Could not find cross_sections.xml file - call fatal_error("Cross sections XML file '" & - &// trim(path_cross_sections) // "' does not exist!") + ! Could not find cross_sections.xml file + call fatal_error("Cross sections XML file '" & + &// trim(path_cross_sections) // "' does not exist!") end if call write_message("Reading cross sections XML file...", 5) @@ -4371,18 +4371,18 @@ contains call open_xmldoc(doc, path_cross_sections) if (check_for_node(doc, "groups")) then - ! Get neutron group count - call get_node_value(doc, "groups", energy_groups) + ! Get neutron group count + call get_node_value(doc, "groups", energy_groups) else - call fatal_error("groups element must exist!") + call fatal_error("groups element must exist!") end if allocate(energy_bins(energy_groups + 1)) if (check_for_node(doc, "group_structure")) then - ! Get neutron group structure - call get_node_array(doc, "group_structure", energy_bins) + ! Get neutron group structure + call get_node_array(doc, "group_structure", energy_bins) else - call fatal_error("group_structures element must exist!") + call fatal_error("group_structures element must exist!") end if allocate(energy_bin_avg(energy_groups)) @@ -4396,10 +4396,10 @@ contains ! Allocate xs_listings array if (n_listings == 0) then - call fatal_error("No XSDATA listings present in cross_sections.xml & - &file!") + call fatal_error("No XSDATA listings present in cross_sections.xml & + &file!") else - allocate(xs_listings(n_listings)) + allocate(xs_listings(n_listings)) end if do i = 1, n_listings @@ -4413,7 +4413,7 @@ contains listing % name = to_lower(listing % name) listing % alias = listing % name if (check_for_node(node_xsdata, "alias")) & - call get_node_value(node_xsdata, "alias", listing % alias) + call get_node_value(node_xsdata, "alias", listing % alias) listing % alias = to_lower(listing % alias) if (check_for_node(node_xsdata, "zaid")) then call get_node_value(node_xsdata, "zaid", listing % zaid) @@ -4421,7 +4421,7 @@ contains listing % zaid = 100 end if if (check_for_node(node_xsdata, "kT")) & - call get_node_value(node_xsdata, "kT", listing % kT) + call get_node_value(node_xsdata, "kT", listing % kT) if (check_for_node(node_xsdata, "awr")) then call get_node_value(node_xsdata, "awr", listing % awr) else @@ -4430,12 +4430,12 @@ contains ! determine type of cross section if (ends_with(listing % name, 'c')) then - listing % type = NEUTRON + listing % type = NEUTRON end if - ! create dictionary entry for both name and alias - call xs_listing_dict % add_key(to_lower(listing % name), i) - call xs_listing_dict % add_key(to_lower(listing % alias), i) + ! create dictionary entry for both name and alias + call xs_listing_dict % add_key(to_lower(listing % name), i) + call xs_listing_dict % add_key(to_lower(listing % alias), i) end do ! Close cross sections XML file diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index 602db4a3b6..b2d9a5fde6 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -249,16 +249,16 @@ contains do gin = 1, groups do gout = 1, groups this % chi(gout,gin) = this % chi(gout,gin) + atom_density * & - nuc % chi(gout) * nuc % nu_fission(gin,1) + nuc % chi(gout) * nuc % nu_fission(gin,1) end do end do this % nu_fission = this % nu_fission + atom_density * & - nuc % nu_fission(:,1) + nuc % nu_fission(:,1) else this % chi = this % chi + atom_density * nuc % nu_fission do gin = 1, groups this % nu_fission(gin) = this % nu_fission(gin) + atom_density * & - sum(nuc % nu_fission(:,gin)) + sum(nuc % nu_fission(:,gin)) end do end if this % fission = this % fission + atom_density * nuc % fission @@ -273,33 +273,33 @@ contains if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then ! Transfer matrix temp_energy(gout,gin) = temp_energy(gout,gin) + atom_density * & - sum(nuc % scatter(gout,gin,:)) + sum(nuc % scatter(gout,gin,:)) ! Determine the angular distribution do imu = 1, order scatt_coeffs(imu, gout, gin) = scatt_coeffs(imu, gout, gin) + & - nuc % scatter(gout,gin,imu) * & - atom_density + nuc % scatter(gout,gin,imu) * & + atom_density end do else if (scatt_type == ANGLE_LEGENDRE) then ! Transfer matrix temp_energy(gout,gin) = temp_energy(gout,gin) + atom_density * & - nuc % scatter(gout,gin,1) + nuc % scatter(gout,gin,1) ! Determine the angular distribution coefficients so we can later ! expand do the complete distribution do l = 1, min(nuc % order, order) + 1 scatt_coeffs(l, gout, gin) = scatt_coeffs(l, gout, gin) + & - nuc % scatter(gout,gin,l) * & - atom_density + nuc % scatter(gout,gin,l) * & + atom_density end do end if ! Multiplicity matrix temp_mult(gout,gin) = temp_mult(gout,gin) + atom_density * & - nuc % mult(gout,gin) + nuc % mult(gout,gin) end do end do type is (Nuclide_Angle) @@ -530,16 +530,16 @@ contains do gin = 1, groups do gout = 1, groups this % chi(gout,gin,:,:) = this % chi(gout,gin,:,:) + atom_density * & - nuc % chi(gout,:,:) * nuc % nu_fission(gin,1,:,:) + nuc % chi(gout,:,:) * nuc % nu_fission(gin,1,:,:) end do end do this % nu_fission = this % nu_fission + atom_density * & - nuc % nu_fission(:,1,:,:) + nuc % nu_fission(:,1,:,:) else this % chi = this % chi + atom_density * nuc % nu_fission do gin = 1, groups this % nu_fission(gin,:,:) = this % nu_fission(gin,:,:) + atom_density * & - sum(nuc % nu_fission(:,gin,:,:),dim=1) + sum(nuc % nu_fission(:,gin,:,:),dim=1) end do end if this % fission = this % fission + atom_density * nuc % fission @@ -554,31 +554,31 @@ contains if (scatt_type == ANGLE_HISTOGRAM .or. scatt_type == ANGLE_TABULAR) then ! Transfer matrix temp_energy(gout,gin,:,:) = temp_energy(gout,gin,:,:) + atom_density * & - sum(nuc % scatter(gout,gin,:,:,:),dim=1) + sum(nuc % scatter(gout,gin,:,:,:),dim=1) ! Determine the angular distribution do imu = 1, order scatt_coeffs(imu,gout,gin,:,:) = scatt_coeffs(imu,gout,gin,:,:) + & - nuc % scatter(gout,gin,imu,:,:) * & - atom_density + nuc % scatter(gout,gin,imu,:,:) * & + atom_density end do else if (scatt_type == ANGLE_LEGENDRE) then ! Transfer matrix temp_energy(gout,gin,:,:) = temp_energy(gout,gin,:,:) + atom_density * & - nuc % scatter(gout,gin,1,:,:) + nuc % scatter(gout,gin,1,:,:) ! Determine the angular distribution coefficients so we can later ! expand do the complete distribution do l = 1, min(nuc % order, order) + 1 scatt_coeffs(l, gout, gin,:,:) = scatt_coeffs(l, gout, gin,:,:) + & - nuc % scatter(gout,gin,l,:,:) * & - atom_density + nuc % scatter(gout,gin,l,:,:) * & + atom_density end do end if ! Multiplicity matrix temp_mult(gout,gin,:,:) = temp_mult(gout,gin,:,:) + atom_density * & - nuc % mult(gout,gin,:,:) + nuc % mult(gout,gin,:,:) end do end do end select diff --git a/src/mesh.F90 b/src/mesh.F90 index 9cb8dc5969..3704b9602c 100644 --- a/src/mesh.F90 +++ b/src/mesh.F90 @@ -163,12 +163,12 @@ contains sites_outside) type(RegularMesh), pointer :: m ! mesh to count sites - type(Bank), intent(in) :: bank_array(:) ! fission or source bank - real(8), intent(out) :: cnt(:,:,:,:) ! weight of sites in each + type(Bank), intent(in) :: bank_array(:) ! fission or source bank + real(8), intent(out) :: cnt(:,:,:,:) ! weight of sites in each ! cell and energy group - real(8), optional :: energies(:) ! energy grid to search - integer(8), optional :: size_bank ! # of bank sites (on each proc) - logical, optional :: sites_outside ! were there sites outside mesh? + real(8), optional :: energies(:) ! energy grid to search + integer(8), optional :: size_bank ! # of bank sites (on each proc) + logical, optional :: sites_outside ! were there sites outside mesh? integer :: i ! loop index for local fission sites integer :: n_sites ! size of bank array diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index c9830f8d0f..b89c73d51a 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -43,9 +43,9 @@ contains ! Check if cross_sections.xml exists inquire(FILE=path_cross_sections, EXIST=file_exists) if (.not. file_exists) then - ! Could not find cross_sections.xml file - call fatal_error("Cross sections XML file '" & - &// trim(path_cross_sections) // "' does not exist!") + ! Could not find cross_sections.xml file + call fatal_error("Cross sections XML file '" & + &// trim(path_cross_sections) // "' does not exist!") end if call write_message("Loading Cross Section Data...", 5) @@ -73,7 +73,7 @@ contains end if end do if (get_kfiss) & - exit + exit end do ! ========================================================================== @@ -265,7 +265,7 @@ contains this % legendre_mu_points = 33 end if if (enable_leg_mu .and. & - check_for_node(node_legendre_mu, "num_points")) then + check_for_node(node_legendre_mu, "num_points")) then call get_node_value(node_legendre_mu, "num_points", & this % legendre_mu_points) if (this % legendre_mu_points <= 0) then @@ -644,7 +644,7 @@ contains end if end do if (get_kfiss) & - exit + exit end do allocate(macro_xs(n_materials)) diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index ad143facb9..7786537db5 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -374,7 +374,7 @@ module nuclide_header if (allocated(this % k_fission)) then deallocate(this % k_fission) end if - if (allocated(this % chi)) then + if (allocated(this % chi)) then deallocate(this % chi) end if if (allocated(this % mult)) then @@ -400,7 +400,7 @@ module nuclide_header if (allocated(this % k_fission)) then deallocate(this % k_fission) end if - if (allocated(this % chi)) then + if (allocated(this % chi)) then deallocate(this % chi) end if diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 38e144e625..a63b1ce134 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -33,6 +33,7 @@ contains ! Store pre-collision particle properties p % last_wgt = p % wgt p % last_g = p % g + p % last_E = p % E p % last_uvw = p % coord(1) % uvw ! Add to collision counter for particle From 6ca9949a915e9c4b25784b36b6cea55fe8d7f4de Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 10 Nov 2015 04:54:35 -0500 Subject: [PATCH 028/149] Updated docs to reflect MG usage, though I still have to add the MGXS data format somewhere. Corrected ace.F90 typo pointed out by @samuelshaner --- docs/source/index.rst | 7 +- docs/source/usersguide/beginners.rst | 2 +- docs/source/usersguide/input.rst | 112 ++++++++++++++++++++++++--- docs/source/usersguide/install.rst | 26 +++++-- examples/xml/c5g7/2d/cmfd.xml | 11 +-- examples/xml/c5g7/2d/settings.xml | 2 +- src/ace.F90 | 2 +- src/input_xml.F90 | 2 +- 8 files changed, 131 insertions(+), 33 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 8dba920161..54ba825e58 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -4,9 +4,10 @@ The OpenMC Monte Carlo Code OpenMC is a Monte Carlo particle transport simulation code focused on neutron criticality calculations. It is capable of simulating 3D models based on -constructive solid geometry with second-order surfaces. The particle interaction -data is based on ACE format cross sections, also used in the MCNP and Serpent -Monte Carlo codes. +constructive solid geometry with second-order surfaces. OpenMC supports either +continuous-energy or multi-group transport. The continuous-energy +particle interaction data is based on ACE format cross sections, also used +in the MCNP and Serpent Monte Carlo codes. OpenMC was originally developed by members of the `Computational Reactor Physics Group`_ at the `Massachusetts Institute of Technology`_ starting diff --git a/docs/source/usersguide/beginners.rst b/docs/source/usersguide/beginners.rst index d65ee1f831..9ecffe3f67 100644 --- a/docs/source/usersguide/beginners.rst +++ b/docs/source/usersguide/beginners.rst @@ -12,7 +12,7 @@ In a nutshell, OpenMC simulates neutrons moving around randomly in a `nuclear reactor`_ (or other fissile system). This is what's known as `Monte Carlo`_ simulation. Neutrons are important in nuclear reactors because they are the particles that induce `fission`_ in uranium and other nuclides. Knowing the -behavior of neutrons allows you to figure out how often and where fission +behavior of neutrons allows you to determine how often and where fission occurs. The amount of energy released is then directly proportional to the fission reaction rate since most heat is produced by fission. By simulating many neutrons (millions or billions), it is possible to determine the average diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index d05dcdf71b..3e7a6ec174 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -114,7 +114,8 @@ The ```` element has no attributes and simply indicates the path to an XML cross section listing file (usually named cross_sections.xml). If this element is absent from the settings.xml file, the :envvar:`CROSS_SECTIONS` environment variable will be used to find the path to the XML cross section -listing. +listing when in continuous-energy mode, and the :envvar:`MG_CROSS_SECTIONS` +environment variable will be used in multi-group mode. ```` Element -------------------- @@ -212,8 +213,21 @@ cross section values between. *Default*: logarithm + .. note:: This element is not used in the multi-group :ref:`energy_mode`. + .. _LA-UR-14-24530: https://laws.lanl.gov/vhosts/mcnp.lanl.gov/pdf_files/la-ur-14-24530.pdf +.. _energy_mode: + +```` Element +------------------------- + +The ```` element tells OpenMC if the run-mode should be +continuous-energy or multi-group. Options for entry are: ``continuous-energy`` +or ``multi-group``. + + *Default*: continuous-energy + ```` Element --------------------- @@ -264,6 +278,20 @@ based on the recommended value in LA-UR-14-24530_. *Default*: 8000 + .. note:: This element is not used in the multi-group :ref:`energy_mode`. + +```` Element +--------------------------- + +The ```` element allows the user to set a maximum scattering order +to apply to every nuclide/material in the problem. That is, if the data +library has :math:`P_3` data available, but ```` was set to ``1``, +then, OpenMC will only use up to the :math:`P_1` data. + + *Default*: Use the maximum order in the data library + + .. note:: This element is not used in the continuous-energy :ref:`energy_mode`. + .. _natural_elements: ```` Element @@ -343,6 +371,8 @@ or sub-elements and can be set to either "false" or "true". *Default*: true + .. note:: This element is not used in the multi-group :ref:`energy_mode`. + ```` Element ---------------------------------- @@ -402,6 +432,8 @@ attributes or sub-elements: *Defaults*: None (scatterer), ARES (method), 0.01 eV (E_min), 1.0 keV (E_max) + .. note:: This element is not used in the multi-group :ref:`energy_mode`. + ```` Element ---------------------- @@ -514,6 +546,8 @@ attributes/sub-elements: *Default*: 0.988 2.249 + .. note:: The above format should be used even when using the multi-group :ref:`energy_mode`. + :write_initial: An element specifying whether to write out the initial source bank used at the beginning of the first batch. The output file is named @@ -1113,10 +1147,15 @@ Each ``material`` element can have the following attributes or sub-elements: :density: An element with attributes/sub-elements called ``value`` and ``units``. The ``value`` attribute is the numeric value of the density while the ``units`` - can be "g/cm3", "kg/m3", "atom/b-cm", "atom/cm3", or "sum". The "sum" unit - indicates that the density should be calculated as the sum of the atom - fractions for each nuclide in the material. This should not be used in - conjunction with weight percents. + can be "g/cm3", "kg/m3", "atom/b-cm", "atom/cm3", "sum", or "macro". + The "sum" unit indicates that the density should be calculated as the sum + of the atom fractions for each nuclide in the material. This should not be + used in conjunction with weight percents. The "macro" unit is used with + a ``macroscopic`` to indicate that the density is already included in the + library and thus not needed here. However, if a value is provided for the + ``value``, then this is treated as a number density multiplier on the + macroscopic cross sections in the multi-group data. This can be used, + for example, when perturbing the density slightly. *Default*: None @@ -1171,6 +1210,24 @@ Each ``material`` element can have the following attributes or sub-elements: *Default*: None + :macroscopic: + The ``macroscopic`` element is similar to the ``nuclide`` element, but, + recognizes that some multi-group libraries may be providing material + specific macroscopic cross sections instead of always providing nuclide + specific data like in the continuous-energy case. To that end, the + macroscopic element has attributes/sub-elements called ``name``, and ``xs``. + The ``name`` attribute is the name of the cross-section for a + desired nuclide while the ``xs`` attribute is the cross-section + identifier. One example would be as follows: + + .. code-block:: xml + + + + .. note:: This element is not used in the multi-group :ref:`energy_mode`. + + *Default*: None + .. _IUPAC Isotopic Compositions of the Elements 2009: http://pac.iupac.org/publications/pac/pdf/2011/pdf/8302x0397.pdf @@ -1257,7 +1314,8 @@ The ```` element accepts the following sub-elements: A list of universes for which the tally should be accumulated. :energy: - A monotonically increasing list of bounding **pre-collision** energies + In continuous-energy mode, this filter should be provided as a + monotonically increasing list of bounding **pre-collision** energies for a number of groups. For example, if this filter is specified as .. code-block:: xml @@ -1267,17 +1325,40 @@ The ```` element accepts the following sub-elements: then two energy bins will be created, one with energies between 0 and 1 MeV and the other with energies between 1 and 20 MeV. + In multi-group mode, however, the bounds of the filter are already + implied as being the same as the group boundaries of the problem. + Therefore no bins would be needed as they are implicitly applied by + the code. For example, the above filter example for continuous-energy + mode would look like the following for multi-group mode, but the + resultant tallies would still be done for every group in the library: + + .. code-block:: xml + + + :energyout: - A monotonically increasing list of bounding **post-collision** - energies for a number of groups. For example, if this filter is - specified as + In continuous-energy mode, this filter should be provided as a + monotonically increasing list of bounding **post-collision** energies + for a number of groups. For example, if this filter is specified as .. code-block:: xml - then two post-collision energy bins will be created, one with energies - between 0 and 1 MeV and the other with energies between 1 and 20 MeV. + then two post-collision energy bins will be created, one with + energies between 0 and 1 MeV and the other with energies between + 1 and 20 MeV. + + In multi-group mode, however, the bounds of the filter are already + implied as being the same as the group boundaries of the problem. + Therefore no bins would be needed as they are implicitly applied by + the code. For example, the above filter example for continuous-energy + mode would look like the following for multi-group mode, but the + resultant tallies would still be done for every group in the library: + + .. code-block:: xml + + :mu: A monotonically increasing list of bounding **post-collision** cosines @@ -1361,6 +1442,8 @@ The ```` element accepts the following sub-elements: + .. note:: This filter type is not used in the multi-group :ref:`energy_mode`. + :nuclides: If specified, the scores listed will be for particular nuclides, not the summation of reactions from all nuclides. The format for nuclides should be @@ -1424,6 +1507,8 @@ The ```` element accepts the following sub-elements: Total production of delayed neutrons due to fission. Units are neutrons produced per source neutron. + .. note:: This score type is not used in the multi-group :ref:`energy_mode`. + :kappa-fission: The recoverable energy production rate due to fission. The recoverable energy is defined as the fission product kinetic energy, prompt and @@ -1494,6 +1579,8 @@ The ```` element accepts the following sub-elements: The ``analog`` estimator is actually identical to the ``collision`` estimator for the inverse-velocity score. + .. note:: This score type is not used in the multi-group :ref:`energy_mode`. + :events: Number of scoring events. Units are events per source particle. @@ -1871,6 +1958,9 @@ attributes/sub-elements: automatically assumes a one energy group calculation over the entire energy range. + .. note:: When running in the multi-group :ref:`energy_mode`, these + energy bins must match the data library's group boundaries. + :albedo: Surface ratio of incoming to outgoing partial currents on global boundary conditions. They are listed in the following order: -x +x -y +y -z +z. diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index dcf990bdad..246e343c1e 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -366,11 +366,17 @@ Cross Section Configuration --------------------------- In order to run a simulation with OpenMC, you will need cross section data for -each nuclide in your problem. Since OpenMC uses ACE format cross sections, you -can use nuclear data that was processed with NJOY_, such as that distributed -with MCNP_ or Serpent_. Several sources provide free processed ACE data as -described below. The TALYS-based evaluated nuclear data library, TENDL_, is also -openly available in ACE format. +each nuclide or material in your problem. OpenMC can be run in +continuous-energy or multi-group mode. + +In continuous-energy mode OpenMC uses ACE format cross sections; in this case +you can use nuclear data that was processed with NJOY_, such as that +distributed with MCNP_ or Serpent_. Several sources provide free processed +ACE data as described below. The TALYS-based evaluated nuclear data library, +TENDL_, is also openly available in ACE format. + +In multi-group mode, OpenMC utilizes an XML-based library format which can be +used to describe nuclidic- or material-specific quantities. Using ENDF/B-VII.1 Cross Sections from NNDC ------------------------------------------- @@ -435,6 +441,16 @@ distribution to the location of the Serpent cross sections. Then, either set the environment variable to the absolute path of the ``cross_sections_serpent.xml`` file. +Using Multi-Group Cross Sections +-------------------------------- + +Multi-group cross section libraries are generally tailored to the specific +calculation to be performed. Therefore, at this point in time, OpenMC is not +distributed with any pre-existing multi-group cross section libraries. +However, if the user has obtained or generated their own library, the user +should set the :envvar:`MG_CROSS_SECTIONS` environment variable +to the absolute path of the file library expected to used most frequently. + .. _NJOY: http://t2.lanl.gov/nis/codes.shtml .. _NNDC: http://www.nndc.bnl.gov/endf/b7.1/acefiles.html .. _NEA: http://www.oecd-nea.org diff --git a/examples/xml/c5g7/2d/cmfd.xml b/examples/xml/c5g7/2d/cmfd.xml index aa3deb4b67..8e8d77490c 100644 --- a/examples/xml/c5g7/2d/cmfd.xml +++ b/examples/xml/c5g7/2d/cmfd.xml @@ -1,21 +1,12 @@ - 2 + 10 true 0.0 0.0 -100.0 64.26 64.26 100.0 6 6 1 - - - 2 2 2 2 1 1 - 2 2 2 2 1 1 - 2 2 2 2 1 1 - 2 2 2 2 1 1 - 1 1 1 1 1 1 - 1 1 1 1 1 1 - 1 0 0 1 1 1 diff --git a/examples/xml/c5g7/2d/settings.xml b/examples/xml/c5g7/2d/settings.xml index 2ad738704a..038c80c303 100644 --- a/examples/xml/c5g7/2d/settings.xml +++ b/examples/xml/c5g7/2d/settings.xml @@ -8,7 +8,7 @@ 2000 500 - 1000 + 10000 - 2000 - 500 + 100 + 10 1000 diff --git a/openmc/__init__.py b/openmc/__init__.py index 397d9f3e27..5bdc3f089a 100644 --- a/openmc/__init__.py +++ b/openmc/__init__.py @@ -1,11 +1,13 @@ from openmc.element import * from openmc.geometry import * from openmc.nuclide import * +from openmc.macroscopic import * from openmc.material import * from openmc.plots import * from openmc.settings import * from openmc.surface import * from openmc.universe import * +from openmc.mgxs_library import * from openmc.mesh import * from openmc.filter import * from openmc.trigger import * diff --git a/openmc/checkvalue.py b/openmc/checkvalue.py index 787052f5d6..303f784078 100644 --- a/openmc/checkvalue.py +++ b/openmc/checkvalue.py @@ -127,7 +127,7 @@ def check_iterable_type(name, value, expected_type, min_depth=1, max_depth=1): # But first, have we exceeded the max depth? if len(tree) > max_depth: msg = 'Error setting {0}: Found an iterable at {1}, items '\ - 'in that iterable excceed the maximum depth of {2}' \ + 'in that iterable exceed the maximum depth of {2}' \ .format(name, ind_str, max_depth) raise ValueError(msg) diff --git a/openmc/material.py b/openmc/material.py index b8d13eb979..4ccc9485e0 100644 --- a/openmc/material.py +++ b/openmc/material.py @@ -325,17 +325,16 @@ class Material(object): """ - # Ensureno nuclides, elements, or sab are added since these would be + # Ensure no nuclides, elements, or sab are added since these would be # incompatible with macroscopics - if (not self._nuclides) and (not self._elements) and (not self._sab): + if ((len(self._nuclides.keys()) != 0) and + (len(self._elements.keys()) != 0) and (len(self._sab) != 0)): msg = 'Unable to add a Macroscopic data set to Material ID="{0}" ' \ 'with a macroscopic value "{1}" as an incompatible data ' \ 'member (i.e., nuclide, element, or S(a,b) table) ' \ 'has already been added'.format(self._id, macroscopic) raise ValueError(msg) - - if not isinstance(macroscopic, (openmc.Macroscopic, str)): msg = 'Unable to add a Macroscopic to Material ID="{0}" with a ' \ 'non-Macroscopic value "{1}"'.format(self._id, macroscopic) @@ -348,7 +347,7 @@ class Material(object): else: macroscopic = openmc.Macroscopic(macroscopic) - if self._macroscopic is not None: + if self._macroscopic is None: self._macroscopic = macroscopic else: msg = 'Unable to add a Macroscopic to Material ID="{0}", ' \ @@ -577,7 +576,7 @@ class Material(object): element.append(subelement) else: # Create macroscopic XML subelements - subelement = self._get_macroscopic_xml(self, self._macroscopic) + subelement = self._get_macroscopic_xml(self._macroscopic) element.append(subelement) else: diff --git a/openmc/mgxs/groups.py b/openmc/mgxs/groups.py index 3436c0e037..e6838b36ba 100644 --- a/openmc/mgxs/groups.py +++ b/openmc/mgxs/groups.py @@ -54,7 +54,7 @@ class EnergyGroups(object): def __eq__(self, other): if not isinstance(other, EnergyGroups): return False - elif self.group_edges != other.group_edges: + elif (self.group_edges != other.group_edges).all(): return False else: return True diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 70023c2c89..282997983b 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -10,7 +10,8 @@ import numpy as np import openmc from openmc.mgxs import EnergyGroups -from openmc.checkvalue import check_type, check_value, check_greater_than +from openmc.checkvalue import check_type, check_value, check_greater_than, \ + check_iterable_type from openmc.clean_xml import * # MGXS Representations supported by OpenMC @@ -114,6 +115,7 @@ class Xsdata(object): self._nu_fission = None self._k_fission = None self._chi = None + self._use_chi = None @property def name(self): @@ -123,6 +125,11 @@ class Xsdata(object): def energy_groups(self): return self._energy_groups + @property + def representation(self): + return self._representation + + @property def alias(self): return self._alias @@ -202,7 +209,9 @@ class Xsdata(object): check_type("energy_groups", energy_groups, EnergyGroups) # Check that there is one or more groups - if (energy_groups.num_energy_groups.num_group is None) or (energy_groups.num_energy_groups.num_group < 1): + if ((energy_groups.num_energy_groups.num_group is None) or + (energy_groups.num_energy_groups.num_group < 1)): + msg = 'energy_groups object incorrectly initialized.' raise ValueError(msg) @@ -262,13 +271,15 @@ class Xsdata(object): num_points = 33 self._tabular_legendre = {'enable': enable, 'num_points': num_points} - @num_polar.setter(self, num_polar): + @num_polar.setter + def num_polar(self, num_polar): # Make sure we have positive ints check_value("num_polar", num_polar, Integral) check_greater_than("num_polar", num_polar, 0) self._num_polar = num_polar - @num_azimuthal.setter(self, num_azimuthal): + @num_azimuthal.setter + def num_azimuthal(self, num_azimuthal): check_value("num_azimuthal", num_azimuthal, Integral) check_greater_than("num_azimuthal", num_azimuthal, 0) self._num_azimuthal = num_azimuthal @@ -276,10 +287,10 @@ class Xsdata(object): @total.setter def total(self, total): if self._representation is 'isotropic': - shape = (self._energy_groups.num_group) + shape = (self._energy_groups.num_groups,) elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + self._energy_groups.num_groups) # check we have a numpy list check_type("total", total, np.ndarray, expected_iter_type=Real) if total.shape == shape: @@ -292,10 +303,10 @@ class Xsdata(object): @absorption.setter def absorption(self, absorption): if self._representation is 'isotropic': - shape = (self._energy_groups.num_group) + shape = (self._energy_groups.num_groups,) elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + self._energy_groups.num_groups) # check we have a numpy list check_type("absorption", absorption, np.ndarray, expected_iter_type=Real) if absorption.shape == shape: @@ -308,10 +319,10 @@ class Xsdata(object): @fission.setter def fission(self, fission): if self._representation is 'isotropic': - shape = (self._energy_groups.num_group) + shape = (self._energy_groups.num_groups,) elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + self._energy_groups.num_groups) # check we have a numpy list check_type("fission", fission, np.ndarray, expected_iter_type=Real) if fission.shape == shape: @@ -326,10 +337,10 @@ class Xsdata(object): @k_fission.setter def k_fission(self, k_fission): if self._representation is 'isotropic': - shape = (self._energy_groups.num_group) + shape = (self._energy_groups.num_groups,) elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + self._energy_groups.num_groups) # check we have a numpy list check_type("k_fission", k_fission, np.ndarray, expected_iter_type=Real) if k_fission.shape == shape: @@ -343,14 +354,14 @@ class Xsdata(object): @chi.setter def chi(self, chi): - if self._use_chi is not None: + if not self._use_chi: msg = 'Providing chi when nu_fission already provided as matrix!' raise ValueError(msg) if self._representation is 'isotropic': - shape = (self._energy_groups.num_group) + shape = (self._energy_groups.num_groups,) elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + self._energy_groups.num_groups) # check we have a numpy list check_type("chi", chi, np.ndarray, expected_iter_type=Real) if chi.shape == shape: @@ -365,14 +376,17 @@ class Xsdata(object): @scatter.setter def scatter(self, scatter): if self._representation is 'isotropic': - shape = (self.num_orders, self._energy_groups.num_group, - self._energy_groups.num_group) + shape = (self.num_orders, self._energy_groups.num_groups, + self._energy_groups.num_groups) + max_depth = 3 elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, self.num_orders, - self._energy_groups.num_group, - self._energy_groups.num_group) + self._energy_groups.num_groups, + self._energy_groups.num_groups) + max_depth = 5 # check we have a numpy list - check_type("scatter", scatter, np.ndarray, expected_iter_type=Real) + check_iterable_type("scatter", scatter, expected_type=Real, + max_depth=max_depth) if scatter.shape == shape: self._scatter = np.copy(scatter) else: @@ -384,14 +398,16 @@ class Xsdata(object): def multiplicity(self, multiplicity): if self._representation is 'isotropic': shape = (self._energy_groups.num_group, - self._energy_groups.num_group) + self._energy_groups.num_groups) + max_depth = 2 elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, self._energy_groups.num_group, - self._energy_groups.num_group) + self._energy_groups.num_groups) + max_depth = 4 # check we have a numpy list - check_type("multiplicity", multiplicity, np.ndarray, - expected_iter_type=Real) + check_iterable_type("multiplicity", multiplicity, expected_type=Real, + max_depth=max_depth) if multiplicity.shape == shape: self._multiplicity = np.copy(multiplicity) else: @@ -411,15 +427,15 @@ class Xsdata(object): # First lets set our dimensions here since they get used repeatedly # throughout this code. if self._representation is 'isotropic': - shape_vec = (self._energy_groups.num_group) - shape_mat = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + shape_vec = (self._energy_groups.num_groups,) + shape_mat = (self._energy_groups.num_groups, + self._energy_groups.num_groups) elif self._representation is 'angle': shape_vec = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group) + self._energy_groups.num_groups) shape_mat = (self._num_polar, self._num_azimuthal, self._energy_groups.num_group, - self._energy_groups.num_group) + self._energy_groups.num_groups) # Begin by checking the case when chi has already been given and thus # the rules for filling in nu_fission are set. @@ -428,7 +444,7 @@ class Xsdata(object): shape = shape_vec else: shape = shape_mat - if nu_fission.shape /= shape: + if nu_fission.shape != shape: msg = "Invalid Shape of Nu_fission!" raise ValueError(msg) else: @@ -436,7 +452,7 @@ class Xsdata(object): if nu_fission.shape == shape_vec: self._use_chi = True shape = shape_vec - elif nu_fission.shape = shape_mat: + elif nu_fission.shape == shape_mat: self._use_chi = False shape = shape_mat else: @@ -449,77 +465,77 @@ class Xsdata(object): def _get_xsdata_xml(self): element = ET.Element("xsdata") - element.set("name", xsdata._name) + element.set("name", self._name) - if xsdata._alias is not None: + if self._alias is not None: subelement = ET.SubElement(element, 'alias') - subelement.text(xsdata.alias) + subelement.text = self.alias - if xsdata._kT is not None: + if self._kT is not None: subelement = ET.SubElement(element, 'kT') - subelement.text(str(self._kT)) + subelement.text = str(self._kT) - if xsdata._fissionable is not None: + if self._fissionable is not None: subelement = ET.SubElement(element, 'fissionable') - subelement.text(str(self._fissionable)) + subelement.text = str(self._fissionable) - if xsdata._representation is not None: + if self._representation is not None: subelement = ET.SubElement(element, 'representation') - subelement.text(self._representation) + subelement.text = self._representation - if xsdata._representation == 'angle': - if xsdata._num_azimuthal is not None: + if self._representation == 'angle': + if self._num_azimuthal is not None: subelement = ET.SubElement(element, 'num_azimuthal') - subelement.text(str(self._num_azimuthal)) - if xsdata._num_polar is not None: + subelement.text = str(self._num_azimuthal) + if self._num_polar is not None: subelement = ET.SubElement(element, 'num_polar') - subelement.text(str(self._num_polar)) + subelement.text = str(self._num_polar) - if xsdata._scatt_type is not None: + if self._scatt_type is not None: subelement = ET.SubElement(element, 'scatt_type') - subelement.text(self._scatt_type) + subelement.text = self._scatt_type - if xsdata._order is not None: + if self._order is not None: subelement = ET.SubElement(element, 'order') - subelement.text(str(self._order)) + subelement.text = str(self._order) - if xsdata._tabular_legendre is not None: + if self._tabular_legendre is not None: subelement = ET.SubElement(element, 'tabular_legendre') - subelement.set('enable', str(xsdata._tabular_legendre['enable'])) - subelement.set('num_points', str(xsdata._tabular_legendre['num_points'])) + subelement.set('enable', str(self._tabular_legendre['enable'])) + subelement.set('num_points', str(self._tabular_legendre['num_points'])) if self._total is not None: subelement = ET.SubElement(element, 'total') - subelement.text(ndarray_to_string(self._total)) + subelement.text = ndarray_to_string(self._total) if self._absorption is not None: subelement = ET.SubElement(element, 'absorption') - subelement.text(ndarray_to_string(self._absorption)) + subelement.text = ndarray_to_string(self._absorption) if self._scatter is not None: subelement = ET.SubElement(element, 'scatter') - subelement.text(ndarray_to_string(self._scatter)) + subelement.text = ndarray_to_string(self._scatter) if self._multiplicity is not None: subelement = ET.SubElement(element, 'multiplicity') - subelement.text(ndarray_to_string(self._multiplicity)) + subelement.text = ndarray_to_string(self._multiplicity) if self._fissionable: if self._fission is not None: subelement = ET.SubElement(element, 'fission') - subelement.text(ndarray_to_string(self._fission)) + subelement.text = ndarray_to_string(self._fission) if self._k_fission is not None: subelement = ET.SubElement(element, 'k_fission') - subelement.text(ndarray_to_string(self._k_fission)) + subelement.text = ndarray_to_string(self._k_fission) if self._nu_fission is not None: subelement = ET.SubElement(element, 'nu_fission') - subelement.text(ndarray_to_string(self._nu_fission)) + subelement.text = ndarray_to_string(self._nu_fission) if self._chi is not None: subelement = ET.SubElement(element, 'chi') - subelement.text(ndarray_to_string(self._chi)) + subelement.text = ndarray_to_string(self._chi) return element @@ -581,7 +597,7 @@ class MGXSLibraryFile(object): raise ValueError(msg) # Make sure energy groups match. - if xsdata.energy_groups /= self._energy_groups: + if xsdata.energy_groups != self._energy_groups: msg = 'Energy groups of Xsdata do not match that of MGXSLibraryFile!' raise ValueError(msg) @@ -625,7 +641,7 @@ class MGXSLibraryFile(object): def _create_groups_subelement(self): if self._energy_groups is not None: element = ET.SubElement(self._cross_sections_file, "groups") - element.text = str(self._energy_groups.num_group) + element.text = str(self._energy_groups.num_groups) def _create_group_structure_subelement(self): if self._energy_groups is not None: @@ -641,7 +657,7 @@ class MGXSLibraryFile(object): def _create_xsdata_subelements(self): for xsdata in self._xsdatas: - xml_element = xsdata.get_xsdata_xml() + xml_element = xsdata._get_xsdata_xml() self._cross_sections_file.append(xml_element) From 5e788cdffb7f5ba836da4a9c5c114c19d0c3b8f6 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 16 Nov 2015 05:31:40 -0500 Subject: [PATCH 039/149] Whoops, forgot to add --- .../python/pincell_multigroup/build-xml.py | 185 ++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 examples/python/pincell_multigroup/build-xml.py diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py new file mode 100644 index 0000000000..300f36ce01 --- /dev/null +++ b/examples/python/pincell_multigroup/build-xml.py @@ -0,0 +1,185 @@ +import openmc +import openmc.mgxs +import numpy as np + +############################################################################### +# Simulation Input File Parameters +############################################################################### + +# OpenMC simulation parameters +batches = 100 +inactive = 10 +particles = 1000 + +############################################################################### +# Exporting to OpenMC mg_cross_sections.xml File +############################################################################### + +# Instantiate the energy group data +groups = openmc.mgxs.EnergyGroups(group_edges=[1E-11, 0.0635E-6, 10.0E-6, + 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) + +# Instantiate the 7-group (C5G7) cross section data +uo2_xsdata = openmc.Xsdata('UO2.300k', groups) +uo2_xsdata.order = 0 +uo2_xsdata.total = np.array([0.1779492, 0.3298048, 0.4803882, 0.5543674, + 0.3118013, 0.3951678, 0.5644058]) +uo2_xsdata.absorption = np.array([8.0248E-03, 3.7174E-03, 2.6769E-02, 9.6236E-02, + 3.0020E-02, 1.1126E-01, 2.8278E-01]) +scatter = [[[0.1275370, 0.0423780, 0.0000094, 0.0000000, 0.0000000, 0.0000000, 0.0000000], + [0.0000000, 0.3244560, 0.0016314, 0.0000000, 0.0000000, 0.0000000, 0.0000000], + [0.0000000, 0.0000000, 0.4509400, 0.0026792, 0.0000000, 0.0000000, 0.0000000], + [0.0000000, 0.0000000, 0.0000000, 0.4525650, 0.0055664, 0.0000000, 0.0000000], + [0.0000000, 0.0000000, 0.0000000, 0.0001253, 0.2714010, 0.0102550, 0.0000000], + [0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0012968, 0.2658020, 0.0168090], + [0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0085458, 0.2730800]]] +uo2_xsdata.scatter = np.array(scatter[:][:]) +uo2_xsdata.fission = np.array([7.21206E-03, 8.19301E-04, 6.45320E-03, + 1.85648E-02, 1.78084E-02, 8.30348E-02, + 2.16004E-01]) +uo2_xsdata.nu_fission = np.array([2.005998E-02, 2.027303E-03, 1.570599E-02, + 4.518301E-02, 4.334208E-02, 2.020901E-01, + 5.257105E-01]) +uo2_xsdata.chi = np.array([5.8791E-01, 4.1176E-01, 3.3906E-04, 1.1761E-07, + 0.0000E+00, 0.0000E+00, 0.0000E+00]) + +h2o_xsdata = openmc.Xsdata('LWTR.300k', groups) +h2o_xsdata.order = 0 +h2o_xsdata.total = np.array([0.15920605, 0.412969593, 0.59030986, 0.58435, + 0.718, 1.2544497, 2.650379]) +h2o_xsdata.absorption = np.array([6.0105E-04, 1.5793E-05, 3.3716E-04, + 1.9406E-03, 5.7416E-03, 1.5001E-02, + 3.7239E-02]) +scatter = [[[0.0444777, 0.1134000, 0.0007235, 0.0000037, 0.0000001, 0.0000000, 0.0000000], + [0.0000000, 0.2823340, 0.1299400, 0.0006234, 0.0000480, 0.0000074, 0.0000010], + [0.0000000, 0.0000000, 0.3452560, 0.2245700, 0.0169990, 0.0026443, 0.0005034], + [0.0000000, 0.0000000, 0.0000000, 0.0910284, 0.4155100, 0.0637320, 0.0121390], + [0.0000000, 0.0000000, 0.0000000, 0.0000714, 0.1391380, 0.5118200, 0.0612290], + [0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0022157, 0.6999130, 0.5373200], + [0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.1324400, 2.4807000]]] +h2o_xsdata.scatter = np.array(scatter[:][:]) + +mg_cross_sections_file = openmc.MGXSLibraryFile(groups) +mg_cross_sections_file.add_xsdatas([uo2_xsdata,h2o_xsdata]) +mg_cross_sections_file.export_to_xml() + + +############################################################################### +# Exporting to OpenMC materials.xml File +############################################################################### + +# Instantiate some Macroscopic Data +uo2_data = openmc.Macroscopic('UO2', '300k') +h2o_data = openmc.Macroscopic('LWTR', '300k') + +# Instantiate some Materials and register the appropriate Nuclides +uo2 = openmc.Material(material_id=1, name='UO2 fuel') +uo2.set_density('macro', 1.0) +uo2.add_macroscopic(uo2_data) + +water = openmc.Material(material_id=2, name='Water') +water.set_density('macro', 1.0) +water.add_macroscopic(h2o_data) + +# Instantiate a MaterialsFile, register all Materials, and export to XML +materials_file = openmc.MaterialsFile() +materials_file.default_xs = '300k' +materials_file.add_materials([uo2, water]) +materials_file.export_to_xml() + + +############################################################################### +# Exporting to OpenMC geometry.xml File +############################################################################### + +# Instantiate ZCylinder surfaces +fuel_or = openmc.ZCylinder(surface_id=1, x0=0, y0=0, R=0.54, name='Fuel OR') +left = openmc.XPlane(surface_id=4, x0=-0.63, name='left') +right = openmc.XPlane(surface_id=5, x0=0.63, name='right') +bottom = openmc.YPlane(surface_id=6, y0=-0.63, name='bottom') +top = openmc.YPlane(surface_id=7, y0=0.63, name='top') + +left.boundary_type = 'reflective' +right.boundary_type = 'reflective' +top.boundary_type = 'reflective' +bottom.boundary_type = 'reflective' + +# Instantiate Cells +fuel = openmc.Cell(cell_id=1, name='cell 1') +moderator = openmc.Cell(cell_id=2, name='cell 2') + +# Use surface half-spaces to define regions +fuel.region = -fuel_or +moderator.region = +fuel_or & +left & -right & +bottom & -top + +# Register Materials with Cells +fuel.fill = uo2 +moderator.fill = water + +# Instantiate Universe +root = openmc.Universe(universe_id=0, name='root universe') + +# Register Cells with Universe +root.add_cells([fuel, moderator]) + +# Instantiate a Geometry and register the root Universe +geometry = openmc.Geometry() +geometry.root_universe = root + +# Instantiate a GeometryFile, register Geometry, and export to XML +geometry_file = openmc.GeometryFile() +geometry_file.geometry = geometry +geometry_file.export_to_xml() + + +############################################################################### +# Exporting to OpenMC settings.xml File +############################################################################### + +# Instantiate a SettingsFile, set all runtime parameters, and export to XML +settings_file = openmc.SettingsFile() +settings_file.energy_mode = "multi-group" +settings_file.cross_sections = "./mg_cross_sections.xml" +settings_file.batches = batches +settings_file.inactive = inactive +settings_file.particles = particles +settings_file.set_source_space('box', [-0.63, -0.63, -1, \ + 0.63, 0.63, 1]) +settings_file.entropy_lower_left = [-0.54, -0.54, -1.e50] +settings_file.entropy_upper_right = [0.54, 0.54, 1.e50] +settings_file.entropy_dimension = [10, 10, 1] +settings_file.export_to_xml() + + +############################################################################### +# Exporting to OpenMC tallies.xml File +############################################################################### + +# Instantiate a tally mesh +mesh = openmc.Mesh(mesh_id=1) +mesh.type = 'regular' +mesh.dimension = [100, 100, 1] +mesh.lower_left = [-0.63, -0.63, -1.e50] +mesh.upper_right = [0.63, 0.63, 1.e50] + +# Instantiate some tally Filters +# energy_filter = openmc.Filter(type='energy', +# bins=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, +# 0.5, 1.0, 20.0]) +energy_filter = openmc.Filter(type='energy') +mesh_filter = openmc.Filter() +mesh_filter.mesh = mesh + +# Instantiate the Tally +tally = openmc.Tally(tally_id=1, name='tally 1') +tally.add_filter(energy_filter) +tally.add_filter(mesh_filter) +tally.add_score('flux') +tally.add_score('fission') +tally.add_score('nu-fission') + +# Instantiate a TalliesFile, register all Tallies, and export to XML +tallies_file = openmc.TalliesFile() +tallies_file.add_mesh(mesh) +tallies_file.add_tally(tally) +tallies_file.export_to_xml() From 5965e92e46e6b12f0212220c8bcb105e7ac1344c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 16 Nov 2015 20:33:42 -0500 Subject: [PATCH 040/149] fixed formatting of python api created mgxs library, added example pincell_multigroup to xml folder, and removed c5g7 as that will be pushed to benchmarks instead once this is complete. --- examples/xml/c5g7/2d/cmfd.xml | 12 -- examples/xml/c5g7/2d/geometry.xml | 118 --------------- examples/xml/c5g7/2d/materials.xml | 1 - examples/xml/c5g7/2d/plots.xml | 29 ---- examples/xml/c5g7/2d/settings.xml | 44 ------ examples/xml/c5g7/2d/tallies.xml | 25 ---- examples/xml/c5g7/3d/geometry.xml | 138 ------------------ examples/xml/c5g7/3d/materials.xml | 1 - examples/xml/c5g7/3d/plots.xml | 42 ------ examples/xml/c5g7/3d/settings.xml | 47 ------ examples/xml/c5g7/3d/tallies.xml | 33 ----- examples/xml/c5g7/pin/materials.xml | 1 - examples/xml/c5g7/pin/tallies.xml | 16 -- .../pin => pincell_multigroup}/geometry.xml | 0 .../materials.xml | 0 .../mg_cross_sections.xml} | 0 .../pin => pincell_multigroup}/plots.xml | 0 .../pin => pincell_multigroup}/settings.xml | 2 +- examples/xml/pincell_multigroup/tallies.xml | 13 ++ openmc/mgxs_library.py | 54 ++++--- 20 files changed, 47 insertions(+), 529 deletions(-) delete mode 100644 examples/xml/c5g7/2d/cmfd.xml delete mode 100644 examples/xml/c5g7/2d/geometry.xml delete mode 120000 examples/xml/c5g7/2d/materials.xml delete mode 100644 examples/xml/c5g7/2d/plots.xml delete mode 100644 examples/xml/c5g7/2d/settings.xml delete mode 100644 examples/xml/c5g7/2d/tallies.xml delete mode 100644 examples/xml/c5g7/3d/geometry.xml delete mode 120000 examples/xml/c5g7/3d/materials.xml delete mode 100644 examples/xml/c5g7/3d/plots.xml delete mode 100644 examples/xml/c5g7/3d/settings.xml delete mode 100644 examples/xml/c5g7/3d/tallies.xml delete mode 120000 examples/xml/c5g7/pin/materials.xml delete mode 100644 examples/xml/c5g7/pin/tallies.xml rename examples/xml/{c5g7/pin => pincell_multigroup}/geometry.xml (100%) rename examples/xml/{c5g7 => pincell_multigroup}/materials.xml (100%) rename examples/xml/{c5g7/data.xml => pincell_multigroup/mg_cross_sections.xml} (100%) rename examples/xml/{c5g7/pin => pincell_multigroup}/plots.xml (100%) rename examples/xml/{c5g7/pin => pincell_multigroup}/settings.xml (94%) create mode 100644 examples/xml/pincell_multigroup/tallies.xml diff --git a/examples/xml/c5g7/2d/cmfd.xml b/examples/xml/c5g7/2d/cmfd.xml deleted file mode 100644 index 8e8d77490c..0000000000 --- a/examples/xml/c5g7/2d/cmfd.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - 10 - true - - 0.0 0.0 -100.0 - 64.26 64.26 100.0 - 6 6 1 - 1 0 0 1 1 1 - - diff --git a/examples/xml/c5g7/2d/geometry.xml b/examples/xml/c5g7/2d/geometry.xml deleted file mode 100644 index 3b43562f37..0000000000 --- a/examples/xml/c5g7/2d/geometry.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 - 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 6 1 1 6 1 1 5 1 1 6 1 1 6 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 - 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - - - - - 0 - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 - 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 - 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 - 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 - 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 - 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 6 4 4 6 4 4 5 4 4 6 4 4 6 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 - 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 - 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 - 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 - 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 - 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 - - - - - - - - - - - - - - - 0 - 3 3 - 0.0 0.0 - 21.42 21.42 - - 10 11 12 - 11 10 12 - 12 12 12 - - - - - - - diff --git a/examples/xml/c5g7/2d/materials.xml b/examples/xml/c5g7/2d/materials.xml deleted file mode 120000 index c3825cffc5..0000000000 --- a/examples/xml/c5g7/2d/materials.xml +++ /dev/null @@ -1 +0,0 @@ -/home/nelsonag/cases/c5g7/materials.xml \ No newline at end of file diff --git a/examples/xml/c5g7/2d/plots.xml b/examples/xml/c5g7/2d/plots.xml deleted file mode 100644 index a38f73f4e3..0000000000 --- a/examples/xml/c5g7/2d/plots.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - 1 - mat - material - 32.13 32.13 0 - 64.26 64.26 - slice - 1000 1000 - - - - - 2 - cell - cell - 32.13 32.13 0 - 64.26 64.26 - slice - 1000 1000 - - - diff --git a/examples/xml/c5g7/2d/settings.xml b/examples/xml/c5g7/2d/settings.xml deleted file mode 100644 index 038c80c303..0000000000 --- a/examples/xml/c5g7/2d/settings.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - multi-group - - - 2000 - 500 - 10000 - - - - - - - 0.0 21.42 -100 - 42.84 64.26 100 - - - - - - - 2000 - true - - - - true - true - true - - - true - - ../data.xml - - diff --git a/examples/xml/c5g7/2d/tallies.xml b/examples/xml/c5g7/2d/tallies.xml deleted file mode 100644 index 8b21bf524a..0000000000 --- a/examples/xml/c5g7/2d/tallies.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - flux - - - - - fission - - - - 1 - regular - 0.0 0.0 -100.0 - 64.26 64.26 100.0 - 51 51 1 - - - false - - diff --git a/examples/xml/c5g7/3d/geometry.xml b/examples/xml/c5g7/3d/geometry.xml deleted file mode 100644 index b7766b32a0..0000000000 --- a/examples/xml/c5g7/3d/geometry.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 - 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 6 1 1 6 1 1 5 1 1 6 1 1 6 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1 - 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - - - - - 0 - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 - 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 - 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 - 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 - 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 - 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 6 4 4 6 4 4 5 4 4 6 4 4 6 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2 - 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2 - 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2 - 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2 - 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2 - 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 - 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 - - - - - - - - - - - - - - - - 3 3 - 0.0 0.0 - 21.42 21.42 - - 10 11 12 - 11 10 12 - 12 12 12 - - - - - - - - - - - - 3 3 - 0.0 0.0 - 21.42 21.42 - - 13 13 13 - 13 13 13 - 13 13 13 - - - - - - - - \ No newline at end of file diff --git a/examples/xml/c5g7/3d/materials.xml b/examples/xml/c5g7/3d/materials.xml deleted file mode 120000 index c344223b66..0000000000 --- a/examples/xml/c5g7/3d/materials.xml +++ /dev/null @@ -1 +0,0 @@ -../materials.xml \ No newline at end of file diff --git a/examples/xml/c5g7/3d/plots.xml b/examples/xml/c5g7/3d/plots.xml deleted file mode 100644 index caab977866..0000000000 --- a/examples/xml/c5g7/3d/plots.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 1 - mat - material - 32.13 32.13 107.1 - 64.26 214.2 - slice - 1000 1000 - - xz - - - - 2 - cell - cell - 32.13 32.13 107.1 - 64.26 214.2 - slice - 1000 1000 - xz - - - - 3 - mat_xy - material - 32.13 32.13 107.1 - 64.26 64.26 - slice - 1000 1000 - xy - - - diff --git a/examples/xml/c5g7/3d/settings.xml b/examples/xml/c5g7/3d/settings.xml deleted file mode 100644 index 51241492d5..0000000000 --- a/examples/xml/c5g7/3d/settings.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - multi-group - - - 2000 - 500 - 1000 - - - - 0.0 21.42 0.0 - 42.84 64.26 192.78 - 34 34 54 - - - - - - - 0.0 21.42 0.0 - 42.84 64.26 192.78 - - - - - - - 2000 - - - - true - true - true - - - ../data.xml - - diff --git a/examples/xml/c5g7/3d/tallies.xml b/examples/xml/c5g7/3d/tallies.xml deleted file mode 100644 index e3826ccb63..0000000000 --- a/examples/xml/c5g7/3d/tallies.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - flux - - - - - fission - - - - 1 - rectangular - 0.0 0.0 0.0 - 64.26 64.26 214.2 - 51 51 60 - - - - 2 - rectangular - 0.0 21.42 0.0 - 42.84 64.26 192.78 - 34 34 54 - - - false - - diff --git a/examples/xml/c5g7/pin/materials.xml b/examples/xml/c5g7/pin/materials.xml deleted file mode 120000 index c3825cffc5..0000000000 --- a/examples/xml/c5g7/pin/materials.xml +++ /dev/null @@ -1 +0,0 @@ -/home/nelsonag/cases/c5g7/materials.xml \ No newline at end of file diff --git a/examples/xml/c5g7/pin/tallies.xml b/examples/xml/c5g7/pin/tallies.xml deleted file mode 100644 index 727584a627..0000000000 --- a/examples/xml/c5g7/pin/tallies.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - flux - - - - - - scatter - - - diff --git a/examples/xml/c5g7/pin/geometry.xml b/examples/xml/pincell_multigroup/geometry.xml similarity index 100% rename from examples/xml/c5g7/pin/geometry.xml rename to examples/xml/pincell_multigroup/geometry.xml diff --git a/examples/xml/c5g7/materials.xml b/examples/xml/pincell_multigroup/materials.xml similarity index 100% rename from examples/xml/c5g7/materials.xml rename to examples/xml/pincell_multigroup/materials.xml diff --git a/examples/xml/c5g7/data.xml b/examples/xml/pincell_multigroup/mg_cross_sections.xml similarity index 100% rename from examples/xml/c5g7/data.xml rename to examples/xml/pincell_multigroup/mg_cross_sections.xml diff --git a/examples/xml/c5g7/pin/plots.xml b/examples/xml/pincell_multigroup/plots.xml similarity index 100% rename from examples/xml/c5g7/pin/plots.xml rename to examples/xml/pincell_multigroup/plots.xml diff --git a/examples/xml/c5g7/pin/settings.xml b/examples/xml/pincell_multigroup/settings.xml similarity index 94% rename from examples/xml/c5g7/pin/settings.xml rename to examples/xml/pincell_multigroup/settings.xml index b11c328e5a..6bd27df3dd 100644 --- a/examples/xml/c5g7/pin/settings.xml +++ b/examples/xml/pincell_multigroup/settings.xml @@ -41,6 +41,6 @@ false - ../data.xml + ./mg_cross_sections.xml diff --git a/examples/xml/pincell_multigroup/tallies.xml b/examples/xml/pincell_multigroup/tallies.xml new file mode 100644 index 0000000000..ed9763be52 --- /dev/null +++ b/examples/xml/pincell_multigroup/tallies.xml @@ -0,0 +1,13 @@ + + + + 100 100 1 + -0.63 -0.63 -1e+50 + 0.63 0.63 1e+50 + + + + + flux fission nu-fission + + diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 282997983b..d1c1f4e05f 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -24,37 +24,49 @@ def ndarray_to_string(arr): shape = arr.shape ndim = arr.ndim - text = '' + tab = ' ' + indent = '\n' + tab + tab + text = indent if ndim == 1: - text += ' '.join(map(str, arr[:])) + text += tab + for i in range(shape[0]): + text += '{:.7E} '.format(arr[i]) + text += indent elif ndim == 2: - for i in xrange(shape[0]): - text += ' '.join(map(str, arr[i,:])) - text += '\n' + for i in range(shape[0]): + text += tab + for j in range(shape[1]): + text += '{:.7E} '.format(arr[i,j]) + text += indent elif ndim == 3: - for i in xrange(shape[0]): - for j in xrange(shape[1]): - text += ' '.join(map(str, arr[i,j,:])) - text += '\n' + for i in range(shape[0]): + for j in range(shape[1]): + text += tab + for k in range(shape[2]): + text += '{:.7E} '.format(arr[i,j,k]) + text += indent elif ndim == 4: - for i in xrange(shape[0]): - for j in xrange(shape[1]): - for k in xrange(shape[2]): - text += ' '.join(map(str, arr[i,j,k,:])) - text += '\n' + for i in range(shape[0]): + for j in range(shape[1]): + for k in range(shape[2]): + text += tab + for l in range(shape[3]): + text += '{:.7E} '.format(arr[i,j,k,l]) + text += indent elif ndim == 5: - for i in xrange(shape[0]): - for j in xrange(shape[1]): - for k in xrange(shape[2]): - for l in xrange(shape[3]): - text += ' '.join(map(str, arr[i,j,k,l,:])) - text += '\n' + for i in range(shape[0]): + for j in range(shape[1]): + for k in range(shape[2]): + for l in range(shape[3]): + text += tab + for m in range(shape[4]): + text += '{:.7E} '.format(arr[i,j,k,l,m]) + text += indent return text - class Xsdata(object): """A multi-group cross section data set (xsdata) providing all the multi-group data necessary for a multi-group OpenMC calculation. From 640409c412ad7cd1aa05bce4a7a942775bf58439 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 16 Nov 2015 20:56:07 -0500 Subject: [PATCH 041/149] Added back in requirement that user must input energy and energyout bins in MG mode --- docs/source/usersguide/input.rst | 24 +----- .../python/pincell_multigroup/build-xml.py | 7 +- examples/xml/pincell_multigroup/tallies.xml | 2 +- src/input_xml.F90 | 71 ++++++------------ src/relaxng/tallies.rnc | 2 +- src/relaxng/tallies.rng | 74 +++++++++---------- 6 files changed, 68 insertions(+), 112 deletions(-) diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index 0244b75fc3..069d483e36 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -1347,16 +1347,8 @@ The ```` element accepts the following sub-elements: then two energy bins will be created, one with energies between 0 and 1 MeV and the other with energies between 1 and 20 MeV. - In multi-group mode, however, the bounds of the filter are already - implied as being the same as the group boundaries of the problem. - Therefore no bins would be needed as they are implicitly applied by - the code. For example, the above filter example for continuous-energy - mode would look like the following for multi-group mode, but the - resultant tallies would still be done for every group in the library: - - .. code-block:: xml - - + In multi-group mode the bins provided must match group edges + defined in the multi-group library. :energyout: In continuous-energy mode, this filter should be provided as a @@ -1371,16 +1363,8 @@ The ```` element accepts the following sub-elements: energies between 0 and 1 MeV and the other with energies between 1 and 20 MeV. - In multi-group mode, however, the bounds of the filter are already - implied as being the same as the group boundaries of the problem. - Therefore no bins would be needed as they are implicitly applied by - the code. For example, the above filter example for continuous-energy - mode would look like the following for multi-group mode, but the - resultant tallies would still be done for every group in the library: - - .. code-block:: xml - - + In multi-group mode the bins provided must match group edges + defined in the multi-group library. :mu: A monotonically increasing list of bounding **post-collision** cosines diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py index 300f36ce01..bb4c2db14f 100644 --- a/examples/python/pincell_multigroup/build-xml.py +++ b/examples/python/pincell_multigroup/build-xml.py @@ -163,10 +163,9 @@ mesh.lower_left = [-0.63, -0.63, -1.e50] mesh.upper_right = [0.63, 0.63, 1.e50] # Instantiate some tally Filters -# energy_filter = openmc.Filter(type='energy', -# bins=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, -# 0.5, 1.0, 20.0]) -energy_filter = openmc.Filter(type='energy') +energy_filter = openmc.Filter(type='energy', + bins=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, + 0.5, 1.0, 20.0]) mesh_filter = openmc.Filter() mesh_filter.mesh = mesh diff --git a/examples/xml/pincell_multigroup/tallies.xml b/examples/xml/pincell_multigroup/tallies.xml index ed9763be52..df65b461db 100644 --- a/examples/xml/pincell_multigroup/tallies.xml +++ b/examples/xml/pincell_multigroup/tallies.xml @@ -6,7 +6,7 @@ 0.63 0.63 1e+50 - + flux fission nu-fission diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 2cc829454d..8e3e8d8e9c 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2623,25 +2623,10 @@ contains if (temp_str == 'energy' .or. temp_str == 'energyout' .or. & temp_str == 'mu' .or. temp_str == 'polar' .or. & temp_str == 'azimuthal') then - ! If in MG mode, fail if user provides bins, as we are only - ! allowing for all groups - if (.not. run_CE .and. (temp_str == 'energy' .or. & - temp_str == 'energyout')) then - call fatal_error("No energy or energyout bins needed on tally " & - &// trim(to_str(t % id))) - else - n_words = get_arraysize_double(node_filt, "bins") - end if + n_words = get_arraysize_double(node_filt, "bins") else n_words = get_arraysize_integer(node_filt, "bins") end if - else if (.not. run_CE .and. (temp_str == 'energy' .or. & - temp_str == 'energyout')) then - ! For MG calculations, dont require the user to put in all the - ! group boundaries, as there could be many. Assume that if no & - ! bins are entered that that means they want group-wise results. - n_words = -1 - else call fatal_error("Bins not set in filter on tally " & &// trim(to_str(t % id))) @@ -2752,48 +2737,38 @@ contains ! Set type of filter t % filters(j) % type = FILTER_ENERGYIN - if (n_words > 0) then - ! Set number of bins - t % filters(j) % n_bins = n_words - 1 + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 - ! Allocate and store bins - allocate(t % filters(j) % real_bins(n_words)) - call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) - if (.not. run_CE) t % energy_matches_groups = .false. - else if (n_words == -1) then - ! Set number of bins - t % filters(j) % n_bins = energy_groups - - ! Allocate and store bins - allocate(t % filters(j) % real_bins(energy_groups)) - t % filters(j) % real_bins = energy_bins - - if (.not. run_CE) t % energy_matches_groups = .true. + if (.not. run_CE) then + if (n_words /= energy_groups + 1) then + t % energy_matches_groups = .false. + else if (all(t % filters(j) % real_bins == energy_bins)) then + t % energy_matches_groups = .false. + end if end if case ('energyout') ! Set type of filter t % filters(j) % type = FILTER_ENERGYOUT - if (n_words > 0) then - ! Set number of bins - t % filters(j) % n_bins = n_words - 1 + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 - ! Allocate and store bins - allocate(t % filters(j) % real_bins(n_words)) - call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) - if (.not. run_CE) t % energyout_matches_groups = .false. - else if (n_words == -1) then - ! Set number of bins - t % filters(j) % n_bins = energy_groups - - ! Allocate and store bins - allocate(t % filters(j) % real_bins(energy_groups)) - t % filters(j) % real_bins = energy_bins - - if (.not. run_CE) t % energyout_matches_groups = .true. + if (.not. run_CE) then + if (n_words /= energy_groups + 1) then + t % energy_matches_groups = .false. + else if (all(t % filters(j) % real_bins == energy_bins)) then + t % energy_matches_groups = .false. + end if end if ! Set to analog estimator diff --git a/src/relaxng/tallies.rnc b/src/relaxng/tallies.rnc index 9efb6c4e2b..75afb0f231 100644 --- a/src/relaxng/tallies.rnc +++ b/src/relaxng/tallies.rnc @@ -27,7 +27,7 @@ element tallies { "polar" | "azimuthal" | "delayedgroup") } | attribute type { ( "cell" | "cellborn" | "material" | "universe" | "surface" | "distribcell" | "mesh" | "energy" | "energyout" | "mu" | - "polar" | "azimuthal" | "delayedgroup") })? & + "polar" | "azimuthal" | "delayedgroup") }) & (element bins { list { xsd:double+ } } | attribute bins { list { xsd:double+ } }) }* & diff --git a/src/relaxng/tallies.rng b/src/relaxng/tallies.rng index 8798efca33..ef55d21e4e 100644 --- a/src/relaxng/tallies.rng +++ b/src/relaxng/tallies.rng @@ -133,44 +133,42 @@ - - - - - cell - cellborn - material - universe - surface - distribcell - mesh - energy - energyout - mu - polar - azimuthal - delayedgroup - - - - - cell - cellborn - material - universe - surface - distribcell - mesh - energy - energyout - mu - polar - azimuthal - delayedgroup - - - - + + + + cell + cellborn + material + universe + surface + distribcell + mesh + energy + energyout + mu + polar + azimuthal + delayedgroup + + + + + cell + cellborn + material + universe + surface + distribcell + mesh + energy + energyout + mu + polar + azimuthal + delayedgroup + + + From 9141e2a00fbaf7afb7a87bfa4c74903d7414e560 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 17 Nov 2015 20:30:16 -0500 Subject: [PATCH 042/149] Updated testing harness and input_set for MG tests and added first MG test: test_mg_basic --- tests/c5g7_mgxs.xml | 383 +++++++++++++++++++++++++++ tests/input_set.py | 162 +++++++++++ tests/test_mg_basic/inputs_true.dat | 1 + tests/test_mg_basic/results_true.dat | 2 + tests/test_mg_basic/test_mg_basic.py | 17 ++ tests/testing_harness.py | 9 +- 6 files changed, 571 insertions(+), 3 deletions(-) create mode 100644 tests/c5g7_mgxs.xml create mode 100644 tests/test_mg_basic/inputs_true.dat create mode 100644 tests/test_mg_basic/results_true.dat create mode 100644 tests/test_mg_basic/test_mg_basic.py diff --git a/tests/c5g7_mgxs.xml b/tests/c5g7_mgxs.xml new file mode 100644 index 0000000000..ec85d4b593 --- /dev/null +++ b/tests/c5g7_mgxs.xml @@ -0,0 +1,383 @@ + + + + 7 + + 1E-11 0.0635E-6 10.0E-6 1.0E-4 1.0E-3 0.5 1.0 20.0 + + + + + + UO2.71c + UO2.71c + 2.53E-8 + 0 + true + + isotropic + + + + 8.0248E-03 3.7174E-03 2.6769E-02 9.6236E-02 3.0020E-02 1.1126E-01 2.8278E-01 + + + + 2.005998E-02 2.027303E-03 1.570599E-02 4.518301E-02 4.334208E-02 2.020901E-01 5.257105E-01 + + + + 5.8791E-01 4.1176E-01 3.3906E-04 1.1761E-07 0.0000E+00 0.0000E+00 0.0000E+00 + + + 7.21206E-03 8.19301E-04 6.45320E-03 1.85648E-02 1.78084E-02 8.30348E-02 2.16004E-01 + + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 0.1275370 0.0423780 0.0000094 0.0000000 0.0000000 0.0000000 0.0000000 + 0.0000000 0.3244560 0.0016314 0.0000000 0.0000000 0.0000000 0.0000000 + 0.0000000 0.0000000 0.4509400 0.0026792 0.0000000 0.0000000 0.0000000 + 0.0000000 0.0000000 0.0000000 0.4525650 0.0055664 0.0000000 0.0000000 + 0.0000000 0.0000000 0.0000000 0.0001253 0.2714010 0.0102550 0.0000000 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0012968 0.2658020 0.0168090 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0000000 0.0085458 0.2730800 + + + + + 0.1779492 0.3298048 0.4803882 0.5543674000000001 0.3118013 0.39516779999999996 0.5644058 + + + + + + + MOX1.71c + MOX1.71c + 2.53E-8 + 0 + true + + + + 8.4339E-03 3.7577E-03 2.7970E-02 1.0421E-01 1.3994E-01 4.0918E-01 4.0935E-01 + + + + 1.27888062E-02 8.95701528E-03 7.37557218E-06 2.55837033E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.49041240E-03 1.04385401E-03 8.59552023E-07 2.98153464E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 9.56411400E-03 6.69850756E-03 5.51582469E-06 1.91327830E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 3.84928781E-02 2.69596154E-02 2.21996483E-05 7.70040890E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.80629998E-02 1.26509513E-02 1.04173100E-05 3.61346022E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 3.91930789E-01 2.74500216E-01 2.26034688E-04 7.84048241E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 4.19762096E-01 2.93992687E-01 2.42085585E-04 8.39724109E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + + + + 7.62704E-03 8.76898E-04 5.69835E-03 2.28872E-02 1.07635E-02 2.32757E-01 2.48968E-01 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 1.27537000E-01 4.23780000E-02 9.43740000E-06 5.51630000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 3.24456000E-01 1.63140000E-03 3.14270000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 4.50940000E-01 2.67920000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.52565000E-01 5.56640000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.25250000E-04 2.71401000E-01 1.02550000E-02 1.00210000E-08 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.29680000E-03 2.65802000E-01 1.68090000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.54580000E-03 2.73080000E-01 + + + + 0.1783583429163 0.3298451031427 0.4815892 0.5623414 0.421721260021 0.6930878 0.6909757999999999 + + + + + + + MOX2.71c + MOX2.71c + 2.53E-8 + 0 + true + + + + 0.0090657 0.0042967 0.032881 0.12203 0.18298 0.56846 0.58521 + + + + 1.40004593E-02 9.80563205E-03 8.07435789E-06 2.80075866E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 2.26856185E-03 1.58885378E-03 1.30832709E-06 4.53820413E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.41886199E-02 9.93741584E-03 8.18287404E-06 2.83839974E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 5.54788444E-02 3.88562347E-02 3.19958106E-05 1.10984111E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 2.69085702E-02 1.88462058E-02 1.55187355E-05 5.38299559E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 5.45687127E-01 3.82187973E-01 3.14709185E-04 1.09163414E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 6.13307712E-01 4.29548032E-01 3.53707392E-04 1.22690752E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + + + + 0.00825446 0.00132565 0.00842156 0.032873 0.0159636 0.323794 0.362803 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 1.30457000E-01 4.17920000E-02 8.51050000E-06 5.13290000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 3.28428000E-01 1.64360000E-03 2.20170000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 4.58371000E-01 2.53310000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.63709000E-01 5.47660000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.76190000E-04 2.82313000E-01 8.72890000E-03 9.00160000E-09 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 2.27600000E-03 2.49751000E-01 1.31140000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.86450000E-03 2.59529000E-01 + + + + 0.1813232156329 0.3343683022017 0.4937851 0.5912156 0.47419809900160004 0.833601 0.8536035 + + + + + + + MOX3.71c + MOX3.71c + 2.53E-8 + 0 + true + + + + 9.48620000E-03 4.65560000E-03 3.62400000E-02 1.32720000E-01 2.08400000E-01 6.58700000E-01 6.90170000E-01 + + + + 1.48071013E-02 1.03705874E-02 8.53956516E-06 2.96212546E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 2.78640474E-03 1.95154023E-03 1.60697792E-06 5.57413653E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 1.73304404E-02 1.21378819E-02 9.99482763E-06 3.46691346E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 6.59928975E-02 4.62200600E-02 3.80594850E-05 1.32017225E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 3.25131926E-02 2.27715674E-02 1.87510386E-05 6.50418701E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 6.32002662E-01 4.42641588E-01 3.64489161E-04 1.26430632E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 7.28595687E-01 5.10293344E-01 4.20196380E-04 1.45753838E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + + + + 8.67209000E-03 1.62426000E-03 1.02716000E-02 3.90447000E-02 1.92576000E-02 3.74888000E-01 4.30599000E-01 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 1.31504000E-01 4.20460000E-02 8.69720000E-06 5.19380000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 3.30403000E-01 1.64630000E-03 2.60060000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 4.61792000E-01 2.47490000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.68021000E-01 5.43300000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.85970000E-04 2.85771000E-01 8.39730000E-03 8.92800000E-09 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 2.39160000E-03 2.47614000E-01 1.23220000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.96810000E-03 2.56093000E-01 + + + + 1.83044902E-01 3.36704903E-01 5.00506900E-01 6.06174000E-01 5.02754279E-01 9.21027600E-01 9.55231100E-01 + + + + + + + FC.71c + FC.71c + 2.53E-8 + 0 + true + + + + 5.1132E-04 7.5813E-05 3.1643E-04 1.1675E-03 3.3977E-03 9.1886E-03 2.3244E-02 + + + + 1.323401E-08 1.434500E-08 1.128599E-06 1.276299E-05 3.538502E-07 1.740099E-06 5.063302E-06 + + + + 5.8791E-01 4.1176E-01 3.3906E-04 1.1761E-07 0.0000E+00 0.0000E+00 0.0000E+00 + + + + 4.79002E-09 5.82564E-09 4.63719E-07 5.24406E-06 1.45390E-07 7.14972E-07 2.08041E-06 + + + + + 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + + + + 6.61659000E-02 5.90700000E-02 2.83340000E-04 1.46220000E-06 2.06420000E-08 0.00000000E00 0.00000000E00 + 0.00000000E00 2.40377000E-01 5.24350000E-02 2.49900000E-04 1.92390000E-05 2.98750000E-06 4.21400000E-07 + 0.00000000E00 0.00000000E00 1.83425000E-01 9.22880000E-02 6.93650000E-03 1.07900000E-03 2.05430000E-04 + 0.00000000E00 0.00000000E00 0.00000000E00 7.90769000E-02 1.69990000E-01 2.58600000E-02 4.92560000E-03 + 0.00000000E00 0.00000000E00 0.00000000E00 3.73400000E-05 9.97570000E-02 2.06790000E-01 2.44780000E-02 + 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 9.17420000E-04 3.16774000E-01 2.38760000E-01 + 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 4.97930000E-02 1.09910000E00 + + + + 1.26032048E-01 2.93160367E-01 2.84250824E-01 2.81025244E-01 3.34460185E-01 5.65640735E-01 1.17213908E00 + + + + + + + GT.71c + GT.71c + 2.53E-8 + 0 + false + + + + 5.11320000E-04 7.58010000E-05 3.15720000E-04 1.15820000E-03 3.39750000E-03 9.18780000E-03 2.32420000E-02 + + + + + + 6.61659000E-02 5.90700000E-02 2.83340000E-04 1.46220000E-06 2.06420000E-08 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 2.40377000E-01 5.24350000E-02 2.49900000E-04 1.92390000E-05 2.98750000E-06 4.21400000E-07 + 0.00000000E+00 0.00000000E+00 1.83297000E-01 9.23970000E-02 6.94460000E-03 1.08030000E-03 2.05670000E-04 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 7.88511000E-02 1.70140000E-01 2.58810000E-02 4.92970000E-03 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 3.73330000E-05 9.97372000E-02 2.06790000E-01 2.44780000E-02 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 9.17260000E-04 3.16765000E-01 2.38770000E-01 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.97920000E-02 1.09912000E+00 + + + + 1.26032043E-01 2.93160349E-01 2.84240290E-01 2.80960000E-01 3.34440033E-01 5.65640060E-01 1.17215400E+00 + + + + + + LWTR.71c + LWTR.71c + 2.53E-8 + 0 + false + + + + 6.0105E-04 1.5793E-05 3.3716E-04 1.9406E-03 5.7416E-03 1.5001E-02 3.7239E-02 + + + + + + 0.0444777 0.1134000 0.0007235 0.0000037 0.0000001 0.0000000 0.0000000 + 0.0000000 0.2823340 0.1299400 0.0006234 0.0000480 0.0000074 0.0000010 + 0.0000000 0.0000000 0.3452560 0.2245700 0.0169990 0.0026443 0.0005034 + 0.0000000 0.0000000 0.0000000 0.0910284 0.4155100 0.0637320 0.0121390 + 0.0000000 0.0000000 0.0000000 0.0000714 0.1391380 0.5118200 0.0612290 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0022157 0.6999130 0.5373200 + 0.0000000 0.0000000 0.0000000 0.0000000 0.0000000 0.1324400 2.4807000 + + + + 0.15920605 0.41296959299999997 0.59030986 0.5843499999999999 0.7180000000000001 1.2544497000000001 2.650379 + + + + + + + CR.71c + CR.71c + 2.53E-8 + 0 + false + + + + 1.70490000E-03 8.36224000E-03 8.37901000E-02 3.97797000E-01 6.98763000E-01 9.29508000E-01 1.17836000E+00 + + + + + + 1.70563000E-01 4.44012000E-02 9.83670000E-05 1.27786000E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 4.71050000E-01 6.85480000E-04 3.91395000E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 8.01859000E-01 7.20132000E-04 0.00000000E+00 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 5.70752000E-01 1.46015000E-03 0.00000000E+00 0.00000000E+00 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 6.55562000E-05 2.07838000E-01 3.81486000E-03 3.69760000E-09 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.02427000E-03 2.02465000E-01 4.75290000E-03 + 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 3.53043000E-03 6.58597000E-01 + + + + 2.16767595E-01 4.80097720E-01 8.86369232E-01 9.70009150E-01 9.10481420E-01 1.13775017E+00 1.84048743E+00 + + + diff --git a/tests/input_set.py b/tests/input_set.py index 87b857f4a9..4e8974680e 100644 --- a/tests/input_set.py +++ b/tests/input_set.py @@ -569,3 +569,165 @@ class InputSet(object): plot.color = 'mat' self.plots.add_plot(plot) + +class MGInputSet(InputSet): + def build_default_materials_and_geometry(self): + # Define materials needed for C5G7 2-D UO2 Assembly + uo2_data = openmc.Macroscopic('UO2', '71c') + uo2 = openmc.Material(name='UO2', material_id=1) + uo2.set_density('macro', 1.0) + uo2.add_macroscopic(uo2_data) + + fiss_cham_data = openmc.Macroscopic('FC', '71c') + fiss_cham = openmc.Material(name='FC', material_id=2) + fiss_cham.set_density('macro', 1.0) + fiss_cham.add_macroscopic(fiss_cham_data) + + guide_tube_data = openmc.Macroscopic('GT', '71c') + guide_tube = openmc.Material(name='GT', material_id=3) + guide_tube.set_density('macro', 1.0) + guide_tube.add_macroscopic(guide_tube_data) + + water_data = openmc.Macroscopic('LWTR', '71c') + water = openmc.Material(name='LWTR', material_id=4) + water.set_density('macro', 1.0) + water.add_macroscopic(water_data) + + # Define the materials file. + self.materials.default_xs = '71c' + self.materials.add_materials((uo2, fiss_cham, guide_tube, water)) + + # Define surfaces. + + # Pin cell + s1 = openmc.ZCylinder(R=0.54, surface_id=1) + # Assembly/Problem Boundary + left = openmc.XPlane(x0=0.0, surface_id=20, + boundary_type='reflective') + right = openmc.XPlane(x0=21.42, surface_id=21, + boundary_type='reflective') + bottom = openmc.YPlane(y0=0.0, surface_id=22, + boundary_type='reflective') + top = openmc.YPlane(y0=21.42, surface_id=23, + boundary_type='reflective') + down = openmc.ZPlane(z0=0.0, surface_id=24, + boundary_type='reflective') + up = openmc.ZPlane(z0=21.42, surface_id=25, + boundary_type='reflective') + + # Define pin cells + # uo2 pin + c10 = openmc.Cell(cell_id=10) + c10.region = -s1 + c10.fill = uo2 + c11 = openmc.Cell(cell_id=11) + c11.region = +s1 + c11.fill = water + fuel_pin = openmc.Universe(name='Fuel pin', universe_id=1) + fuel_pin.add_cells((c10, c11)) + + # Fission chamber pin + c20 = openmc.Cell(cell_id=20) + c20.region = -s1 + c20.fill = fiss_cham + c21 = openmc.Cell(cell_id=21) + c21.region = +s1 + c21.fill = water + fiss_chamber_pin = openmc.Universe(name='Fission Chamber', universe_id=2) + fiss_chamber_pin.add_cells((c20, c21)) + + # Guide Tube pin + c30 = openmc.Cell(cell_id=30) + c30.region = -s1 + c30.fill = guide_tube + c31 = openmc.Cell(cell_id=31) + c31.region = +s1 + c31.fill = water + gt_pin = openmc.Universe(name='Guide Tube', universe_id=3) + gt_pin.add_cells((c30, c31)) + + # Define fuel lattice + l100 = openmc.RectLattice(name='UO2 assembly', lattice_id=100) + l100.dimension = (17, 17) + l100.lower_left = (-10.71, -10.71) + l100.pitch = (1.26, 1.26) + l100.universes = [ + [fuel_pin]*17, + [fuel_pin]*17, + [fuel_pin]*5 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*5, + [fuel_pin]*3 + [gt_pin] + [fuel_pin]*9 + [gt_pin] + + [fuel_pin]*3, + [fuel_pin]*17, + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2, + [fuel_pin]*17, + [fuel_pin]*17, + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [fiss_chamber_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2, + [fuel_pin]*17, + [fuel_pin]*17, + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2, + [fuel_pin]*17, + [fuel_pin]*3 + [gt_pin] + [fuel_pin]*9 + [gt_pin] + + [fuel_pin]*3, + [fuel_pin]*5 + [gt_pin] + [fuel_pin]*2 + [gt_pin] + + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*5, + [fuel_pin]*17, + [fuel_pin]*17 ] + + # Define assemblies. + fa = openmc.Universe(name='Fuel assembly', universe_id=10) + c100 = openmc.Cell(cell_id=110) + c100.region = +down & -up + c100.fill = l100 + fa.add_cells((c100, )) + + # Define core lattices + l200 = openmc.RectLattice(name='Core lattice', lattice_id=200) + l200.dimension = (1, 1) + l200.lower_left = (0.0, 0.0) + l200.pitch = (21.42, 21.42) + l200.universes = [[fa]] + + # Define root universe. + root = openmc.Universe(universe_id=0, name='root universe') + c1 = openmc.Cell(cell_id=1) + c1.region = +left & -right & +bottom & -top & +down & -up + c1.fill = l200 + + root.add_cells((c1,)) + + # Define the geometry file. + geometry = openmc.Geometry() + geometry.root_universe = root + + self.geometry.geometry = geometry + + + def build_default_settings(self): + self.settings.batches = 10 + self.settings.inactive = 5 + self.settings.particles = 100 + self.settings.set_source_space('box', (0.0, 0.0, 0.0, 21.42, 21.42, 100.0)) + self.settings.energy_mode = "multi-group" + self.settings.cross_sections = "../c5g7_mgxs.xml" + + def build_defualt_plots(self): + plot = openmc.Plot() + plot.filename = 'mat' + plot.origin = (10.71, 10.71, 50.0) + plot.width = (21.42, 21.42) + plot.pixels = (3000, 3000) + plot.color = 'mat' + + self.plots.add_plot(plot) + + + + + diff --git a/tests/test_mg_basic/inputs_true.dat b/tests/test_mg_basic/inputs_true.dat new file mode 100644 index 0000000000..d576cd402a --- /dev/null +++ b/tests/test_mg_basic/inputs_true.dat @@ -0,0 +1 @@ +b41c9621e2f068dab8f44b4fbf29aa5f075c04e463543550b7d1324b75b4709db810808e64474d2400c8c36465814bcca095650b0e19d640860dd4a860bb40a3 \ No newline at end of file diff --git a/tests/test_mg_basic/results_true.dat b/tests/test_mg_basic/results_true.dat new file mode 100644 index 0000000000..93683d28bb --- /dev/null +++ b/tests/test_mg_basic/results_true.dat @@ -0,0 +1,2 @@ +k-combined: +1.359283E+00 7.465863E-02 diff --git a/tests/test_mg_basic/test_mg_basic.py b/tests/test_mg_basic/test_mg_basic.py new file mode 100644 index 0000000000..1a49ee8a82 --- /dev/null +++ b/tests/test_mg_basic/test_mg_basic.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +import openmc + + +class MGBasicTestHarness(PyAPITestHarness): + def _build_inputs(self): + super(MGBasicTestHarness, self)._build_inputs() + + +if __name__ == '__main__': + harness = MGBasicTestHarness('statepoint.10.*', False, mg=True) + harness.main() diff --git a/tests/testing_harness.py b/tests/testing_harness.py index ed89f76946..90f35078a6 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -12,7 +12,7 @@ import sys import numpy as np sys.path.insert(0, os.path.join(os.pardir, os.pardir)) -from input_set import InputSet +from input_set import InputSet, MGInputSet from openmc.statepoint import StatePoint from openmc.executor import Executor import openmc.particle_restart as pr @@ -273,9 +273,12 @@ class ParticleRestartTestHarness(TestHarness): class PyAPITestHarness(TestHarness): - def __init__(self, statepoint_name, tallies_present=False): + def __init__(self, statepoint_name, tallies_present=False, mg=False): TestHarness.__init__(self, statepoint_name, tallies_present) - self._input_set = InputSet() + if mg: + self._input_set = MGInputSet() + else: + self._input_set = InputSet() def execute_test(self): """Build input XMLs, run OpenMC, and verify correct results.""" From da76c2c8ff34d1fef5a2e71da91153f2560dc845 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 17 Nov 2015 20:49:22 -0500 Subject: [PATCH 043/149] Added test for MG tallying --- tests/test_mg_tallies/inputs_true.dat | 1 + tests/test_mg_tallies/results_true.dat | 3482 ++++++++++++++++++++++ tests/test_mg_tallies/test_mg_tallies.py | 61 + 3 files changed, 3544 insertions(+) create mode 100644 tests/test_mg_tallies/inputs_true.dat create mode 100644 tests/test_mg_tallies/results_true.dat create mode 100644 tests/test_mg_tallies/test_mg_tallies.py diff --git a/tests/test_mg_tallies/inputs_true.dat b/tests/test_mg_tallies/inputs_true.dat new file mode 100644 index 0000000000..44099dbd82 --- /dev/null +++ b/tests/test_mg_tallies/inputs_true.dat @@ -0,0 +1 @@ +87d5adff4c8d53f020baa25db59d9ad6eada791ef010577e3586c543a9ee6cee6022d99e7a27911a94560acddba3602570c0748a0b4cba48f630b726221f14dc \ No newline at end of file diff --git a/tests/test_mg_tallies/results_true.dat b/tests/test_mg_tallies/results_true.dat new file mode 100644 index 0000000000..920f5f3e36 --- /dev/null +++ b/tests/test_mg_tallies/results_true.dat @@ -0,0 +1,3482 @@ +k-combined: +1.359283E+00 7.465863E-02 +tally 1: +2.847813E-01 +2.025790E-02 +1.172423E-02 +4.616814E-05 +6.871019E-01 +1.096320E-01 +5.348095E-03 +1.062108E-05 +1.340369E-02 +6.465987E-05 +1.682119E-01 +7.397131E-03 +9.038916E-03 +2.581353E-05 +4.138462E-01 +3.732581E-02 +4.267302E-03 +6.286845E-06 +1.058944E-02 +3.804411E-05 +3.633299E-01 +3.976542E-02 +2.487014E-02 +2.126766E-04 +6.982763E-01 +1.317345E-01 +1.257758E-02 +6.051328E-05 +3.075036E-02 +3.600723E-04 +2.492313E-01 +1.682228E-02 +1.380182E-02 +6.570494E-05 +5.765551E-01 +9.181006E-02 +7.743475E-03 +2.727482E-05 +1.902781E-02 +1.627120E-04 +2.191122E-01 +1.298025E-02 +1.148883E-02 +4.334141E-05 +5.203670E-01 +7.022054E-02 +5.000169E-03 +7.803760E-06 +1.236816E-02 +4.736991E-05 +2.269064E-01 +2.056966E-02 +1.410446E-02 +1.199602E-04 +4.515464E-01 +7.417552E-02 +7.887256E-03 +4.708793E-05 +1.932915E-02 +2.805214E-04 +2.364191E-01 +1.654063E-02 +1.415339E-02 +1.415624E-04 +4.940050E-01 +6.265173E-02 +6.299407E-03 +3.280872E-05 +1.540495E-02 +1.953911E-04 +3.192689E-01 +2.306298E-02 +1.230781E-02 +6.401926E-05 +6.470467E-01 +9.154956E-02 +5.234535E-03 +1.578586E-05 +1.286806E-02 +9.375617E-05 +2.540069E-01 +1.409067E-02 +7.206254E-03 +1.691929E-05 +6.264964E-01 +8.583680E-02 +1.958907E-03 +1.137122E-06 +4.944068E-03 +7.184508E-06 +3.299226E-01 +2.361991E-02 +1.153904E-02 +3.398774E-05 +7.350880E-01 +1.172602E-01 +4.976946E-03 +7.515943E-06 +1.226957E-02 +4.522435E-05 +2.734191E-01 +1.823188E-02 +1.314351E-02 +4.883110E-05 +5.162639E-01 +5.997683E-02 +5.567315E-03 +1.116578E-05 +1.355695E-02 +6.620192E-05 +1.971066E-01 +8.872106E-03 +7.289937E-03 +1.482506E-05 +3.624107E-01 +2.788172E-02 +3.946019E-03 +4.911976E-06 +9.796252E-03 +2.939620E-05 +2.435676E-01 +1.550957E-02 +1.471975E-02 +6.447073E-05 +3.711107E-01 +3.097190E-02 +8.485525E-03 +2.418503E-05 +2.074995E-02 +1.440717E-04 +2.427633E-01 +1.927418E-02 +1.659082E-02 +9.533795E-05 +3.947070E-01 +4.039320E-02 +8.721245E-03 +3.472785E-05 +2.129433E-02 +2.058398E-04 +2.930833E-01 +3.717078E-02 +1.961320E-02 +2.361042E-04 +5.029290E-01 +7.452592E-02 +1.162396E-02 +9.544883E-05 +2.835116E-02 +5.654990E-04 +3.612968E-01 +3.626192E-02 +2.275737E-02 +2.915981E-04 +6.836531E-01 +1.007739E-01 +1.386251E-02 +1.308722E-04 +3.381273E-02 +7.755475E-04 +3.379726E-01 +3.059811E-02 +1.034847E-02 +2.508685E-05 +7.876015E-01 +1.626433E-01 +4.304432E-03 +4.836158E-06 +1.080846E-02 +3.049489E-05 +2.207527E-01 +1.480236E-02 +9.133299E-03 +4.378685E-05 +5.306469E-01 +6.883187E-02 +3.832635E-03 +7.385540E-06 +9.542013E-03 +4.429238E-05 +1.746455E-01 +7.365091E-03 +6.210077E-03 +1.980262E-05 +4.018765E-01 +3.788658E-02 +3.022816E-03 +4.602873E-06 +7.491747E-03 +2.745170E-05 +2.568492E-01 +1.811320E-02 +1.821423E-02 +2.069737E-04 +4.656788E-01 +5.401259E-02 +1.232525E-02 +1.058384E-04 +3.013811E-02 +6.273405E-04 +2.225493E-01 +1.562018E-02 +1.010014E-02 +5.040357E-05 +4.589131E-01 +6.663804E-02 +5.258730E-03 +1.491454E-05 +1.298284E-02 +9.047317E-05 +2.447664E-01 +1.706786E-02 +1.478729E-02 +6.497711E-05 +5.983362E-01 +1.049331E-01 +6.596398E-03 +1.524559E-05 +1.633146E-02 +9.299953E-05 +2.413969E-01 +2.116589E-02 +2.021668E-02 +2.024522E-04 +3.619973E-01 +4.122998E-02 +1.346912E-02 +9.583517E-05 +3.286803E-02 +5.685240E-04 +2.049752E-01 +8.601175E-03 +1.025940E-02 +2.514980E-05 +4.043912E-01 +3.463281E-02 +4.452720E-03 +6.434910E-06 +1.096850E-02 +3.904161E-05 +3.102820E-01 +2.045820E-02 +1.459368E-02 +5.241789E-05 +6.773052E-01 +9.567203E-02 +7.341203E-03 +1.649958E-05 +1.800485E-02 +9.887491E-05 +2.550379E-01 +1.497142E-02 +1.091961E-02 +3.974930E-05 +5.647093E-01 +7.433920E-02 +5.249459E-03 +1.177345E-05 +1.284826E-02 +7.017030E-05 +3.556052E-01 +2.703280E-02 +2.735992E-02 +1.564623E-04 +6.683707E-01 +1.040515E-01 +1.590490E-02 +6.014424E-05 +3.877604E-02 +3.576128E-04 +2.497863E-01 +1.507086E-02 +1.494719E-02 +1.025755E-04 +4.762993E-01 +5.549879E-02 +8.527272E-03 +4.579896E-05 +2.085262E-02 +2.725955E-04 +1.839365E-01 +8.369442E-03 +1.237838E-02 +7.164219E-05 +3.775826E-01 +3.190193E-02 +7.884508E-03 +3.507069E-05 +1.929540E-02 +2.080904E-04 +1.708555E-01 +9.399504E-03 +7.715238E-03 +2.292805E-05 +3.732199E-01 +4.315843E-02 +3.978302E-03 +6.440288E-06 +9.770196E-03 +3.826434E-05 +3.241297E-01 +2.680732E-02 +2.827721E-02 +2.383010E-04 +5.925440E-01 +7.572445E-02 +1.805046E-02 +9.773692E-05 +4.409968E-02 +5.812383E-04 +2.602482E-01 +1.672576E-02 +7.932620E-03 +1.561951E-05 +5.580855E-01 +6.844216E-02 +2.088329E-03 +9.313432E-07 +5.186486E-03 +5.737715E-06 +2.890696E-01 +2.384728E-02 +1.015490E-02 +3.717081E-05 +6.111526E-01 +8.518321E-02 +4.213456E-03 +7.925859E-06 +1.037122E-02 +4.719897E-05 +3.855713E-01 +3.814941E-02 +1.595567E-02 +1.026684E-04 +8.322980E-01 +1.786719E-01 +6.646130E-03 +1.662975E-05 +1.674159E-02 +1.022582E-04 +1.897658E-01 +1.150551E-02 +8.071193E-03 +3.172610E-05 +4.219179E-01 +4.854116E-02 +3.808837E-03 +8.709924E-06 +9.434346E-03 +5.203901E-05 +2.195178E-01 +1.516218E-02 +7.926578E-03 +2.639446E-05 +5.306593E-01 +7.568838E-02 +2.106381E-03 +1.749456E-06 +5.313752E-03 +1.093384E-05 +3.256867E-01 +4.534052E-02 +2.131147E-02 +2.570637E-04 +5.297378E-01 +1.136688E-01 +1.158918E-02 +7.267385E-05 +2.831750E-02 +4.331969E-04 +1.414992E-01 +5.003890E-03 +4.258013E-03 +7.891903E-06 +3.615210E-01 +3.145749E-02 +1.093412E-03 +3.546225E-07 +2.758486E-03 +2.166206E-06 +1.514116E-01 +6.201312E-03 +4.857451E-03 +6.866877E-06 +3.984685E-01 +3.930815E-02 +2.038032E-03 +1.261346E-06 +5.152722E-03 +7.792008E-06 +3.159334E-01 +3.379738E-02 +2.905400E-03 +4.164258E-06 +5.469766E-01 +9.022824E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.132668E-01 +1.056200E-02 +9.631005E-03 +2.427206E-05 +4.566464E-01 +5.683176E-02 +4.166599E-03 +5.882400E-06 +1.031031E-02 +3.580708E-05 +2.912415E-01 +2.272338E-02 +1.775965E-02 +1.443229E-04 +4.943869E-01 +5.913494E-02 +1.104606E-02 +6.433295E-05 +2.697987E-02 +3.816975E-04 +2.570902E-01 +1.798689E-02 +2.361267E-03 +2.378626E-06 +4.065439E-01 +4.281600E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.949017E-01 +2.326343E-02 +1.187639E-02 +4.961037E-05 +6.020356E-01 +9.395273E-02 +6.276821E-03 +1.931834E-05 +1.538205E-02 +1.153434E-04 +2.558511E-01 +1.698459E-02 +1.575580E-02 +8.651862E-05 +5.875503E-01 +8.849521E-02 +7.883870E-03 +3.015633E-05 +1.949261E-02 +1.802377E-04 +1.839277E-01 +8.799415E-03 +9.390667E-04 +4.683772E-07 +4.384277E-01 +4.401825E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.609130E-01 +1.523879E-02 +1.198704E-02 +4.620730E-05 +6.275273E-01 +8.589709E-02 +6.342769E-03 +1.539049E-05 +1.563218E-02 +9.287339E-05 +2.481956E-01 +1.445135E-02 +7.512217E-03 +2.578216E-05 +5.254869E-01 +6.462207E-02 +4.109411E-03 +1.008346E-05 +1.011567E-02 +5.994042E-05 +2.029184E-01 +9.361823E-03 +5.088961E-03 +6.279329E-06 +4.979684E-01 +5.589905E-02 +1.833935E-03 +7.843470E-07 +4.590978E-03 +4.909945E-06 +2.259899E-01 +1.904652E-02 +1.437025E-02 +1.402125E-04 +5.175625E-01 +7.750371E-02 +8.659314E-03 +5.998348E-05 +2.125004E-02 +3.556838E-04 +2.491821E-01 +1.416884E-02 +1.505865E-02 +1.184227E-04 +6.046546E-01 +7.493539E-02 +9.648000E-03 +5.809858E-05 +2.378233E-02 +3.456642E-04 +2.380529E-01 +1.543764E-02 +1.826271E-02 +8.884450E-05 +4.803110E-01 +5.846859E-02 +8.805950E-03 +2.475992E-05 +2.159062E-02 +1.489502E-04 +2.026084E-01 +1.110441E-02 +8.160845E-03 +1.785658E-05 +4.437692E-01 +5.639028E-02 +3.565175E-03 +3.302071E-06 +8.864014E-03 +2.024481E-05 +2.224558E-01 +1.680211E-02 +1.555273E-02 +1.869799E-04 +4.173737E-01 +6.228541E-02 +9.135566E-03 +7.133316E-05 +2.241062E-02 +4.286070E-04 +2.004042E-01 +1.095639E-02 +1.437370E-03 +8.849524E-07 +4.174469E-01 +4.395281E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.755714E-01 +6.756269E-03 +8.983808E-03 +1.906916E-05 +4.261288E-01 +3.852168E-02 +3.247612E-03 +3.858076E-06 +8.028951E-03 +2.337512E-05 +2.223071E-01 +1.353146E-02 +1.705765E-02 +1.245386E-04 +5.197542E-01 +6.518812E-02 +9.805805E-03 +4.604085E-05 +2.405033E-02 +2.748160E-04 +1.948532E-01 +9.221640E-03 +1.164060E-02 +3.726891E-05 +4.394449E-01 +4.772119E-02 +5.615780E-03 +1.145305E-05 +1.379554E-02 +6.876959E-05 +1.729605E-01 +7.269018E-03 +7.081459E-03 +1.086510E-05 +3.596419E-01 +3.677088E-02 +2.576810E-03 +2.237622E-06 +6.357471E-03 +1.343160E-05 +2.686943E-01 +2.027464E-02 +1.549158E-02 +1.119369E-04 +4.683049E-01 +6.133136E-02 +8.958022E-03 +4.362320E-05 +2.185541E-02 +2.586495E-04 +2.805365E-01 +1.741332E-02 +1.350305E-02 +4.115261E-05 +6.438641E-01 +9.350345E-02 +5.285236E-03 +6.082302E-06 +1.295017E-02 +3.639939E-05 +2.572894E-01 +1.557396E-02 +9.152971E-03 +2.187378E-05 +5.397672E-01 +6.947168E-02 +3.989601E-03 +5.329696E-06 +9.816007E-03 +3.199508E-05 +1.844650E-01 +6.889035E-03 +9.054549E-03 +2.388416E-05 +4.959347E-01 +5.022290E-02 +6.016437E-03 +1.166505E-05 +1.483958E-02 +6.985694E-05 +2.448423E-01 +1.383982E-02 +1.979087E-02 +1.017532E-04 +5.292703E-01 +7.138674E-02 +1.203905E-02 +3.777525E-05 +2.948865E-02 +2.261060E-04 +3.678431E-01 +4.444197E-02 +3.828158E-03 +8.237670E-06 +5.902793E-01 +7.688814E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.935423E-01 +7.592536E-03 +6.894656E-03 +1.790118E-05 +4.320616E-01 +3.963147E-02 +2.212586E-03 +1.758405E-06 +5.535114E-03 +1.077459E-05 +2.000222E-01 +8.790536E-03 +6.130353E-03 +1.084913E-05 +5.241401E-01 +6.739015E-02 +2.660110E-03 +2.912115E-06 +6.629933E-03 +1.756202E-05 +2.006222E-01 +1.191794E-02 +3.681584E-03 +4.563880E-06 +4.694831E-01 +5.256578E-02 +1.424456E-03 +6.817103E-07 +3.630744E-03 +4.291288E-06 +1.427746E-01 +5.192636E-03 +1.037189E-02 +4.055885E-05 +3.029633E-01 +2.157045E-02 +4.326032E-03 +8.614945E-06 +1.057731E-02 +5.155246E-05 +1.646414E-01 +6.623537E-03 +5.439480E-03 +7.768447E-06 +4.145907E-01 +4.057023E-02 +1.461466E-03 +5.282344E-07 +3.707510E-03 +3.392769E-06 +1.648802E-01 +7.366519E-03 +1.070584E-02 +7.721854E-05 +3.742934E-01 +3.508076E-02 +6.499009E-03 +3.696865E-05 +1.592990E-02 +2.222355E-04 +2.180319E-01 +9.923859E-03 +7.969510E-03 +1.700099E-05 +5.221346E-01 +5.681643E-02 +3.896242E-03 +5.553555E-06 +9.611215E-03 +3.391405E-05 +2.292243E-01 +1.349466E-02 +1.175536E-02 +6.134192E-05 +5.588849E-01 +7.531263E-02 +5.067123E-03 +1.484964E-05 +1.251725E-02 +8.896195E-05 +3.324146E-01 +2.547046E-02 +2.018340E-02 +1.567704E-04 +7.652357E-01 +1.207356E-01 +1.178472E-02 +6.216943E-05 +2.903536E-02 +3.717118E-04 +2.285590E-01 +1.197525E-02 +6.912934E-03 +1.203784E-05 +4.578967E-01 +5.011634E-02 +2.559431E-03 +2.572737E-06 +6.387641E-03 +1.570623E-05 +1.930700E-01 +1.057009E-02 +6.872837E-03 +2.126589E-05 +3.910460E-01 +4.649162E-02 +3.546523E-03 +6.380991E-06 +8.655793E-03 +3.783828E-05 +3.934470E-01 +3.734695E-02 +2.227825E-02 +1.453115E-04 +6.775238E-01 +1.033120E-01 +1.338820E-02 +5.501040E-05 +3.274687E-02 +3.279809E-04 +3.088799E-01 +2.873704E-02 +1.749960E-02 +1.305258E-04 +5.601385E-01 +8.645103E-02 +1.038254E-02 +5.085454E-05 +2.542701E-02 +3.023135E-04 +3.700473E-01 +3.161307E-02 +2.646517E-02 +1.740940E-04 +6.414793E-01 +8.696363E-02 +1.500269E-02 +5.967096E-05 +3.661756E-02 +3.551291E-04 +3.565351E-01 +2.588617E-02 +2.829818E-02 +2.379254E-04 +6.754679E-01 +9.310347E-02 +1.785149E-02 +1.083839E-04 +4.359723E-02 +6.452495E-04 +2.956875E-01 +2.095277E-02 +1.344873E-02 +5.606169E-05 +5.669819E-01 +6.817515E-02 +7.251551E-03 +1.703252E-05 +1.777118E-02 +1.016817E-04 +2.506887E-01 +1.299858E-02 +1.588362E-02 +7.727995E-05 +4.753313E-01 +5.001149E-02 +1.000924E-02 +3.700899E-05 +2.445351E-02 +2.204775E-04 +2.126121E-01 +1.123409E-02 +1.190127E-02 +3.832263E-05 +3.707959E-01 +3.067361E-02 +5.030198E-03 +9.080178E-06 +1.230610E-02 +5.408354E-05 +2.764143E-01 +1.563717E-02 +1.790747E-02 +9.078882E-05 +5.678500E-01 +6.620735E-02 +1.046412E-02 +3.855578E-05 +2.561249E-02 +2.296019E-04 +2.902769E-01 +2.046134E-02 +1.234799E-02 +6.085833E-05 +6.155753E-01 +8.929554E-02 +6.140705E-03 +2.104623E-05 +1.517340E-02 +1.267427E-04 +2.178843E-01 +1.129871E-02 +6.208339E-03 +9.542966E-06 +5.034079E-01 +6.194116E-02 +2.128719E-03 +1.227568E-06 +5.264120E-03 +7.484188E-06 +2.125960E-01 +9.351344E-03 +6.822592E-03 +1.025641E-05 +4.869649E-01 +4.997451E-02 +2.293340E-03 +1.145791E-06 +5.665763E-03 +6.954001E-06 +2.709614E-01 +1.628033E-02 +1.293964E-03 +6.917833E-07 +6.177875E-01 +8.137663E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.314443E-01 +2.391247E-02 +1.873938E-02 +1.577380E-04 +6.121093E-01 +8.135846E-02 +1.073229E-02 +7.334175E-05 +2.617620E-02 +4.348152E-04 +3.166995E-01 +2.320865E-02 +2.036524E-02 +1.279210E-04 +6.658781E-01 +9.649554E-02 +9.461128E-03 +3.244725E-05 +2.313190E-02 +1.926149E-04 +3.297678E-01 +2.820763E-02 +1.923411E-03 +1.900405E-06 +8.093044E-01 +1.549168E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.456076E-01 +1.494726E-02 +1.107664E-02 +5.262577E-05 +4.808813E-01 +5.271759E-02 +5.560675E-03 +1.646259E-05 +1.363247E-02 +9.798701E-05 +2.427021E-01 +1.432013E-02 +1.238222E-02 +4.787991E-05 +4.944297E-01 +5.130649E-02 +6.815175E-03 +1.474275E-05 +1.672131E-02 +8.786745E-05 +3.752437E-01 +4.854811E-02 +3.614564E-03 +7.655432E-06 +6.782217E-01 +1.182298E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.647096E-01 +3.545521E-02 +1.786012E-02 +1.465595E-04 +6.852491E-01 +1.194618E-01 +8.922910E-03 +5.271906E-05 +2.195699E-02 +3.131230E-04 +3.739088E-01 +3.265037E-02 +2.215242E-02 +1.812199E-04 +7.104581E-01 +1.100949E-01 +1.112087E-02 +4.919605E-05 +2.716623E-02 +2.917209E-04 +3.646148E-01 +3.098153E-02 +3.468938E-03 +3.673617E-06 +6.439522E-01 +8.790186E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.988792E-01 +3.585276E-02 +1.769735E-02 +7.190181E-05 +7.203928E-01 +1.136161E-01 +8.994571E-03 +1.910703E-05 +2.195114E-02 +1.134487E-04 +2.180681E-01 +1.069385E-02 +1.207089E-02 +3.821459E-05 +4.543812E-01 +4.676007E-02 +5.078523E-03 +7.405974E-06 +1.242019E-02 +4.429054E-05 +3.387204E-01 +3.973516E-02 +3.338763E-03 +5.743416E-06 +6.143123E-01 +9.874284E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.573709E-01 +1.674382E-02 +1.789150E-02 +8.268291E-05 +4.926442E-01 +5.444271E-02 +1.080063E-02 +3.171383E-05 +2.644879E-02 +1.900877E-04 +3.675868E-01 +3.260765E-02 +3.091945E-02 +3.382288E-04 +6.630012E-01 +9.843066E-02 +1.886091E-02 +1.405418E-04 +4.605866E-02 +8.347384E-04 +2.393729E-01 +1.348727E-02 +9.089783E-03 +2.427644E-05 +5.291297E-01 +7.168179E-02 +4.297079E-03 +6.989668E-06 +1.057952E-02 +4.186885E-05 +3.231612E-01 +2.306799E-02 +1.049737E-02 +2.683860E-05 +6.962022E-01 +1.052928E-01 +3.906472E-03 +4.558902E-06 +9.688302E-03 +2.762523E-05 +3.081575E-01 +2.418407E-02 +1.147679E-02 +3.854959E-05 +6.947453E-01 +1.227514E-01 +5.492866E-03 +1.250383E-05 +1.366407E-02 +7.575691E-05 +3.601378E-01 +3.119766E-02 +1.856683E-02 +1.137752E-04 +6.790405E-01 +1.110025E-01 +1.005459E-02 +3.495544E-05 +2.461545E-02 +2.087020E-04 +3.505867E-01 +3.343394E-02 +1.851972E-02 +1.598653E-04 +6.695596E-01 +9.510495E-02 +1.018052E-02 +5.221675E-05 +2.496525E-02 +3.096426E-04 +3.832686E-01 +3.148793E-02 +1.999211E-02 +1.215996E-04 +7.990637E-01 +1.345049E-01 +1.016673E-02 +4.022763E-05 +2.487451E-02 +2.398045E-04 +3.238454E-01 +2.516992E-02 +1.603342E-02 +7.138171E-05 +6.930200E-01 +1.094620E-01 +9.610453E-03 +2.882518E-05 +2.367498E-02 +1.737604E-04 +2.433247E-01 +1.382228E-02 +1.026348E-02 +3.722424E-05 +6.058218E-01 +8.021503E-02 +5.222456E-03 +1.425419E-05 +1.293486E-02 +8.486641E-05 +3.405008E-01 +2.926643E-02 +1.702379E-02 +9.214884E-05 +6.732747E-01 +1.123595E-01 +7.705730E-03 +2.518557E-05 +1.891328E-02 +1.517838E-04 +2.619123E-01 +1.659685E-02 +6.964887E-03 +1.698405E-05 +5.916662E-01 +8.408950E-02 +2.958893E-03 +5.202669E-06 +7.307355E-03 +3.175251E-05 +5.917279E-01 +8.427634E-02 +3.884610E-02 +4.129413E-04 +1.054440E+00 +2.468893E-01 +2.320189E-02 +1.593770E-04 +5.690805E-02 +9.561233E-04 +4.377758E-01 +4.319166E-02 +2.986805E-02 +2.393363E-04 +8.248635E-01 +1.512547E-01 +1.372568E-02 +4.799401E-05 +3.349029E-02 +2.857467E-04 +3.421089E-01 +2.979789E-02 +2.249013E-02 +1.559001E-04 +6.850890E-01 +1.290414E-01 +1.160224E-02 +4.302043E-05 +2.846348E-02 +2.591994E-04 +3.722540E-01 +2.904052E-02 +2.335195E-02 +1.699377E-04 +6.863934E-01 +1.046451E-01 +1.439649E-02 +7.569328E-05 +3.524469E-02 +4.513332E-04 +3.015492E-01 +2.688128E-02 +2.018127E-02 +2.032826E-04 +6.714661E-01 +1.187385E-01 +1.212713E-02 +8.198620E-05 +2.973564E-02 +4.888576E-04 +2.528792E-01 +1.477470E-02 +1.121978E-02 +3.087195E-05 +6.406078E-01 +9.017936E-02 +5.885821E-03 +9.181268E-06 +1.457639E-02 +5.584147E-05 +2.038650E-01 +9.623965E-03 +1.310712E-02 +5.593573E-05 +4.908799E-01 +5.902527E-02 +6.946389E-03 +2.251232E-05 +1.702889E-02 +1.340271E-04 +1.139788E-01 +4.277809E-03 +4.614286E-03 +1.120138E-05 +2.704042E-01 +2.220192E-02 +1.076409E-03 +5.608463E-07 +2.705241E-03 +3.490247E-06 +2.370973E-01 +1.305565E-02 +7.409820E-03 +1.519920E-05 +5.419723E-01 +6.833854E-02 +3.405550E-03 +3.330468E-06 +8.520273E-03 +2.078583E-05 +2.382071E-01 +1.383356E-02 +9.254640E-03 +2.398783E-05 +6.083591E-01 +8.592760E-02 +4.554881E-03 +6.539019E-06 +1.130393E-02 +3.971676E-05 +2.799334E-01 +1.704488E-02 +1.745706E-02 +7.748191E-05 +5.327410E-01 +6.309686E-02 +8.374890E-03 +2.219332E-05 +2.046374E-02 +1.322507E-04 +3.299989E-01 +2.500153E-02 +1.662220E-02 +9.214247E-05 +5.777125E-01 +7.504937E-02 +9.185426E-03 +3.401334E-05 +2.245932E-02 +2.018294E-04 +2.480945E-01 +1.409562E-02 +1.027283E-02 +2.736596E-05 +5.305733E-01 +7.019314E-02 +4.898185E-03 +5.923984E-06 +1.209377E-02 +3.598246E-05 +2.435916E-01 +1.296299E-02 +1.168450E-02 +5.994065E-05 +5.303919E-01 +5.892047E-02 +6.394644E-03 +2.573114E-05 +1.573948E-02 +1.534027E-04 +3.382910E-01 +3.158552E-02 +1.585392E-02 +1.113895E-04 +6.399010E-01 +1.083590E-01 +6.841954E-03 +2.411006E-05 +1.678550E-02 +1.439749E-04 +3.981095E-01 +3.726016E-02 +2.142413E-02 +1.284486E-04 +7.603821E-01 +1.209106E-01 +1.046497E-02 +4.179315E-05 +2.573004E-02 +2.505335E-04 +3.874363E-01 +3.575389E-02 +2.107756E-02 +1.052519E-04 +8.211656E-01 +1.924162E-01 +1.256245E-02 +3.945660E-05 +3.082654E-02 +2.380887E-04 +4.456573E-01 +4.237155E-02 +2.596764E-02 +1.687922E-04 +8.729138E-01 +1.545134E-01 +1.510275E-02 +6.265801E-05 +3.696609E-02 +3.740070E-04 +3.992793E-01 +3.296068E-02 +2.048068E-02 +9.504244E-05 +8.331278E-01 +1.470933E-01 +1.127453E-02 +3.432997E-05 +2.760806E-02 +2.054207E-04 +3.886517E-01 +3.801441E-02 +2.253407E-02 +1.768474E-04 +7.039271E-01 +1.249249E-01 +1.248570E-02 +6.126807E-05 +3.052526E-02 +3.644213E-04 +3.138763E-01 +2.242983E-02 +2.691593E-02 +3.776077E-04 +6.449202E-01 +8.943446E-02 +1.834857E-02 +2.003405E-04 +4.483992E-02 +1.189482E-03 +3.304662E-01 +2.601947E-02 +1.705125E-02 +1.093125E-04 +7.576247E-01 +1.316185E-01 +8.728845E-03 +2.691230E-05 +2.149655E-02 +1.614671E-04 +3.542477E-01 +2.702674E-02 +2.469817E-02 +1.455831E-04 +7.115078E-01 +1.026190E-01 +1.552045E-02 +5.994661E-05 +3.791483E-02 +3.569299E-04 +2.614009E-01 +1.471316E-02 +9.277502E-03 +2.274093E-05 +5.564657E-01 +6.496526E-02 +3.380006E-03 +2.763922E-06 +8.448047E-03 +1.692336E-05 +4.068252E-01 +3.446693E-02 +2.245360E-02 +1.722882E-04 +7.532457E-01 +1.251856E-01 +1.415713E-02 +8.327501E-05 +3.483023E-02 +4.989609E-04 +3.836239E-01 +3.481679E-02 +2.946278E-02 +2.273732E-04 +6.795627E-01 +1.096060E-01 +1.842353E-02 +9.338437E-05 +4.498328E-02 +5.557198E-04 +2.678688E-01 +1.982541E-02 +1.936290E-03 +1.603437E-06 +5.664033E-01 +7.235502E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.540894E-01 +2.828987E-02 +1.435174E-02 +5.674926E-05 +6.973646E-01 +1.020010E-01 +6.832777E-03 +1.519381E-05 +1.682126E-02 +9.113421E-05 +3.455532E-01 +2.525192E-02 +2.020162E-02 +9.765516E-05 +7.040136E-01 +1.093402E-01 +1.088099E-02 +3.831955E-05 +2.661063E-02 +2.277881E-04 +2.776016E-01 +1.920243E-02 +2.052713E-03 +1.376197E-06 +6.585464E-01 +9.903277E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.091116E-01 +2.801257E-02 +2.024177E-02 +1.487498E-04 +6.138896E-01 +9.760701E-02 +1.262011E-02 +5.893128E-05 +3.079776E-02 +3.500582E-04 +4.487706E-01 +4.623185E-02 +4.373194E-02 +6.227096E-04 +8.118881E-01 +1.430088E-01 +2.909097E-02 +2.931199E-04 +7.090335E-02 +1.741024E-03 +4.974461E-01 +7.638705E-02 +5.262803E-03 +9.305275E-06 +8.298919E-01 +1.867351E-01 +4.223383E-07 +5.157240E-14 +1.028071E-06 +3.055838E-13 +3.906825E-01 +3.395073E-02 +2.733734E-02 +2.244620E-04 +7.121951E-01 +1.102604E-01 +1.681025E-02 +9.894122E-05 +4.107934E-02 +5.893557E-04 +2.885297E-01 +1.780804E-02 +1.916292E-02 +1.071634E-04 +6.439592E-01 +8.863510E-02 +1.116822E-02 +3.755311E-05 +2.741619E-02 +2.250014E-04 +3.733478E-01 +2.968457E-02 +2.417235E-03 +1.601471E-06 +8.160636E-01 +1.392543E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.807050E-01 +3.567435E-02 +1.639520E-02 +8.976183E-05 +8.352591E-01 +1.618917E-01 +7.549384E-03 +2.052873E-05 +1.868571E-02 +1.237926E-04 +4.113785E-01 +4.105596E-02 +2.760797E-02 +3.224706E-04 +8.312520E-01 +1.593787E-01 +1.755904E-02 +1.501020E-04 +4.309969E-02 +8.945939E-04 +4.264452E-01 +3.725052E-02 +2.761193E-03 +2.435650E-06 +9.907602E-01 +1.997766E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.190564E-01 +2.211691E-02 +2.297586E-02 +1.527095E-04 +6.146814E-01 +8.438195E-02 +1.406876E-02 +6.039729E-05 +3.440408E-02 +3.599638E-04 +3.441464E-01 +2.721527E-02 +2.208497E-02 +2.084304E-04 +6.754061E-01 +9.588273E-02 +1.249467E-02 +7.294249E-05 +3.053834E-02 +4.341021E-04 +4.902348E-01 +5.753291E-02 +4.141899E-02 +4.944456E-04 +8.677723E-01 +1.834890E-01 +2.563835E-02 +1.920950E-04 +6.257208E-02 +1.139519E-03 +3.219458E-01 +2.681583E-02 +1.509759E-02 +7.089200E-05 +7.411535E-01 +1.399501E-01 +7.267619E-03 +2.195119E-05 +1.781703E-02 +1.304167E-04 +3.460861E-01 +3.062496E-02 +2.305587E-02 +1.686535E-04 +7.279411E-01 +1.156782E-01 +1.567573E-02 +7.910023E-05 +3.843848E-02 +4.721498E-04 +3.706413E-01 +4.607848E-02 +2.101789E-02 +2.205947E-04 +6.385961E-01 +1.004148E-01 +1.096358E-02 +6.216344E-05 +2.682421E-02 +3.692258E-04 +4.326697E-01 +4.048321E-02 +2.321371E-02 +1.359451E-04 +8.057041E-01 +1.359077E-01 +1.178456E-02 +4.532462E-05 +2.882484E-02 +2.702988E-04 +3.700813E-01 +3.145900E-02 +1.629352E-02 +7.752174E-05 +7.168661E-01 +1.142671E-01 +8.563032E-03 +2.424964E-05 +2.094203E-02 +1.448273E-04 +4.171696E-01 +4.090198E-02 +1.942144E-02 +1.387048E-04 +7.827435E-01 +1.320064E-01 +1.123721E-02 +5.225505E-05 +2.747262E-02 +3.113824E-04 +3.936452E-01 +3.863175E-02 +1.864453E-02 +1.426388E-04 +7.621977E-01 +1.259923E-01 +1.114507E-02 +5.649068E-05 +2.735223E-02 +3.374133E-04 +4.146463E-01 +4.565600E-02 +2.051099E-02 +1.708674E-04 +8.092070E-01 +1.483485E-01 +1.068128E-02 +5.635889E-05 +2.623860E-02 +3.368690E-04 +3.502918E-01 +2.962552E-02 +2.245539E-02 +1.353853E-04 +6.798743E-01 +1.244576E-01 +1.299645E-02 +5.263601E-05 +3.188515E-02 +3.178466E-04 +3.664319E-01 +3.762644E-02 +1.543591E-02 +6.786902E-05 +7.257390E-01 +1.308037E-01 +7.920735E-03 +2.010753E-05 +1.954092E-02 +1.209187E-04 +2.881558E-01 +2.091566E-02 +1.253893E-02 +4.874752E-05 +6.867849E-01 +1.142347E-01 +6.304481E-03 +1.195351E-05 +1.563357E-02 +7.346975E-05 +4.226989E-01 +3.731519E-02 +1.464919E-02 +5.381568E-05 +9.709527E-01 +1.979486E-01 +5.624028E-03 +7.623772E-06 +1.400491E-02 +4.711591E-05 +4.177322E-01 +4.315006E-02 +1.820553E-02 +1.147713E-04 +8.897521E-01 +1.764672E-01 +8.738022E-03 +3.234864E-05 +2.155239E-02 +1.941292E-04 +4.092607E-01 +3.530369E-02 +2.094863E-02 +1.698700E-04 +9.371798E-01 +1.782535E-01 +1.252469E-02 +6.937532E-05 +3.076548E-02 +4.148830E-04 +3.694768E-01 +3.810772E-02 +1.842214E-02 +1.102654E-04 +7.440566E-01 +1.378317E-01 +1.077497E-02 +3.938422E-05 +2.649591E-02 +2.371539E-04 +3.561758E-01 +3.892218E-02 +1.971769E-02 +1.829864E-04 +7.613019E-01 +1.474240E-01 +1.192622E-02 +7.156692E-05 +2.936758E-02 +4.300051E-04 +2.527416E-01 +1.830741E-02 +1.645432E-02 +1.267160E-04 +5.925996E-01 +9.467855E-02 +8.871453E-03 +5.348101E-05 +2.184328E-02 +3.189633E-04 +3.300644E-01 +2.928166E-02 +1.882410E-02 +1.436109E-04 +7.237383E-01 +1.333008E-01 +9.519880E-03 +4.704072E-05 +2.342545E-02 +2.806433E-04 +3.764914E-01 +3.641557E-02 +1.821370E-02 +1.541319E-04 +7.651976E-01 +1.295027E-01 +1.036579E-02 +6.438503E-05 +2.552774E-02 +3.859463E-04 +2.999858E-01 +2.596841E-02 +2.166579E-02 +2.610355E-04 +6.375460E-01 +1.048518E-01 +1.456288E-02 +1.290713E-04 +3.563700E-02 +7.694303E-04 +4.842591E-01 +6.171881E-02 +2.321959E-02 +1.668178E-04 +8.833362E-01 +1.695389E-01 +1.327201E-02 +5.801276E-05 +3.246066E-02 +3.448393E-04 +5.214507E-01 +7.645410E-02 +2.106712E-02 +1.794528E-04 +8.149268E-01 +1.497643E-01 +1.099539E-02 +6.388195E-05 +2.693654E-02 +3.799114E-04 +4.660026E-01 +5.353148E-02 +2.651479E-02 +2.310878E-04 +8.389665E-01 +1.518968E-01 +1.651906E-02 +9.356467E-05 +4.039371E-02 +5.572969E-04 +5.848474E-01 +9.288276E-02 +4.985330E-02 +1.127634E-03 +1.055201E+00 +2.709678E-01 +3.348026E-02 +5.556505E-04 +8.197497E-02 +3.315235E-03 +4.139721E-01 +3.782370E-02 +1.933292E-02 +1.125655E-04 +9.059089E-01 +1.795184E-01 +9.265770E-03 +3.682450E-05 +2.278990E-02 +2.207751E-04 +3.882528E-01 +4.110026E-02 +1.561145E-02 +6.509900E-05 +6.762051E-01 +9.661914E-02 +7.561172E-03 +1.586464E-05 +1.861326E-02 +9.601481E-05 +3.055549E-01 +2.290439E-02 +1.869038E-02 +1.012810E-04 +6.519604E-01 +9.557502E-02 +1.045342E-02 +3.401674E-05 +2.561909E-02 +2.031141E-04 +3.784039E-01 +3.540818E-02 +1.144663E-02 +3.747954E-05 +7.982030E-01 +1.492246E-01 +3.743861E-03 +3.826041E-06 +9.336060E-03 +2.375886E-05 +3.893167E-01 +3.224146E-02 +1.465378E-02 +5.640030E-05 +8.519576E-01 +1.546319E-01 +7.851346E-03 +2.140423E-05 +1.941671E-02 +1.297116E-04 +4.628352E-01 +4.648532E-02 +3.104209E-02 +2.927221E-04 +9.424350E-01 +1.848692E-01 +1.805340E-02 +1.259139E-04 +4.411679E-02 +7.489332E-04 +5.036437E-01 +6.329907E-02 +3.701287E-02 +4.293191E-04 +9.845647E-01 +2.302864E-01 +2.189511E-02 +1.860705E-04 +5.357155E-02 +1.113432E-03 +3.651286E-01 +3.372208E-02 +1.898638E-02 +1.788233E-04 +7.283966E-01 +1.166080E-01 +1.159586E-02 +7.325796E-05 +2.849437E-02 +4.369152E-04 +3.712514E-01 +3.312825E-02 +2.124449E-02 +1.626400E-04 +7.116233E-01 +1.089685E-01 +1.329424E-02 +6.857983E-05 +3.257383E-02 +4.067854E-04 +2.729718E-01 +2.308771E-02 +5.130628E-03 +8.219165E-06 +7.257857E-01 +1.711422E-01 +1.662698E-03 +9.477833E-07 +4.314077E-03 +6.608852E-06 +2.780491E-01 +2.511642E-02 +1.327468E-02 +1.125406E-04 +5.815634E-01 +9.937798E-02 +6.802535E-03 +3.433855E-05 +1.678587E-02 +2.048151E-04 +4.836173E-01 +6.301714E-02 +5.126877E-03 +7.676969E-06 +7.235761E-01 +1.309488E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.031875E-01 +4.115015E-02 +2.401570E-02 +1.884922E-04 +7.226240E-01 +1.246862E-01 +1.365997E-02 +6.483039E-05 +3.348484E-02 +3.878250E-04 +3.969397E-01 +3.388912E-02 +1.954568E-02 +1.484093E-04 +8.502161E-01 +1.499123E-01 +1.000927E-02 +5.813943E-05 +2.452378E-02 +3.457355E-04 +5.393064E-01 +7.598949E-02 +4.596848E-03 +8.271188E-06 +9.233647E-01 +1.837028E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.305005E-01 +3.980527E-02 +3.622333E-02 +2.714888E-04 +7.562019E-01 +1.251870E-01 +2.210501E-02 +1.044787E-04 +5.402135E-02 +6.242016E-04 +4.150253E-01 +4.310022E-02 +3.055341E-02 +3.204376E-04 +8.383810E-01 +1.598344E-01 +1.799260E-02 +1.186722E-04 +4.421143E-02 +7.098098E-04 +5.053663E-01 +6.741744E-02 +4.302548E-03 +5.486457E-06 +1.001508E+00 +2.499069E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +5.305404E-01 +9.168988E-02 +4.204388E-02 +6.233654E-04 +1.019287E+00 +2.883833E-01 +2.692540E-02 +2.702944E-04 +6.578499E-02 +1.604933E-03 +2.979429E-01 +2.557053E-02 +1.270971E-02 +6.086980E-05 +6.133144E-01 +9.302940E-02 +6.554631E-03 +2.408980E-05 +1.614693E-02 +1.437968E-04 +2.985643E-01 +2.168009E-02 +1.675518E-03 +6.853400E-07 +6.603013E-01 +1.039248E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.978111E-01 +3.476147E-02 +2.583972E-02 +1.494411E-04 +8.471730E-01 +1.545734E-01 +1.585722E-02 +6.154411E-05 +3.885738E-02 +3.693284E-04 +5.202672E-01 +6.063991E-02 +2.696218E-02 +2.266432E-04 +1.106648E+00 +2.681959E-01 +1.522211E-02 +8.625903E-05 +3.740299E-02 +5.175445E-04 +4.764994E-01 +7.395612E-02 +4.506348E-03 +1.035606E-05 +9.157662E-01 +2.118046E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.132742E-01 +4.146437E-02 +3.375089E-02 +4.225536E-04 +7.921867E-01 +1.381808E-01 +2.045881E-02 +1.753311E-04 +5.005367E-02 +1.042462E-03 +2.661077E-01 +1.751445E-02 +1.121639E-02 +3.636881E-05 +5.712386E-01 +7.771405E-02 +6.533439E-03 +1.250013E-05 +1.610362E-02 +7.471829E-05 +3.425750E-01 +3.408776E-02 +1.156146E-02 +5.411528E-05 +8.276841E-01 +1.940431E-01 +6.001009E-03 +2.103242E-05 +1.484593E-02 +1.276999E-04 +3.790958E-01 +5.528325E-02 +2.035138E-02 +2.087186E-04 +7.464973E-01 +1.698540E-01 +1.056382E-02 +7.655648E-05 +2.594266E-02 +4.578317E-04 +4.673249E-01 +5.113730E-02 +2.751426E-02 +1.816642E-04 +8.149126E-01 +1.677855E-01 +1.476997E-02 +5.736790E-05 +3.624040E-02 +3.439634E-04 +4.969678E-01 +6.703663E-02 +3.324010E-02 +4.839680E-04 +7.957816E-01 +1.402618E-01 +1.787791E-02 +1.889011E-04 +4.366390E-02 +1.122265E-03 +3.987041E-01 +3.319083E-02 +1.717610E-02 +7.614560E-05 +8.405362E-01 +1.455051E-01 +9.116726E-03 +2.731734E-05 +2.243998E-02 +1.635133E-04 +3.557016E-01 +2.733014E-02 +1.946614E-02 +9.722258E-05 +8.042289E-01 +1.325000E-01 +1.081675E-02 +3.317997E-05 +2.660183E-02 +1.988697E-04 +4.238750E-01 +5.071137E-02 +3.860553E-02 +4.907754E-04 +6.818241E-01 +1.059015E-01 +2.594551E-02 +2.253483E-04 +6.329673E-02 +1.337276E-03 +4.845466E-01 +4.739927E-02 +3.781105E-02 +3.188017E-04 +8.754691E-01 +1.592141E-01 +2.256002E-02 +1.269857E-04 +5.521664E-02 +7.580381E-04 +4.762135E-01 +5.411538E-02 +2.732678E-02 +2.310254E-04 +7.810833E-01 +1.311139E-01 +1.597068E-02 +8.360266E-05 +3.898613E-02 +4.967345E-04 +4.626499E-01 +6.385872E-02 +2.294200E-02 +1.768315E-04 +9.372052E-01 +2.270799E-01 +1.299342E-02 +6.187834E-05 +3.189449E-02 +3.716202E-04 +3.261518E-01 +3.233233E-02 +1.344996E-02 +7.296974E-05 +6.438319E-01 +1.139836E-01 +6.902941E-03 +2.347639E-05 +1.691710E-02 +1.400440E-04 +4.352336E-01 +5.775668E-02 +2.123686E-02 +1.661853E-04 +8.342632E-01 +1.707879E-01 +1.088157E-02 +4.787467E-05 +2.666381E-02 +2.851629E-04 +4.309663E-01 +3.819583E-02 +2.280285E-02 +1.438300E-04 +8.522076E-01 +1.478770E-01 +1.272222E-02 +4.969054E-05 +3.123456E-02 +2.971660E-04 +3.545417E-01 +3.176670E-02 +2.104462E-02 +1.973843E-04 +6.924468E-01 +1.084661E-01 +1.359515E-02 +9.318781E-05 +3.323698E-02 +5.537381E-04 +2.601793E-01 +1.854037E-02 +7.292982E-03 +2.119725E-05 +5.911869E-01 +8.786472E-02 +3.411247E-03 +4.494329E-06 +8.395279E-03 +2.694816E-05 +2.856586E-01 +1.974948E-02 +1.054334E-02 +2.769649E-05 +6.966115E-01 +1.097272E-01 +4.020408E-03 +5.909802E-06 +1.002274E-02 +3.621226E-05 +2.990262E-01 +2.895771E-02 +1.524669E-02 +1.075200E-04 +5.511247E-01 +7.221915E-02 +7.850283E-03 +4.154474E-05 +1.921607E-02 +2.483852E-04 +2.734313E-01 +2.247782E-02 +1.398383E-02 +1.162049E-04 +6.576619E-01 +1.210529E-01 +8.907424E-03 +5.814670E-05 +2.190592E-02 +3.497392E-04 +2.815363E-01 +1.901069E-02 +1.186929E-02 +3.364035E-05 +6.515902E-01 +9.851410E-02 +6.886950E-03 +1.323736E-05 +1.695569E-02 +7.940407E-05 +3.484143E-01 +2.809808E-02 +2.158706E-02 +1.746308E-04 +6.459834E-01 +9.326184E-02 +1.339059E-02 +7.862843E-05 +3.279132E-02 +4.674908E-04 +4.872293E-01 +6.299198E-02 +4.535678E-03 +8.886458E-06 +7.995378E-01 +1.391013E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.517270E-01 +4.298933E-02 +2.983900E-02 +2.534533E-04 +9.003348E-01 +1.639649E-01 +1.797753E-02 +1.058508E-04 +4.408492E-02 +6.323324E-04 +3.840449E-01 +3.048942E-02 +2.304747E-02 +1.451405E-04 +7.696800E-01 +1.200152E-01 +1.291566E-02 +4.856104E-05 +3.169233E-02 +2.900548E-04 +3.899986E-01 +4.842017E-02 +3.398750E-02 +5.012913E-04 +7.289300E-01 +1.213432E-01 +2.225136E-02 +2.225919E-04 +5.443442E-02 +1.322013E-03 +5.598647E-01 +7.209791E-02 +3.636258E-02 +2.972603E-04 +9.425990E-01 +1.980189E-01 +2.180409E-02 +1.030147E-04 +5.325326E-02 +6.135525E-04 +5.137462E-01 +5.449795E-02 +2.968013E-02 +2.213205E-04 +1.089121E+00 +2.416550E-01 +1.633665E-02 +8.162297E-05 +4.019388E-02 +4.875490E-04 +4.289801E-01 +4.093477E-02 +2.010221E-02 +9.125869E-05 +8.441503E-01 +1.577640E-01 +1.121134E-02 +3.076206E-05 +2.749358E-02 +1.837347E-04 +4.669049E-01 +4.985409E-02 +3.155885E-02 +2.843354E-04 +8.541836E-01 +1.586915E-01 +1.971407E-02 +1.199500E-04 +4.819514E-02 +7.142000E-04 +5.476118E-01 +7.964842E-02 +3.671613E-02 +5.048684E-04 +9.819505E-01 +2.224104E-01 +2.057791E-02 +1.723983E-04 +5.020646E-02 +1.023284E-03 +3.570430E-01 +3.236156E-02 +2.642812E-02 +2.499237E-04 +6.566192E-01 +1.028336E-01 +1.658528E-02 +1.090997E-04 +4.052667E-02 +6.501756E-04 +3.157944E-01 +2.754029E-02 +2.510614E-03 +2.597981E-06 +6.619048E-01 +1.052488E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.796550E-01 +1.863344E-02 +1.041219E-02 +5.191551E-05 +6.609168E-01 +1.042598E-01 +6.108228E-03 +2.425637E-05 +1.502705E-02 +1.442032E-04 +2.179231E-01 +1.148681E-02 +1.158771E-02 +5.115165E-05 +5.338009E-01 +6.387573E-02 +6.955519E-03 +2.069739E-05 +1.714723E-02 +1.242632E-04 +2.723379E-01 +1.612703E-02 +1.661668E-02 +8.393477E-05 +6.115831E-01 +7.762931E-02 +8.158618E-03 +2.912656E-05 +2.012066E-02 +1.734434E-04 +4.177079E-01 +5.021689E-02 +1.465133E-02 +8.170592E-05 +8.821701E-01 +2.073297E-01 +5.279873E-03 +1.131685E-05 +1.297780E-02 +6.813348E-05 +4.389866E-01 +5.718767E-02 +2.509233E-02 +2.986289E-04 +8.525743E-01 +1.748816E-01 +1.369565E-02 +1.018308E-04 +3.355369E-02 +6.079070E-04 +4.137349E-01 +4.314157E-02 +2.371796E-02 +2.559421E-04 +7.149288E-01 +1.144426E-01 +1.335685E-02 +1.050731E-04 +3.269465E-02 +6.277716E-04 +6.493181E-01 +8.850590E-02 +4.003436E-02 +4.029382E-04 +1.240508E+00 +3.254748E-01 +2.412272E-02 +1.510168E-04 +5.916870E-02 +9.052554E-04 +4.999253E-01 +5.822974E-02 +2.648913E-02 +2.036552E-04 +8.603421E-01 +1.542102E-01 +1.503446E-02 +7.780397E-05 +3.680872E-02 +4.627887E-04 +2.140322E-01 +1.009989E-02 +9.821979E-04 +2.888126E-07 +5.412641E-01 +6.614023E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.473664E-01 +1.445695E-02 +1.115793E-02 +4.639483E-05 +6.402572E-01 +1.087519E-01 +6.977317E-03 +2.012165E-05 +1.726283E-02 +1.209389E-04 +4.106842E-01 +4.252374E-02 +2.865498E-02 +2.625513E-04 +6.937372E-01 +1.072413E-01 +1.818386E-02 +1.104345E-04 +4.446846E-02 +6.595035E-04 +4.211497E-01 +4.077958E-02 +2.971575E-03 +2.487030E-06 +8.520797E-01 +1.481605E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +5.226188E-01 +5.944362E-02 +2.960968E-02 +2.245340E-04 +9.222348E-01 +1.736139E-01 +1.631529E-02 +7.908945E-05 +3.982616E-02 +4.708490E-04 +4.418421E-01 +4.437957E-02 +2.517739E-02 +1.907600E-04 +7.787605E-01 +1.249305E-01 +1.536054E-02 +7.917968E-05 +3.755245E-02 +4.723672E-04 +4.343976E-01 +4.457981E-02 +3.388911E-03 +3.822692E-06 +8.737430E-01 +1.764940E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.598455E-01 +2.729560E-02 +2.418740E-02 +2.378985E-04 +7.302175E-01 +1.135251E-01 +1.616906E-02 +1.246680E-04 +3.949063E-02 +7.402107E-04 +2.619461E-01 +1.513254E-02 +8.926754E-03 +1.978809E-05 +6.435721E-01 +9.157538E-02 +4.651147E-03 +7.139204E-06 +1.149560E-02 +4.303315E-05 +3.477772E-01 +3.056585E-02 +1.223437E-02 +5.499474E-05 +7.995504E-01 +1.386715E-01 +6.975627E-03 +1.888125E-05 +1.734787E-02 +1.146221E-04 +3.619349E-01 +3.702197E-02 +1.807440E-02 +1.270513E-04 +7.778669E-01 +1.474144E-01 +1.099124E-02 +4.917455E-05 +2.701829E-02 +2.940738E-04 +3.162191E-01 +2.268893E-02 +1.158071E-02 +3.480324E-05 +7.692808E-01 +1.327980E-01 +4.095665E-03 +5.158750E-06 +1.022758E-02 +3.212100E-05 +5.342532E-01 +8.478330E-02 +2.903573E-02 +3.357498E-04 +1.120085E+00 +3.408745E-01 +1.690122E-02 +1.279478E-04 +4.141172E-02 +7.637947E-04 +4.496065E-01 +6.505133E-02 +2.635557E-02 +3.323123E-04 +9.612470E-01 +2.510212E-01 +1.538003E-02 +1.327695E-04 +3.782149E-02 +7.945656E-04 +4.847046E-01 +5.967696E-02 +2.535687E-02 +2.173087E-04 +1.077043E+00 +2.811943E-01 +1.097101E-02 +3.799483E-05 +2.709062E-02 +2.304602E-04 +5.175767E-01 +5.719466E-02 +1.973241E-02 +8.575798E-05 +9.679612E-01 +2.056860E-01 +8.303999E-03 +1.805765E-05 +2.040361E-02 +1.089188E-04 +5.517001E-01 +6.994072E-02 +2.497158E-02 +1.771114E-04 +1.098639E+00 +2.726418E-01 +1.399598E-02 +6.099098E-05 +3.430186E-02 +3.665835E-04 +2.863207E-01 +1.857525E-02 +8.336069E-03 +1.649811E-05 +6.476326E-01 +9.010693E-02 +3.429198E-03 +3.106979E-06 +8.565244E-03 +1.898164E-05 +2.620263E-01 +1.413830E-02 +1.486260E-02 +6.016669E-05 +5.979318E-01 +7.637631E-02 +7.005392E-03 +1.590920E-05 +1.730862E-02 +9.593066E-05 +3.655323E-01 +3.067786E-02 +2.564543E-02 +2.165772E-04 +7.572344E-01 +1.217887E-01 +1.473507E-02 +8.140802E-05 +3.619562E-02 +4.852029E-04 +3.419278E-01 +2.642670E-02 +2.272345E-02 +1.520173E-04 +6.406916E-01 +8.632502E-02 +1.398347E-02 +6.589014E-05 +3.414144E-02 +3.923320E-04 +4.462443E-01 +4.882939E-02 +3.221856E-02 +4.381937E-04 +7.714529E-01 +1.298248E-01 +2.030822E-02 +2.050592E-04 +4.959466E-02 +1.221874E-03 +4.241623E-01 +4.238067E-02 +3.017189E-02 +3.192439E-04 +8.184443E-01 +1.472953E-01 +1.653484E-02 +9.828819E-05 +4.040308E-02 +5.837728E-04 +5.468649E-01 +6.932849E-02 +3.506986E-02 +3.414126E-04 +9.081801E-01 +1.955422E-01 +2.067323E-02 +1.252268E-04 +5.051840E-02 +7.466097E-04 +4.049238E-01 +3.619626E-02 +1.820878E-02 +8.370629E-05 +7.947251E-01 +1.471574E-01 +6.827689E-03 +1.877378E-05 +1.682488E-02 +1.119968E-04 +3.181706E-01 +2.312073E-02 +1.853503E-02 +9.670338E-05 +7.307830E-01 +1.165409E-01 +1.133833E-02 +4.507577E-05 +2.784164E-02 +2.700020E-04 +4.535053E-01 +4.781822E-02 +2.298094E-02 +1.379435E-04 +9.393810E-01 +1.913101E-01 +1.088324E-02 +3.746573E-05 +2.670626E-02 +2.245210E-04 +3.711608E-01 +3.011209E-02 +2.135571E-02 +1.326869E-04 +7.941852E-01 +1.316708E-01 +1.330360E-02 +5.321889E-05 +3.253974E-02 +3.167152E-04 +4.121174E-01 +3.478939E-02 +1.586472E-02 +6.068678E-05 +1.040216E+00 +2.214218E-01 +5.758712E-03 +1.002333E-05 +1.426440E-02 +6.037119E-05 +4.435090E-01 +4.161468E-02 +1.602560E-02 +5.789996E-05 +1.002899E+00 +2.058070E-01 +7.221739E-03 +1.233021E-05 +1.798457E-02 +7.523251E-05 +4.605997E-01 +5.734630E-02 +1.933007E-02 +1.409861E-04 +1.082221E+00 +2.959635E-01 +9.105646E-03 +3.669942E-05 +2.256185E-02 +2.209209E-04 +4.760643E-01 +5.548670E-02 +2.305845E-02 +1.988737E-04 +1.108307E+00 +2.819143E-01 +1.141829E-02 +5.438996E-05 +2.821950E-02 +3.289724E-04 +2.990870E-01 +2.614044E-02 +1.379131E-02 +6.530395E-05 +6.526311E-01 +1.174214E-01 +6.340014E-03 +1.465241E-05 +1.577489E-02 +8.917934E-05 +4.539651E-01 +5.989053E-02 +3.706059E-02 +7.451853E-04 +9.479066E-01 +2.087790E-01 +2.371011E-02 +3.624597E-04 +5.802863E-02 +2.153033E-03 +3.550875E-01 +3.154848E-02 +1.517370E-02 +6.019907E-05 +8.233200E-01 +1.604220E-01 +7.096967E-03 +1.239328E-05 +1.749843E-02 +7.496910E-05 +2.669672E-01 +1.655119E-02 +9.921355E-03 +2.850701E-05 +6.229281E-01 +9.065592E-02 +3.525996E-03 +3.622432E-06 +8.763114E-03 +2.217997E-05 +3.117641E-01 +2.706928E-02 +1.301318E-02 +6.380468E-05 +7.069278E-01 +1.223940E-01 +5.520667E-03 +1.450549E-05 +1.364327E-02 +8.705049E-05 +4.253175E-01 +4.226465E-02 +3.130303E-02 +2.892976E-04 +8.847586E-01 +1.831350E-01 +1.869718E-02 +1.080033E-04 +4.581100E-02 +6.437392E-04 +4.373877E-01 +4.563513E-02 +2.171789E-02 +1.852469E-04 +8.427752E-01 +1.639163E-01 +1.193320E-02 +6.904423E-05 +2.934222E-02 +4.124494E-04 +3.309335E-01 +2.360277E-02 +1.782689E-02 +7.495262E-05 +7.435456E-01 +1.161667E-01 +9.806683E-03 +2.456418E-05 +2.407241E-02 +1.471923E-04 +3.295651E-01 +2.892136E-02 +9.136199E-03 +2.751683E-05 +7.402491E-01 +1.444989E-01 +4.232396E-03 +6.593472E-06 +1.064377E-02 +4.140318E-05 +2.646177E-01 +1.820511E-02 +6.560072E-03 +1.355487E-05 +6.853657E-01 +1.299412E-01 +2.501821E-03 +2.093278E-06 +6.398968E-03 +1.362528E-05 +5.276217E-01 +6.992447E-02 +4.094462E-02 +5.970189E-04 +1.098251E+00 +3.357754E-01 +2.710360E-02 +2.943539E-04 +6.624993E-02 +1.748479E-03 +4.706582E-01 +4.760382E-02 +1.885346E-02 +7.652927E-05 +9.303306E-01 +1.833640E-01 +9.384721E-03 +2.029091E-05 +2.290445E-02 +1.208163E-04 +5.382357E-01 +6.759212E-02 +2.981285E-02 +2.571507E-04 +1.218516E+00 +3.361214E-01 +1.807366E-02 +9.486632E-05 +4.459288E-02 +5.717156E-04 +5.926040E-01 +7.178398E-02 +4.360128E-02 +5.324114E-04 +1.307820E+00 +3.690548E-01 +2.600218E-02 +2.365448E-04 +6.382907E-02 +1.415541E-03 +tally 2: +2.410000E+00 +1.233100E+00 +2.410000E+00 +1.233100E+00 +8.400000E-01 +1.434000E-01 +8.400000E-01 +1.434000E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.262000E+01 +3.207480E+01 +1.262000E+01 +3.207480E+01 +6.000000E-02 +1.800000E-03 +6.000000E-02 +1.800000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +8.220000E+00 +1.365100E+01 +8.220000E+00 +1.365100E+01 +9.000000E-02 +2.300000E-03 +9.000000E-02 +2.300000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.430000E+00 +2.409500E+00 +3.430000E+00 +2.409500E+00 +4.000000E-02 +4.000000E-04 +4.000000E-02 +4.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.450000E+00 +4.253000E-01 +1.450000E+00 +4.253000E-01 +7.000000E-02 +1.900000E-03 +7.000000E-02 +1.900000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.570000E+00 +5.095000E-01 +1.570000E+00 +5.095000E-01 +9.000000E-02 +2.300000E-03 +9.000000E-02 +2.300000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.000000E-02 +1.900000E-03 +9.000000E-02 +1.900000E-03 +2.010000E+00 +8.355000E-01 +2.010000E+00 +8.355000E-01 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +2.000000E-02 +2.000000E-04 +2.000000E-02 +2.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.000000E-02 +6.000000E-04 +4.000000E-02 +6.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.000000E-02 +4.000000E-04 +4.000000E-02 +4.000000E-04 +5.000000E-02 +5.000000E-04 +5.000000E-02 +5.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +7.000000E-02 +2.100000E-03 +7.000000E-02 +2.100000E-03 +1.000000E-01 +2.600000E-03 +1.000000E-01 +2.600000E-03 +8.000000E-02 +1.600000E-03 +8.000000E-02 +1.600000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +8.600000E-01 +1.528000E-01 +8.600000E-01 +1.528000E-01 +1.800000E-01 +8.000000E-03 +1.800000E-01 +8.000000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.600000E-01 +1.420000E-02 +2.600000E-01 +1.420000E-02 +1.600000E-01 +6.200000E-03 +1.600000E-01 +6.200000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +5.000000E-02 +9.000000E-04 +5.000000E-02 +9.000000E-04 +1.200000E-01 +3.800000E-03 +1.200000E-01 +3.800000E-03 +2.000000E-02 +2.000000E-04 +2.000000E-02 +2.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.000000E-02 +2.300000E-03 +9.000000E-02 +2.300000E-03 +1.500000E-01 +7.300000E-03 +1.500000E-01 +7.300000E-03 +3.000000E-02 +5.000000E-04 +3.000000E-02 +5.000000E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.400000E-01 +4.000000E-03 +1.400000E-01 +4.000000E-03 +1.000000E-01 +2.400000E-03 +1.000000E-01 +2.400000E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.000000E-02 +6.000000E-04 +4.000000E-02 +6.000000E-04 +1.140000E+00 +2.858000E-01 +1.140000E+00 +2.858000E-01 diff --git a/tests/test_mg_tallies/test_mg_tallies.py b/tests/test_mg_tallies/test_mg_tallies.py new file mode 100644 index 0000000000..a9b1860c59 --- /dev/null +++ b/tests/test_mg_tallies/test_mg_tallies.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +import openmc + + +class MGTalliesTestHarness(PyAPITestHarness): + def _build_inputs(self): + # Instantiate a tally mesh + mesh = openmc.Mesh(mesh_id=1) + mesh.type = 'regular' + mesh.dimension = [17, 17, 1] + mesh.lower_left = [0.0, 0.0, 0.0] + mesh.upper_right = [21.42, 21.42, 100.0] + + # Instantiate some tally filters + energy_filter = openmc.Filter(type='energy', + bins=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, + 1.0E-3, 0.5, 1.0, 20.0]) + energyout_filter = openmc.Filter(type='energyout', + bins=[1E-11, 0.0635E-6, 10.0E-6, + 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) + mesh_filter = openmc.Filter() + mesh_filter.mesh = mesh + + mat_filter = openmc.Filter(type='material', bins=[1,2,3]) + + tally1 = openmc.Tally(tally_id=1) + tally1.add_filter(mesh_filter) + tally1.add_score('total') + tally1.add_score('absorption') + tally1.add_score('flux') + tally1.add_score('fission') + tally1.add_score('nu-fission') + + tally2 = openmc.Tally(tally_id=2) + tally2.add_filter(mat_filter) + tally2.add_filter(energy_filter) + tally2.add_filter(energyout_filter) + tally2.add_score('scatter') + tally2.add_score('nu-scatter') + + self._input_set.tallies = openmc.TalliesFile() + self._input_set.tallies.add_mesh(mesh) + self._input_set.tallies.add_tally(tally1) + self._input_set.tallies.add_tally(tally2) + + super(MGTalliesTestHarness, self)._build_inputs() + + def _cleanup(self): + super(MGTalliesTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + + +if __name__ == '__main__': + harness = MGTalliesTestHarness('statepoint.10.*', True, mg=True) + harness.main() From a093d6fde8e4db4615f780356e9a9f4ea245b44b Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 17 Nov 2015 21:28:57 -0500 Subject: [PATCH 044/149] Added option tp print logfile for failing tests --- tests/run_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/run_tests.py b/tests/run_tests.py index 338732c142..e62629401a 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -470,6 +470,7 @@ for key in iter(tests): logfilename = os.path.splitext(logfilename)[0] logfilename = logfilename + '_{0}.log'.format(test.name) shutil.copy(logfile[0], logfilename) + with open(logfilename) as fh: print(fh.read()) # Clear build directory and remove binary and hdf5 files shutil.rmtree('build', ignore_errors=True) From bd39cbe59ec51ce66dd87e27d3bb14178e40002a Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 18 Nov 2015 04:52:38 -0500 Subject: [PATCH 045/149] Fixed failing MPI case - didnt update MPI_BANK type for addition of group - and cleaned up travis log dump change --- src/initialize.F90 | 18 ++++++++++-------- tests/run_tests.py | 1 - 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/initialize.F90 b/src/initialize.F90 index 128759e429..7aa351b498 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -202,17 +202,17 @@ contains subroutine initialize_mpi() - integer :: bank_blocks(5) ! Count for each datatype + integer :: bank_blocks(6) ! Count for each datatype #ifdef MPIF08 - type(MPI_Datatype) :: bank_types(5) + type(MPI_Datatype) :: bank_types(6) type(MPI_Datatype) :: result_types(1) type(MPI_Datatype) :: temp_type #else - integer :: bank_types(5) ! Datatypes + integer :: bank_types(6) ! Datatypes integer :: result_types(1) ! Datatypes integer :: temp_type ! temporary derived type #endif - integer(MPI_ADDRESS_KIND) :: bank_disp(5) ! Displacements + integer(MPI_ADDRESS_KIND) :: bank_disp(6) ! Displacements integer :: result_blocks(1) ! Count for each datatype integer(MPI_ADDRESS_KIND) :: result_disp(1) ! Displacements integer(MPI_ADDRESS_KIND) :: result_base_disp ! Base displacement @@ -246,15 +246,17 @@ contains call MPI_GET_ADDRESS(b % xyz, bank_disp(2), mpi_err) call MPI_GET_ADDRESS(b % uvw, bank_disp(3), mpi_err) call MPI_GET_ADDRESS(b % E, bank_disp(4), mpi_err) - call MPI_GET_ADDRESS(b % delayed_group, bank_disp(5), mpi_err) + call MPI_GET_ADDRESS(b % g, bank_disp(5), mpi_err) + call MPI_GET_ADDRESS(b % delayed_group, bank_disp(6), mpi_err) ! Adjust displacements bank_disp = bank_disp - bank_disp(1) ! Define MPI_BANK for fission sites - bank_blocks = (/ 1, 3, 3, 1, 1 /) - bank_types = (/ MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_INTEGER /) - call MPI_TYPE_CREATE_STRUCT(5, bank_blocks, bank_disp, & + bank_blocks = (/ 1, 3, 3, 1, 1, 1 /) + bank_types = (/ MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_REAL8, & + MPI_INTEGER, MPI_INTEGER /) + call MPI_TYPE_CREATE_STRUCT(6, bank_blocks, bank_disp, & bank_types, MPI_BANK, mpi_err) call MPI_TYPE_COMMIT(MPI_BANK, mpi_err) diff --git a/tests/run_tests.py b/tests/run_tests.py index e62629401a..338732c142 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -470,7 +470,6 @@ for key in iter(tests): logfilename = os.path.splitext(logfilename)[0] logfilename = logfilename + '_{0}.log'.format(test.name) shutil.copy(logfile[0], logfilename) - with open(logfilename) as fh: print(fh.read()) # Clear build directory and remove binary and hdf5 files shutil.rmtree('build', ignore_errors=True) From d6f71ff6034af1e75f05cc613cb43934b19cbe52 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 18 Nov 2015 20:47:54 -0500 Subject: [PATCH 046/149] Revised existing MG tests to use my 1d problem since I had angular xs and tabular scattering kernels already generated; added tests for max_order and nuclidic data instead of macroscopic mgxs data. Fixed a bug related to doing the nuclidic data. --- src/input_xml.F90 | 7 + src/mgxs_data.F90 | 10 +- src/nuclide_header.F90 | 3 +- tests/1d_mgxs.xml | 9859 ++++++++++++++++++ tests/c5g7_mgxs.xml | 383 - tests/input_set.py | 144 +- tests/test_mg_basic/inputs_true.dat | 2 +- tests/test_mg_basic/results_true.dat | 2 +- tests/test_mg_max_order/inputs_true.dat | 1 + tests/test_mg_max_order/results_true.dat | 2 + tests/test_mg_max_order/test_mg_max_order.py | 85 + tests/test_mg_nuclide/inputs_true.dat | 1 + tests/test_mg_nuclide/results_true.dat | 2 + tests/test_mg_nuclide/test_mg_nuclide.py | 84 + tests/test_mg_tallies/inputs_true.dat | 2 +- tests/test_mg_tallies/results_true.dat | 6382 ++++++------ tests/test_mg_tallies/test_mg_tallies.py | 6 +- 17 files changed, 12991 insertions(+), 3984 deletions(-) create mode 100644 tests/1d_mgxs.xml delete mode 100644 tests/c5g7_mgxs.xml create mode 100644 tests/test_mg_max_order/inputs_true.dat create mode 100644 tests/test_mg_max_order/results_true.dat create mode 100644 tests/test_mg_max_order/test_mg_max_order.py create mode 100644 tests/test_mg_nuclide/inputs_true.dat create mode 100644 tests/test_mg_nuclide/results_true.dat create mode 100644 tests/test_mg_nuclide/test_mg_nuclide.py diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 8e3e8d8e9c..b3d85e4688 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -4463,6 +4463,13 @@ contains else listing % zaid = -1 end if + if (check_for_node(node_xsdata, "awr")) then + call get_node_value(node_xsdata, "awr", listing % awr) + else + ! Set to a default of 1; this allows a macroscopic library to still + ! be used with materials with atom/b-cm units for testing purposes + listing % awr = ONE + end if if (check_for_node(node_xsdata, "kT")) then call get_node_value(node_xsdata, "kT", listing % kT) else diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index b89c73d51a..10f66882fe 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -653,18 +653,18 @@ contains mat => materials(i_mat) ! Check to see how our nuclides are represented - ! Assume all are the same type - ! Therefore type(nuclides(1) % obj) dictates type(macroxs) + ! Force all to be the same type + ! Therefore type(nuclides(mat % nuclide(1)) % obj) dictates type(macroxs) ! At the same time, we will find the scattering type, as that will dictate ! how we allocate the scatter object within macroxs - legendre_mu_points = nuclides_MG(1) % obj % legendre_mu_points - select type(nuc => nuclides_MG(1) % obj) + legendre_mu_points = nuclides_MG(mat % nuclide(1)) % obj % legendre_mu_points + select type(nuc => nuclides_MG(mat % nuclide(1)) % obj) type is (Nuclide_Iso) representation = ISOTROPIC type is (Nuclide_Angle) representation = ANGLE end select - scatt_type = nuclides_MG(1) % obj % scatt_type + scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type ! Now allocate accordingly select case(representation) diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 7786537db5..5102528d05 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -543,8 +543,9 @@ module nuclide_header ! Basic nuclide information write(unit_,*) 'Nuclide ' // trim(this % name) if (this % zaid > 0) then - ! Dont print if data was macroscopic and thus zaid would be nonsense + ! Dont print if data was macroscopic and thus zaid & AWR would be nonsense write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) end if write(unit_,*) ' kT = ' // trim(to_str(this % kT)) if (this % scatt_type == ANGLE_LEGENDRE) then diff --git a/tests/1d_mgxs.xml b/tests/1d_mgxs.xml new file mode 100644 index 0000000000..33b20464b6 --- /dev/null +++ b/tests/1d_mgxs.xml @@ -0,0 +1,9859 @@ + + + 1 + 0.0000000E+00 2.0000000E+01 + + + uo2_iso.71c + uo2_iso.71c + 2.5300000E-08 + 5 + true + isotropic + + 4.1022364E-01 + + + 3.4687432E-02 + + + 4.9631431E-02 + + + 1.0000000E+00 + + + 2.0019027E-02 + + + 3.7564339E-01 + + 4.4983802E-02 + + 2.2781624E-02 + + 1.1639469E-02 + + 7.1975833E-03 + + 3.5887673E-03 + + + 1.0002764E+00 + + + + + clad_iso.71c + clad_iso.71c + 2.5300000E-08 + 5 + false + isotropic + + 3.0736836E-01 + + + 1.7027907E-03 + + + 3.0566993E-01 + + 4.1625057E-02 + + 2.2287832E-02 + + 3.9580806E-03 + + 3.3420849E-03 + + 1.3963828E-03 + + + 1.0000372E+00 + + + + + lwtr_iso.71c + lwtr_iso.71c + 2.5300000E-08 + 5 + false + isotropic + + 9.6904862E-01 + + + 1.0230968E-02 + + + 9.5881780E-01 + + 3.9202760E-01 + + 1.2865356E-01 + + 9.5231115E-03 + + -1.9647208E-02 + + 5.9291968E-04 + + + 1.0000000E+00 + + + + + uo2_iso_mu.71c + uo2_iso_mu.71c + 2.5300000E-08 + 32 + true + isotropic + histogram + + 4.1022364E-01 + + + 3.4687432E-02 + + + 4.9631431E-02 + + + 1.0000000E+00 + + + 2.0019027E-02 + + + 9.7621928E-03 + + 9.6669975E-03 + + 9.6217012E-03 + + 9.6029285E-03 + + 9.6155223E-03 + + 9.6417022E-03 + + 9.6845888E-03 + + 9.7355785E-03 + + 9.7971852E-03 + + 9.8708684E-03 + + 9.9451996E-03 + + 1.0026273E-02 + + 1.0121536E-02 + + 1.0227606E-02 + + 1.0340467E-02 + + 1.0461281E-02 + + 1.0600371E-02 + + 1.0742182E-02 + + 1.0892295E-02 + + 1.1062409E-02 + + 1.1236639E-02 + + 1.1440302E-02 + + 1.1662283E-02 + + 1.1931512E-02 + + 1.2259589E-02 + + 1.2696194E-02 + + 1.3272953E-02 + + 1.4078939E-02 + + 1.5238289E-02 + + 1.6956791E-02 + + 1.9602217E-02 + + 2.3848802E-02 + + + 1.0002764E+00 + + + + + clad_iso_mu.71c + clad_iso_mu.71c + 2.5300000E-08 + 32 + false + isotropic + histogram + + 3.0736836E-01 + + + 1.7027907E-03 + + + 8.7275040E-03 + + 8.3252599E-03 + + 8.0120655E-03 + + 7.7711039E-03 + + 7.5947251E-03 + + 7.4705350E-03 + + 7.3804037E-03 + + 7.3241515E-03 + + 7.3010244E-03 + + 7.3107188E-03 + + 7.3487081E-03 + + 7.4144814E-03 + + 7.5104992E-03 + + 7.6438156E-03 + + 7.7974114E-03 + + 7.9812213E-03 + + 8.1816102E-03 + + 8.4284406E-03 + + 8.6892059E-03 + + 8.9675370E-03 + + 9.2626673E-03 + + 9.6121293E-03 + + 9.9669464E-03 + + 1.0354054E-02 + + 1.0794903E-02 + + 1.1296566E-02 + + 1.1883978E-02 + + 1.2592532E-02 + + 1.3494682E-02 + + 1.4666635E-02 + + 1.6229823E-02 + + 1.8334594E-02 + + + 1.0000372E+00 + + + + + lwtr_iso_mu.71c + lwtr_iso_mu.71c + 2.5300000E-08 + 32 + false + isotropic + histogram + + 9.6904862E-01 + + + 1.0230968E-02 + + + 5.8755233E-03 + + 1.0934725E-02 + + 1.1142414E-02 + + 1.0437139E-02 + + 1.0756915E-02 + + 1.0623054E-02 + + 1.1295335E-02 + + 1.1326212E-02 + + 1.1795885E-02 + + 1.2179916E-02 + + 1.2528003E-02 + + 1.3121696E-02 + + 1.3563685E-02 + + 1.4242846E-02 + + 1.4567732E-02 + + 1.5913317E-02 + + 1.6851680E-02 + + 2.0792196E-02 + + 2.4129531E-02 + + 2.8258248E-02 + + 3.2040957E-02 + + 3.6266761E-02 + + 4.0455247E-02 + + 4.4731350E-02 + + 4.8820583E-02 + + 5.3746086E-02 + + 5.7743648E-02 + + 6.3513540E-02 + + 6.7353451E-02 + + 7.2430683E-02 + + 8.0723820E-02 + + 8.0655621E-02 + + + 1.0000000E+00 + + + + + uo2_ang.71c + uo2_ang.71c + 2.5300000E-08 + 5 + true + 32 + 1 + angle + + 4.0734790E-01 + + 4.0709470E-01 + + 4.0665280E-01 + + 4.0605122E-01 + + 4.0509226E-01 + + 4.0399893E-01 + + 4.0264927E-01 + + 4.0112684E-01 + + 3.9937450E-01 + + 3.9743081E-01 + + 3.9533879E-01 + + 3.9307550E-01 + + 3.9084961E-01 + + 3.8878017E-01 + + 3.8751931E-01 + + 3.8693825E-01 + + 3.9039929E-01 + + 4.0037023E-01 + + 4.1057791E-01 + + 4.1924835E-01 + + 4.2629128E-01 + + 4.3202621E-01 + + 4.3673213E-01 + + 4.4062993E-01 + + 4.4385222E-01 + + 4.4647166E-01 + + 4.4861335E-01 + + 4.5026817E-01 + + 4.5165329E-01 + + 4.5255720E-01 + + 4.5310208E-01 + + 4.5337269E-01 + + + 3.1599020E-02 + + 3.1371085E-02 + + 3.1023091E-02 + + 3.0539250E-02 + + 2.9839460E-02 + + 2.9013479E-02 + + 2.8058288E-02 + + 2.7047229E-02 + + 2.5977776E-02 + + 2.4952391E-02 + + 2.4009896E-02 + + 2.3244570E-02 + + 2.2725200E-02 + + 2.2489873E-02 + + 2.2624168E-02 + + 2.3059735E-02 + + 2.4782557E-02 + + 2.8553081E-02 + + 3.3194318E-02 + + 3.8038660E-02 + + 4.2666012E-02 + + 4.6923885E-02 + + 5.0708283E-02 + + 5.3996846E-02 + + 5.6845491E-02 + + 5.9213445E-02 + + 6.1182604E-02 + + 6.2742563E-02 + + 6.3985293E-02 + + 6.4852148E-02 + + 6.5364227E-02 + + 6.5703785E-02 + + + 4.5146530E-02 + + 4.4766687E-02 + + 4.4155441E-02 + + 4.3323960E-02 + + 4.2141314E-02 + + 4.0739637E-02 + + 3.9143652E-02 + + 3.7465300E-02 + + 3.5735871E-02 + + 3.4113931E-02 + + 3.2678644E-02 + + 3.1591060E-02 + + 3.0966537E-02 + + 3.0821062E-02 + + 3.1238242E-02 + + 3.2075654E-02 + + 3.4603728E-02 + + 3.9898114E-02 + + 4.6725370E-02 + + 5.4142159E-02 + + 6.1436273E-02 + + 6.8238302E-02 + + 7.4365771E-02 + + 7.9727018E-02 + + 8.4398863E-02 + + 8.8315890E-02 + + 9.1574736E-02 + + 9.4183896E-02 + + 9.6266615E-02 + + 9.7706019E-02 + + 9.8564505E-02 + + 9.9171965E-02 + + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + + 1.8183034E-02 + + 1.8028751E-02 + + 1.7777081E-02 + + 1.7434939E-02 + + 1.6947918E-02 + + 1.6371445E-02 + + 1.5714505E-02 + + 1.5023310E-02 + + 1.4310527E-02 + + 1.3640363E-02 + + 1.3045308E-02 + + 1.2590537E-02 + + 1.2323486E-02 + + 1.2250235E-02 + + 1.2408325E-02 + + 1.2741816E-02 + + 1.3791905E-02 + + 1.6011218E-02 + + 1.8846275E-02 + + 2.1907807E-02 + + 2.4909120E-02 + + 2.7704245E-02 + + 3.0220623E-02 + + 3.2422114E-02 + + 3.4339614E-02 + + 3.5947934E-02 + + 3.7286018E-02 + + 3.8357139E-02 + + 3.9212858E-02 + + 3.9804080E-02 + + 4.0156625E-02 + + 4.0404918E-02 + + + 3.7585902E-01 + + 4.4872720E-02 + + 2.2814276E-02 + + 1.1556342E-02 + + 7.2018303E-03 + + 3.6175403E-03 + + + + 3.7582315E-01 + + 4.4995749E-02 + + 2.2725116E-02 + + 1.1466478E-02 + + 7.0875483E-03 + + 3.5308164E-03 + + + + 3.7572011E-01 + + 4.4992452E-02 + + 2.2759820E-02 + + 1.1516099E-02 + + 7.0323440E-03 + + 3.5020003E-03 + + + + 3.7562995E-01 + + 4.5132914E-02 + + 2.2777514E-02 + + 1.1548988E-02 + + 7.0831467E-03 + + 3.5299129E-03 + + + + 3.7536612E-01 + + 4.5293164E-02 + + 2.2890080E-02 + + 1.1675089E-02 + + 7.1438522E-03 + + 3.5771809E-03 + + + + 3.7510372E-01 + + 4.5594244E-02 + + 2.2986083E-02 + + 1.1616892E-02 + + 7.1593645E-03 + + 3.5827527E-03 + + + + 3.7471139E-01 + + 4.5893399E-02 + + 2.3129097E-02 + + 1.1710573E-02 + + 7.2294990E-03 + + 3.6035030E-03 + + + + 3.7417853E-01 + + 4.6212271E-02 + + 2.3407493E-02 + + 1.1803607E-02 + + 7.2768873E-03 + + 3.6185275E-03 + + + + 3.7350485E-01 + + 4.6653124E-02 + + 2.3603271E-02 + + 1.1928427E-02 + + 7.3368483E-03 + + 3.6311780E-03 + + + + 3.7257204E-01 + + 4.7127424E-02 + + 2.3927026E-02 + + 1.2138279E-02 + + 7.4376541E-03 + + 3.6855451E-03 + + + + 3.7144563E-01 + + 4.7675499E-02 + + 2.4252831E-02 + + 1.2320100E-02 + + 7.5749097E-03 + + 3.7669728E-03 + + + + 3.6996977E-01 + + 4.8300830E-02 + + 2.4647138E-02 + + 1.2560662E-02 + + 7.7886594E-03 + + 3.8654464E-03 + + + + 3.6821602E-01 + + 4.8824396E-02 + + 2.5017750E-02 + + 1.2840163E-02 + + 7.9274823E-03 + + 3.9779025E-03 + + + + 3.6638016E-01 + + 4.9306135E-02 + + 2.5474307E-02 + + 1.3192593E-02 + + 8.2112330E-03 + + 4.1160831E-03 + + + + 3.6503713E-01 + + 4.9560796E-02 + + 2.5756337E-02 + + 1.3455138E-02 + + 8.3858370E-03 + + 4.2114689E-03 + + + + 3.6400368E-01 + + 4.9633132E-02 + + 2.5987536E-02 + + 1.3659891E-02 + + 8.5714354E-03 + + 4.3181256E-03 + + + + 3.6576117E-01 + + 4.8863049E-02 + + 2.5525363E-02 + + 1.3370670E-02 + + 8.3567729E-03 + + 4.1905625E-03 + + + + 3.7192172E-01 + + 4.6844936E-02 + + 2.3959446E-02 + + 1.2270393E-02 + + 7.5751281E-03 + + 3.7309644E-03 + + + + 3.7748124E-01 + + 4.4748629E-02 + + 2.2514789E-02 + + 1.1348962E-02 + + 6.9297472E-03 + + 3.4104693E-03 + + + + 3.8128097E-01 + + 4.3075850E-02 + + 2.1398961E-02 + + 1.0675116E-02 + + 6.5306660E-03 + + 3.2210938E-03 + + + + 3.8373406E-01 + + 4.1672472E-02 + + 2.0547117E-02 + + 1.0330913E-02 + + 6.3048028E-03 + + 3.1386749E-03 + + + + 3.8520439E-01 + + 4.0681902E-02 + + 2.0057126E-02 + + 1.0056063E-02 + + 6.1829817E-03 + + 3.0802737E-03 + + + + 3.8614505E-01 + + 3.9879282E-02 + + 1.9626439E-02 + + 9.9375963E-03 + + 6.1229946E-03 + + 3.0426688E-03 + + + + 3.8675390E-01 + + 3.9278504E-02 + + 1.9339777E-02 + + 9.8184985E-03 + + 6.0956157E-03 + + 3.0580002E-03 + + + + 3.8705360E-01 + + 3.8883125E-02 + + 1.9159064E-02 + + 9.7301477E-03 + + 6.0595588E-03 + + 3.0225068E-03 + + + + 3.8731880E-01 + + 3.8576519E-02 + + 1.9045072E-02 + + 9.7127863E-03 + + 6.0463869E-03 + + 3.0519472E-03 + + + + 3.8756725E-01 + + 3.8382695E-02 + + 1.8916082E-02 + + 9.6925622E-03 + + 6.0590015E-03 + + 2.9913798E-03 + + + + 3.8761982E-01 + + 3.8249486E-02 + + 1.8841512E-02 + + 9.6699646E-03 + + 6.0488356E-03 + + 3.0212480E-03 + + + + 3.8779017E-01 + + 3.8052198E-02 + + 1.8815974E-02 + + 9.5833623E-03 + + 5.9965640E-03 + + 2.9751261E-03 + + + + 3.8780028E-01 + + 3.7931450E-02 + + 1.8735581E-02 + + 9.6072395E-03 + + 5.9416328E-03 + + 3.0080955E-03 + + + + 3.8782277E-01 + + 3.7963999E-02 + + 1.8776116E-02 + + 9.6491264E-03 + + 5.9087373E-03 + + 3.0066367E-03 + + + + 3.8767898E-01 + + 3.7876954E-02 + + 1.8837344E-02 + + 9.7088929E-03 + + 5.9136976E-03 + + 3.0171235E-03 + + + 1.0002763E+00 + + + 1.0002760E+00 + + + 1.0002658E+00 + + + 1.0002710E+00 + + + 1.0002776E+00 + + + 1.0002767E+00 + + + 1.0002833E+00 + + + 1.0002791E+00 + + + 1.0002788E+00 + + + 1.0002858E+00 + + + 1.0002884E+00 + + + 1.0002916E+00 + + + 1.0003039E+00 + + + 1.0003181E+00 + + + 1.0003365E+00 + + + 1.0003544E+00 + + + 1.0003372E+00 + + + 1.0002764E+00 + + + 1.0002508E+00 + + + 1.0002343E+00 + + + 1.0002360E+00 + + + 1.0002375E+00 + + + 1.0002331E+00 + + + 1.0002344E+00 + + + 1.0002385E+00 + + + 1.0002316E+00 + + + 1.0002360E+00 + + + 1.0002360E+00 + + + 1.0002354E+00 + + + 1.0002349E+00 + + + 1.0002325E+00 + + + 1.0002268E+00 + + + + + clad_ang.71c + clad_ang.71c + 2.5300000E-08 + 5 + false + 32 + 1 + angle + + 3.1005638E-01 + + 3.0999067E-01 + + 3.0994879E-01 + + 3.0987779E-01 + + 3.0961631E-01 + + 3.0948272E-01 + + 3.0913340E-01 + + 3.0868239E-01 + + 3.0799925E-01 + + 3.0712597E-01 + + 3.0590948E-01 + + 3.0432728E-01 + + 3.0235012E-01 + + 2.9996873E-01 + + 2.9743091E-01 + + 2.9739624E-01 + + 3.0835788E-01 + + 3.1305337E-01 + + 3.1379599E-01 + + 3.1314506E-01 + + 3.1216249E-01 + + 3.1129786E-01 + + 3.1059203E-01 + + 3.1009561E-01 + + 3.0977837E-01 + + 3.0951041E-01 + + 3.0930940E-01 + + 3.0929712E-01 + + 3.0925741E-01 + + 3.0917641E-01 + + 3.0919741E-01 + + 3.0912502E-01 + + + 1.3490691E-03 + + 1.3463259E-03 + + 1.3498512E-03 + + 1.3366347E-03 + + 1.3288899E-03 + + 1.3176269E-03 + + 1.3059971E-03 + + 1.2891508E-03 + + 1.2713136E-03 + + 1.2555332E-03 + + 1.2394055E-03 + + 1.2170158E-03 + + 1.1969201E-03 + + 1.1849620E-03 + + 1.1899173E-03 + + 1.2761137E-03 + + 1.6244505E-03 + + 1.9090551E-03 + + 2.0837409E-03 + + 2.1976011E-03 + + 2.2746911E-03 + + 2.3308251E-03 + + 2.3700744E-03 + + 2.3981231E-03 + + 2.4248079E-03 + + 2.4441792E-03 + + 2.4510541E-03 + + 2.4640212E-03 + + 2.4741885E-03 + + 2.4697219E-03 + + 2.4721421E-03 + + 2.4729172E-03 + + + 3.0860746E-01 + + 5.0621457E-02 + + 2.7347709E-02 + + 4.7204795E-03 + + 4.0838896E-03 + + 1.6974585E-03 + + + + 3.0865194E-01 + + 5.0806752E-02 + + 2.6916586E-02 + + 4.8439138E-03 + + 4.1728626E-03 + + 1.7130886E-03 + + + + 3.0861586E-01 + + 5.0757624E-02 + + 2.7196188E-02 + + 4.8679553E-03 + + 4.0626181E-03 + + 1.7815988E-03 + + + + 3.0850283E-01 + + 5.0925397E-02 + + 2.7204505E-02 + + 4.8109149E-03 + + 4.1177685E-03 + + 1.7500469E-03 + + + + 3.0831737E-01 + + 5.1138142E-02 + + 2.7308021E-02 + + 4.8683307E-03 + + 4.0620680E-03 + + 1.6728150E-03 + + + + 3.0815133E-01 + + 5.1220538E-02 + + 2.7286345E-02 + + 4.8715905E-03 + + 4.0963982E-03 + + 1.6783881E-03 + + + + 3.0777979E-01 + + 5.1536936E-02 + + 2.7522750E-02 + + 4.9751865E-03 + + 4.1461347E-03 + + 1.7481718E-03 + + + + 3.0740186E-01 + + 5.1745014E-02 + + 2.7548398E-02 + + 4.9705992E-03 + + 4.2128374E-03 + + 1.7852471E-03 + + + + 3.0674467E-01 + + 5.2102012E-02 + + 2.7721735E-02 + + 4.9326171E-03 + + 4.2065723E-03 + + 1.7520577E-03 + + + + 3.0588587E-01 + + 5.2410298E-02 + + 2.7935183E-02 + + 5.1068594E-03 + + 4.2771962E-03 + + 1.7875734E-03 + + + + 3.0465659E-01 + + 5.2543078E-02 + + 2.7962434E-02 + + 5.0839680E-03 + + 4.3050048E-03 + + 1.8499733E-03 + + + + 3.0312229E-01 + + 5.2483292E-02 + + 2.8137041E-02 + + 5.2734764E-03 + + 4.4574974E-03 + + 1.8578935E-03 + + + + 3.0117092E-01 + + 5.2332000E-02 + + 2.8003257E-02 + + 5.2432554E-03 + + 4.5485878E-03 + + 1.8980534E-03 + + + + 2.9880209E-01 + + 5.1679340E-02 + + 2.7750518E-02 + + 5.3056401E-03 + + 4.5878997E-03 + + 1.9401945E-03 + + + + 2.9627667E-01 + + 5.0169523E-02 + + 2.7059202E-02 + + 5.2026216E-03 + + 4.5921641E-03 + + 1.8856744E-03 + + + + 2.9609986E-01 + + 4.6032461E-02 + + 2.4630572E-02 + + 4.5841577E-03 + + 3.9297754E-03 + + 1.6420383E-03 + + + + 3.0675667E-01 + + 3.7400062E-02 + + 1.9426565E-02 + + 2.7294131E-03 + + 2.0654845E-03 + + 6.7157182E-04 + + + + 3.1112942E-01 + + 3.2514340E-02 + + 1.7042298E-02 + + 2.2975512E-03 + + 1.7171252E-03 + + 6.1586296E-04 + + + + 3.1168284E-01 + + 2.9994361E-02 + + 1.5982971E-02 + + 2.2082409E-03 + + 1.7621544E-03 + + 6.7848731E-04 + + + + 3.1094402E-01 + + 2.9043011E-02 + + 1.5559822E-02 + + 2.3867453E-03 + + 1.8805422E-03 + + 8.0257257E-04 + + + + 3.0988917E-01 + + 2.8642621E-02 + + 1.5527633E-02 + + 2.5363175E-03 + + 2.0667848E-03 + + 8.9512793E-04 + + + + 3.0900783E-01 + + 2.8683967E-02 + + 1.5531635E-02 + + 2.6907133E-03 + + 2.2374989E-03 + + 9.9838820E-04 + + + + 3.0823110E-01 + + 2.8772506E-02 + + 1.5617343E-02 + + 2.7855260E-03 + + 2.3324886E-03 + + 1.0334317E-03 + + + + 3.0768619E-01 + + 2.9118421E-02 + + 1.5860568E-02 + + 2.8469804E-03 + + 2.4600144E-03 + + 1.0754851E-03 + + + + 3.0729355E-01 + + 2.9429106E-02 + + 1.6138063E-02 + + 2.9901807E-03 + + 2.5154903E-03 + + 1.1139796E-03 + + + + 3.0707342E-01 + + 2.9773340E-02 + + 1.6110013E-02 + + 2.9606704E-03 + + 2.6433692E-03 + + 1.1310602E-03 + + + + 3.0685025E-01 + + 3.0055483E-02 + + 1.6246774E-02 + + 3.1035410E-03 + + 2.6316501E-03 + + 1.1158252E-03 + + + + 3.0681469E-01 + + 3.0238686E-02 + + 1.6524723E-02 + + 3.0402635E-03 + + 2.6108287E-03 + + 1.1691486E-03 + + + + 3.0690606E-01 + + 3.0618190E-02 + + 1.6493402E-02 + + 3.0268029E-03 + + 2.5956288E-03 + + 1.0751657E-03 + + + + 3.0676357E-01 + + 3.0613175E-02 + + 1.6679358E-02 + + 2.8764512E-03 + + 2.5398735E-03 + + 1.0482210E-03 + + + + 3.0676223E-01 + + 3.0798581E-02 + + 1.6764686E-02 + + 3.1471928E-03 + + 2.7160881E-03 + + 1.2265875E-03 + + + + 3.0687178E-01 + + 3.0702117E-02 + + 1.6628813E-02 + + 2.8692462E-03 + + 2.4997850E-03 + + 9.3974161E-04 + + + 1.0000416E+00 + + + 1.0000513E+00 + + + 1.0000397E+00 + + + 1.0000409E+00 + + + 1.0000455E+00 + + + 1.0000417E+00 + + + 1.0000452E+00 + + + 1.0000431E+00 + + + 1.0000455E+00 + + + 1.0000451E+00 + + + 1.0000445E+00 + + + 1.0000482E+00 + + + 1.0000507E+00 + + + 1.0000542E+00 + + + 1.0000545E+00 + + + 1.0000461E+00 + + + 1.0000114E+00 + + + 1.0000112E+00 + + + 1.0000195E+00 + + + 1.0000216E+00 + + + 1.0000279E+00 + + + 1.0000307E+00 + + + 1.0000302E+00 + + + 1.0000313E+00 + + + 1.0000334E+00 + + + 1.0000309E+00 + + + 1.0000325E+00 + + + 1.0000318E+00 + + + 1.0000346E+00 + + + 1.0000335E+00 + + + 1.0000285E+00 + + + 1.0000358E+00 + + + + + lwtr_ang.71c + lwtr_ang.71c + 2.5300000E-08 + 5 + false + 32 + 1 + angle + + 8.3129229E-01 + + 8.3203829E-01 + + 8.3332424E-01 + + 8.3539719E-01 + + 8.3799288E-01 + + 8.4156597E-01 + + 8.4594074E-01 + + 8.5122773E-01 + + 8.5788274E-01 + + 8.6633387E-01 + + 8.7719846E-01 + + 8.9195077E-01 + + 9.1326621E-01 + + 9.4469159E-01 + + 9.9368716E-01 + + 1.0616854E+00 + + 1.0982938E+00 + + 1.0997200E+00 + + 1.0855410E+00 + + 1.0676695E+00 + + 1.0508172E+00 + + 1.0369337E+00 + + 1.0255762E+00 + + 1.0162841E+00 + + 1.0086633E+00 + + 1.0025783E+00 + + 9.9737297E-01 + + 9.9326768E-01 + + 9.9030852E-01 + + 9.8792719E-01 + + 9.8610453E-01 + + 9.8540665E-01 + + + 7.7368065E-03 + + 7.7519393E-03 + + 7.7819449E-03 + + 7.8285240E-03 + + 7.8881877E-03 + + 7.9652685E-03 + + 8.0588251E-03 + + 8.1724303E-03 + + 8.3079937E-03 + + 8.4749946E-03 + + 8.6811506E-03 + + 8.9456784E-03 + + 9.3049336E-03 + + 9.8025199E-03 + + 1.0529992E-02 + + 1.1498571E-02 + + 1.2065971E-02 + + 1.2168395E-02 + + 1.2053690E-02 + + 1.1870414E-02 + + 1.1678759E-02 + + 1.1516371E-02 + + 1.1377145E-02 + + 1.1262809E-02 + + 1.1166687E-02 + + 1.1090107E-02 + + 1.1022668E-02 + + 1.0968772E-02 + + 1.0931381E-02 + + 1.0898236E-02 + + 1.0872094E-02 + + 1.0866295E-02 + + + 8.2371185E-01 + + 3.5234207E-01 + + 1.1927931E-01 + + 7.4555729E-03 + + -1.8093822E-02 + + 4.7584668E-04 + + + + 8.2420033E-01 + + 3.5255993E-01 + + 1.1937026E-01 + + 7.2853742E-03 + + -1.8313481E-02 + + 4.3042936E-04 + + + + 8.2554395E-01 + + 3.5269171E-01 + + 1.1923224E-01 + + 7.3701368E-03 + + -1.8272340E-02 + + 4.4800957E-04 + + + + 8.2759297E-01 + + 3.5316566E-01 + + 1.1927088E-01 + + 7.3660347E-03 + + -1.8328170E-02 + + 4.1130682E-04 + + + + 8.3010220E-01 + + 3.5369971E-01 + + 1.1938537E-01 + + 7.4104975E-03 + + -1.8303317E-02 + + 4.1953876E-04 + + + + 8.3343687E-01 + + 3.5441436E-01 + + 1.1949872E-01 + + 7.5322327E-03 + + -1.8306753E-02 + + 4.5747101E-04 + + + + 8.3787092E-01 + + 3.5551997E-01 + + 1.1969232E-01 + + 7.5811660E-03 + + -1.8329166E-02 + + 4.7852748E-04 + + + + 8.4310387E-01 + + 3.5672367E-01 + + 1.1987885E-01 + + 7.6564988E-03 + + -1.8365527E-02 + + 4.5067238E-04 + + + + 8.4958953E-01 + + 3.5843887E-01 + + 1.2018528E-01 + + 7.7892315E-03 + + -1.8386164E-02 + + 4.8596316E-04 + + + + 8.5783406E-01 + + 3.6063097E-01 + + 1.2066889E-01 + + 7.9351893E-03 + + -1.8471175E-02 + + 4.7399741E-04 + + + + 8.6863002E-01 + + 3.6377631E-01 + + 1.2139807E-01 + + 8.1733217E-03 + + -1.8540490E-02 + + 5.0406643E-04 + + + + 8.8306988E-01 + + 3.6819641E-01 + + 1.2250274E-01 + + 8.4479144E-03 + + -1.8664160E-02 + + 5.3786229E-04 + + + + 9.0387733E-01 + + 3.7488040E-01 + + 1.2420959E-01 + + 8.7500816E-03 + + -1.8976448E-02 + + 4.9664889E-04 + + + + 9.3478951E-01 + + 3.8530100E-01 + + 1.2704555E-01 + + 9.1818403E-03 + + -1.9402464E-02 + + 5.3777400E-04 + + + + 9.8306151E-01 + + 4.0212328E-01 + + 1.3182489E-01 + + 9.8420986E-03 + + -2.0147587E-02 + + 5.9236718E-04 + + + + 1.0501953E+00 + + 4.2587762E-01 + + 1.3867637E-01 + + 1.0689470E-02 + + -2.1155894E-02 + + 6.5005469E-04 + + + + 1.0862685E+00 + + 4.3797788E-01 + + 1.4197736E-01 + + 1.1172759E-02 + + -2.1737067E-02 + + 6.5599084E-04 + + + + 1.0874414E+00 + + 4.3717092E-01 + + 1.4142760E-01 + + 1.1235986E-02 + + -2.1646253E-02 + + 6.5585383E-04 + + + + 1.0736455E+00 + + 4.3084349E-01 + + 1.3933736E-01 + + 1.1186759E-02 + + -2.1309779E-02 + + 6.3989000E-04 + + + + 1.0558960E+00 + + 4.2321090E-01 + + 1.3684390E-01 + + 1.1034633E-02 + + -2.0842589E-02 + + 6.8339604E-04 + + + + 1.0391120E+00 + + 4.1635648E-01 + + 1.3463939E-01 + + 1.0869743E-02 + + -2.0503958E-02 + + 6.5877305E-04 + + + + 1.0254663E+00 + + 4.1079355E-01 + + 1.3288830E-01 + + 1.0692002E-02 + + -2.0222325E-02 + + 7.2411022E-04 + + + + 1.0142449E+00 + + 4.0621344E-01 + + 1.3145072E-01 + + 1.0526222E-02 + + -1.9995334E-02 + + 6.8891812E-04 + + + + 1.0049846E+00 + + 4.0236090E-01 + + 1.3022093E-01 + + 1.0429641E-02 + + -1.9811424E-02 + + 7.3287561E-04 + + + + 9.9758865E-01 + + 3.9933064E-01 + + 1.2934518E-01 + + 1.0285856E-02 + + -1.9735216E-02 + + 6.4095239E-04 + + + + 9.9137092E-01 + + 3.9669204E-01 + + 1.2850897E-01 + + 1.0180247E-02 + + -1.9595919E-02 + + 7.4239863E-04 + + + + 9.8633885E-01 + + 3.9464706E-01 + + 1.2782783E-01 + + 1.0115679E-02 + + -1.9489063E-02 + + 6.7732699E-04 + + + + 9.8241480E-01 + + 3.9293162E-01 + + 1.2725328E-01 + + 1.0076113E-02 + + -1.9411729E-02 + + 6.7080378E-04 + + + + 9.7912906E-01 + + 3.9164180E-01 + + 1.2687293E-01 + + 9.9947816E-03 + + -1.9390105E-02 + + 6.8484948E-04 + + + + 9.7702901E-01 + + 3.9079267E-01 + + 1.2678305E-01 + + 1.0006132E-02 + + -1.9296574E-02 + + 7.3827259E-04 + + + + 9.7553202E-01 + + 3.9010913E-01 + + 1.2644932E-01 + + 9.9292219E-03 + + -1.9314591E-02 + + 7.3482134E-04 + + + + 9.7483429E-01 + + 3.8985598E-01 + + 1.2640804E-01 + + 9.9206549E-03 + + -1.9266376E-02 + + 7.6472379E-04 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + + + uo2_ang_mu.71c + uo2_ang_mu.71c + 2.5300000E-08 + 32 + true + 32 + 1 + angle + histogram + + 4.0734790E-01 + + 4.0709470E-01 + + 4.0665280E-01 + + 4.0605122E-01 + + 4.0509226E-01 + + 4.0399893E-01 + + 4.0264927E-01 + + 4.0112684E-01 + + 3.9937450E-01 + + 3.9743081E-01 + + 3.9533879E-01 + + 3.9307550E-01 + + 3.9084961E-01 + + 3.8878017E-01 + + 3.8751931E-01 + + 3.8693825E-01 + + 3.9039929E-01 + + 4.0037023E-01 + + 4.1057791E-01 + + 4.1924835E-01 + + 4.2629128E-01 + + 4.3202621E-01 + + 4.3673213E-01 + + 4.4062993E-01 + + 4.4385222E-01 + + 4.4647166E-01 + + 4.4861335E-01 + + 4.5026817E-01 + + 4.5165329E-01 + + 4.5255720E-01 + + 4.5310208E-01 + + 4.5337269E-01 + + + 3.1599020E-02 + + 3.1371085E-02 + + 3.1023091E-02 + + 3.0539250E-02 + + 2.9839460E-02 + + 2.9013479E-02 + + 2.8058288E-02 + + 2.7047229E-02 + + 2.5977776E-02 + + 2.4952391E-02 + + 2.4009896E-02 + + 2.3244570E-02 + + 2.2725200E-02 + + 2.2489873E-02 + + 2.2624168E-02 + + 2.3059735E-02 + + 2.4782557E-02 + + 2.8553081E-02 + + 3.3194318E-02 + + 3.8038660E-02 + + 4.2666012E-02 + + 4.6923885E-02 + + 5.0708283E-02 + + 5.3996846E-02 + + 5.6845491E-02 + + 5.9213445E-02 + + 6.1182604E-02 + + 6.2742563E-02 + + 6.3985293E-02 + + 6.4852148E-02 + + 6.5364227E-02 + + 6.5703785E-02 + + + 4.5146530E-02 + + 4.4766687E-02 + + 4.4155441E-02 + + 4.3323960E-02 + + 4.2141314E-02 + + 4.0739637E-02 + + 3.9143652E-02 + + 3.7465300E-02 + + 3.5735871E-02 + + 3.4113931E-02 + + 3.2678644E-02 + + 3.1591060E-02 + + 3.0966537E-02 + + 3.0821062E-02 + + 3.1238242E-02 + + 3.2075654E-02 + + 3.4603728E-02 + + 3.9898114E-02 + + 4.6725370E-02 + + 5.4142159E-02 + + 6.1436273E-02 + + 6.8238302E-02 + + 7.4365771E-02 + + 7.9727018E-02 + + 8.4398863E-02 + + 8.8315890E-02 + + 9.1574736E-02 + + 9.4183896E-02 + + 9.6266615E-02 + + 9.7706019E-02 + + 9.8564505E-02 + + 9.9171965E-02 + + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + 1.0000000E+00 + + + 1.8183034E-02 + + 1.8028751E-02 + + 1.7777081E-02 + + 1.7434939E-02 + + 1.6947918E-02 + + 1.6371445E-02 + + 1.5714505E-02 + + 1.5023310E-02 + + 1.4310527E-02 + + 1.3640363E-02 + + 1.3045308E-02 + + 1.2590537E-02 + + 1.2323486E-02 + + 1.2250235E-02 + + 1.2408325E-02 + + 1.2741816E-02 + + 1.3791905E-02 + + 1.6011218E-02 + + 1.8846275E-02 + + 2.1907807E-02 + + 2.4909120E-02 + + 2.7704245E-02 + + 3.0220623E-02 + + 3.2422114E-02 + + 3.4339614E-02 + + 3.5947934E-02 + + 3.7286018E-02 + + 3.8357139E-02 + + 3.9212858E-02 + + 3.9804080E-02 + + 4.0156625E-02 + + 4.0404918E-02 + + + 9.8066123E-03 + + 9.6646401E-03 + + 9.6663597E-03 + + 9.6289590E-03 + + 9.6096138E-03 + + 9.6458323E-03 + + 9.7060173E-03 + + 9.7686742E-03 + + 9.7497590E-03 + + 9.8863575E-03 + + 9.9653503E-03 + + 1.0024461E-02 + + 1.0143433E-02 + + 1.0224038E-02 + + 1.0343441E-02 + + 1.0433289E-02 + + 1.0526146E-02 + + 1.0783759E-02 + + 1.0949268E-02 + + 1.1096291E-02 + + 1.1232675E-02 + + 1.1455467E-02 + + 1.1650746E-02 + + 1.1903201E-02 + + 1.2297735E-02 + + 1.2748370E-02 + + 1.3264457E-02 + + 1.4048689E-02 + + 1.5280440E-02 + + 1.6908123E-02 + + 1.9601832E-02 + + 2.3844984E-02 + + + + 9.7708240E-03 + + 9.6914019E-03 + + 9.6149267E-03 + + 9.5973173E-03 + + 9.6433893E-03 + + 9.6506128E-03 + + 9.7039801E-03 + + 9.6956785E-03 + + 9.7873194E-03 + + 9.8654118E-03 + + 9.9413480E-03 + + 1.0063248E-02 + + 1.0102923E-02 + + 1.0232802E-02 + + 1.0308882E-02 + + 1.0501651E-02 + + 1.0589986E-02 + + 1.0719182E-02 + + 1.0893048E-02 + + 1.1057750E-02 + + 1.1303383E-02 + + 1.1462120E-02 + + 1.1668725E-02 + + 1.1965138E-02 + + 1.2270967E-02 + + 1.2704483E-02 + + 1.3318045E-02 + + 1.4113776E-02 + + 1.5284443E-02 + + 1.6903540E-02 + + 1.9623766E-02 + + 2.3773086E-02 + + + + 9.7573912E-03 + + 9.6754767E-03 + + 9.6414920E-03 + + 9.5888776E-03 + + 9.6229707E-03 + + 9.6517720E-03 + + 9.7047117E-03 + + 9.7260741E-03 + + 9.8017859E-03 + + 9.8536413E-03 + + 9.9389825E-03 + + 1.0024606E-02 + + 1.0138509E-02 + + 1.0234629E-02 + + 1.0324330E-02 + + 1.0453936E-02 + + 1.0578467E-02 + + 1.0739823E-02 + + 1.0879319E-02 + + 1.1046986E-02 + + 1.1241981E-02 + + 1.1441204E-02 + + 1.1664457E-02 + + 1.1957610E-02 + + 1.2276940E-02 + + 1.2759947E-02 + + 1.3279607E-02 + + 1.4124886E-02 + + 1.5267698E-02 + + 1.6982394E-02 + + 1.9550155E-02 + + 2.3789453E-02 + + + + 9.7595941E-03 + + 9.6406785E-03 + + 9.6091241E-03 + + 9.6094212E-03 + + 9.6096714E-03 + + 9.6231813E-03 + + 9.6784094E-03 + + 9.7493834E-03 + + 9.7951671E-03 + + 9.8514115E-03 + + 9.9241369E-03 + + 1.0012170E-02 + + 1.0117529E-02 + + 1.0213412E-02 + + 1.0335767E-02 + + 1.0447944E-02 + + 1.0584231E-02 + + 1.0753231E-02 + + 1.0883138E-02 + + 1.1065663E-02 + + 1.1250080E-02 + + 1.1439297E-02 + + 1.1646700E-02 + + 1.1958053E-02 + + 1.2287514E-02 + + 1.2721568E-02 + + 1.3290189E-02 + + 1.4110041E-02 + + 1.5281715E-02 + + 1.6979118E-02 + + 1.9608566E-02 + + 2.3793845E-02 + + + + 9.7316881E-03 + + 9.6194631E-03 + + 9.6065192E-03 + + 9.5773341E-03 + + 9.6080573E-03 + + 9.6136679E-03 + + 9.6707217E-03 + + 9.7207622E-03 + + 9.7745677E-03 + + 9.8542855E-03 + + 9.9290325E-03 + + 1.0013807E-02 + + 1.0087705E-02 + + 1.0212493E-02 + + 1.0318553E-02 + + 1.0440413E-02 + + 1.0586043E-02 + + 1.0693482E-02 + + 1.0881032E-02 + + 1.1028668E-02 + + 1.1236016E-02 + + 1.1448039E-02 + + 1.1645248E-02 + + 1.1940864E-02 + + 1.2280554E-02 + + 1.2704859E-02 + + 1.3284908E-02 + + 1.4087561E-02 + + 1.5269781E-02 + + 1.6974160E-02 + + 1.9647654E-02 + + 2.3878185E-02 + + + + 9.7161201E-03 + + 9.6202380E-03 + + 9.5797790E-03 + + 9.5545189E-03 + + 9.5785124E-03 + + 9.5970413E-03 + + 9.6077970E-03 + + 9.7078158E-03 + + 9.7457417E-03 + + 9.8241572E-03 + + 9.9053715E-03 + + 9.9664533E-03 + + 1.0069700E-02 + + 1.0182303E-02 + + 1.0310258E-02 + + 1.0426742E-02 + + 1.0561490E-02 + + 1.0707708E-02 + + 1.0863937E-02 + + 1.1051125E-02 + + 1.1221704E-02 + + 1.1442069E-02 + + 1.1658848E-02 + + 1.1941489E-02 + + 1.2275743E-02 + + 1.2702110E-02 + + 1.3323051E-02 + + 1.4108176E-02 + + 1.5289516E-02 + + 1.6993392E-02 + + 1.9675117E-02 + + 2.3895695E-02 + + + + 9.6862964E-03 + + 9.6118860E-03 + + 9.5204994E-03 + + 9.5427943E-03 + + 9.5461966E-03 + + 9.5657839E-03 + + 9.5949449E-03 + + 9.6654696E-03 + + 9.7413833E-03 + + 9.7999604E-03 + + 9.8652718E-03 + + 9.9395415E-03 + + 1.0066252E-02 + + 1.0162957E-02 + + 1.0288525E-02 + + 1.0410136E-02 + + 1.0544012E-02 + + 1.0683294E-02 + + 1.0857487E-02 + + 1.1034643E-02 + + 1.1202400E-02 + + 1.1413244E-02 + + 1.1649707E-02 + + 1.1927823E-02 + + 1.2268032E-02 + + 1.2711207E-02 + + 1.3301163E-02 + + 1.4107114E-02 + + 1.5299888E-02 + + 1.7035047E-02 + + 1.9688248E-02 + + 2.3980184E-02 + + + + 9.6789320E-03 + + 9.5794368E-03 + + 9.5136834E-03 + + 9.4987637E-03 + + 9.5122403E-03 + + 9.5462846E-03 + + 9.5893599E-03 + + 9.6291844E-03 + + 9.6755880E-03 + + 9.7758823E-03 + + 9.8512097E-03 + + 9.9153183E-03 + + 1.0010492E-02 + + 1.0132751E-02 + + 1.0249082E-02 + + 1.0374304E-02 + + 1.0525789E-02 + + 1.0647590E-02 + + 1.0816183E-02 + + 1.1002705E-02 + + 1.1172733E-02 + + 1.1391942E-02 + + 1.1634015E-02 + + 1.1896152E-02 + + 1.2250313E-02 + + 1.2701494E-02 + + 1.3297953E-02 + + 1.4128277E-02 + + 1.5304878E-02 + + 1.7057822E-02 + + 1.9759949E-02 + + 2.4058227E-02 + + + + 9.6295658E-03 + + 9.5389047E-03 + + 9.4742925E-03 + + 9.4575039E-03 + + 9.4670086E-03 + + 9.5016333E-03 + + 9.5287576E-03 + + 9.5962610E-03 + + 9.6450345E-03 + + 9.7355000E-03 + + 9.8168240E-03 + + 9.8832939E-03 + + 9.9783337E-03 + + 1.0096077E-02 + + 1.0226691E-02 + + 1.0343925E-02 + + 1.0478576E-02 + + 1.0624400E-02 + + 1.0795052E-02 + + 1.0971506E-02 + + 1.1155210E-02 + + 1.1359948E-02 + + 1.1600072E-02 + + 1.1891155E-02 + + 1.2217464E-02 + + 1.2687949E-02 + + 1.3279851E-02 + + 1.4139232E-02 + + 1.5331088E-02 + + 1.7109049E-02 + + 1.9804341E-02 + + 2.4140346E-02 + + + + 9.5761863E-03 + + 9.4820918E-03 + + 9.4335419E-03 + + 9.4124923E-03 + + 9.4238881E-03 + + 9.4447526E-03 + + 9.4999957E-03 + + 9.5315541E-03 + + 9.6078277E-03 + + 9.7003335E-03 + + 9.7574525E-03 + + 9.8379436E-03 + + 9.9462733E-03 + + 1.0053971E-02 + + 1.0174903E-02 + + 1.0296178E-02 + + 1.0416178E-02 + + 1.0598338E-02 + + 1.0736969E-02 + + 1.0921999E-02 + + 1.1103049E-02 + + 1.1337535E-02 + + 1.1560952E-02 + + 1.1844754E-02 + + 1.2186109E-02 + + 1.2650980E-02 + + 1.3288356E-02 + + 1.4113781E-02 + + 1.5336174E-02 + + 1.7136757E-02 + + 1.9885917E-02 + + 2.4274812E-02 + + + + 9.5122168E-03 + + 9.4370370E-03 + + 9.3789842E-03 + + 9.3641793E-03 + + 9.3461446E-03 + + 9.3736151E-03 + + 9.4378621E-03 + + 9.4888307E-03 + + 9.5578870E-03 + + 9.6287585E-03 + + 9.7018579E-03 + + 9.7842398E-03 + + 9.8853931E-03 + + 9.9928939E-03 + + 1.0118830E-02 + + 1.0234335E-02 + + 1.0390558E-02 + + 1.0549529E-02 + + 1.0695492E-02 + + 1.0871300E-02 + + 1.1074656E-02 + + 1.1276285E-02 + + 1.1528116E-02 + + 1.1795259E-02 + + 1.2170410E-02 + + 1.2620687E-02 + + 1.3248447E-02 + + 1.4113310E-02 + + 1.5330992E-02 + + 1.7146317E-02 + + 1.9971083E-02 + + 2.4420125E-02 + + + + 9.4655965E-03 + + 9.3472543E-03 + + 9.3135845E-03 + + 9.2723897E-03 + + 9.2802062E-03 + + 9.3207904E-03 + + 9.3438769E-03 + + 9.4089282E-03 + + 9.4772470E-03 + + 9.5593066E-03 + + 9.6350349E-03 + + 9.7156422E-03 + + 9.8254749E-03 + + 9.9256153E-03 + + 1.0046422E-02 + + 1.0170127E-02 + + 1.0324109E-02 + + 1.0494779E-02 + + 1.0643991E-02 + + 1.0830850E-02 + + 1.1006031E-02 + + 1.1226896E-02 + + 1.1461160E-02 + + 1.1751421E-02 + + 1.2117075E-02 + + 1.2580807E-02 + + 1.3191655E-02 + + 1.4078045E-02 + + 1.5308284E-02 + + 1.7194422E-02 + + 2.0045307E-02 + + 2.4607445E-02 + + + + 9.3803794E-03 + + 9.2679518E-03 + + 9.2244314E-03 + + 9.2113545E-03 + + 9.2138570E-03 + + 9.2462589E-03 + + 9.2883856E-03 + + 9.3378797E-03 + + 9.4087558E-03 + + 9.4791189E-03 + + 9.5459849E-03 + + 9.6532937E-03 + + 9.7407231E-03 + + 9.8542750E-03 + + 9.9718785E-03 + + 1.0102253E-02 + + 1.0257191E-02 + + 1.0422947E-02 + + 1.0576154E-02 + + 1.0751370E-02 + + 1.0937694E-02 + + 1.1150504E-02 + + 1.1403363E-02 + + 1.1690271E-02 + + 1.2041631E-02 + + 1.2515941E-02 + + 1.3148002E-02 + + 1.4030663E-02 + + 1.5293666E-02 + + 1.7182409E-02 + + 2.0111404E-02 + + 2.4776028E-02 + + + + 9.3172617E-03 + + 9.2089569E-03 + + 9.1486659E-03 + + 9.1277777E-03 + + 9.1461098E-03 + + 9.1678665E-03 + + 9.2093270E-03 + + 9.2630599E-03 + + 9.3084731E-03 + + 9.4133582E-03 + + 9.4836368E-03 + + 9.5792942E-03 + + 9.6772510E-03 + + 9.7775420E-03 + + 9.9042034E-03 + + 1.0042269E-02 + + 1.0180349E-02 + + 1.0339342E-02 + + 1.0499500E-02 + + 1.0689206E-02 + + 1.0856780E-02 + + 1.1064872E-02 + + 1.1313606E-02 + + 1.1607748E-02 + + 1.1964604E-02 + + 1.2435691E-02 + + 1.3060461E-02 + + 1.3974178E-02 + + 1.5269813E-02 + + 1.7174181E-02 + + 2.0168154E-02 + + 2.5006625E-02 + + + + 9.2675186E-03 + + 9.1560947E-03 + + 9.1099682E-03 + + 9.0686023E-03 + + 9.0949282E-03 + + 9.1189359E-03 + + 9.1587135E-03 + + 9.2079644E-03 + + 9.2872523E-03 + + 9.3678425E-03 + + 9.4331971E-03 + + 9.5255074E-03 + + 9.6234797E-03 + + 9.7408756E-03 + + 9.8464228E-03 + + 9.9839770E-03 + + 1.0134229E-02 + + 1.0296950E-02 + + 1.0437157E-02 + + 1.0621205E-02 + + 1.0805038E-02 + + 1.1016214E-02 + + 1.1261528E-02 + + 1.1539985E-02 + + 1.1895722E-02 + + 1.2371092E-02 + + 1.3001136E-02 + + 1.3913205E-02 + + 1.5214879E-02 + + 1.7172526E-02 + + 2.0220324E-02 + + 2.5144658E-02 + + + + 9.2487420E-03 + + 9.1281258E-03 + + 9.0754703E-03 + + 9.0528962E-03 + + 9.0607826E-03 + + 9.0836186E-03 + + 9.1336267E-03 + + 9.1791302E-03 + + 9.2456080E-03 + + 9.3262261E-03 + + 9.3970635E-03 + + 9.4814471E-03 + + 9.5988170E-03 + + 9.7082444E-03 + + 9.8223867E-03 + + 9.9431245E-03 + + 1.0105918E-02 + + 1.0235908E-02 + + 1.0399441E-02 + + 1.0585520E-02 + + 1.0757015E-02 + + 1.0981562E-02 + + 1.1194196E-02 + + 1.1486474E-02 + + 1.1845432E-02 + + 1.2322129E-02 + + 1.2940763E-02 + + 1.3835543E-02 + + 1.5166292E-02 + + 1.7159569E-02 + + 2.0241404E-02 + + 2.5261208E-02 + + + + 9.3326963E-03 + + 9.2136145E-03 + + 9.1672115E-03 + + 9.1448034E-03 + + 9.1509378E-03 + + 9.1710414E-03 + + 9.2163629E-03 + + 9.2665486E-03 + + 9.3325121E-03 + + 9.4016396E-03 + + 9.5034088E-03 + + 9.5773816E-03 + + 9.6674816E-03 + + 9.7850853E-03 + + 9.9014422E-03 + + 1.0023693E-02 + + 1.0166562E-02 + + 1.0315995E-02 + + 1.0472398E-02 + + 1.0641203E-02 + + 1.0830711E-02 + + 1.1048828E-02 + + 1.1263336E-02 + + 1.1551095E-02 + + 1.1894787E-02 + + 1.2358496E-02 + + 1.2983340E-02 + + 1.3874895E-02 + + 1.5186930E-02 + + 1.7144384E-02 + + 2.0133533E-02 + + 2.5038814E-02 + + + + 9.5906528E-03 + + 9.4714149E-03 + + 9.4373276E-03 + + 9.4092245E-03 + + 9.4080878E-03 + + 9.4464166E-03 + + 9.4856267E-03 + + 9.5436808E-03 + + 9.6059463E-03 + + 9.6771305E-03 + + 9.7582049E-03 + + 9.8361595E-03 + + 9.9382461E-03 + + 1.0051079E-02 + + 1.0152805E-02 + + 1.0287101E-02 + + 1.0441087E-02 + + 1.0565078E-02 + + 1.0711502E-02 + + 1.0891178E-02 + + 1.1071184E-02 + + 1.1292859E-02 + + 1.1522246E-02 + + 1.1788324E-02 + + 1.2135266E-02 + + 1.2615017E-02 + + 1.3201487E-02 + + 1.4060330E-02 + + 1.5281894E-02 + + 1.7084038E-02 + + 1.9845860E-02 + + 2.4315267E-02 + + + + 9.8248104E-03 + + 9.7323237E-03 + + 9.6774360E-03 + + 9.6780777E-03 + + 9.6806071E-03 + + 9.7078157E-03 + + 9.7458638E-03 + + 9.8100671E-03 + + 9.8562275E-03 + + 9.9244575E-03 + + 1.0022233E-02 + + 1.0083426E-02 + + 1.0184960E-02 + + 1.0286955E-02 + + 1.0393298E-02 + + 1.0523934E-02 + + 1.0674383E-02 + + 1.0799950E-02 + + 1.0950769E-02 + + 1.1117330E-02 + + 1.1304368E-02 + + 1.1511486E-02 + + 1.1731876E-02 + + 1.2009368E-02 + + 1.2343059E-02 + + 1.2776813E-02 + + 1.3375541E-02 + + 1.4170942E-02 + + 1.5323633E-02 + + 1.7010159E-02 + + 1.9570530E-02 + + 2.3678539E-02 + + + + 1.0003922E-02 + + 9.9126090E-03 + + 9.8710015E-03 + + 9.8670066E-03 + + 9.8659781E-03 + + 9.8893674E-03 + + 9.9377144E-03 + + 9.9843851E-03 + + 1.0043716E-02 + + 1.0114248E-02 + + 1.0187530E-02 + + 1.0267347E-02 + + 1.0358552E-02 + + 1.0462167E-02 + + 1.0591882E-02 + + 1.0702606E-02 + + 1.0831901E-02 + + 1.0977238E-02 + + 1.1108339E-02 + + 1.1308120E-02 + + 1.1462407E-02 + + 1.1644185E-02 + + 1.1896695E-02 + + 1.2152261E-02 + + 1.2470909E-02 + + 1.2904242E-02 + + 1.3463705E-02 + + 1.4217800E-02 + + 1.5306830E-02 + + 1.6913123E-02 + + 1.9352840E-02 + + 2.3210338E-02 + + + + 1.0110150E-02 + + 1.0038689E-02 + + 1.0006487E-02 + + 9.9882512E-03 + + 1.0012465E-02 + + 1.0038003E-02 + + 1.0080385E-02 + + 1.0133099E-02 + + 1.0195776E-02 + + 1.0230495E-02 + + 1.0337794E-02 + + 1.0414378E-02 + + 1.0494026E-02 + + 1.0600307E-02 + + 1.0712290E-02 + + 1.0823942E-02 + + 1.0947285E-02 + + 1.1079870E-02 + + 1.1237336E-02 + + 1.1392659E-02 + + 1.1573008E-02 + + 1.1782567E-02 + + 1.1965944E-02 + + 1.2231191E-02 + + 1.2530296E-02 + + 1.2940908E-02 + + 1.3487030E-02 + + 1.4206747E-02 + + 1.5258559E-02 + + 1.6813287E-02 + + 1.9165344E-02 + + 2.2905494E-02 + + + + 1.0214736E-02 + + 1.0132229E-02 + + 1.0105238E-02 + + 1.0076016E-02 + + 1.0102342E-02 + + 1.0126079E-02 + + 1.0166649E-02 + + 1.0211271E-02 + + 1.0274414E-02 + + 1.0328594E-02 + + 1.0415141E-02 + + 1.0493084E-02 + + 1.0583179E-02 + + 1.0679080E-02 + + 1.0785554E-02 + + 1.0896861E-02 + + 1.1025180E-02 + + 1.1151734E-02 + + 1.1308616E-02 + + 1.1460250E-02 + + 1.1631030E-02 + + 1.1818829E-02 + + 1.2020589E-02 + + 1.2270878E-02 + + 1.2564608E-02 + + 1.2974969E-02 + + 1.3498179E-02 + + 1.4207601E-02 + + 1.5228538E-02 + + 1.6730509E-02 + + 1.9011440E-02 + + 2.2710972E-02 + + + + 1.0268267E-02 + + 1.0196885E-02 + + 1.0157361E-02 + + 1.0140649E-02 + + 1.0169437E-02 + + 1.0183304E-02 + + 1.0243979E-02 + + 1.0276945E-02 + + 1.0343732E-02 + + 1.0412311E-02 + + 1.0476453E-02 + + 1.0547309E-02 + + 1.0646659E-02 + + 1.0745962E-02 + + 1.0848409E-02 + + 1.0960759E-02 + + 1.1082990E-02 + + 1.1214082E-02 + + 1.1358598E-02 + + 1.1499661E-02 + + 1.1661477E-02 + + 1.1836025E-02 + + 1.2058652E-02 + + 1.2293116E-02 + + 1.2566338E-02 + + 1.2977505E-02 + + 1.3480636E-02 + + 1.4176526E-02 + + 1.5190195E-02 + + 1.6660100E-02 + + 1.8910243E-02 + + 2.2560488E-02 + + + + 1.0317792E-02 + + 1.0247350E-02 + + 1.0209518E-02 + + 1.0176974E-02 + + 1.0202003E-02 + + 1.0234569E-02 + + 1.0290041E-02 + + 1.0329819E-02 + + 1.0401460E-02 + + 1.0453530E-02 + + 1.0512745E-02 + + 1.0606160E-02 + + 1.0688319E-02 + + 1.0769020E-02 + + 1.0865579E-02 + + 1.0991642E-02 + + 1.1131957E-02 + + 1.1257621E-02 + + 1.1387433E-02 + + 1.1532542E-02 + + 1.1687029E-02 + + 1.1880598E-02 + + 1.2082924E-02 + + 1.2307513E-02 + + 1.2595319E-02 + + 1.2957554E-02 + + 1.3464867E-02 + + 1.4143088E-02 + + 1.5132042E-02 + + 1.6579665E-02 + + 1.8862731E-02 + + 2.2454495E-02 + + + + 1.0353436E-02 + + 1.0273106E-02 + + 1.0227967E-02 + + 1.0220784E-02 + + 1.0226684E-02 + + 1.0260876E-02 + + 1.0312588E-02 + + 1.0358157E-02 + + 1.0401938E-02 + + 1.0498406E-02 + + 1.0534029E-02 + + 1.0633113E-02 + + 1.0711786E-02 + + 1.0806930E-02 + + 1.0902341E-02 + + 1.1005862E-02 + + 1.1140903E-02 + + 1.1256190E-02 + + 1.1418216E-02 + + 1.1551704E-02 + + 1.1699315E-02 + + 1.1876316E-02 + + 1.2095791E-02 + + 1.2321059E-02 + + 1.2598778E-02 + + 1.2945785E-02 + + 1.3441410E-02 + + 1.4150310E-02 + + 1.5110707E-02 + + 1.6555004E-02 + + 1.8801362E-02 + + 2.2362745E-02 + + + + 1.0368488E-02 + + 1.0298130E-02 + + 1.0243651E-02 + + 1.0237480E-02 + + 1.0271825E-02 + + 1.0283702E-02 + + 1.0344999E-02 + + 1.0388950E-02 + + 1.0443402E-02 + + 1.0499057E-02 + + 1.0554275E-02 + + 1.0647638E-02 + + 1.0712690E-02 + + 1.0827382E-02 + + 1.0931601E-02 + + 1.1018556E-02 + + 1.1152881E-02 + + 1.1290059E-02 + + 1.1420028E-02 + + 1.1563732E-02 + + 1.1705467E-02 + + 1.1895794E-02 + + 1.2092710E-02 + + 1.2310135E-02 + + 1.2594991E-02 + + 1.2963713E-02 + + 1.3446042E-02 + + 1.4105472E-02 + + 1.5078624E-02 + + 1.6548015E-02 + + 1.8734322E-02 + + 2.2344993E-02 + + + + 1.0381081E-02 + + 1.0306858E-02 + + 1.0277150E-02 + + 1.0252664E-02 + + 1.0290401E-02 + + 1.0294657E-02 + + 1.0329546E-02 + + 1.0392619E-02 + + 1.0438626E-02 + + 1.0515024E-02 + + 1.0591864E-02 + + 1.0665572E-02 + + 1.0764627E-02 + + 1.0867664E-02 + + 1.0949159E-02 + + 1.1055591E-02 + + 1.1176115E-02 + + 1.1296618E-02 + + 1.1417920E-02 + + 1.1572450E-02 + + 1.1714864E-02 + + 1.1894815E-02 + + 1.2080388E-02 + + 1.2311306E-02 + + 1.2600200E-02 + + 1.2956245E-02 + + 1.3438289E-02 + + 1.4113577E-02 + + 1.5087407E-02 + + 1.6503410E-02 + + 1.8740374E-02 + + 2.2290166E-02 + + + + 1.0379499E-02 + + 1.0316828E-02 + + 1.0280998E-02 + + 1.0282758E-02 + + 1.0275605E-02 + + 1.0306117E-02 + + 1.0348208E-02 + + 1.0378745E-02 + + 1.0464787E-02 + + 1.0530463E-02 + + 1.0608232E-02 + + 1.0674147E-02 + + 1.0763998E-02 + + 1.0837280E-02 + + 1.0949195E-02 + + 1.1058508E-02 + + 1.1190589E-02 + + 1.1322242E-02 + + 1.1432422E-02 + + 1.1582770E-02 + + 1.1718207E-02 + + 1.1912632E-02 + + 1.2075287E-02 + + 1.2309263E-02 + + 1.2598203E-02 + + 1.2947275E-02 + + 1.3422204E-02 + + 1.4101792E-02 + + 1.5074531E-02 + + 1.6493963E-02 + + 1.8703917E-02 + + 2.2279156E-02 + + + + 1.0425160E-02 + + 1.0318223E-02 + + 1.0301788E-02 + + 1.0294047E-02 + + 1.0284686E-02 + + 1.0349566E-02 + + 1.0366017E-02 + + 1.0397170E-02 + + 1.0476721E-02 + + 1.0527169E-02 + + 1.0602826E-02 + + 1.0679945E-02 + + 1.0766188E-02 + + 1.0868516E-02 + + 1.0967919E-02 + + 1.1069388E-02 + + 1.1166089E-02 + + 1.1293657E-02 + + 1.1442396E-02 + + 1.1579055E-02 + + 1.1756181E-02 + + 1.1901153E-02 + + 1.2075228E-02 + + 1.2329489E-02 + + 1.2582177E-02 + + 1.2965246E-02 + + 1.3451596E-02 + + 1.4114325E-02 + + 1.5048259E-02 + + 1.6478843E-02 + + 1.8702139E-02 + + 2.2209013E-02 + + + + 1.0403120E-02 + + 1.0338330E-02 + + 1.0290627E-02 + + 1.0277361E-02 + + 1.0322671E-02 + + 1.0363565E-02 + + 1.0362094E-02 + + 1.0440786E-02 + + 1.0485173E-02 + + 1.0557958E-02 + + 1.0608779E-02 + + 1.0701287E-02 + + 1.0735526E-02 + + 1.0841760E-02 + + 1.0953485E-02 + + 1.1083460E-02 + + 1.1193252E-02 + + 1.1297597E-02 + + 1.1457508E-02 + + 1.1572681E-02 + + 1.1742409E-02 + + 1.1907920E-02 + + 1.2078022E-02 + + 1.2328222E-02 + + 1.2585186E-02 + + 1.2967887E-02 + + 1.3432333E-02 + + 1.4108413E-02 + + 1.5033330E-02 + + 1.6472418E-02 + + 1.8651936E-02 + + 2.2205180E-02 + + + + 1.0383972E-02 + + 1.0327340E-02 + + 1.0320447E-02 + + 1.0278943E-02 + + 1.0322805E-02 + + 1.0366993E-02 + + 1.0395218E-02 + + 1.0418111E-02 + + 1.0463460E-02 + + 1.0564171E-02 + + 1.0601357E-02 + + 1.0671268E-02 + + 1.0756633E-02 + + 1.0863620E-02 + + 1.0982943E-02 + + 1.1088262E-02 + + 1.1182298E-02 + + 1.1297412E-02 + + 1.1404871E-02 + + 1.1585288E-02 + + 1.1730768E-02 + + 1.1878353E-02 + + 1.2074551E-02 + + 1.2333404E-02 + + 1.2612428E-02 + + 1.2970577E-02 + + 1.3454326E-02 + + 1.4077858E-02 + + 1.5040384E-02 + + 1.6507810E-02 + + 1.8671362E-02 + + 2.2195534E-02 + + + + 1.0393621E-02 + + 1.0343827E-02 + + 1.0278122E-02 + + 1.0307024E-02 + + 1.0321853E-02 + + 1.0374136E-02 + + 1.0395136E-02 + + 1.0457919E-02 + + 1.0485306E-02 + + 1.0588898E-02 + + 1.0597124E-02 + + 1.0623537E-02 + + 1.0731134E-02 + + 1.0828231E-02 + + 1.0959209E-02 + + 1.1072327E-02 + + 1.1248877E-02 + + 1.1263490E-02 + + 1.1402046E-02 + + 1.1566689E-02 + + 1.1767919E-02 + + 1.1861445E-02 + + 1.2076314E-02 + + 1.2322575E-02 + + 1.2537228E-02 + + 1.2963070E-02 + + 1.3353083E-02 + + 1.4108968E-02 + + 1.5044977E-02 + + 1.6501651E-02 + + 1.8769742E-02 + + 2.2133504E-02 + + + 1.0002763E+00 + + + 1.0002760E+00 + + + 1.0002658E+00 + + + 1.0002710E+00 + + + 1.0002776E+00 + + + 1.0002767E+00 + + + 1.0002833E+00 + + + 1.0002791E+00 + + + 1.0002788E+00 + + + 1.0002858E+00 + + + 1.0002884E+00 + + + 1.0002916E+00 + + + 1.0003039E+00 + + + 1.0003181E+00 + + + 1.0003365E+00 + + + 1.0003544E+00 + + + 1.0003372E+00 + + + 1.0002764E+00 + + + 1.0002508E+00 + + + 1.0002343E+00 + + + 1.0002360E+00 + + + 1.0002375E+00 + + + 1.0002331E+00 + + + 1.0002344E+00 + + + 1.0002385E+00 + + + 1.0002316E+00 + + + 1.0002360E+00 + + + 1.0002360E+00 + + + 1.0002354E+00 + + + 1.0002349E+00 + + + 1.0002325E+00 + + + 1.0002268E+00 + + + + + clad_ang_mu.71c + clad_ang_mu.71c + 2.5300000E-08 + 32 + false + 32 + 1 + angle + histogram + + 3.1005638E-01 + + 3.0999067E-01 + + 3.0994879E-01 + + 3.0987779E-01 + + 3.0961631E-01 + + 3.0948272E-01 + + 3.0913340E-01 + + 3.0868239E-01 + + 3.0799925E-01 + + 3.0712597E-01 + + 3.0590948E-01 + + 3.0432728E-01 + + 3.0235012E-01 + + 2.9996873E-01 + + 2.9743091E-01 + + 2.9739624E-01 + + 3.0835788E-01 + + 3.1305337E-01 + + 3.1379599E-01 + + 3.1314506E-01 + + 3.1216249E-01 + + 3.1129786E-01 + + 3.1059203E-01 + + 3.1009561E-01 + + 3.0977837E-01 + + 3.0951041E-01 + + 3.0930940E-01 + + 3.0929712E-01 + + 3.0925741E-01 + + 3.0917641E-01 + + 3.0919741E-01 + + 3.0912502E-01 + + + 1.3490691E-03 + + 1.3463259E-03 + + 1.3498512E-03 + + 1.3366347E-03 + + 1.3288899E-03 + + 1.3176269E-03 + + 1.3059971E-03 + + 1.2891508E-03 + + 1.2713136E-03 + + 1.2555332E-03 + + 1.2394055E-03 + + 1.2170158E-03 + + 1.1969201E-03 + + 1.1849620E-03 + + 1.1899173E-03 + + 1.2761137E-03 + + 1.6244505E-03 + + 1.9090551E-03 + + 2.0837409E-03 + + 2.1976011E-03 + + 2.2746911E-03 + + 2.3308251E-03 + + 2.3700744E-03 + + 2.3981231E-03 + + 2.4248079E-03 + + 2.4441792E-03 + + 2.4510541E-03 + + 2.4640212E-03 + + 2.4741885E-03 + + 2.4697219E-03 + + 2.4721421E-03 + + 2.4729172E-03 + + + 8.6638893E-03 + + 8.2719674E-03 + + 7.8055649E-03 + + 7.4105610E-03 + + 7.2544086E-03 + + 7.0854147E-03 + + 6.9965517E-03 + + 7.0314805E-03 + + 6.8552954E-03 + + 6.9138525E-03 + + 6.9528906E-03 + + 7.0689776E-03 + + 7.0720596E-03 + + 7.2523539E-03 + + 7.5405167E-03 + + 7.7624175E-03 + + 7.9838046E-03 + + 8.1702629E-03 + + 8.4784584E-03 + + 8.8970906E-03 + + 9.3105862E-03 + + 9.7826390E-03 + + 1.0253151E-02 + + 1.0659455E-02 + + 1.1134076E-02 + + 1.1649276E-02 + + 1.2603655E-02 + + 1.3342297E-02 + + 1.4372697E-02 + + 1.5779610E-02 + + 1.7933383E-02 + + 2.0318816E-02 + + + + 8.6137649E-03 + + 8.0815773E-03 + + 7.7778880E-03 + + 7.4879636E-03 + + 7.2446680E-03 + + 7.0652074E-03 + + 6.9244607E-03 + + 6.9131046E-03 + + 6.9017486E-03 + + 6.9408066E-03 + + 6.9814132E-03 + + 7.0440438E-03 + + 7.1589812E-03 + + 7.3353447E-03 + + 7.5896522E-03 + + 7.7529390E-03 + + 8.0199791E-03 + + 8.3484454E-03 + + 8.5960425E-03 + + 8.9554799E-03 + + 9.2763754E-03 + + 9.7440398E-03 + + 1.0084034E-02 + + 1.0634976E-02 + + 1.1176800E-02 + + 1.1768004E-02 + + 1.2488944E-02 + + 1.3414293E-02 + + 1.4307639E-02 + + 1.5845012E-02 + + 1.7838866E-02 + + 2.0339442E-02 + + + + 8.6069286E-03 + + 8.1600584E-03 + + 7.7753343E-03 + + 7.5082514E-03 + + 7.2541589E-03 + + 7.1052368E-03 + + 7.0049508E-03 + + 6.9087178E-03 + + 6.8877253E-03 + + 6.9276318E-03 + + 6.9580813E-03 + + 7.0116019E-03 + + 7.1577180E-03 + + 7.3369857E-03 + + 7.5182280E-03 + + 7.7277374E-03 + + 7.9440018E-03 + + 8.2744779E-03 + + 8.6378977E-03 + + 8.8881451E-03 + + 9.2653867E-03 + + 9.6492794E-03 + + 1.0205685E-02 + + 1.0657959E-02 + + 1.1210208E-02 + + 1.1713716E-02 + + 1.2497402E-02 + + 1.3347079E-02 + + 1.4469243E-02 + + 1.5835834E-02 + + 1.7754882E-02 + + 2.0415319E-02 + + + + 8.6357058E-03 + + 8.1456937E-03 + + 7.7155413E-03 + + 7.4818571E-03 + + 7.2524325E-03 + + 7.0736756E-03 + + 7.0115740E-03 + + 6.8735456E-03 + + 6.8726489E-03 + + 6.9218219E-03 + + 6.9136015E-03 + + 7.0770385E-03 + + 7.1125358E-03 + + 7.2947303E-03 + + 7.5540473E-03 + + 7.7247333E-03 + + 7.9593143E-03 + + 8.2175104E-03 + + 8.5783123E-03 + + 8.9662416E-03 + + 9.2850446E-03 + + 9.7500218E-03 + + 1.0192206E-02 + + 1.0589252E-02 + + 1.1196518E-02 + + 1.1754610E-02 + + 1.2477858E-02 + + 1.3364244E-02 + + 1.4489097E-02 + + 1.5799582E-02 + + 1.7806262E-02 + + 2.0415575E-02 + + + + 8.6187094E-03 + + 8.1028888E-03 + + 7.7502930E-03 + + 7.4368288E-03 + + 7.2053294E-03 + + 7.0754195E-03 + + 6.9609624E-03 + + 6.9199506E-03 + + 6.8721819E-03 + + 6.9170716E-03 + + 6.9278240E-03 + + 7.0082024E-03 + + 7.1469258E-03 + + 7.2928174E-03 + + 7.4578635E-03 + + 7.7005853E-03 + + 7.9397817E-03 + + 8.2897923E-03 + + 8.5642424E-03 + + 8.9336425E-03 + + 9.2822429E-03 + + 9.6866617E-03 + + 1.0169638E-02 + + 1.0601319E-02 + + 1.1134062E-02 + + 1.1797713E-02 + + 1.2521413E-02 + + 1.3398584E-02 + + 1.4465948E-02 + + 1.5920693E-02 + + 1.7831503E-02 + + 2.0386280E-02 + + + + 8.5957828E-03 + + 8.0917421E-03 + + 7.7483058E-03 + + 7.4335661E-03 + + 7.2051598E-03 + + 7.0542832E-03 + + 6.9482999E-03 + + 6.8660522E-03 + + 6.8566650E-03 + + 6.8895446E-03 + + 6.9769966E-03 + + 7.0151292E-03 + + 7.1289919E-03 + + 7.2728159E-03 + + 7.4843447E-03 + + 7.6904746E-03 + + 7.9728210E-03 + + 8.2376090E-03 + + 8.5714149E-03 + + 8.9027889E-03 + + 9.2973443E-03 + + 9.6952072E-03 + + 1.0177798E-02 + + 1.0619290E-02 + + 1.1136220E-02 + + 1.1749356E-02 + + 1.2532485E-02 + + 1.3371645E-02 + + 1.4476030E-02 + + 1.5936887E-02 + + 1.7814576E-02 + + 2.0401706E-02 + + + + 8.5762717E-03 + + 8.0787798E-03 + + 7.6957274E-03 + + 7.4218081E-03 + + 7.1969403E-03 + + 7.0456914E-03 + + 6.9243998E-03 + + 6.8670339E-03 + + 6.8410876E-03 + + 6.8440959E-03 + + 6.9114894E-03 + + 6.9709444E-03 + + 7.1246584E-03 + + 7.2467020E-03 + + 7.4540634E-03 + + 7.6790984E-03 + + 7.9072251E-03 + + 8.2202101E-03 + + 8.5598098E-03 + + 8.9093117E-03 + + 9.2775317E-03 + + 9.6625479E-03 + + 1.0156279E-02 + + 1.0632045E-02 + + 1.1116292E-02 + + 1.1767916E-02 + + 1.2489983E-02 + + 1.3349302E-02 + + 1.4524155E-02 + + 1.5953415E-02 + + 1.7870641E-02 + + 2.0504336E-02 + + + + 8.5580155E-03 + + 8.0552826E-03 + + 7.6847006E-03 + + 7.3901486E-03 + + 7.1714794E-03 + + 6.9956094E-03 + + 6.8966894E-03 + + 6.8584904E-03 + + 6.8074847E-03 + + 6.8182305E-03 + + 6.8700458E-03 + + 6.9598760E-03 + + 7.0775275E-03 + + 7.2721659E-03 + + 7.4256244E-03 + + 7.6626570E-03 + + 7.8956048E-03 + + 8.2476025E-03 + + 8.5876768E-03 + + 8.8916497E-03 + + 9.2599869E-03 + + 9.6607086E-03 + + 1.0104818E-02 + + 1.0621057E-02 + + 1.1139577E-02 + + 1.1789513E-02 + + 1.2505652E-02 + + 1.3335138E-02 + + 1.4480446E-02 + + 1.5926378E-02 + + 1.7926012E-02 + + 2.0526011E-02 + + + + 8.5161659E-03 + + 8.0446298E-03 + + 7.6545410E-03 + + 7.3722009E-03 + + 7.1148071E-03 + + 6.9727284E-03 + + 6.8574133E-03 + + 6.7687628E-03 + + 6.7671107E-03 + + 6.8028617E-03 + + 6.8012426E-03 + + 6.9205557E-03 + + 7.0398688E-03 + + 7.2416867E-03 + + 7.3960899E-03 + + 7.6495518E-03 + + 7.9006016E-03 + + 8.1906074E-03 + + 8.4993478E-03 + + 8.8863636E-03 + + 9.2483009E-03 + + 9.6547452E-03 + + 1.0109959E-02 + + 1.0588004E-02 + + 1.1123575E-02 + + 1.1768480E-02 + + 1.2510924E-02 + + 1.3377043E-02 + + 1.4514862E-02 + + 1.5985046E-02 + + 1.7920853E-02 + + 2.0545741E-02 + + + + 8.4881904E-03 + + 8.0008968E-03 + + 7.5800933E-03 + + 7.3219921E-03 + + 7.0930406E-03 + + 6.9243759E-03 + + 6.8395166E-03 + + 6.7595356E-03 + + 6.7209304E-03 + + 6.7524289E-03 + + 6.7924495E-03 + + 6.8886916E-03 + + 7.0061035E-03 + + 7.1949742E-03 + + 7.3557793E-03 + + 7.6015942E-03 + + 7.8273839E-03 + + 8.1635087E-03 + + 8.4872268E-03 + + 8.8563257E-03 + + 9.1982925E-03 + + 9.6315629E-03 + + 1.0058991E-02 + + 1.0542942E-02 + + 1.1120245E-02 + + 1.1716127E-02 + + 1.2496242E-02 + + 1.3357995E-02 + + 1.4520670E-02 + + 1.5968277E-02 + + 1.7999571E-02 + + 2.0619911E-02 + + + + 8.4547550E-03 + + 7.9415583E-03 + + 7.5504996E-03 + + 7.2492760E-03 + + 7.0388623E-03 + + 6.9114334E-03 + + 6.7880701E-03 + + 6.7298137E-03 + + 6.6707776E-03 + + 6.6865113E-03 + + 6.7469676E-03 + + 6.8440431E-03 + + 6.9530093E-03 + + 7.1334872E-03 + + 7.3320937E-03 + + 7.5447909E-03 + + 7.7926035E-03 + + 8.1024597E-03 + + 8.4776176E-03 + + 8.7989469E-03 + + 9.1860513E-03 + + 9.6106103E-03 + + 1.0035921E-02 + + 1.0516926E-02 + + 1.1111883E-02 + + 1.1693054E-02 + + 1.2421315E-02 + + 1.3359879E-02 + + 1.4448956E-02 + + 1.5939312E-02 + + 1.7946680E-02 + + 2.0638422E-02 + + + + 8.4199682E-03 + + 7.9132357E-03 + + 7.5289024E-03 + + 7.2000914E-03 + + 6.9952420E-03 + + 6.8508371E-03 + + 6.7532303E-03 + + 6.6833325E-03 + + 6.6177839E-03 + + 6.6622382E-03 + + 6.7105208E-03 + + 6.7909136E-03 + + 6.9136513E-03 + + 7.0763901E-03 + + 7.2891302E-03 + + 7.5133811E-03 + + 7.7798727E-03 + + 8.0728234E-03 + + 8.3719982E-03 + + 8.7418259E-03 + + 9.0827206E-03 + + 9.5593221E-03 + + 9.9725625E-03 + + 1.0449294E-02 + + 1.0985324E-02 + + 1.1627712E-02 + + 1.2345830E-02 + + 1.3279892E-02 + + 1.4416720E-02 + + 1.5897541E-02 + + 1.7949472E-02 + + 2.0670535E-02 + + + + 8.3808798E-03 + + 7.8549469E-03 + + 7.4548947E-03 + + 7.1338816E-03 + + 6.9441484E-03 + + 6.7971643E-03 + + 6.6772004E-03 + + 6.6034372E-03 + + 6.5689962E-03 + + 6.6291014E-03 + + 6.6629260E-03 + + 6.7229080E-03 + + 6.8650107E-03 + + 7.0400011E-03 + + 7.2281319E-03 + + 7.4627838E-03 + + 7.7395439E-03 + + 8.0343750E-03 + + 8.3395359E-03 + + 8.6563579E-03 + + 9.0736921E-03 + + 9.4975103E-03 + + 9.9294641E-03 + + 1.0370071E-02 + + 1.0916688E-02 + + 1.1554450E-02 + + 1.2270239E-02 + + 1.3181629E-02 + + 1.4291357E-02 + + 1.5819158E-02 + + 1.7859062E-02 + + 2.0611377E-02 + + + + 8.3161285E-03 + + 7.8077760E-03 + + 7.3959293E-03 + + 7.1090603E-03 + + 6.8980291E-03 + + 6.7587447E-03 + + 6.6504860E-03 + + 6.5749792E-03 + + 6.5613818E-03 + + 6.5416597E-03 + + 6.6015118E-03 + + 6.7070747E-03 + + 6.8290963E-03 + + 7.0031900E-03 + + 7.1846853E-03 + + 7.4125063E-03 + + 7.6750420E-03 + + 7.9813021E-03 + + 8.2806571E-03 + + 8.6141119E-03 + + 8.9704813E-03 + + 9.3882871E-03 + + 9.8368112E-03 + + 1.0298412E-02 + + 1.0822136E-02 + + 1.1413491E-02 + + 1.2145337E-02 + + 1.3048321E-02 + + 1.4114237E-02 + + 1.5706737E-02 + + 1.7654188E-02 + + 2.0500295E-02 + + + + 8.3192873E-03 + + 7.7697531E-03 + + 7.3819594E-03 + + 7.0971817E-03 + + 6.8836908E-03 + + 6.7313952E-03 + + 6.6234836E-03 + + 6.5684539E-03 + + 6.5572540E-03 + + 6.5781759E-03 + + 6.6163018E-03 + + 6.6999200E-03 + + 6.8297696E-03 + + 6.9564324E-03 + + 7.1572917E-03 + + 7.4359960E-03 + + 7.6444528E-03 + + 7.9171531E-03 + + 8.2232683E-03 + + 8.5632604E-03 + + 8.9017284E-03 + + 9.3233527E-03 + + 9.7185361E-03 + + 1.0167756E-02 + + 1.0690318E-02 + + 1.1287654E-02 + + 1.1955699E-02 + + 1.2797701E-02 + + 1.3915636E-02 + + 1.5417831E-02 + + 1.7413631E-02 + + 2.0132344E-02 + + + + 8.3402366E-03 + + 7.8783074E-03 + + 7.5306252E-03 + + 7.2763123E-03 + + 7.0815582E-03 + + 6.9389151E-03 + + 6.8574149E-03 + + 6.7982581E-03 + + 6.7740232E-03 + + 6.7825822E-03 + + 6.8155653E-03 + + 6.8794036E-03 + + 7.0109342E-03 + + 7.1732489E-03 + + 7.3504593E-03 + + 7.5193707E-03 + + 7.7780813E-03 + + 8.0399365E-03 + + 8.3133536E-03 + + 8.6051891E-03 + + 8.9148994E-03 + + 9.3197524E-03 + + 9.7034206E-03 + + 1.0115863E-02 + + 1.0600845E-02 + + 1.1142903E-02 + + 1.1780624E-02 + + 1.2556047E-02 + + 1.3579729E-02 + + 1.4891180E-02 + + 1.6672103E-02 + + 1.9078712E-02 + + + + 8.8088395E-03 + + 8.4507679E-03 + + 8.1708811E-03 + + 7.9801672E-03 + + 7.8027326E-03 + + 7.7405325E-03 + + 7.6178992E-03 + + 7.5796349E-03 + + 7.5729815E-03 + + 7.5709385E-03 + + 7.6313441E-03 + + 7.6551420E-03 + + 7.7197992E-03 + + 7.8770525E-03 + + 7.9879526E-03 + + 8.1371998E-03 + + 8.3342910E-03 + + 8.5247565E-03 + + 8.7962504E-03 + + 9.0806648E-03 + + 9.3313150E-03 + + 9.6858805E-03 + + 1.0017311E-02 + + 1.0396502E-02 + + 1.0810783E-02 + + 1.1308495E-02 + + 1.1873348E-02 + + 1.2517849E-02 + + 1.3292300E-02 + + 1.4204872E-02 + + 1.5413040E-02 + + 1.6865149E-02 + + + + 9.0402122E-03 + + 8.7656934E-03 + + 8.5418137E-03 + + 8.3375574E-03 + + 8.2205328E-03 + + 8.0954859E-03 + + 8.0140696E-03 + + 7.9720195E-03 + + 7.9707073E-03 + + 7.9496524E-03 + + 7.9729738E-03 + + 8.0286530E-03 + + 8.0949490E-03 + + 8.2040408E-03 + + 8.3348436E-03 + + 8.4638271E-03 + + 8.5967473E-03 + + 8.8120082E-03 + + 9.0406595E-03 + + 9.2571730E-03 + + 9.4741636E-03 + + 9.7864082E-03 + + 1.0105154E-02 + + 1.0426882E-02 + + 1.0815324E-02 + + 1.1263114E-02 + + 1.1718090E-02 + + 1.2294266E-02 + + 1.2954841E-02 + + 1.3732023E-02 + + 1.4787929E-02 + + 1.6057604E-02 + + + + 9.1615425E-03 + + 8.8847745E-03 + + 8.6630839E-03 + + 8.4765570E-03 + + 8.3309009E-03 + + 8.2383585E-03 + + 8.1836800E-03 + + 8.1120640E-03 + + 8.1261785E-03 + + 8.0708249E-03 + + 8.1480561E-03 + + 8.1784637E-03 + + 8.2346151E-03 + + 8.3274337E-03 + + 8.4147598E-03 + + 8.5448285E-03 + + 8.7091710E-03 + + 8.8843142E-03 + + 9.0949279E-03 + + 9.2936363E-03 + + 9.5389840E-03 + + 9.7958383E-03 + + 1.0086138E-02 + + 1.0400309E-02 + + 1.0727798E-02 + + 1.1115580E-02 + + 1.1556966E-02 + + 1.2062390E-02 + + 1.2723933E-02 + + 1.3461879E-02 + + 1.4407800E-02 + + 1.5727050E-02 + + + + 9.1377654E-03 + + 8.8751018E-03 + + 8.6821226E-03 + + 8.4858221E-03 + + 8.3554460E-03 + + 8.2804350E-03 + + 8.2266991E-03 + + 8.1758459E-03 + + 8.1472390E-03 + + 8.1455783E-03 + + 8.1349878E-03 + + 8.1925776E-03 + + 8.2538648E-03 + + 8.3264317E-03 + + 8.4644531E-03 + + 8.6009391E-03 + + 8.7147401E-03 + + 8.9206598E-03 + + 9.1064325E-03 + + 9.2780740E-03 + + 9.4991589E-03 + + 9.7677443E-03 + + 1.0040842E-02 + + 1.0310399E-02 + + 1.0637483E-02 + + 1.1002699E-02 + + 1.1454957E-02 + + 1.1928711E-02 + + 1.2543618E-02 + + 1.3315003E-02 + + 1.4311921E-02 + + 1.5626273E-02 + + + + 9.1477964E-03 + + 8.8569131E-03 + + 8.6480911E-03 + + 8.4806682E-03 + + 8.3743826E-03 + + 8.2509863E-03 + + 8.2112855E-03 + + 8.1583830E-03 + + 8.1332616E-03 + + 8.1132990E-03 + + 8.1560439E-03 + + 8.1779291E-03 + + 8.2488074E-03 + + 8.3305803E-03 + + 8.4259072E-03 + + 8.5822114E-03 + + 8.7017305E-03 + + 8.8788944E-03 + + 9.0655429E-03 + + 9.2582475E-03 + + 9.4805275E-03 + + 9.7278007E-03 + + 9.9553998E-03 + + 1.0269546E-02 + + 1.0586672E-02 + + 1.0921006E-02 + + 1.1328973E-02 + + 1.1802691E-02 + + 1.2450626E-02 + + 1.3255698E-02 + + 1.4251456E-02 + + 1.5657809E-02 + + + + 9.0883340E-03 + + 8.8433984E-03 + + 8.6289182E-03 + + 8.4439323E-03 + + 8.3093188E-03 + + 8.2332632E-03 + + 8.1799745E-03 + + 8.1280446E-03 + + 8.0845653E-03 + + 8.1128997E-03 + + 8.1014997E-03 + + 8.1603558E-03 + + 8.2532133E-03 + + 8.3021938E-03 + + 8.4337253E-03 + + 8.5567067E-03 + + 8.6772027E-03 + + 8.8890649E-03 + + 9.0381936E-03 + + 9.2474046E-03 + + 9.4507499E-03 + + 9.7047326E-03 + + 9.9402566E-03 + + 1.0205441E-02 + + 1.0504990E-02 + + 1.0882385E-02 + + 1.1274627E-02 + + 1.1783289E-02 + + 1.2386232E-02 + + 1.3164784E-02 + + 1.4270026E-02 + + 1.5728107E-02 + + + + 9.0807708E-03 + + 8.8015024E-03 + + 8.5814276E-03 + + 8.4248165E-03 + + 8.2946254E-03 + + 8.2126919E-03 + + 8.1370075E-03 + + 8.0715301E-03 + + 8.0815288E-03 + + 8.0835771E-03 + + 8.1054492E-03 + + 8.1477700E-03 + + 8.2076231E-03 + + 8.2545960E-03 + + 8.4024583E-03 + + 8.5599026E-03 + + 8.6575633E-03 + + 8.8233051E-03 + + 9.0064404E-03 + + 9.2354725E-03 + + 9.4557209E-03 + + 9.6788857E-03 + + 9.8947250E-03 + + 1.0174410E-02 + + 1.0498117E-02 + + 1.0823664E-02 + + 1.1218924E-02 + + 1.1737640E-02 + + 1.2318916E-02 + + 1.3224386E-02 + + 1.4293237E-02 + + 1.5742419E-02 + + + + 9.0662532E-03 + + 8.7875937E-03 + + 8.5608939E-03 + + 8.3990606E-03 + + 8.2689578E-03 + + 8.1502455E-03 + + 8.0945876E-03 + + 8.0499873E-03 + + 8.0046473E-03 + + 8.0312744E-03 + + 8.0845285E-03 + + 8.0864516E-03 + + 8.1794243E-03 + + 8.2886692E-03 + + 8.3753921E-03 + + 8.5095259E-03 + + 8.6235784E-03 + + 8.8149234E-03 + + 9.0064533E-03 + + 9.1933604E-03 + + 9.4366281E-03 + + 9.6340012E-03 + + 9.8577424E-03 + + 1.0162178E-02 + + 1.0489950E-02 + + 1.0830480E-02 + + 1.1216758E-02 + + 1.1718234E-02 + + 1.2372964E-02 + + 1.3217004E-02 + + 1.4300060E-02 + + 1.5874384E-02 + + + + 9.0385593E-03 + + 8.7911739E-03 + + 8.5398942E-03 + + 8.3506015E-03 + + 8.2438909E-03 + + 8.1613890E-03 + + 8.0460870E-03 + + 8.0305903E-03 + + 8.0028889E-03 + + 8.0232434E-03 + + 8.0276194E-03 + + 8.1064278E-03 + + 8.1288298E-03 + + 8.2312446E-03 + + 8.3452218E-03 + + 8.4759402E-03 + + 8.6203085E-03 + + 8.7737100E-03 + + 8.9852040E-03 + + 9.1640184E-03 + + 9.3706145E-03 + + 9.6371098E-03 + + 9.8385671E-03 + + 1.0187163E-02 + + 1.0453859E-02 + + 1.0791575E-02 + + 1.1239213E-02 + + 1.1704998E-02 + + 1.2413952E-02 + + 1.3197580E-02 + + 1.4388298E-02 + + 1.5983777E-02 + + + + 9.0381972E-03 + + 8.7249421E-03 + + 8.5299403E-03 + + 8.3296610E-03 + + 8.1906552E-03 + + 8.0856852E-03 + + 8.0084895E-03 + + 7.9976213E-03 + + 7.9681027E-03 + + 7.9954298E-03 + + 8.0300023E-03 + + 8.0899341E-03 + + 8.1518784E-03 + + 8.2341280E-03 + + 8.3101161E-03 + + 8.4644180E-03 + + 8.6281121E-03 + + 8.7991411E-03 + + 8.9588100E-03 + + 9.1981791E-03 + + 9.3869641E-03 + + 9.6145258E-03 + + 9.9132005E-03 + + 1.0156461E-02 + + 1.0475933E-02 + + 1.0810611E-02 + + 1.1229999E-02 + + 1.1691965E-02 + + 1.2394061E-02 + + 1.3229214E-02 + + 1.4413895E-02 + + 1.6023151E-02 + + + + 8.9900779E-03 + + 8.7242101E-03 + + 8.4738461E-03 + + 8.3135886E-03 + + 8.1704723E-03 + + 8.0916227E-03 + + 8.0054050E-03 + + 7.9890825E-03 + + 7.9822260E-03 + + 7.9494275E-03 + + 8.0343148E-03 + + 8.0498187E-03 + + 8.1090198E-03 + + 8.2328458E-03 + + 8.3082672E-03 + + 8.4585469E-03 + + 8.6087756E-03 + + 8.8041342E-03 + + 8.9504229E-03 + + 9.1682953E-03 + + 9.3389911E-03 + + 9.6352014E-03 + + 9.8666333E-03 + + 1.0149489E-02 + + 1.0464017E-02 + + 1.0804437E-02 + + 1.1200629E-02 + + 1.1730829E-02 + + 1.2396625E-02 + + 1.3311556E-02 + + 1.4467897E-02 + + 1.6069551E-02 + + + + 9.0103050E-03 + + 8.7325667E-03 + + 8.5095225E-03 + + 8.3198922E-03 + + 8.1828827E-03 + + 8.0755069E-03 + + 7.9981914E-03 + + 7.9413633E-03 + + 7.9823990E-03 + + 7.9246563E-03 + + 7.9815454E-03 + + 8.0345931E-03 + + 8.0725191E-03 + + 8.2341012E-03 + + 8.3041608E-03 + + 8.3831836E-03 + + 8.6106789E-03 + + 8.7518346E-03 + + 8.9641474E-03 + + 9.0978032E-03 + + 9.3592003E-03 + + 9.5996223E-03 + + 9.9237621E-03 + + 1.0175830E-02 + + 1.0455459E-02 + + 1.0836548E-02 + + 1.1244650E-02 + + 1.1760188E-02 + + 1.2384627E-02 + + 1.3346254E-02 + + 1.4480133E-02 + + 1.6136563E-02 + + + + 9.0228604E-03 + + 8.6804828E-03 + + 8.4614534E-03 + + 8.2426545E-03 + + 8.1392111E-03 + + 8.0814949E-03 + + 7.9912702E-03 + + 7.9974952E-03 + + 7.9421615E-03 + + 7.9138029E-03 + + 7.9451587E-03 + + 8.0340001E-03 + + 8.0954821E-03 + + 8.1764077E-03 + + 8.3095930E-03 + + 8.4157262E-03 + + 8.6168490E-03 + + 8.7576427E-03 + + 8.9333274E-03 + + 9.1895534E-03 + + 9.3857577E-03 + + 9.6418300E-03 + + 9.8564788E-03 + + 1.0150132E-02 + + 1.0487898E-02 + + 1.0870470E-02 + + 1.1271947E-02 + + 1.1778020E-02 + + 1.2502739E-02 + + 1.3339816E-02 + + 1.4543555E-02 + + 1.6130789E-02 + + + + 9.0622003E-03 + + 8.7178702E-03 + + 8.4596226E-03 + + 8.2747360E-03 + + 8.1644825E-03 + + 8.0165944E-03 + + 7.9932716E-03 + + 7.9360246E-03 + + 7.9425974E-03 + + 7.9418553E-03 + + 7.9541528E-03 + + 8.0182907E-03 + + 8.0812624E-03 + + 8.0915456E-03 + + 8.2908500E-03 + + 8.4101146E-03 + + 8.5246086E-03 + + 8.7454336E-03 + + 8.9623361E-03 + + 9.1273983E-03 + + 9.3738784E-03 + + 9.6552369E-03 + + 9.8941901E-03 + + 1.0161555E-02 + + 1.0501008E-02 + + 1.0866011E-02 + + 1.1314128E-02 + + 1.1790338E-02 + + 1.2447300E-02 + + 1.3396964E-02 + + 1.4531939E-02 + + 1.6115773E-02 + + + + 8.9679455E-03 + + 8.7523346E-03 + + 8.4194831E-03 + + 8.2562897E-03 + + 8.2501744E-03 + + 8.0453964E-03 + + 7.9636250E-03 + + 7.9278064E-03 + + 7.9395130E-03 + + 7.8808053E-03 + + 7.8942591E-03 + + 7.9779525E-03 + + 8.1203535E-03 + + 8.1780129E-03 + + 8.2976996E-03 + + 8.3927501E-03 + + 8.5693973E-03 + + 8.7760972E-03 + + 8.9639268E-03 + + 9.1777904E-03 + + 9.3233365E-03 + + 9.6757573E-03 + + 9.8043550E-03 + + 1.0142972E-02 + + 1.0460099E-02 + + 1.0900581E-02 + + 1.1166513E-02 + + 1.1798843E-02 + + 1.2569032E-02 + + 1.3335377E-02 + + 1.4567713E-02 + + 1.6266042E-02 + + + + 9.0235493E-03 + + 8.7359753E-03 + + 8.4400355E-03 + + 8.2314136E-03 + + 8.1409585E-03 + + 8.0562549E-03 + + 8.0165174E-03 + + 7.9631855E-03 + + 7.9527283E-03 + + 7.9590026E-03 + + 7.9558654E-03 + + 7.9982172E-03 + + 7.9903743E-03 + + 8.1472328E-03 + + 8.3527175E-03 + + 8.3019999E-03 + + 8.5775481E-03 + + 8.8353190E-03 + + 8.9853803E-03 + + 9.0836784E-03 + + 9.4481131E-03 + + 9.5401367E-03 + + 9.8920227E-03 + + 1.0186917E-02 + + 1.0500634E-02 + + 1.0833697E-02 + + 1.1379042E-02 + + 1.1793671E-02 + + 1.2553389E-02 + + 1.3369577E-02 + + 1.4595165E-02 + + 1.6031466E-02 + + + 1.0000416E+00 + + + 1.0000513E+00 + + + 1.0000397E+00 + + + 1.0000409E+00 + + + 1.0000455E+00 + + + 1.0000417E+00 + + + 1.0000452E+00 + + + 1.0000431E+00 + + + 1.0000455E+00 + + + 1.0000451E+00 + + + 1.0000445E+00 + + + 1.0000482E+00 + + + 1.0000507E+00 + + + 1.0000542E+00 + + + 1.0000545E+00 + + + 1.0000461E+00 + + + 1.0000114E+00 + + + 1.0000112E+00 + + + 1.0000195E+00 + + + 1.0000216E+00 + + + 1.0000279E+00 + + + 1.0000307E+00 + + + 1.0000302E+00 + + + 1.0000313E+00 + + + 1.0000334E+00 + + + 1.0000309E+00 + + + 1.0000325E+00 + + + 1.0000318E+00 + + + 1.0000346E+00 + + + 1.0000335E+00 + + + 1.0000285E+00 + + + 1.0000358E+00 + + + + + lwtr_ang_mu.71c + lwtr_ang_mu.71c + 2.5300000E-08 + 32 + false + 32 + 1 + angle + histogram + + 8.3129229E-01 + + 8.3203829E-01 + + 8.3332424E-01 + + 8.3539719E-01 + + 8.3799288E-01 + + 8.4156597E-01 + + 8.4594074E-01 + + 8.5122773E-01 + + 8.5788274E-01 + + 8.6633387E-01 + + 8.7719846E-01 + + 8.9195077E-01 + + 9.1326621E-01 + + 9.4469159E-01 + + 9.9368716E-01 + + 1.0616854E+00 + + 1.0982938E+00 + + 1.0997200E+00 + + 1.0855410E+00 + + 1.0676695E+00 + + 1.0508172E+00 + + 1.0369337E+00 + + 1.0255762E+00 + + 1.0162841E+00 + + 1.0086633E+00 + + 1.0025783E+00 + + 9.9737297E-01 + + 9.9326768E-01 + + 9.9030852E-01 + + 9.8792719E-01 + + 9.8610453E-01 + + 9.8540665E-01 + + + 7.7368065E-03 + + 7.7519393E-03 + + 7.7819449E-03 + + 7.8285240E-03 + + 7.8881877E-03 + + 7.9652685E-03 + + 8.0588251E-03 + + 8.1724303E-03 + + 8.3079937E-03 + + 8.4749946E-03 + + 8.6811506E-03 + + 8.9456784E-03 + + 9.3049336E-03 + + 9.8025199E-03 + + 1.0529992E-02 + + 1.1498571E-02 + + 1.2065971E-02 + + 1.2168395E-02 + + 1.2053690E-02 + + 1.1870414E-02 + + 1.1678759E-02 + + 1.1516371E-02 + + 1.1377145E-02 + + 1.1262809E-02 + + 1.1166687E-02 + + 1.1090107E-02 + + 1.1022668E-02 + + 1.0968772E-02 + + 1.0931381E-02 + + 1.0898236E-02 + + 1.0872094E-02 + + 1.0866295E-02 + + + 5.0690953E-03 + + 8.8284325E-03 + + 9.0078067E-03 + + 8.3473577E-03 + + 8.6118779E-03 + + 8.5008333E-03 + + 9.0278160E-03 + + 9.0320024E-03 + + 9.3778370E-03 + + 9.6052477E-03 + + 9.9703821E-03 + + 1.0342612E-02 + + 1.0646441E-02 + + 1.1197549E-02 + + 1.1382812E-02 + + 1.2469275E-02 + + 1.3368771E-02 + + 1.7162734E-02 + + 2.0335842E-02 + + 2.4108518E-02 + + 2.7585384E-02 + + 3.1409361E-02 + + 3.5211839E-02 + + 3.9132244E-02 + + 4.2882641E-02 + + 4.7206070E-02 + + 5.1012876E-02 + + 5.6053305E-02 + + 5.9624825E-02 + + 6.4222850E-02 + + 7.1113785E-02 + + 7.1863425E-02 + + + + 5.0668773E-03 + + 8.8623444E-03 + + 8.9736897E-03 + + 8.4193826E-03 + + 8.6200366E-03 + + 8.5331711E-03 + + 9.0253536E-03 + + 9.0024868E-03 + + 9.3587966E-03 + + 9.6337679E-03 + + 9.9001048E-03 + + 1.0351369E-02 + + 1.0700823E-02 + + 1.1172796E-02 + + 1.1445656E-02 + + 1.2427412E-02 + + 1.3375674E-02 + + 1.7104580E-02 + + 2.0306601E-02 + + 2.4056263E-02 + + 2.7577305E-02 + + 3.1469932E-02 + + 3.5286392E-02 + + 3.9182103E-02 + + 4.2943152E-02 + + 4.7360483E-02 + + 5.1005109E-02 + + 5.6171187E-02 + + 5.9667108E-02 + + 6.4232789E-02 + + 7.1121280E-02 + + 7.1846306E-02 + + + + 5.0585819E-03 + + 8.8480548E-03 + + 9.0578095E-03 + + 8.4267843E-03 + + 8.6269032E-03 + + 8.5421136E-03 + + 9.0526837E-03 + + 9.0736449E-03 + + 9.4245294E-03 + + 9.6888060E-03 + + 9.9567766E-03 + + 1.0375670E-02 + + 1.0725481E-02 + + 1.1243110E-02 + + 1.1484936E-02 + + 1.2521826E-02 + + 1.3438046E-02 + + 1.7151864E-02 + + 2.0343472E-02 + + 2.4110251E-02 + + 2.7659343E-02 + + 3.1511614E-02 + + 3.5309076E-02 + + 3.9196826E-02 + + 4.3043312E-02 + + 4.7345488E-02 + + 5.1124137E-02 + + 5.6080519E-02 + + 5.9764341E-02 + + 6.4292466E-02 + + 7.1165161E-02 + + 7.1900319E-02 + + + + 5.0739533E-03 + + 8.8878014E-03 + + 9.0739746E-03 + + 8.4571184E-03 + + 8.6763187E-03 + + 8.5845734E-03 + + 9.0893274E-03 + + 9.1072493E-03 + + 9.4607350E-03 + + 9.7370233E-03 + + 1.0006337E-02 + + 1.0437546E-02 + + 1.0767301E-02 + + 1.1309766E-02 + + 1.1552543E-02 + + 1.2572863E-02 + + 1.3499221E-02 + + 1.7217227E-02 + + 2.0383163E-02 + + 2.4178222E-02 + + 2.7731888E-02 + + 3.1561770E-02 + + 3.5431417E-02 + + 3.9298803E-02 + + 4.3075219E-02 + + 4.7440921E-02 + + 5.1196928E-02 + + 5.6281715E-02 + + 5.9863517E-02 + + 6.4363763E-02 + + 7.1290039E-02 + + 7.1984722E-02 + + + + 5.0933569E-03 + + 8.9571748E-03 + + 9.1350789E-03 + + 8.5026806E-03 + + 8.7154122E-03 + + 8.6182850E-03 + + 9.1387403E-03 + + 9.1503576E-03 + + 9.5054271E-03 + + 9.8046510E-03 + + 1.0063015E-02 + + 1.0512898E-02 + + 1.0850976E-02 + + 1.1369711E-02 + + 1.1602210E-02 + + 1.2644534E-02 + + 1.3573331E-02 + + 1.7276147E-02 + + 2.0485160E-02 + + 2.4267827E-02 + + 2.7795345E-02 + + 3.1650606E-02 + + 3.5516413E-02 + + 3.9384282E-02 + + 4.3193261E-02 + + 4.7565933E-02 + + 5.1283045E-02 + + 5.6364736E-02 + + 5.9999740E-02 + + 6.4499325E-02 + + 7.1460960E-02 + + 7.2121578E-02 + + + + 5.1073627E-03 + + 9.0205393E-03 + + 9.1796662E-03 + + 8.5645656E-03 + + 8.7990379E-03 + + 8.7021912E-03 + + 9.2162069E-03 + + 9.2138958E-03 + + 9.5751521E-03 + + 9.8799162E-03 + + 1.0149817E-02 + + 1.0595940E-02 + + 1.0925157E-02 + + 1.1451227E-02 + + 1.1697295E-02 + + 1.2747125E-02 + + 1.3679064E-02 + + 1.7388258E-02 + + 2.0589616E-02 + + 2.4369432E-02 + + 2.7920510E-02 + + 3.1792267E-02 + + 3.5621878E-02 + + 3.9491661E-02 + + 4.3278532E-02 + + 4.7679951E-02 + + 5.1436615E-02 + + 5.6547886E-02 + + 6.0145268E-02 + + 6.4662138E-02 + + 7.1681806E-02 + + 7.2326892E-02 + + + + 5.1442091E-03 + + 9.0852521E-03 + + 9.2735609E-03 + + 8.6388628E-03 + + 8.8708740E-03 + + 8.7690933E-03 + + 9.2934119E-03 + + 9.3186161E-03 + + 9.6592707E-03 + + 9.9678700E-03 + + 1.0236163E-02 + + 1.0694734E-02 + + 1.1025890E-02 + + 1.1566030E-02 + + 1.1820104E-02 + + 1.2881706E-02 + + 1.3817409E-02 + + 1.7525018E-02 + + 2.0707299E-02 + + 2.4504049E-02 + + 2.8056398E-02 + + 3.1942086E-02 + + 3.5781215E-02 + + 3.9676732E-02 + + 4.3508487E-02 + + 4.7899374E-02 + + 5.1653601E-02 + + 5.6724194E-02 + + 6.0363176E-02 + + 6.4884496E-02 + + 7.1995314E-02 + + 7.2586420E-02 + + + + 5.1859947E-03 + + 9.1884111E-03 + + 9.3553722E-03 + + 8.7326674E-03 + + 8.9615831E-03 + + 8.8682756E-03 + + 9.3981872E-03 + + 9.4022342E-03 + + 9.7833217E-03 + + 1.0082626E-02 + + 1.0346345E-02 + + 1.0823172E-02 + + 1.1169852E-02 + + 1.1713674E-02 + + 1.1957780E-02 + + 1.3030310E-02 + + 1.3974055E-02 + + 1.7679518E-02 + + 2.0873339E-02 + + 2.4674002E-02 + + 2.8233633E-02 + + 3.2098518E-02 + + 3.5967409E-02 + + 3.9901149E-02 + + 4.3708564E-02 + + 4.8163155E-02 + + 5.1864987E-02 + + 5.6965609E-02 + + 6.0598955E-02 + + 6.5237827E-02 + + 7.2317026E-02 + + 7.2846315E-02 + + + + 5.2179276E-03 + + 9.2840460E-03 + + 9.4689692E-03 + + 8.8426310E-03 + + 9.0784020E-03 + + 8.9710561E-03 + + 9.5058449E-03 + + 9.5242525E-03 + + 9.8985438E-03 + + 1.0230104E-02 + + 1.0489612E-02 + + 1.0966586E-02 + + 1.1313882E-02 + + 1.1867051E-02 + + 1.2127596E-02 + + 1.3217267E-02 + + 1.4158489E-02 + + 1.7874095E-02 + + 2.1071639E-02 + + 2.4904630E-02 + + 2.8444961E-02 + + 3.2350782E-02 + + 3.6218293E-02 + + 4.0127228E-02 + + 4.3958446E-02 + + 4.8412743E-02 + + 5.2176893E-02 + + 5.7339635E-02 + + 6.0969984E-02 + + 6.5571180E-02 + + 7.2752295E-02 + + 7.3254466E-02 + + + + 5.2716442E-03 + + 9.4281164E-03 + + 9.6132026E-03 + + 8.9742401E-03 + + 9.2100433E-03 + + 9.1094424E-03 + + 9.6671272E-03 + + 9.6893875E-03 + + 1.0054424E-02 + + 1.0384782E-02 + + 1.0663088E-02 + + 1.1145331E-02 + + 1.1502660E-02 + + 1.2069220E-02 + + 1.2330654E-02 + + 1.3451168E-02 + + 1.4376732E-02 + + 1.8119744E-02 + + 2.1312268E-02 + + 2.5156150E-02 + + 2.8702855E-02 + + 3.2612605E-02 + + 3.6519082E-02 + + 4.0492357E-02 + + 4.4282144E-02 + + 4.8807320E-02 + + 5.2599863E-02 + + 5.7759050E-02 + + 6.1395630E-02 + + 6.6046712E-02 + + 7.3333461E-02 + + 7.3753560E-02 + + + + 5.3238344E-03 + + 9.5970913E-03 + + 9.7854600E-03 + + 9.1224140E-03 + + 9.3984166E-03 + + 9.2843910E-03 + + 9.8479041E-03 + + 9.8775712E-03 + + 1.0248815E-02 + + 1.0588076E-02 + + 1.0866467E-02 + + 1.1377201E-02 + + 1.1745016E-02 + + 1.2324752E-02 + + 1.2591933E-02 + + 1.3738942E-02 + + 1.4661945E-02 + + 1.8420789E-02 + + 2.1616210E-02 + + 2.5483933E-02 + + 2.9053296E-02 + + 3.3018657E-02 + + 3.6902567E-02 + + 4.0918920E-02 + + 4.4768920E-02 + + 4.9324206E-02 + + 5.3104469E-02 + + 5.8346792E-02 + + 6.2007342E-02 + + 6.6700912E-02 + + 7.4111114E-02 + + 7.4471661E-02 + + + + 5.4122500E-03 + + 9.8114809E-03 + + 9.9988824E-03 + + 9.3373137E-03 + + 9.6193550E-03 + + 9.5022652E-03 + + 1.0091629E-02 + + 1.0102292E-02 + + 1.0507181E-02 + + 1.0845994E-02 + + 1.1145961E-02 + + 1.1663724E-02 + + 1.2054675E-02 + + 1.2641320E-02 + + 1.2925378E-02 + + 1.4109631E-02 + + 1.5019788E-02 + + 1.8801255E-02 + + 2.2007215E-02 + + 2.5928762E-02 + + 2.9530128E-02 + + 3.3525210E-02 + + 3.7488914E-02 + + 4.1518826E-02 + + 4.5409731E-02 + + 5.0007891E-02 + + 5.3821041E-02 + + 5.9155539E-02 + + 6.2863258E-02 + + 6.7589912E-02 + + 7.5149452E-02 + + 7.5483624E-02 + + + + 5.5291381E-03 + + 1.0106920E-02 + + 1.0289680E-02 + + 9.6380580E-03 + + 9.9265277E-03 + + 9.8058620E-03 + + 1.0411771E-02 + + 1.0436031E-02 + + 1.0855919E-02 + + 1.1210324E-02 + + 1.1523264E-02 + + 1.2064653E-02 + + 1.2477020E-02 + + 1.3073068E-02 + + 1.3372106E-02 + + 1.4596687E-02 + + 1.5522669E-02 + + 1.9346144E-02 + + 2.2590235E-02 + + 2.6577078E-02 + + 3.0198519E-02 + + 3.4263702E-02 + + 3.8312940E-02 + + 4.2417033E-02 + + 4.6331184E-02 + + 5.1039786E-02 + + 5.4923952E-02 + + 6.0373272E-02 + + 6.4126997E-02 + + 6.8933518E-02 + + 7.6721947E-02 + + 7.6881324E-02 + + + + 5.7051926E-03 + + 1.0534340E-02 + + 1.0734999E-02 + + 1.0047973E-02 + + 1.0355258E-02 + + 1.0218464E-02 + + 1.0877782E-02 + + 1.0922582E-02 + + 1.1349348E-02 + + 1.1717445E-02 + + 1.2048634E-02 + + 1.2622834E-02 + + 1.3044209E-02 + + 1.3697572E-02 + + 1.4007429E-02 + + 1.5297796E-02 + + 1.6229092E-02 + + 2.0130646E-02 + + 2.3419720E-02 + + 2.7507372E-02 + + 3.1241243E-02 + + 3.5411821E-02 + + 3.9541855E-02 + + 4.3748213E-02 + + 4.7789294E-02 + + 5.2605069E-02 + + 5.6580575E-02 + + 6.2218120E-02 + + 6.6002923E-02 + + 7.0996802E-02 + + 7.9059610E-02 + + 7.9125302E-02 + + + + 5.9798621E-03 + + 1.1178770E-02 + + 1.1398960E-02 + + 1.0686315E-02 + + 1.1015007E-02 + + 1.0888426E-02 + + 1.1578312E-02 + + 1.1599595E-02 + + 1.2096215E-02 + + 1.2485774E-02 + + 1.2847301E-02 + + 1.3454293E-02 + + 1.3910042E-02 + + 1.4624946E-02 + + 1.4951480E-02 + + 1.6345303E-02 + + 1.7294576E-02 + + 2.1305917E-02 + + 2.4724135E-02 + + 2.8975117E-02 + + 3.2851405E-02 + + 3.7179235E-02 + + 4.1473071E-02 + + 4.5870569E-02 + + 5.0061541E-02 + + 5.5118747E-02 + + 5.9217709E-02 + + 6.5121185E-02 + + 6.9056004E-02 + + 7.4268036E-02 + + 8.2796332E-02 + + 8.2707329E-02 + + + + 6.3814382E-03 + + 1.2092503E-02 + + 1.2307256E-02 + + 1.1538828E-02 + + 1.1908080E-02 + + 1.1757836E-02 + + 1.2534374E-02 + + 1.2563508E-02 + + 1.3099926E-02 + + 1.3526120E-02 + + 1.3927022E-02 + + 1.4604411E-02 + + 1.5096848E-02 + + 1.5885767E-02 + + 1.6230507E-02 + + 1.7756050E-02 + + 1.8747181E-02 + + 2.2956423E-02 + + 2.6549953E-02 + + 3.1007445E-02 + + 3.5079178E-02 + + 3.9663485E-02 + + 4.4205438E-02 + + 4.8827182E-02 + + 5.3252335E-02 + + 5.8585422E-02 + + 6.2916830E-02 + + 6.9202743E-02 + + 7.3345048E-02 + + 7.8865458E-02 + + 8.8060504E-02 + + 8.7720181E-02 + + + + 6.5814203E-03 + + 1.2589556E-02 + + 1.2831098E-02 + + 1.2021990E-02 + + 1.2420962E-02 + + 1.2274328E-02 + + 1.3072229E-02 + + 1.3125790E-02 + + 1.3684984E-02 + + 1.4120320E-02 + + 1.4541810E-02 + + 1.5241834E-02 + + 1.5792664E-02 + + 1.6581300E-02 + + 1.6973815E-02 + + 1.8580511E-02 + + 1.9572617E-02 + + 2.3865583E-02 + + 2.7520381E-02 + + 3.2101383E-02 + + 3.6273771E-02 + + 4.0991031E-02 + + 4.5628107E-02 + + 5.0375712E-02 + + 5.4927552E-02 + + 6.0463390E-02 + + 6.4846891E-02 + + 7.1361573E-02 + + 7.5574981E-02 + + 8.1252683E-02 + + 9.0772914E-02 + + 9.0305344E-02 + + + + 6.5954047E-03 + + 1.2649872E-02 + + 1.2894758E-02 + + 1.2088299E-02 + + 1.2500706E-02 + + 1.2323868E-02 + + 1.3135140E-02 + + 1.3183877E-02 + + 1.3757540E-02 + + 1.4215358E-02 + + 1.4630076E-02 + + 1.5341576E-02 + + 1.5875377E-02 + + 1.6697400E-02 + + 1.7075964E-02 + + 1.8685615E-02 + + 1.9688554E-02 + + 2.3959638E-02 + + 2.7582865E-02 + + 3.2154359E-02 + + 3.6319478E-02 + + 4.0991674E-02 + + 4.5627244E-02 + + 5.0390376E-02 + + 5.4901681E-02 + + 6.0435636E-02 + + 6.4805706E-02 + + 7.1338882E-02 + + 7.5494665E-02 + + 8.1186566E-02 + + 9.0719563E-02 + + 9.0193680E-02 + + + + 6.5336047E-03 + + 1.2512090E-02 + + 1.2764479E-02 + + 1.1984145E-02 + + 1.2375802E-02 + + 1.2210337E-02 + + 1.3005945E-02 + + 1.3053548E-02 + + 1.3626485E-02 + + 1.4068961E-02 + + 1.4494598E-02 + + 1.5200428E-02 + + 1.5722617E-02 + + 1.6508783E-02 + + 1.6910525E-02 + + 1.8489314E-02 + + 1.9473998E-02 + + 2.3688731E-02 + + 2.7256893E-02 + + 3.1731269E-02 + + 3.5822276E-02 + + 4.0457390E-02 + + 4.5020879E-02 + + 4.9721896E-02 + + 5.4161674E-02 + + 5.9588663E-02 + + 6.3895979E-02 + + 7.0351683E-02 + + 7.4478980E-02 + + 8.0093110E-02 + + 8.9495166E-02 + + 8.8945256E-02 + + + + 6.4468824E-03 + + 1.2344191E-02 + + 1.2577769E-02 + + 1.1799198E-02 + + 1.2185250E-02 + + 1.2024671E-02 + + 1.2823561E-02 + + 1.2867050E-02 + + 1.3414223E-02 + + 1.3868383E-02 + + 1.4274902E-02 + + 1.4957665E-02 + + 1.5477639E-02 + + 1.6280478E-02 + + 1.6660201E-02 + + 1.8210099E-02 + + 1.9176459E-02 + + 2.3317865E-02 + + 2.6814611E-02 + + 3.1226187E-02 + + 3.5261695E-02 + + 3.9778054E-02 + + 4.4282066E-02 + + 4.8849080E-02 + + 5.3188035E-02 + + 5.8562223E-02 + + 6.2824222E-02 + + 6.9127893E-02 + + 7.3188187E-02 + + 7.8690046E-02 + + 8.7933862E-02 + + 8.7463314E-02 + + + + 6.3504172E-03 + + 1.2150642E-02 + + 1.2387727E-02 + + 1.1620660E-02 + + 1.2007755E-02 + + 1.1841239E-02 + + 1.2616226E-02 + + 1.2659354E-02 + + 1.3210608E-02 + + 1.3647237E-02 + + 1.4056090E-02 + + 1.4738601E-02 + + 1.5248667E-02 + + 1.6022604E-02 + + 1.6399027E-02 + + 1.7924821E-02 + + 1.8865800E-02 + + 2.2962104E-02 + + 2.6396869E-02 + + 3.0722714E-02 + + 3.4680261E-02 + + 3.9148700E-02 + + 4.3549586E-02 + + 4.8057389E-02 + + 5.2369847E-02 + + 5.7634643E-02 + + 6.1797568E-02 + + 6.8018235E-02 + + 7.1991375E-02 + + 7.7432633E-02 + + 8.6562066E-02 + + 8.6040544E-02 + + + + 6.2807225E-03 + + 1.2005102E-02 + + 1.2236833E-02 + + 1.1484849E-02 + + 1.1844265E-02 + + 1.1694745E-02 + + 1.2469442E-02 + + 1.2503258E-02 + + 1.3035750E-02 + + 1.3456731E-02 + + 1.3869786E-02 + + 1.4538788E-02 + + 1.5043345E-02 + + 1.5804904E-02 + + 1.6173155E-02 + + 1.7678967E-02 + + 1.8617817E-02 + + 2.2640680E-02 + + 2.6043512E-02 + + 3.0350793E-02 + + 3.4235767E-02 + + 3.8635112E-02 + + 4.3006209E-02 + + 4.7438737E-02 + + 5.1680206E-02 + + 5.6869882E-02 + + 6.0948428E-02 + + 6.7112720E-02 + + 7.1046470E-02 + + 7.6389984E-02 + + 8.5416908E-02 + + 8.4912400E-02 + + + + 6.2384011E-03 + + 1.1883626E-02 + + 1.2102819E-02 + + 1.1362792E-02 + + 1.1727085E-02 + + 1.1577991E-02 + + 1.2321572E-02 + + 1.2368887E-02 + + 1.2886627E-02 + + 1.3323476E-02 + + 1.3712662E-02 + + 1.4368905E-02 + + 1.4867001E-02 + + 1.5621404E-02 + + 1.6001770E-02 + + 1.7495457E-02 + + 1.8410484E-02 + + 2.2403739E-02 + + 2.5792442E-02 + + 3.0003874E-02 + + 3.3860219E-02 + + 3.8194472E-02 + + 4.2513447E-02 + + 4.6944801E-02 + + 5.1102508E-02 + + 5.6230364E-02 + + 6.0282905E-02 + + 6.6396185E-02 + + 7.0267237E-02 + + 7.5567209E-02 + + 8.4430462E-02 + + 8.3984117E-02 + + + + 6.1845926E-03 + + 1.1774745E-02 + + 1.2008907E-02 + + 1.1282463E-02 + + 1.1630642E-02 + + 1.1486008E-02 + + 1.2212483E-02 + + 1.2255192E-02 + + 1.2777462E-02 + + 1.3204562E-02 + + 1.3600398E-02 + + 1.4255316E-02 + + 1.4736561E-02 + + 1.5470029E-02 + + 1.5845176E-02 + + 1.7313807E-02 + + 1.8247178E-02 + + 2.2230316E-02 + + 2.5531152E-02 + + 2.9731972E-02 + + 3.3558284E-02 + + 3.7872884E-02 + + 4.2109048E-02 + + 4.6517240E-02 + + 5.0645413E-02 + + 5.5683251E-02 + + 5.9750465E-02 + + 6.5766931E-02 + + 6.9579667E-02 + + 7.4872290E-02 + + 8.3643239E-02 + + 8.3206968E-02 + + + + 6.1719734E-03 + + 1.1719545E-02 + + 1.1917909E-02 + + 1.1189341E-02 + + 1.1548606E-02 + + 1.1416064E-02 + + 1.2129643E-02 + + 1.2168083E-02 + + 1.2694983E-02 + + 1.3100793E-02 + + 1.3481593E-02 + + 1.4146417E-02 + + 1.4630389E-02 + + 1.5367839E-02 + + 1.5730917E-02 + + 1.7184516E-02 + + 1.8089440E-02 + + 2.2023196E-02 + + 2.5336832E-02 + + 2.9501303E-02 + + 3.3286048E-02 + + 3.7579302E-02 + + 4.1818920E-02 + + 4.6160226E-02 + + 5.0276169E-02 + + 5.5322377E-02 + + 5.9292479E-02 + + 6.5292838E-02 + + 6.9134443E-02 + + 7.4296625E-02 + + 8.3006295E-02 + + 8.2573545E-02 + + + + 6.1382782E-03 + + 1.1652027E-02 + + 1.1858603E-02 + + 1.1149474E-02 + + 1.1500153E-02 + + 1.1352538E-02 + + 1.2052433E-02 + + 1.2104328E-02 + + 1.2615826E-02 + + 1.3028027E-02 + + 1.3393814E-02 + + 1.4056119E-02 + + 1.4520800E-02 + + 1.5244525E-02 + + 1.5619872E-02 + + 1.7065448E-02 + + 1.7976677E-02 + + 2.1928655E-02 + + 2.5188600E-02 + + 2.9345474E-02 + + 3.3098490E-02 + + 3.7352890E-02 + + 4.1577882E-02 + + 4.5851588E-02 + + 4.9907550E-02 + + 5.5007580E-02 + + 5.8924848E-02 + + 6.4866195E-02 + + 6.8653679E-02 + + 7.3799695E-02 + + 8.2491620E-02 + + 8.2047228E-02 + + + + 6.1241006E-03 + + 1.1590726E-02 + + 1.1801215E-02 + + 1.1080585E-02 + + 1.1434054E-02 + + 1.1286311E-02 + + 1.2000496E-02 + + 1.2020032E-02 + + 1.2555074E-02 + + 1.2968561E-02 + + 1.3345040E-02 + + 1.3984260E-02 + + 1.4471501E-02 + + 1.5187071E-02 + + 1.5527587E-02 + + 1.6969733E-02 + + 1.7880430E-02 + + 2.1827072E-02 + + 2.5070882E-02 + + 2.9204178E-02 + + 3.2920367E-02 + + 3.7138445E-02 + + 4.1355200E-02 + + 4.5651496E-02 + + 4.9686415E-02 + + 5.4664866E-02 + + 5.8632525E-02 + + 6.4518086E-02 + + 6.8341097E-02 + + 7.3449748E-02 + + 8.2031901E-02 + + 8.1619798E-02 + + + + 6.1062727E-03 + + 1.1540200E-02 + + 1.1761046E-02 + + 1.1040109E-02 + + 1.1412932E-02 + + 1.1240736E-02 + + 1.1950046E-02 + + 1.1997678E-02 + + 1.2505989E-02 + + 1.2930265E-02 + + 1.3303213E-02 + + 1.3935054E-02 + + 1.4397122E-02 + + 1.5128867E-02 + + 1.5487202E-02 + + 1.6938379E-02 + + 1.7810772E-02 + + 2.1723430E-02 + + 2.4973244E-02 + + 2.9068452E-02 + + 3.2834028E-02 + + 3.7010997E-02 + + 4.1148015E-02 + + 4.5454526E-02 + + 4.9470264E-02 + + 5.4447102E-02 + + 5.8392796E-02 + + 6.4249338E-02 + + 6.8034422E-02 + + 7.3189468E-02 + + 8.1672467E-02 + + 8.1260364E-02 + + + + 6.0833777E-03 + + 1.1517436E-02 + + 1.1712978E-02 + + 1.1032819E-02 + + 1.1358893E-02 + + 1.1208870E-02 + + 1.1912352E-02 + + 1.1958737E-02 + + 1.2469851E-02 + + 1.2881147E-02 + + 1.3237414E-02 + + 1.3873203E-02 + + 1.4346868E-02 + + 1.5065060E-02 + + 1.5417558E-02 + + 1.6865782E-02 + + 1.7748238E-02 + + 2.1647065E-02 + + 2.4885779E-02 + + 2.8999390E-02 + + 3.2709869E-02 + + 3.6878634E-02 + + 4.1028900E-02 + + 4.5288735E-02 + + 4.9351482E-02 + + 5.4263443E-02 + + 5.8208019E-02 + + 6.4026596E-02 + + 6.7817431E-02 + + 7.2944166E-02 + + 8.1408951E-02 + + 8.0980011E-02 + + + + 6.0960595E-03 + + 1.1509277E-02 + + 1.1717750E-02 + + 1.1016084E-02 + + 1.1324287E-02 + + 1.1181299E-02 + + 1.1926512E-02 + + 1.1924795E-02 + + 1.2430825E-02 + + 1.2836520E-02 + + 1.3191644E-02 + + 1.3847845E-02 + + 1.4306693E-02 + + 1.5047376E-02 + + 1.5361189E-02 + + 1.6797970E-02 + + 1.7681035E-02 + + 2.1572902E-02 + + 2.4843981E-02 + + 2.8950004E-02 + + 3.2646669E-02 + + 3.6798605E-02 + + 4.0927881E-02 + + 4.5165770E-02 + + 4.9225435E-02 + + 5.4165928E-02 + + 5.8066998E-02 + + 6.3897046E-02 + + 6.7667188E-02 + + 7.2785603E-02 + + 8.1253392E-02 + + 8.0864443E-02 + + + + 6.0706294E-03 + + 1.1507691E-02 + + 1.1695334E-02 + + 1.0977998E-02 + + 1.1320263E-02 + + 1.1167309E-02 + + 1.1887145E-02 + + 1.1908635E-02 + + 1.2405259E-02 + + 1.2838152E-02 + + 1.3210507E-02 + + 1.3849960E-02 + + 1.4283591E-02 + + 1.5028182E-02 + + 1.5329706E-02 + + 1.6759635E-02 + + 1.7685388E-02 + + 2.1572849E-02 + + 2.4772494E-02 + + 2.8864133E-02 + + 3.2582677E-02 + + 3.6784719E-02 + + 4.0900801E-02 + + 4.5137865E-02 + + 4.9135372E-02 + + 5.4093178E-02 + + 5.8034149E-02 + + 6.3786244E-02 + + 6.7502120E-02 + + 7.2584553E-02 + + 8.1167082E-02 + + 8.0688398E-02 + + + + 6.0461907E-03 + + 1.1481547E-02 + + 1.1737058E-02 + + 1.0999643E-02 + + 1.1361089E-02 + + 1.1125441E-02 + + 1.1866202E-02 + + 1.1842566E-02 + + 1.2424994E-02 + + 1.2799184E-02 + + 1.3219862E-02 + + 1.3773742E-02 + + 1.4257782E-02 + + 1.4972557E-02 + + 1.5426839E-02 + + 1.6740630E-02 + + 1.7654390E-02 + + 2.1573482E-02 + + 2.4801577E-02 + + 2.8800263E-02 + + 3.2583876E-02 + + 3.6801622E-02 + + 4.0806074E-02 + + 4.5107401E-02 + + 4.9075545E-02 + + 5.3960225E-02 + + 5.7982974E-02 + + 6.3859228E-02 + + 6.7502946E-02 + + 7.2470281E-02 + + 8.1149466E-02 + + 8.0629616E-02 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + 1.0000000E+00 + + + + + \ No newline at end of file diff --git a/tests/c5g7_mgxs.xml b/tests/c5g7_mgxs.xml deleted file mode 100644 index ec85d4b593..0000000000 --- a/tests/c5g7_mgxs.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - 7 - - 1E-11 0.0635E-6 10.0E-6 1.0E-4 1.0E-3 0.5 1.0 20.0 - - - - - - UO2.71c - UO2.71c - 2.53E-8 - 0 - true - - isotropic - - - - 8.0248E-03 3.7174E-03 2.6769E-02 9.6236E-02 3.0020E-02 1.1126E-01 2.8278E-01 - - - - 2.005998E-02 2.027303E-03 1.570599E-02 4.518301E-02 4.334208E-02 2.020901E-01 5.257105E-01 - - - - 5.8791E-01 4.1176E-01 3.3906E-04 1.1761E-07 0.0000E+00 0.0000E+00 0.0000E+00 - - - 7.21206E-03 8.19301E-04 6.45320E-03 1.85648E-02 1.78084E-02 8.30348E-02 2.16004E-01 - - - - - - 1.0 1.0 1.0 1.0 1.0 1.0 1.0 - - - - - - 0.1275370 0.0423780 0.0000094 0.0000000 0.0000000 0.0000000 0.0000000 - 0.0000000 0.3244560 0.0016314 0.0000000 0.0000000 0.0000000 0.0000000 - 0.0000000 0.0000000 0.4509400 0.0026792 0.0000000 0.0000000 0.0000000 - 0.0000000 0.0000000 0.0000000 0.4525650 0.0055664 0.0000000 0.0000000 - 0.0000000 0.0000000 0.0000000 0.0001253 0.2714010 0.0102550 0.0000000 - 0.0000000 0.0000000 0.0000000 0.0000000 0.0012968 0.2658020 0.0168090 - 0.0000000 0.0000000 0.0000000 0.0000000 0.0000000 0.0085458 0.2730800 - - - - - 0.1779492 0.3298048 0.4803882 0.5543674000000001 0.3118013 0.39516779999999996 0.5644058 - - - - - - - MOX1.71c - MOX1.71c - 2.53E-8 - 0 - true - - - - 8.4339E-03 3.7577E-03 2.7970E-02 1.0421E-01 1.3994E-01 4.0918E-01 4.0935E-01 - - - - 1.27888062E-02 8.95701528E-03 7.37557218E-06 2.55837033E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 1.49041240E-03 1.04385401E-03 8.59552023E-07 2.98153464E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 9.56411400E-03 6.69850756E-03 5.51582469E-06 1.91327830E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 3.84928781E-02 2.69596154E-02 2.21996483E-05 7.70040890E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 1.80629998E-02 1.26509513E-02 1.04173100E-05 3.61346022E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 3.91930789E-01 2.74500216E-01 2.26034688E-04 7.84048241E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 4.19762096E-01 2.93992687E-01 2.42085585E-04 8.39724109E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 - - - - 7.62704E-03 8.76898E-04 5.69835E-03 2.28872E-02 1.07635E-02 2.32757E-01 2.48968E-01 - - - - - 1.0 1.0 1.0 1.0 1.0 1.0 1.0 - - - - - - 1.27537000E-01 4.23780000E-02 9.43740000E-06 5.51630000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 3.24456000E-01 1.63140000E-03 3.14270000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 4.50940000E-01 2.67920000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.52565000E-01 5.56640000E-03 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.25250000E-04 2.71401000E-01 1.02550000E-02 1.00210000E-08 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.29680000E-03 2.65802000E-01 1.68090000E-02 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.54580000E-03 2.73080000E-01 - - - - 0.1783583429163 0.3298451031427 0.4815892 0.5623414 0.421721260021 0.6930878 0.6909757999999999 - - - - - - - MOX2.71c - MOX2.71c - 2.53E-8 - 0 - true - - - - 0.0090657 0.0042967 0.032881 0.12203 0.18298 0.56846 0.58521 - - - - 1.40004593E-02 9.80563205E-03 8.07435789E-06 2.80075866E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 2.26856185E-03 1.58885378E-03 1.30832709E-06 4.53820413E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 1.41886199E-02 9.93741584E-03 8.18287404E-06 2.83839974E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 5.54788444E-02 3.88562347E-02 3.19958106E-05 1.10984111E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 2.69085702E-02 1.88462058E-02 1.55187355E-05 5.38299559E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 5.45687127E-01 3.82187973E-01 3.14709185E-04 1.09163414E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 6.13307712E-01 4.29548032E-01 3.53707392E-04 1.22690752E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 - - - - 0.00825446 0.00132565 0.00842156 0.032873 0.0159636 0.323794 0.362803 - - - - - 1.0 1.0 1.0 1.0 1.0 1.0 1.0 - - - - - - 1.30457000E-01 4.17920000E-02 8.51050000E-06 5.13290000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 3.28428000E-01 1.64360000E-03 2.20170000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 4.58371000E-01 2.53310000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.63709000E-01 5.47660000E-03 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.76190000E-04 2.82313000E-01 8.72890000E-03 9.00160000E-09 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 2.27600000E-03 2.49751000E-01 1.31140000E-02 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.86450000E-03 2.59529000E-01 - - - - 0.1813232156329 0.3343683022017 0.4937851 0.5912156 0.47419809900160004 0.833601 0.8536035 - - - - - - - MOX3.71c - MOX3.71c - 2.53E-8 - 0 - true - - - - 9.48620000E-03 4.65560000E-03 3.62400000E-02 1.32720000E-01 2.08400000E-01 6.58700000E-01 6.90170000E-01 - - - - 1.48071013E-02 1.03705874E-02 8.53956516E-06 2.96212546E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 2.78640474E-03 1.95154023E-03 1.60697792E-06 5.57413653E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 1.73304404E-02 1.21378819E-02 9.99482763E-06 3.46691346E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 6.59928975E-02 4.62200600E-02 3.80594850E-05 1.32017225E-08 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 3.25131926E-02 2.27715674E-02 1.87510386E-05 6.50418701E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 6.32002662E-01 4.42641588E-01 3.64489161E-04 1.26430632E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 7.28595687E-01 5.10293344E-01 4.20196380E-04 1.45753838E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 - - - - 8.67209000E-03 1.62426000E-03 1.02716000E-02 3.90447000E-02 1.92576000E-02 3.74888000E-01 4.30599000E-01 - - - - - 1.0 1.0 1.0 1.0 1.0 1.0 1.0 - - - - - - 1.31504000E-01 4.20460000E-02 8.69720000E-06 5.19380000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 3.30403000E-01 1.64630000E-03 2.60060000E-09 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 4.61792000E-01 2.47490000E-03 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.68021000E-01 5.43300000E-03 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.85970000E-04 2.85771000E-01 8.39730000E-03 8.92800000E-09 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 2.39160000E-03 2.47614000E-01 1.23220000E-02 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 8.96810000E-03 2.56093000E-01 - - - - 1.83044902E-01 3.36704903E-01 5.00506900E-01 6.06174000E-01 5.02754279E-01 9.21027600E-01 9.55231100E-01 - - - - - - - FC.71c - FC.71c - 2.53E-8 - 0 - true - - - - 5.1132E-04 7.5813E-05 3.1643E-04 1.1675E-03 3.3977E-03 9.1886E-03 2.3244E-02 - - - - 1.323401E-08 1.434500E-08 1.128599E-06 1.276299E-05 3.538502E-07 1.740099E-06 5.063302E-06 - - - - 5.8791E-01 4.1176E-01 3.3906E-04 1.1761E-07 0.0000E+00 0.0000E+00 0.0000E+00 - - - - 4.79002E-09 5.82564E-09 4.63719E-07 5.24406E-06 1.45390E-07 7.14972E-07 2.08041E-06 - - - - - 1.0 1.0 1.0 1.0 1.0 1.0 1.0 - - - - - - 6.61659000E-02 5.90700000E-02 2.83340000E-04 1.46220000E-06 2.06420000E-08 0.00000000E00 0.00000000E00 - 0.00000000E00 2.40377000E-01 5.24350000E-02 2.49900000E-04 1.92390000E-05 2.98750000E-06 4.21400000E-07 - 0.00000000E00 0.00000000E00 1.83425000E-01 9.22880000E-02 6.93650000E-03 1.07900000E-03 2.05430000E-04 - 0.00000000E00 0.00000000E00 0.00000000E00 7.90769000E-02 1.69990000E-01 2.58600000E-02 4.92560000E-03 - 0.00000000E00 0.00000000E00 0.00000000E00 3.73400000E-05 9.97570000E-02 2.06790000E-01 2.44780000E-02 - 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 9.17420000E-04 3.16774000E-01 2.38760000E-01 - 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 0.00000000E00 4.97930000E-02 1.09910000E00 - - - - 1.26032048E-01 2.93160367E-01 2.84250824E-01 2.81025244E-01 3.34460185E-01 5.65640735E-01 1.17213908E00 - - - - - - - GT.71c - GT.71c - 2.53E-8 - 0 - false - - - - 5.11320000E-04 7.58010000E-05 3.15720000E-04 1.15820000E-03 3.39750000E-03 9.18780000E-03 2.32420000E-02 - - - - - - 6.61659000E-02 5.90700000E-02 2.83340000E-04 1.46220000E-06 2.06420000E-08 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 2.40377000E-01 5.24350000E-02 2.49900000E-04 1.92390000E-05 2.98750000E-06 4.21400000E-07 - 0.00000000E+00 0.00000000E+00 1.83297000E-01 9.23970000E-02 6.94460000E-03 1.08030000E-03 2.05670000E-04 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 7.88511000E-02 1.70140000E-01 2.58810000E-02 4.92970000E-03 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 3.73330000E-05 9.97372000E-02 2.06790000E-01 2.44780000E-02 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 9.17260000E-04 3.16765000E-01 2.38770000E-01 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 4.97920000E-02 1.09912000E+00 - - - - 1.26032043E-01 2.93160349E-01 2.84240290E-01 2.80960000E-01 3.34440033E-01 5.65640060E-01 1.17215400E+00 - - - - - - LWTR.71c - LWTR.71c - 2.53E-8 - 0 - false - - - - 6.0105E-04 1.5793E-05 3.3716E-04 1.9406E-03 5.7416E-03 1.5001E-02 3.7239E-02 - - - - - - 0.0444777 0.1134000 0.0007235 0.0000037 0.0000001 0.0000000 0.0000000 - 0.0000000 0.2823340 0.1299400 0.0006234 0.0000480 0.0000074 0.0000010 - 0.0000000 0.0000000 0.3452560 0.2245700 0.0169990 0.0026443 0.0005034 - 0.0000000 0.0000000 0.0000000 0.0910284 0.4155100 0.0637320 0.0121390 - 0.0000000 0.0000000 0.0000000 0.0000714 0.1391380 0.5118200 0.0612290 - 0.0000000 0.0000000 0.0000000 0.0000000 0.0022157 0.6999130 0.5373200 - 0.0000000 0.0000000 0.0000000 0.0000000 0.0000000 0.1324400 2.4807000 - - - - 0.15920605 0.41296959299999997 0.59030986 0.5843499999999999 0.7180000000000001 1.2544497000000001 2.650379 - - - - - - - CR.71c - CR.71c - 2.53E-8 - 0 - false - - - - 1.70490000E-03 8.36224000E-03 8.37901000E-02 3.97797000E-01 6.98763000E-01 9.29508000E-01 1.17836000E+00 - - - - - - 1.70563000E-01 4.44012000E-02 9.83670000E-05 1.27786000E-07 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 4.71050000E-01 6.85480000E-04 3.91395000E-10 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 8.01859000E-01 7.20132000E-04 0.00000000E+00 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 5.70752000E-01 1.46015000E-03 0.00000000E+00 0.00000000E+00 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 6.55562000E-05 2.07838000E-01 3.81486000E-03 3.69760000E-09 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 1.02427000E-03 2.02465000E-01 4.75290000E-03 - 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 3.53043000E-03 6.58597000E-01 - - - - 2.16767595E-01 4.80097720E-01 8.86369232E-01 9.70009150E-01 9.10481420E-01 1.13775017E+00 1.84048743E+00 - - - diff --git a/tests/input_set.py b/tests/input_set.py index 4e8974680e..c0bf2b0951 100644 --- a/tests/input_set.py +++ b/tests/input_set.py @@ -572,135 +572,60 @@ class InputSet(object): class MGInputSet(InputSet): def build_default_materials_and_geometry(self): - # Define materials needed for C5G7 2-D UO2 Assembly - uo2_data = openmc.Macroscopic('UO2', '71c') + # Define materials needed for 1D/1G slab problem + uo2_data = openmc.Macroscopic('uo2_iso', '71c') uo2 = openmc.Material(name='UO2', material_id=1) uo2.set_density('macro', 1.0) uo2.add_macroscopic(uo2_data) - fiss_cham_data = openmc.Macroscopic('FC', '71c') - fiss_cham = openmc.Material(name='FC', material_id=2) - fiss_cham.set_density('macro', 1.0) - fiss_cham.add_macroscopic(fiss_cham_data) + clad_data = openmc.Macroscopic('clad_ang_mu', '71c') + clad = openmc.Material(name='Clad', material_id=2) + clad.set_density('macro', 1.0) + clad.add_macroscopic(clad_data) - guide_tube_data = openmc.Macroscopic('GT', '71c') - guide_tube = openmc.Material(name='GT', material_id=3) - guide_tube.set_density('macro', 1.0) - guide_tube.add_macroscopic(guide_tube_data) - - water_data = openmc.Macroscopic('LWTR', '71c') - water = openmc.Material(name='LWTR', material_id=4) + water_data = openmc.Macroscopic('lwtr_iso_mu', '71c') + water = openmc.Material(name='LWTR', material_id=3) water.set_density('macro', 1.0) water.add_macroscopic(water_data) # Define the materials file. self.materials.default_xs = '71c' - self.materials.add_materials((uo2, fiss_cham, guide_tube, water)) + self.materials.add_materials((uo2, clad, water)) # Define surfaces. - # Pin cell - s1 = openmc.ZCylinder(R=0.54, surface_id=1) # Assembly/Problem Boundary - left = openmc.XPlane(x0=0.0, surface_id=20, + left = openmc.XPlane(x0=0.0, surface_id=200, boundary_type='reflective') - right = openmc.XPlane(x0=21.42, surface_id=21, + right = openmc.XPlane(x0=10.0, surface_id=201, boundary_type='reflective') - bottom = openmc.YPlane(y0=0.0, surface_id=22, + bottom = openmc.YPlane(y0=0.0, surface_id=300, boundary_type='reflective') - top = openmc.YPlane(y0=21.42, surface_id=23, - boundary_type='reflective') - down = openmc.ZPlane(z0=0.0, surface_id=24, - boundary_type='reflective') - up = openmc.ZPlane(z0=21.42, surface_id=25, + top = openmc.YPlane(y0=10.0, surface_id=301, boundary_type='reflective') - # Define pin cells - # uo2 pin - c10 = openmc.Cell(cell_id=10) - c10.region = -s1 - c10.fill = uo2 - c11 = openmc.Cell(cell_id=11) - c11.region = +s1 - c11.fill = water - fuel_pin = openmc.Universe(name='Fuel pin', universe_id=1) - fuel_pin.add_cells((c10, c11)) + down = openmc.ZPlane(z0=0.0, surface_id=0, + boundary_type='reflective') + fuel_clad_intfc = openmc.ZPlane(z0=2.0, surface_id=1) + clad_lwtr_intfc = openmc.ZPlane(z0=2.4, surface_id=2) + up = openmc.ZPlane(z0=5.0, surface_id=3, + boundary_type='reflective') - # Fission chamber pin - c20 = openmc.Cell(cell_id=20) - c20.region = -s1 - c20.fill = fiss_cham - c21 = openmc.Cell(cell_id=21) - c21.region = +s1 - c21.fill = water - fiss_chamber_pin = openmc.Universe(name='Fission Chamber', universe_id=2) - fiss_chamber_pin.add_cells((c20, c21)) - - # Guide Tube pin - c30 = openmc.Cell(cell_id=30) - c30.region = -s1 - c30.fill = guide_tube - c31 = openmc.Cell(cell_id=31) - c31.region = +s1 - c31.fill = water - gt_pin = openmc.Universe(name='Guide Tube', universe_id=3) - gt_pin.add_cells((c30, c31)) - - # Define fuel lattice - l100 = openmc.RectLattice(name='UO2 assembly', lattice_id=100) - l100.dimension = (17, 17) - l100.lower_left = (-10.71, -10.71) - l100.pitch = (1.26, 1.26) - l100.universes = [ - [fuel_pin]*17, - [fuel_pin]*17, - [fuel_pin]*5 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*5, - [fuel_pin]*3 + [gt_pin] + [fuel_pin]*9 + [gt_pin] - + [fuel_pin]*3, - [fuel_pin]*17, - [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2, - [fuel_pin]*17, - [fuel_pin]*17, - [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [fiss_chamber_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2, - [fuel_pin]*17, - [fuel_pin]*17, - [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*2, - [fuel_pin]*17, - [fuel_pin]*3 + [gt_pin] + [fuel_pin]*9 + [gt_pin] - + [fuel_pin]*3, - [fuel_pin]*5 + [gt_pin] + [fuel_pin]*2 + [gt_pin] - + [fuel_pin]*2 + [gt_pin] + [fuel_pin]*5, - [fuel_pin]*17, - [fuel_pin]*17 ] - - # Define assemblies. - fa = openmc.Universe(name='Fuel assembly', universe_id=10) - c100 = openmc.Cell(cell_id=110) - c100.region = +down & -up - c100.fill = l100 - fa.add_cells((c100, )) - - # Define core lattices - l200 = openmc.RectLattice(name='Core lattice', lattice_id=200) - l200.dimension = (1, 1) - l200.lower_left = (0.0, 0.0) - l200.pitch = (21.42, 21.42) - l200.universes = [[fa]] + # Define cells + c1 = openmc.Cell(cell_id=1) + c1.region = +left & -right & +bottom & -top & +down & -fuel_clad_intfc + c1.fill = uo2 + c2 = openmc.Cell(cell_id=2) + c2.region = +left & -right & +bottom & -top & +fuel_clad_intfc & -clad_lwtr_intfc + c2.fill = clad + c3 = openmc.Cell(cell_id=3) + c3.region = +left & -right & +bottom & -top & +clad_lwtr_intfc & -up + c3.fill = water # Define root universe. root = openmc.Universe(universe_id=0, name='root universe') - c1 = openmc.Cell(cell_id=1) - c1.region = +left & -right & +bottom & -top & +down & -up - c1.fill = l200 - root.add_cells((c1,)) + root.add_cells((c1,c2,c3)) # Define the geometry file. geometry = openmc.Geometry() @@ -713,15 +638,16 @@ class MGInputSet(InputSet): self.settings.batches = 10 self.settings.inactive = 5 self.settings.particles = 100 - self.settings.set_source_space('box', (0.0, 0.0, 0.0, 21.42, 21.42, 100.0)) + self.settings.set_source_space('box', (0.0, 0.0, 0.0, 10.0, 10.0, 2.0)) self.settings.energy_mode = "multi-group" - self.settings.cross_sections = "../c5g7_mgxs.xml" + self.settings.cross_sections = "../1d_mgxs.xml" def build_defualt_plots(self): plot = openmc.Plot() plot.filename = 'mat' - plot.origin = (10.71, 10.71, 50.0) - plot.width = (21.42, 21.42) + plot.origin = (5.0, 5.0, 2.5) + plot.width = (2.5, 2.5) + plot.basis = 'xz' plot.pixels = (3000, 3000) plot.color = 'mat' diff --git a/tests/test_mg_basic/inputs_true.dat b/tests/test_mg_basic/inputs_true.dat index d576cd402a..549172b1a9 100644 --- a/tests/test_mg_basic/inputs_true.dat +++ b/tests/test_mg_basic/inputs_true.dat @@ -1 +1 @@ -b41c9621e2f068dab8f44b4fbf29aa5f075c04e463543550b7d1324b75b4709db810808e64474d2400c8c36465814bcca095650b0e19d640860dd4a860bb40a3 \ No newline at end of file +be47096ff6382e07c58c67870eb1c77402c961ee8cb9a4671b52627f6432fe282403e70f5825c90764758fcabe5a480653a961e24d7a0349929283848e79667d \ No newline at end of file diff --git a/tests/test_mg_basic/results_true.dat b/tests/test_mg_basic/results_true.dat index 93683d28bb..35e2af7c06 100644 --- a/tests/test_mg_basic/results_true.dat +++ b/tests/test_mg_basic/results_true.dat @@ -1,2 +1,2 @@ k-combined: -1.359283E+00 7.465863E-02 +1.035488E+00 4.058903E-02 diff --git a/tests/test_mg_max_order/inputs_true.dat b/tests/test_mg_max_order/inputs_true.dat new file mode 100644 index 0000000000..3529d50921 --- /dev/null +++ b/tests/test_mg_max_order/inputs_true.dat @@ -0,0 +1 @@ +7bd8b00b5aaad3913e0022269cf6ef92dfd0051bd79fb136838ea5a65d322d9711b454e62ef03dcf2b9dd75e31a4febcc633f968d7d07dcb6da2e0d36daf45db \ No newline at end of file diff --git a/tests/test_mg_max_order/results_true.dat b/tests/test_mg_max_order/results_true.dat new file mode 100644 index 0000000000..dfb1c02d79 --- /dev/null +++ b/tests/test_mg_max_order/results_true.dat @@ -0,0 +1,2 @@ +k-combined: +1.106635E+00 4.503267E-02 diff --git a/tests/test_mg_max_order/test_mg_max_order.py b/tests/test_mg_max_order/test_mg_max_order.py new file mode 100644 index 0000000000..423f068f71 --- /dev/null +++ b/tests/test_mg_max_order/test_mg_max_order.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +from input_set import MGInputSet +import openmc + +class MGNuclideInputSet(MGInputSet): + def build_default_materials_and_geometry(self): + # Define materials needed for 1D/1G slab problem + uo2_data = openmc.Macroscopic('uo2_iso', '71c') + uo2 = openmc.Material(name='UO2', material_id=1) + uo2.set_density('macro', 1.0) + uo2.add_macroscopic(uo2_data) + + clad_data = openmc.Macroscopic('clad_iso', '71c') + clad = openmc.Material(name='Clad', material_id=2) + clad.set_density('macro', 1.0) + clad.add_macroscopic(clad_data) + + water_data = openmc.Macroscopic('lwtr_iso', '71c') + water = openmc.Material(name='LWTR', material_id=3) + water.set_density('macro', 1.0) + water.add_macroscopic(water_data) + + # Define the materials file. + self.materials.default_xs = '71c' + self.materials.add_materials((uo2, clad, water)) + + # Define surfaces. + + # Assembly/Problem Boundary + left = openmc.XPlane(x0=0.0, surface_id=200, + boundary_type='reflective') + right = openmc.XPlane(x0=10.0, surface_id=201, + boundary_type='reflective') + bottom = openmc.YPlane(y0=0.0, surface_id=300, + boundary_type='reflective') + top = openmc.YPlane(y0=10.0, surface_id=301, + boundary_type='reflective') + + down = openmc.ZPlane(z0=0.0, surface_id=0, + boundary_type='reflective') + fuel_clad_intfc = openmc.ZPlane(z0=2.0, surface_id=1) + clad_lwtr_intfc = openmc.ZPlane(z0=2.4, surface_id=2) + up = openmc.ZPlane(z0=5.0, surface_id=3, + boundary_type='reflective') + + # Define cells + c1 = openmc.Cell(cell_id=1) + c1.region = +left & -right & +bottom & -top & +down & -fuel_clad_intfc + c1.fill = uo2 + c2 = openmc.Cell(cell_id=2) + c2.region = +left & -right & +bottom & -top & +fuel_clad_intfc & -clad_lwtr_intfc + c2.fill = clad + c3 = openmc.Cell(cell_id=3) + c3.region = +left & -right & +bottom & -top & +clad_lwtr_intfc & -up + c3.fill = water + + # Define root universe. + root = openmc.Universe(universe_id=0, name='root universe') + + root.add_cells((c1,c2,c3)) + + # Define the geometry file. + geometry = openmc.Geometry() + geometry.root_universe = root + + self.geometry.geometry = geometry + +class MGNuclideTestHarness(PyAPITestHarness): + def __init__(self, statepoint_name, tallies_present, mg=False): + TestHarness.__init__(self, statepoint_name, tallies_present) + self._input_set = MGNuclideInputSet() + + def _build_inputs(self): + super(MGNuclideTestHarness, self)._build_inputs() + # Set P1 scattering + self._input_set.settings.max_order = 1 + +if __name__ == '__main__': + harness = MGNuclideTestHarness('statepoint.10.*', False, mg=True) + harness.main() diff --git a/tests/test_mg_nuclide/inputs_true.dat b/tests/test_mg_nuclide/inputs_true.dat new file mode 100644 index 0000000000..ea61b92221 --- /dev/null +++ b/tests/test_mg_nuclide/inputs_true.dat @@ -0,0 +1 @@ +f3d614294177f34186bf0d439330d144438ac6a2402af9b5433efb7bf6a311043140c487c86f4d3cae9d51742f5042823d224c9da6365da6c8972b44edb7fb71 \ No newline at end of file diff --git a/tests/test_mg_nuclide/results_true.dat b/tests/test_mg_nuclide/results_true.dat new file mode 100644 index 0000000000..26a41ade87 --- /dev/null +++ b/tests/test_mg_nuclide/results_true.dat @@ -0,0 +1,2 @@ +k-combined: +1.271009E-01 6.377851E-03 diff --git a/tests/test_mg_nuclide/test_mg_nuclide.py b/tests/test_mg_nuclide/test_mg_nuclide.py new file mode 100644 index 0000000000..736473bd9f --- /dev/null +++ b/tests/test_mg_nuclide/test_mg_nuclide.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +from input_set import MGInputSet +import openmc + +class MGNuclideInputSet(MGInputSet): + def build_default_materials_and_geometry(self): + # Define materials needed for 1D/1G slab problem + # This time do using nuclide, not macroscopic + uo2 = openmc.Material(name='UO2', material_id=1) + uo2.set_density('g/cm3', 1.0) + uo2.add_nuclide("uo2_iso", 1.0) + + clad = openmc.Material(name='Clad', material_id=2) + clad.set_density('g/cm3', 1.0) + clad.add_nuclide("clad_ang_mu", 1.0) + + water_data = openmc.Nuclide('lwtr_iso_mu', '71c') + water = openmc.Material(name='LWTR', material_id=3) + water.set_density('g/cm3', 1.0) + water.add_nuclide("lwtr_iso_mu", 1.0) + + # Define the materials file. + self.materials.default_xs = '71c' + self.materials.add_materials((uo2, clad, water)) + + # Define surfaces. + + # Assembly/Problem Boundary + left = openmc.XPlane(x0=0.0, surface_id=200, + boundary_type='reflective') + right = openmc.XPlane(x0=10.0, surface_id=201, + boundary_type='reflective') + bottom = openmc.YPlane(y0=0.0, surface_id=300, + boundary_type='reflective') + top = openmc.YPlane(y0=10.0, surface_id=301, + boundary_type='reflective') + + down = openmc.ZPlane(z0=0.0, surface_id=0, + boundary_type='reflective') + fuel_clad_intfc = openmc.ZPlane(z0=2.0, surface_id=1) + clad_lwtr_intfc = openmc.ZPlane(z0=2.4, surface_id=2) + up = openmc.ZPlane(z0=5.0, surface_id=3, + boundary_type='reflective') + + # Define cells + c1 = openmc.Cell(cell_id=1) + c1.region = +left & -right & +bottom & -top & +down & -fuel_clad_intfc + c1.fill = uo2 + c2 = openmc.Cell(cell_id=2) + c2.region = +left & -right & +bottom & -top & +fuel_clad_intfc & -clad_lwtr_intfc + c2.fill = clad + c3 = openmc.Cell(cell_id=3) + c3.region = +left & -right & +bottom & -top & +clad_lwtr_intfc & -up + c3.fill = water + + # Define root universe. + root = openmc.Universe(universe_id=0, name='root universe') + + root.add_cells((c1,c2,c3)) + + # Define the geometry file. + geometry = openmc.Geometry() + geometry.root_universe = root + + self.geometry.geometry = geometry + +class MGNuclideTestHarness(PyAPITestHarness): + def __init__(self, statepoint_name, tallies_present, mg=False): + TestHarness.__init__(self, statepoint_name, tallies_present) + self._input_set = MGNuclideInputSet() + + def _build_inputs(self): + super(MGNuclideTestHarness, self)._build_inputs() + + + +if __name__ == '__main__': + harness = MGNuclideTestHarness('statepoint.10.*', False, mg=True) + harness.main() diff --git a/tests/test_mg_tallies/inputs_true.dat b/tests/test_mg_tallies/inputs_true.dat index 44099dbd82..063b36923d 100644 --- a/tests/test_mg_tallies/inputs_true.dat +++ b/tests/test_mg_tallies/inputs_true.dat @@ -1 +1 @@ -87d5adff4c8d53f020baa25db59d9ad6eada791ef010577e3586c543a9ee6cee6022d99e7a27911a94560acddba3602570c0748a0b4cba48f630b726221f14dc \ No newline at end of file +dcde495bd5d0ace409154be3529ae91d454e92f7060e38f00bc0880350d53c889b87edcfd481e6c8bcec2450bdf780e6fdc52240978eb1c67a6ef290ad85442d \ No newline at end of file diff --git a/tests/test_mg_tallies/results_true.dat b/tests/test_mg_tallies/results_true.dat index 920f5f3e36..4e27ab66b9 100644 --- a/tests/test_mg_tallies/results_true.dat +++ b/tests/test_mg_tallies/results_true.dat @@ -1,3482 +1,2906 @@ k-combined: -1.359283E+00 7.465863E-02 +1.035488E+00 4.058903E-02 tally 1: -2.847813E-01 -2.025790E-02 -1.172423E-02 -4.616814E-05 -6.871019E-01 -1.096320E-01 -5.348095E-03 -1.062108E-05 -1.340369E-02 -6.465987E-05 -1.682119E-01 -7.397131E-03 -9.038916E-03 -2.581353E-05 -4.138462E-01 -3.732581E-02 -4.267302E-03 -6.286845E-06 -1.058944E-02 -3.804411E-05 -3.633299E-01 -3.976542E-02 -2.487014E-02 -2.126766E-04 -6.982763E-01 -1.317345E-01 -1.257758E-02 -6.051328E-05 -3.075036E-02 -3.600723E-04 -2.492313E-01 -1.682228E-02 -1.380182E-02 -6.570494E-05 -5.765551E-01 -9.181006E-02 -7.743475E-03 -2.727482E-05 -1.902781E-02 -1.627120E-04 -2.191122E-01 -1.298025E-02 -1.148883E-02 -4.334141E-05 -5.203670E-01 -7.022054E-02 -5.000169E-03 -7.803760E-06 -1.236816E-02 -4.736991E-05 -2.269064E-01 -2.056966E-02 -1.410446E-02 -1.199602E-04 -4.515464E-01 -7.417552E-02 -7.887256E-03 -4.708793E-05 -1.932915E-02 -2.805214E-04 -2.364191E-01 -1.654063E-02 -1.415339E-02 -1.415624E-04 -4.940050E-01 -6.265173E-02 -6.299407E-03 -3.280872E-05 -1.540495E-02 -1.953911E-04 -3.192689E-01 -2.306298E-02 -1.230781E-02 -6.401926E-05 -6.470467E-01 -9.154956E-02 -5.234535E-03 -1.578586E-05 -1.286806E-02 -9.375617E-05 -2.540069E-01 -1.409067E-02 -7.206254E-03 -1.691929E-05 -6.264964E-01 -8.583680E-02 -1.958907E-03 -1.137122E-06 -4.944068E-03 -7.184508E-06 -3.299226E-01 -2.361991E-02 -1.153904E-02 -3.398774E-05 -7.350880E-01 -1.172602E-01 -4.976946E-03 -7.515943E-06 -1.226957E-02 -4.522435E-05 -2.734191E-01 -1.823188E-02 -1.314351E-02 -4.883110E-05 -5.162639E-01 -5.997683E-02 -5.567315E-03 -1.116578E-05 -1.355695E-02 -6.620192E-05 -1.971066E-01 -8.872106E-03 -7.289937E-03 -1.482506E-05 -3.624107E-01 -2.788172E-02 -3.946019E-03 -4.911976E-06 -9.796252E-03 -2.939620E-05 -2.435676E-01 -1.550957E-02 -1.471975E-02 -6.447073E-05 -3.711107E-01 -3.097190E-02 -8.485525E-03 -2.418503E-05 -2.074995E-02 -1.440717E-04 -2.427633E-01 -1.927418E-02 -1.659082E-02 -9.533795E-05 -3.947070E-01 -4.039320E-02 -8.721245E-03 -3.472785E-05 -2.129433E-02 -2.058398E-04 -2.930833E-01 -3.717078E-02 -1.961320E-02 -2.361042E-04 -5.029290E-01 -7.452592E-02 -1.162396E-02 -9.544883E-05 -2.835116E-02 -5.654990E-04 -3.612968E-01 -3.626192E-02 -2.275737E-02 -2.915981E-04 -6.836531E-01 -1.007739E-01 -1.386251E-02 -1.308722E-04 -3.381273E-02 -7.755475E-04 -3.379726E-01 -3.059811E-02 -1.034847E-02 -2.508685E-05 -7.876015E-01 -1.626433E-01 -4.304432E-03 -4.836158E-06 -1.080846E-02 -3.049489E-05 -2.207527E-01 -1.480236E-02 -9.133299E-03 -4.378685E-05 -5.306469E-01 -6.883187E-02 -3.832635E-03 -7.385540E-06 -9.542013E-03 -4.429238E-05 -1.746455E-01 -7.365091E-03 -6.210077E-03 -1.980262E-05 -4.018765E-01 -3.788658E-02 -3.022816E-03 -4.602873E-06 -7.491747E-03 -2.745170E-05 -2.568492E-01 -1.811320E-02 -1.821423E-02 -2.069737E-04 -4.656788E-01 -5.401259E-02 -1.232525E-02 -1.058384E-04 -3.013811E-02 -6.273405E-04 -2.225493E-01 -1.562018E-02 -1.010014E-02 -5.040357E-05 -4.589131E-01 -6.663804E-02 -5.258730E-03 -1.491454E-05 -1.298284E-02 -9.047317E-05 -2.447664E-01 -1.706786E-02 -1.478729E-02 -6.497711E-05 -5.983362E-01 -1.049331E-01 -6.596398E-03 -1.524559E-05 -1.633146E-02 -9.299953E-05 -2.413969E-01 -2.116589E-02 -2.021668E-02 -2.024522E-04 -3.619973E-01 -4.122998E-02 -1.346912E-02 -9.583517E-05 -3.286803E-02 -5.685240E-04 -2.049752E-01 -8.601175E-03 -1.025940E-02 -2.514980E-05 -4.043912E-01 -3.463281E-02 -4.452720E-03 -6.434910E-06 -1.096850E-02 -3.904161E-05 -3.102820E-01 -2.045820E-02 -1.459368E-02 -5.241789E-05 -6.773052E-01 -9.567203E-02 -7.341203E-03 -1.649958E-05 -1.800485E-02 -9.887491E-05 -2.550379E-01 -1.497142E-02 -1.091961E-02 -3.974930E-05 -5.647093E-01 -7.433920E-02 -5.249459E-03 -1.177345E-05 -1.284826E-02 -7.017030E-05 -3.556052E-01 -2.703280E-02 -2.735992E-02 -1.564623E-04 -6.683707E-01 -1.040515E-01 -1.590490E-02 -6.014424E-05 -3.877604E-02 -3.576128E-04 -2.497863E-01 -1.507086E-02 -1.494719E-02 -1.025755E-04 -4.762993E-01 -5.549879E-02 -8.527272E-03 -4.579896E-05 -2.085262E-02 -2.725955E-04 -1.839365E-01 -8.369442E-03 -1.237838E-02 -7.164219E-05 -3.775826E-01 -3.190193E-02 -7.884508E-03 -3.507069E-05 -1.929540E-02 -2.080904E-04 -1.708555E-01 -9.399504E-03 -7.715238E-03 -2.292805E-05 -3.732199E-01 -4.315843E-02 -3.978302E-03 -6.440288E-06 -9.770196E-03 -3.826434E-05 -3.241297E-01 -2.680732E-02 -2.827721E-02 -2.383010E-04 -5.925440E-01 -7.572445E-02 -1.805046E-02 -9.773692E-05 -4.409968E-02 -5.812383E-04 -2.602482E-01 -1.672576E-02 -7.932620E-03 -1.561951E-05 -5.580855E-01 -6.844216E-02 -2.088329E-03 -9.313432E-07 -5.186486E-03 -5.737715E-06 -2.890696E-01 -2.384728E-02 -1.015490E-02 -3.717081E-05 -6.111526E-01 -8.518321E-02 -4.213456E-03 -7.925859E-06 -1.037122E-02 -4.719897E-05 -3.855713E-01 -3.814941E-02 -1.595567E-02 -1.026684E-04 -8.322980E-01 -1.786719E-01 -6.646130E-03 -1.662975E-05 -1.674159E-02 -1.022582E-04 -1.897658E-01 -1.150551E-02 -8.071193E-03 -3.172610E-05 -4.219179E-01 -4.854116E-02 -3.808837E-03 -8.709924E-06 -9.434346E-03 -5.203901E-05 -2.195178E-01 -1.516218E-02 -7.926578E-03 -2.639446E-05 -5.306593E-01 -7.568838E-02 -2.106381E-03 -1.749456E-06 -5.313752E-03 -1.093384E-05 -3.256867E-01 -4.534052E-02 -2.131147E-02 -2.570637E-04 -5.297378E-01 -1.136688E-01 -1.158918E-02 -7.267385E-05 -2.831750E-02 -4.331969E-04 -1.414992E-01 -5.003890E-03 -4.258013E-03 -7.891903E-06 -3.615210E-01 -3.145749E-02 -1.093412E-03 -3.546225E-07 -2.758486E-03 -2.166206E-06 -1.514116E-01 -6.201312E-03 -4.857451E-03 -6.866877E-06 -3.984685E-01 -3.930815E-02 -2.038032E-03 -1.261346E-06 -5.152722E-03 -7.792008E-06 -3.159334E-01 -3.379738E-02 -2.905400E-03 -4.164258E-06 -5.469766E-01 -9.022824E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.132668E-01 -1.056200E-02 -9.631005E-03 -2.427206E-05 -4.566464E-01 -5.683176E-02 -4.166599E-03 -5.882400E-06 -1.031031E-02 -3.580708E-05 -2.912415E-01 -2.272338E-02 -1.775965E-02 -1.443229E-04 -4.943869E-01 -5.913494E-02 -1.104606E-02 -6.433295E-05 -2.697987E-02 -3.816975E-04 -2.570902E-01 -1.798689E-02 -2.361267E-03 -2.378626E-06 -4.065439E-01 -4.281600E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.949017E-01 -2.326343E-02 -1.187639E-02 -4.961037E-05 -6.020356E-01 -9.395273E-02 -6.276821E-03 -1.931834E-05 -1.538205E-02 -1.153434E-04 -2.558511E-01 -1.698459E-02 -1.575580E-02 -8.651862E-05 -5.875503E-01 -8.849521E-02 -7.883870E-03 -3.015633E-05 -1.949261E-02 -1.802377E-04 -1.839277E-01 -8.799415E-03 -9.390667E-04 -4.683772E-07 -4.384277E-01 -4.401825E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.609130E-01 -1.523879E-02 -1.198704E-02 -4.620730E-05 -6.275273E-01 -8.589709E-02 -6.342769E-03 -1.539049E-05 -1.563218E-02 -9.287339E-05 -2.481956E-01 -1.445135E-02 -7.512217E-03 -2.578216E-05 -5.254869E-01 -6.462207E-02 -4.109411E-03 -1.008346E-05 -1.011567E-02 -5.994042E-05 -2.029184E-01 -9.361823E-03 -5.088961E-03 -6.279329E-06 -4.979684E-01 -5.589905E-02 -1.833935E-03 -7.843470E-07 -4.590978E-03 -4.909945E-06 -2.259899E-01 -1.904652E-02 -1.437025E-02 -1.402125E-04 -5.175625E-01 -7.750371E-02 -8.659314E-03 -5.998348E-05 -2.125004E-02 -3.556838E-04 -2.491821E-01 -1.416884E-02 -1.505865E-02 -1.184227E-04 -6.046546E-01 -7.493539E-02 -9.648000E-03 -5.809858E-05 -2.378233E-02 -3.456642E-04 -2.380529E-01 -1.543764E-02 -1.826271E-02 -8.884450E-05 -4.803110E-01 -5.846859E-02 -8.805950E-03 -2.475992E-05 -2.159062E-02 -1.489502E-04 -2.026084E-01 -1.110441E-02 -8.160845E-03 -1.785658E-05 -4.437692E-01 -5.639028E-02 -3.565175E-03 -3.302071E-06 -8.864014E-03 -2.024481E-05 -2.224558E-01 -1.680211E-02 -1.555273E-02 -1.869799E-04 -4.173737E-01 -6.228541E-02 -9.135566E-03 -7.133316E-05 -2.241062E-02 -4.286070E-04 -2.004042E-01 -1.095639E-02 -1.437370E-03 -8.849524E-07 -4.174469E-01 -4.395281E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.755714E-01 -6.756269E-03 -8.983808E-03 -1.906916E-05 -4.261288E-01 -3.852168E-02 -3.247612E-03 -3.858076E-06 -8.028951E-03 -2.337512E-05 -2.223071E-01 -1.353146E-02 -1.705765E-02 -1.245386E-04 -5.197542E-01 -6.518812E-02 -9.805805E-03 -4.604085E-05 -2.405033E-02 -2.748160E-04 -1.948532E-01 -9.221640E-03 -1.164060E-02 -3.726891E-05 -4.394449E-01 -4.772119E-02 -5.615780E-03 -1.145305E-05 -1.379554E-02 -6.876959E-05 -1.729605E-01 -7.269018E-03 -7.081459E-03 -1.086510E-05 -3.596419E-01 -3.677088E-02 -2.576810E-03 -2.237622E-06 -6.357471E-03 -1.343160E-05 -2.686943E-01 -2.027464E-02 -1.549158E-02 -1.119369E-04 -4.683049E-01 -6.133136E-02 -8.958022E-03 -4.362320E-05 -2.185541E-02 -2.586495E-04 -2.805365E-01 -1.741332E-02 -1.350305E-02 -4.115261E-05 -6.438641E-01 -9.350345E-02 -5.285236E-03 -6.082302E-06 -1.295017E-02 -3.639939E-05 -2.572894E-01 -1.557396E-02 -9.152971E-03 -2.187378E-05 -5.397672E-01 -6.947168E-02 -3.989601E-03 -5.329696E-06 -9.816007E-03 -3.199508E-05 -1.844650E-01 -6.889035E-03 -9.054549E-03 -2.388416E-05 -4.959347E-01 -5.022290E-02 -6.016437E-03 -1.166505E-05 -1.483958E-02 -6.985694E-05 -2.448423E-01 -1.383982E-02 -1.979087E-02 -1.017532E-04 -5.292703E-01 -7.138674E-02 -1.203905E-02 -3.777525E-05 -2.948865E-02 -2.261060E-04 -3.678431E-01 -4.444197E-02 -3.828158E-03 -8.237670E-06 -5.902793E-01 -7.688814E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.935423E-01 -7.592536E-03 -6.894656E-03 -1.790118E-05 -4.320616E-01 -3.963147E-02 -2.212586E-03 -1.758405E-06 -5.535114E-03 -1.077459E-05 -2.000222E-01 -8.790536E-03 -6.130353E-03 -1.084913E-05 -5.241401E-01 -6.739015E-02 -2.660110E-03 -2.912115E-06 -6.629933E-03 -1.756202E-05 -2.006222E-01 -1.191794E-02 -3.681584E-03 -4.563880E-06 -4.694831E-01 -5.256578E-02 -1.424456E-03 -6.817103E-07 -3.630744E-03 -4.291288E-06 -1.427746E-01 -5.192636E-03 -1.037189E-02 -4.055885E-05 -3.029633E-01 -2.157045E-02 -4.326032E-03 -8.614945E-06 -1.057731E-02 -5.155246E-05 -1.646414E-01 -6.623537E-03 -5.439480E-03 -7.768447E-06 -4.145907E-01 -4.057023E-02 -1.461466E-03 -5.282344E-07 -3.707510E-03 -3.392769E-06 -1.648802E-01 -7.366519E-03 -1.070584E-02 -7.721854E-05 -3.742934E-01 -3.508076E-02 -6.499009E-03 -3.696865E-05 -1.592990E-02 -2.222355E-04 -2.180319E-01 -9.923859E-03 -7.969510E-03 -1.700099E-05 -5.221346E-01 -5.681643E-02 -3.896242E-03 -5.553555E-06 -9.611215E-03 -3.391405E-05 -2.292243E-01 -1.349466E-02 -1.175536E-02 -6.134192E-05 -5.588849E-01 -7.531263E-02 -5.067123E-03 -1.484964E-05 -1.251725E-02 -8.896195E-05 -3.324146E-01 -2.547046E-02 -2.018340E-02 -1.567704E-04 -7.652357E-01 -1.207356E-01 -1.178472E-02 -6.216943E-05 -2.903536E-02 -3.717118E-04 -2.285590E-01 -1.197525E-02 -6.912934E-03 -1.203784E-05 -4.578967E-01 -5.011634E-02 -2.559431E-03 -2.572737E-06 -6.387641E-03 -1.570623E-05 -1.930700E-01 -1.057009E-02 -6.872837E-03 -2.126589E-05 -3.910460E-01 -4.649162E-02 -3.546523E-03 -6.380991E-06 -8.655793E-03 -3.783828E-05 -3.934470E-01 -3.734695E-02 -2.227825E-02 -1.453115E-04 -6.775238E-01 -1.033120E-01 -1.338820E-02 -5.501040E-05 -3.274687E-02 -3.279809E-04 -3.088799E-01 -2.873704E-02 -1.749960E-02 -1.305258E-04 -5.601385E-01 -8.645103E-02 -1.038254E-02 -5.085454E-05 -2.542701E-02 -3.023135E-04 -3.700473E-01 -3.161307E-02 -2.646517E-02 -1.740940E-04 -6.414793E-01 -8.696363E-02 -1.500269E-02 -5.967096E-05 -3.661756E-02 -3.551291E-04 -3.565351E-01 -2.588617E-02 -2.829818E-02 -2.379254E-04 -6.754679E-01 -9.310347E-02 -1.785149E-02 -1.083839E-04 -4.359723E-02 -6.452495E-04 -2.956875E-01 -2.095277E-02 -1.344873E-02 -5.606169E-05 -5.669819E-01 -6.817515E-02 -7.251551E-03 -1.703252E-05 -1.777118E-02 -1.016817E-04 -2.506887E-01 -1.299858E-02 -1.588362E-02 -7.727995E-05 -4.753313E-01 -5.001149E-02 -1.000924E-02 -3.700899E-05 -2.445351E-02 -2.204775E-04 -2.126121E-01 -1.123409E-02 -1.190127E-02 -3.832263E-05 -3.707959E-01 -3.067361E-02 -5.030198E-03 -9.080178E-06 -1.230610E-02 -5.408354E-05 -2.764143E-01 -1.563717E-02 -1.790747E-02 -9.078882E-05 -5.678500E-01 -6.620735E-02 -1.046412E-02 -3.855578E-05 -2.561249E-02 -2.296019E-04 -2.902769E-01 -2.046134E-02 -1.234799E-02 -6.085833E-05 -6.155753E-01 -8.929554E-02 -6.140705E-03 -2.104623E-05 -1.517340E-02 -1.267427E-04 -2.178843E-01 -1.129871E-02 -6.208339E-03 -9.542966E-06 -5.034079E-01 -6.194116E-02 -2.128719E-03 -1.227568E-06 -5.264120E-03 -7.484188E-06 -2.125960E-01 -9.351344E-03 -6.822592E-03 -1.025641E-05 -4.869649E-01 -4.997451E-02 -2.293340E-03 -1.145791E-06 -5.665763E-03 -6.954001E-06 -2.709614E-01 -1.628033E-02 -1.293964E-03 -6.917833E-07 -6.177875E-01 -8.137663E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.314443E-01 -2.391247E-02 -1.873938E-02 -1.577380E-04 -6.121093E-01 -8.135846E-02 -1.073229E-02 -7.334175E-05 -2.617620E-02 -4.348152E-04 -3.166995E-01 -2.320865E-02 -2.036524E-02 -1.279210E-04 -6.658781E-01 -9.649554E-02 -9.461128E-03 -3.244725E-05 -2.313190E-02 -1.926149E-04 -3.297678E-01 -2.820763E-02 -1.923411E-03 -1.900405E-06 -8.093044E-01 -1.549168E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.456076E-01 -1.494726E-02 -1.107664E-02 -5.262577E-05 -4.808813E-01 -5.271759E-02 -5.560675E-03 -1.646259E-05 -1.363247E-02 -9.798701E-05 -2.427021E-01 -1.432013E-02 -1.238222E-02 -4.787991E-05 -4.944297E-01 -5.130649E-02 -6.815175E-03 -1.474275E-05 -1.672131E-02 -8.786745E-05 -3.752437E-01 -4.854811E-02 -3.614564E-03 -7.655432E-06 -6.782217E-01 -1.182298E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.647096E-01 -3.545521E-02 -1.786012E-02 -1.465595E-04 -6.852491E-01 -1.194618E-01 -8.922910E-03 -5.271906E-05 -2.195699E-02 -3.131230E-04 -3.739088E-01 -3.265037E-02 -2.215242E-02 -1.812199E-04 -7.104581E-01 -1.100949E-01 -1.112087E-02 -4.919605E-05 -2.716623E-02 -2.917209E-04 -3.646148E-01 -3.098153E-02 -3.468938E-03 -3.673617E-06 -6.439522E-01 -8.790186E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.988792E-01 -3.585276E-02 -1.769735E-02 -7.190181E-05 -7.203928E-01 -1.136161E-01 -8.994571E-03 -1.910703E-05 -2.195114E-02 -1.134487E-04 -2.180681E-01 -1.069385E-02 -1.207089E-02 -3.821459E-05 -4.543812E-01 -4.676007E-02 -5.078523E-03 -7.405974E-06 -1.242019E-02 -4.429054E-05 -3.387204E-01 -3.973516E-02 -3.338763E-03 -5.743416E-06 -6.143123E-01 -9.874284E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.573709E-01 -1.674382E-02 -1.789150E-02 -8.268291E-05 -4.926442E-01 -5.444271E-02 -1.080063E-02 -3.171383E-05 -2.644879E-02 -1.900877E-04 -3.675868E-01 -3.260765E-02 -3.091945E-02 -3.382288E-04 -6.630012E-01 -9.843066E-02 -1.886091E-02 -1.405418E-04 -4.605866E-02 -8.347384E-04 -2.393729E-01 -1.348727E-02 -9.089783E-03 -2.427644E-05 -5.291297E-01 -7.168179E-02 -4.297079E-03 -6.989668E-06 -1.057952E-02 -4.186885E-05 -3.231612E-01 -2.306799E-02 -1.049737E-02 -2.683860E-05 -6.962022E-01 -1.052928E-01 -3.906472E-03 -4.558902E-06 -9.688302E-03 -2.762523E-05 -3.081575E-01 -2.418407E-02 -1.147679E-02 -3.854959E-05 -6.947453E-01 -1.227514E-01 -5.492866E-03 -1.250383E-05 -1.366407E-02 -7.575691E-05 -3.601378E-01 -3.119766E-02 -1.856683E-02 -1.137752E-04 -6.790405E-01 -1.110025E-01 -1.005459E-02 -3.495544E-05 -2.461545E-02 -2.087020E-04 -3.505867E-01 -3.343394E-02 -1.851972E-02 -1.598653E-04 -6.695596E-01 -9.510495E-02 -1.018052E-02 -5.221675E-05 -2.496525E-02 -3.096426E-04 -3.832686E-01 -3.148793E-02 -1.999211E-02 -1.215996E-04 -7.990637E-01 -1.345049E-01 -1.016673E-02 -4.022763E-05 -2.487451E-02 -2.398045E-04 -3.238454E-01 -2.516992E-02 -1.603342E-02 -7.138171E-05 -6.930200E-01 -1.094620E-01 -9.610453E-03 -2.882518E-05 -2.367498E-02 -1.737604E-04 -2.433247E-01 -1.382228E-02 -1.026348E-02 -3.722424E-05 -6.058218E-01 -8.021503E-02 -5.222456E-03 -1.425419E-05 -1.293486E-02 -8.486641E-05 -3.405008E-01 -2.926643E-02 -1.702379E-02 -9.214884E-05 -6.732747E-01 -1.123595E-01 -7.705730E-03 -2.518557E-05 -1.891328E-02 -1.517838E-04 -2.619123E-01 -1.659685E-02 -6.964887E-03 -1.698405E-05 -5.916662E-01 -8.408950E-02 -2.958893E-03 -5.202669E-06 -7.307355E-03 -3.175251E-05 -5.917279E-01 -8.427634E-02 -3.884610E-02 -4.129413E-04 -1.054440E+00 -2.468893E-01 -2.320189E-02 -1.593770E-04 -5.690805E-02 -9.561233E-04 -4.377758E-01 -4.319166E-02 -2.986805E-02 -2.393363E-04 -8.248635E-01 -1.512547E-01 -1.372568E-02 -4.799401E-05 -3.349029E-02 -2.857467E-04 -3.421089E-01 -2.979789E-02 -2.249013E-02 -1.559001E-04 -6.850890E-01 -1.290414E-01 -1.160224E-02 -4.302043E-05 -2.846348E-02 -2.591994E-04 -3.722540E-01 -2.904052E-02 -2.335195E-02 -1.699377E-04 -6.863934E-01 -1.046451E-01 -1.439649E-02 -7.569328E-05 -3.524469E-02 -4.513332E-04 -3.015492E-01 -2.688128E-02 -2.018127E-02 -2.032826E-04 -6.714661E-01 -1.187385E-01 -1.212713E-02 -8.198620E-05 -2.973564E-02 -4.888576E-04 -2.528792E-01 -1.477470E-02 -1.121978E-02 -3.087195E-05 -6.406078E-01 -9.017936E-02 -5.885821E-03 -9.181268E-06 -1.457639E-02 -5.584147E-05 -2.038650E-01 -9.623965E-03 -1.310712E-02 -5.593573E-05 -4.908799E-01 -5.902527E-02 -6.946389E-03 -2.251232E-05 -1.702889E-02 -1.340271E-04 -1.139788E-01 -4.277809E-03 -4.614286E-03 -1.120138E-05 -2.704042E-01 -2.220192E-02 -1.076409E-03 -5.608463E-07 -2.705241E-03 -3.490247E-06 -2.370973E-01 -1.305565E-02 -7.409820E-03 -1.519920E-05 -5.419723E-01 -6.833854E-02 -3.405550E-03 -3.330468E-06 -8.520273E-03 -2.078583E-05 -2.382071E-01 -1.383356E-02 -9.254640E-03 -2.398783E-05 -6.083591E-01 -8.592760E-02 -4.554881E-03 -6.539019E-06 -1.130393E-02 -3.971676E-05 -2.799334E-01 -1.704488E-02 -1.745706E-02 -7.748191E-05 -5.327410E-01 -6.309686E-02 -8.374890E-03 -2.219332E-05 -2.046374E-02 -1.322507E-04 -3.299989E-01 -2.500153E-02 -1.662220E-02 -9.214247E-05 -5.777125E-01 -7.504937E-02 -9.185426E-03 -3.401334E-05 -2.245932E-02 -2.018294E-04 -2.480945E-01 -1.409562E-02 -1.027283E-02 -2.736596E-05 -5.305733E-01 -7.019314E-02 -4.898185E-03 -5.923984E-06 -1.209377E-02 -3.598246E-05 -2.435916E-01 -1.296299E-02 -1.168450E-02 -5.994065E-05 -5.303919E-01 -5.892047E-02 -6.394644E-03 -2.573114E-05 -1.573948E-02 -1.534027E-04 -3.382910E-01 -3.158552E-02 -1.585392E-02 -1.113895E-04 -6.399010E-01 -1.083590E-01 -6.841954E-03 -2.411006E-05 -1.678550E-02 -1.439749E-04 -3.981095E-01 -3.726016E-02 -2.142413E-02 -1.284486E-04 -7.603821E-01 -1.209106E-01 -1.046497E-02 -4.179315E-05 -2.573004E-02 -2.505335E-04 -3.874363E-01 -3.575389E-02 -2.107756E-02 -1.052519E-04 -8.211656E-01 -1.924162E-01 -1.256245E-02 -3.945660E-05 -3.082654E-02 -2.380887E-04 -4.456573E-01 -4.237155E-02 -2.596764E-02 -1.687922E-04 -8.729138E-01 -1.545134E-01 -1.510275E-02 -6.265801E-05 -3.696609E-02 -3.740070E-04 -3.992793E-01 -3.296068E-02 -2.048068E-02 -9.504244E-05 -8.331278E-01 -1.470933E-01 -1.127453E-02 -3.432997E-05 -2.760806E-02 -2.054207E-04 -3.886517E-01 -3.801441E-02 -2.253407E-02 -1.768474E-04 -7.039271E-01 -1.249249E-01 -1.248570E-02 -6.126807E-05 -3.052526E-02 -3.644213E-04 -3.138763E-01 -2.242983E-02 -2.691593E-02 -3.776077E-04 -6.449202E-01 -8.943446E-02 -1.834857E-02 -2.003405E-04 -4.483992E-02 -1.189482E-03 -3.304662E-01 -2.601947E-02 -1.705125E-02 -1.093125E-04 -7.576247E-01 -1.316185E-01 -8.728845E-03 -2.691230E-05 -2.149655E-02 -1.614671E-04 -3.542477E-01 -2.702674E-02 -2.469817E-02 -1.455831E-04 -7.115078E-01 -1.026190E-01 -1.552045E-02 -5.994661E-05 -3.791483E-02 -3.569299E-04 -2.614009E-01 -1.471316E-02 -9.277502E-03 -2.274093E-05 -5.564657E-01 -6.496526E-02 -3.380006E-03 -2.763922E-06 -8.448047E-03 -1.692336E-05 -4.068252E-01 -3.446693E-02 -2.245360E-02 -1.722882E-04 -7.532457E-01 -1.251856E-01 -1.415713E-02 -8.327501E-05 -3.483023E-02 -4.989609E-04 -3.836239E-01 -3.481679E-02 -2.946278E-02 -2.273732E-04 -6.795627E-01 -1.096060E-01 -1.842353E-02 -9.338437E-05 -4.498328E-02 -5.557198E-04 -2.678688E-01 -1.982541E-02 -1.936290E-03 -1.603437E-06 -5.664033E-01 -7.235502E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.540894E-01 -2.828987E-02 -1.435174E-02 -5.674926E-05 -6.973646E-01 -1.020010E-01 -6.832777E-03 -1.519381E-05 -1.682126E-02 -9.113421E-05 -3.455532E-01 -2.525192E-02 -2.020162E-02 -9.765516E-05 -7.040136E-01 -1.093402E-01 -1.088099E-02 -3.831955E-05 -2.661063E-02 -2.277881E-04 -2.776016E-01 -1.920243E-02 -2.052713E-03 -1.376197E-06 -6.585464E-01 -9.903277E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.091116E-01 -2.801257E-02 -2.024177E-02 -1.487498E-04 -6.138896E-01 -9.760701E-02 -1.262011E-02 -5.893128E-05 -3.079776E-02 -3.500582E-04 -4.487706E-01 -4.623185E-02 -4.373194E-02 -6.227096E-04 -8.118881E-01 -1.430088E-01 -2.909097E-02 -2.931199E-04 -7.090335E-02 -1.741024E-03 -4.974461E-01 -7.638705E-02 -5.262803E-03 -9.305275E-06 -8.298919E-01 -1.867351E-01 -4.223383E-07 -5.157240E-14 -1.028071E-06 -3.055838E-13 -3.906825E-01 -3.395073E-02 -2.733734E-02 -2.244620E-04 -7.121951E-01 -1.102604E-01 -1.681025E-02 -9.894122E-05 -4.107934E-02 -5.893557E-04 -2.885297E-01 -1.780804E-02 -1.916292E-02 -1.071634E-04 -6.439592E-01 -8.863510E-02 -1.116822E-02 -3.755311E-05 -2.741619E-02 -2.250014E-04 -3.733478E-01 -2.968457E-02 -2.417235E-03 -1.601471E-06 -8.160636E-01 -1.392543E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.807050E-01 -3.567435E-02 -1.639520E-02 -8.976183E-05 -8.352591E-01 -1.618917E-01 -7.549384E-03 -2.052873E-05 -1.868571E-02 -1.237926E-04 -4.113785E-01 -4.105596E-02 -2.760797E-02 -3.224706E-04 -8.312520E-01 -1.593787E-01 -1.755904E-02 -1.501020E-04 -4.309969E-02 -8.945939E-04 -4.264452E-01 -3.725052E-02 -2.761193E-03 -2.435650E-06 -9.907602E-01 -1.997766E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.190564E-01 -2.211691E-02 -2.297586E-02 -1.527095E-04 -6.146814E-01 -8.438195E-02 -1.406876E-02 -6.039729E-05 -3.440408E-02 -3.599638E-04 -3.441464E-01 -2.721527E-02 -2.208497E-02 -2.084304E-04 -6.754061E-01 -9.588273E-02 -1.249467E-02 -7.294249E-05 -3.053834E-02 -4.341021E-04 -4.902348E-01 -5.753291E-02 -4.141899E-02 -4.944456E-04 -8.677723E-01 -1.834890E-01 -2.563835E-02 -1.920950E-04 -6.257208E-02 -1.139519E-03 -3.219458E-01 -2.681583E-02 -1.509759E-02 -7.089200E-05 -7.411535E-01 -1.399501E-01 -7.267619E-03 -2.195119E-05 -1.781703E-02 -1.304167E-04 -3.460861E-01 -3.062496E-02 -2.305587E-02 -1.686535E-04 -7.279411E-01 -1.156782E-01 -1.567573E-02 -7.910023E-05 -3.843848E-02 -4.721498E-04 -3.706413E-01 -4.607848E-02 -2.101789E-02 -2.205947E-04 -6.385961E-01 -1.004148E-01 -1.096358E-02 -6.216344E-05 -2.682421E-02 -3.692258E-04 -4.326697E-01 -4.048321E-02 -2.321371E-02 -1.359451E-04 -8.057041E-01 -1.359077E-01 -1.178456E-02 -4.532462E-05 -2.882484E-02 -2.702988E-04 -3.700813E-01 -3.145900E-02 -1.629352E-02 -7.752174E-05 -7.168661E-01 -1.142671E-01 -8.563032E-03 -2.424964E-05 -2.094203E-02 -1.448273E-04 -4.171696E-01 -4.090198E-02 -1.942144E-02 -1.387048E-04 -7.827435E-01 -1.320064E-01 -1.123721E-02 -5.225505E-05 -2.747262E-02 -3.113824E-04 -3.936452E-01 -3.863175E-02 -1.864453E-02 -1.426388E-04 -7.621977E-01 -1.259923E-01 -1.114507E-02 -5.649068E-05 -2.735223E-02 -3.374133E-04 -4.146463E-01 -4.565600E-02 -2.051099E-02 -1.708674E-04 -8.092070E-01 -1.483485E-01 -1.068128E-02 -5.635889E-05 -2.623860E-02 -3.368690E-04 -3.502918E-01 -2.962552E-02 -2.245539E-02 -1.353853E-04 -6.798743E-01 -1.244576E-01 -1.299645E-02 -5.263601E-05 -3.188515E-02 -3.178466E-04 -3.664319E-01 -3.762644E-02 -1.543591E-02 -6.786902E-05 -7.257390E-01 -1.308037E-01 -7.920735E-03 -2.010753E-05 -1.954092E-02 -1.209187E-04 -2.881558E-01 -2.091566E-02 -1.253893E-02 -4.874752E-05 -6.867849E-01 -1.142347E-01 -6.304481E-03 -1.195351E-05 -1.563357E-02 -7.346975E-05 -4.226989E-01 -3.731519E-02 -1.464919E-02 -5.381568E-05 -9.709527E-01 -1.979486E-01 -5.624028E-03 -7.623772E-06 -1.400491E-02 -4.711591E-05 -4.177322E-01 -4.315006E-02 -1.820553E-02 -1.147713E-04 -8.897521E-01 -1.764672E-01 -8.738022E-03 -3.234864E-05 -2.155239E-02 -1.941292E-04 -4.092607E-01 -3.530369E-02 -2.094863E-02 -1.698700E-04 -9.371798E-01 -1.782535E-01 -1.252469E-02 -6.937532E-05 -3.076548E-02 -4.148830E-04 -3.694768E-01 -3.810772E-02 -1.842214E-02 -1.102654E-04 -7.440566E-01 -1.378317E-01 -1.077497E-02 -3.938422E-05 -2.649591E-02 -2.371539E-04 -3.561758E-01 -3.892218E-02 -1.971769E-02 -1.829864E-04 -7.613019E-01 -1.474240E-01 -1.192622E-02 -7.156692E-05 -2.936758E-02 -4.300051E-04 -2.527416E-01 -1.830741E-02 -1.645432E-02 -1.267160E-04 -5.925996E-01 -9.467855E-02 -8.871453E-03 -5.348101E-05 -2.184328E-02 -3.189633E-04 -3.300644E-01 -2.928166E-02 -1.882410E-02 -1.436109E-04 -7.237383E-01 -1.333008E-01 -9.519880E-03 -4.704072E-05 -2.342545E-02 -2.806433E-04 -3.764914E-01 -3.641557E-02 -1.821370E-02 -1.541319E-04 -7.651976E-01 -1.295027E-01 -1.036579E-02 -6.438503E-05 -2.552774E-02 -3.859463E-04 -2.999858E-01 -2.596841E-02 -2.166579E-02 -2.610355E-04 -6.375460E-01 -1.048518E-01 -1.456288E-02 -1.290713E-04 -3.563700E-02 -7.694303E-04 -4.842591E-01 -6.171881E-02 -2.321959E-02 -1.668178E-04 -8.833362E-01 -1.695389E-01 -1.327201E-02 -5.801276E-05 -3.246066E-02 -3.448393E-04 -5.214507E-01 -7.645410E-02 -2.106712E-02 -1.794528E-04 -8.149268E-01 -1.497643E-01 -1.099539E-02 -6.388195E-05 -2.693654E-02 -3.799114E-04 -4.660026E-01 -5.353148E-02 -2.651479E-02 -2.310878E-04 -8.389665E-01 -1.518968E-01 -1.651906E-02 -9.356467E-05 -4.039371E-02 -5.572969E-04 -5.848474E-01 -9.288276E-02 -4.985330E-02 -1.127634E-03 -1.055201E+00 -2.709678E-01 -3.348026E-02 -5.556505E-04 -8.197497E-02 -3.315235E-03 -4.139721E-01 -3.782370E-02 -1.933292E-02 -1.125655E-04 -9.059089E-01 -1.795184E-01 -9.265770E-03 -3.682450E-05 -2.278990E-02 -2.207751E-04 -3.882528E-01 -4.110026E-02 -1.561145E-02 -6.509900E-05 -6.762051E-01 -9.661914E-02 -7.561172E-03 -1.586464E-05 -1.861326E-02 -9.601481E-05 -3.055549E-01 -2.290439E-02 -1.869038E-02 -1.012810E-04 -6.519604E-01 -9.557502E-02 -1.045342E-02 -3.401674E-05 -2.561909E-02 -2.031141E-04 -3.784039E-01 -3.540818E-02 -1.144663E-02 -3.747954E-05 -7.982030E-01 -1.492246E-01 -3.743861E-03 -3.826041E-06 -9.336060E-03 -2.375886E-05 -3.893167E-01 -3.224146E-02 -1.465378E-02 -5.640030E-05 -8.519576E-01 -1.546319E-01 -7.851346E-03 -2.140423E-05 -1.941671E-02 -1.297116E-04 -4.628352E-01 -4.648532E-02 -3.104209E-02 -2.927221E-04 -9.424350E-01 -1.848692E-01 -1.805340E-02 -1.259139E-04 -4.411679E-02 -7.489332E-04 -5.036437E-01 -6.329907E-02 -3.701287E-02 -4.293191E-04 -9.845647E-01 -2.302864E-01 -2.189511E-02 -1.860705E-04 -5.357155E-02 -1.113432E-03 -3.651286E-01 -3.372208E-02 -1.898638E-02 -1.788233E-04 -7.283966E-01 -1.166080E-01 -1.159586E-02 -7.325796E-05 -2.849437E-02 -4.369152E-04 -3.712514E-01 -3.312825E-02 -2.124449E-02 -1.626400E-04 -7.116233E-01 -1.089685E-01 -1.329424E-02 -6.857983E-05 -3.257383E-02 -4.067854E-04 -2.729718E-01 -2.308771E-02 -5.130628E-03 -8.219165E-06 -7.257857E-01 -1.711422E-01 -1.662698E-03 -9.477833E-07 -4.314077E-03 -6.608852E-06 -2.780491E-01 -2.511642E-02 -1.327468E-02 -1.125406E-04 -5.815634E-01 -9.937798E-02 -6.802535E-03 -3.433855E-05 -1.678587E-02 -2.048151E-04 -4.836173E-01 -6.301714E-02 -5.126877E-03 -7.676969E-06 -7.235761E-01 -1.309488E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.031875E-01 -4.115015E-02 -2.401570E-02 -1.884922E-04 -7.226240E-01 -1.246862E-01 -1.365997E-02 -6.483039E-05 -3.348484E-02 -3.878250E-04 -3.969397E-01 -3.388912E-02 -1.954568E-02 -1.484093E-04 -8.502161E-01 -1.499123E-01 -1.000927E-02 -5.813943E-05 -2.452378E-02 -3.457355E-04 -5.393064E-01 -7.598949E-02 -4.596848E-03 -8.271188E-06 -9.233647E-01 -1.837028E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.305005E-01 -3.980527E-02 -3.622333E-02 -2.714888E-04 -7.562019E-01 -1.251870E-01 -2.210501E-02 -1.044787E-04 -5.402135E-02 -6.242016E-04 -4.150253E-01 -4.310022E-02 -3.055341E-02 -3.204376E-04 -8.383810E-01 -1.598344E-01 -1.799260E-02 -1.186722E-04 -4.421143E-02 -7.098098E-04 -5.053663E-01 -6.741744E-02 -4.302548E-03 -5.486457E-06 -1.001508E+00 -2.499069E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -5.305404E-01 -9.168988E-02 -4.204388E-02 -6.233654E-04 -1.019287E+00 -2.883833E-01 -2.692540E-02 -2.702944E-04 -6.578499E-02 -1.604933E-03 -2.979429E-01 -2.557053E-02 -1.270971E-02 -6.086980E-05 -6.133144E-01 -9.302940E-02 -6.554631E-03 -2.408980E-05 -1.614693E-02 -1.437968E-04 -2.985643E-01 -2.168009E-02 -1.675518E-03 -6.853400E-07 -6.603013E-01 -1.039248E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.978111E-01 -3.476147E-02 -2.583972E-02 -1.494411E-04 -8.471730E-01 -1.545734E-01 -1.585722E-02 -6.154411E-05 -3.885738E-02 -3.693284E-04 -5.202672E-01 -6.063991E-02 -2.696218E-02 -2.266432E-04 -1.106648E+00 -2.681959E-01 -1.522211E-02 -8.625903E-05 -3.740299E-02 -5.175445E-04 -4.764994E-01 -7.395612E-02 -4.506348E-03 -1.035606E-05 -9.157662E-01 -2.118046E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.132742E-01 -4.146437E-02 -3.375089E-02 -4.225536E-04 -7.921867E-01 -1.381808E-01 -2.045881E-02 -1.753311E-04 -5.005367E-02 -1.042462E-03 -2.661077E-01 -1.751445E-02 -1.121639E-02 -3.636881E-05 -5.712386E-01 -7.771405E-02 -6.533439E-03 -1.250013E-05 -1.610362E-02 -7.471829E-05 -3.425750E-01 -3.408776E-02 -1.156146E-02 -5.411528E-05 -8.276841E-01 -1.940431E-01 -6.001009E-03 -2.103242E-05 -1.484593E-02 -1.276999E-04 -3.790958E-01 -5.528325E-02 -2.035138E-02 -2.087186E-04 -7.464973E-01 -1.698540E-01 -1.056382E-02 -7.655648E-05 -2.594266E-02 -4.578317E-04 -4.673249E-01 -5.113730E-02 -2.751426E-02 -1.816642E-04 -8.149126E-01 -1.677855E-01 -1.476997E-02 -5.736790E-05 -3.624040E-02 -3.439634E-04 -4.969678E-01 -6.703663E-02 -3.324010E-02 -4.839680E-04 -7.957816E-01 -1.402618E-01 -1.787791E-02 -1.889011E-04 -4.366390E-02 -1.122265E-03 -3.987041E-01 -3.319083E-02 -1.717610E-02 -7.614560E-05 -8.405362E-01 -1.455051E-01 -9.116726E-03 -2.731734E-05 -2.243998E-02 -1.635133E-04 -3.557016E-01 -2.733014E-02 -1.946614E-02 -9.722258E-05 -8.042289E-01 -1.325000E-01 -1.081675E-02 -3.317997E-05 -2.660183E-02 -1.988697E-04 -4.238750E-01 -5.071137E-02 -3.860553E-02 -4.907754E-04 -6.818241E-01 -1.059015E-01 -2.594551E-02 -2.253483E-04 -6.329673E-02 -1.337276E-03 -4.845466E-01 -4.739927E-02 -3.781105E-02 -3.188017E-04 -8.754691E-01 -1.592141E-01 -2.256002E-02 -1.269857E-04 -5.521664E-02 -7.580381E-04 -4.762135E-01 -5.411538E-02 -2.732678E-02 -2.310254E-04 -7.810833E-01 -1.311139E-01 -1.597068E-02 -8.360266E-05 -3.898613E-02 -4.967345E-04 -4.626499E-01 -6.385872E-02 -2.294200E-02 -1.768315E-04 -9.372052E-01 -2.270799E-01 -1.299342E-02 -6.187834E-05 -3.189449E-02 -3.716202E-04 -3.261518E-01 -3.233233E-02 -1.344996E-02 -7.296974E-05 -6.438319E-01 -1.139836E-01 -6.902941E-03 -2.347639E-05 -1.691710E-02 -1.400440E-04 -4.352336E-01 -5.775668E-02 -2.123686E-02 -1.661853E-04 -8.342632E-01 -1.707879E-01 -1.088157E-02 -4.787467E-05 -2.666381E-02 -2.851629E-04 -4.309663E-01 -3.819583E-02 -2.280285E-02 -1.438300E-04 -8.522076E-01 -1.478770E-01 -1.272222E-02 -4.969054E-05 -3.123456E-02 -2.971660E-04 -3.545417E-01 -3.176670E-02 -2.104462E-02 -1.973843E-04 -6.924468E-01 -1.084661E-01 -1.359515E-02 -9.318781E-05 -3.323698E-02 -5.537381E-04 -2.601793E-01 -1.854037E-02 -7.292982E-03 -2.119725E-05 -5.911869E-01 -8.786472E-02 -3.411247E-03 -4.494329E-06 -8.395279E-03 -2.694816E-05 -2.856586E-01 -1.974948E-02 -1.054334E-02 -2.769649E-05 -6.966115E-01 -1.097272E-01 -4.020408E-03 -5.909802E-06 -1.002274E-02 -3.621226E-05 -2.990262E-01 -2.895771E-02 -1.524669E-02 -1.075200E-04 -5.511247E-01 -7.221915E-02 -7.850283E-03 -4.154474E-05 -1.921607E-02 -2.483852E-04 -2.734313E-01 -2.247782E-02 -1.398383E-02 -1.162049E-04 -6.576619E-01 -1.210529E-01 -8.907424E-03 -5.814670E-05 -2.190592E-02 -3.497392E-04 -2.815363E-01 -1.901069E-02 -1.186929E-02 -3.364035E-05 -6.515902E-01 -9.851410E-02 -6.886950E-03 -1.323736E-05 -1.695569E-02 -7.940407E-05 -3.484143E-01 -2.809808E-02 -2.158706E-02 -1.746308E-04 -6.459834E-01 -9.326184E-02 -1.339059E-02 -7.862843E-05 -3.279132E-02 -4.674908E-04 -4.872293E-01 -6.299198E-02 -4.535678E-03 -8.886458E-06 -7.995378E-01 -1.391013E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.517270E-01 -4.298933E-02 -2.983900E-02 -2.534533E-04 -9.003348E-01 -1.639649E-01 -1.797753E-02 -1.058508E-04 -4.408492E-02 -6.323324E-04 -3.840449E-01 -3.048942E-02 -2.304747E-02 -1.451405E-04 -7.696800E-01 -1.200152E-01 -1.291566E-02 -4.856104E-05 -3.169233E-02 -2.900548E-04 -3.899986E-01 -4.842017E-02 -3.398750E-02 -5.012913E-04 -7.289300E-01 -1.213432E-01 -2.225136E-02 -2.225919E-04 -5.443442E-02 -1.322013E-03 -5.598647E-01 -7.209791E-02 -3.636258E-02 -2.972603E-04 -9.425990E-01 -1.980189E-01 -2.180409E-02 -1.030147E-04 -5.325326E-02 -6.135525E-04 -5.137462E-01 -5.449795E-02 -2.968013E-02 -2.213205E-04 -1.089121E+00 -2.416550E-01 -1.633665E-02 -8.162297E-05 -4.019388E-02 -4.875490E-04 -4.289801E-01 -4.093477E-02 -2.010221E-02 -9.125869E-05 -8.441503E-01 -1.577640E-01 -1.121134E-02 -3.076206E-05 -2.749358E-02 -1.837347E-04 -4.669049E-01 -4.985409E-02 -3.155885E-02 -2.843354E-04 -8.541836E-01 -1.586915E-01 -1.971407E-02 -1.199500E-04 -4.819514E-02 -7.142000E-04 -5.476118E-01 -7.964842E-02 -3.671613E-02 -5.048684E-04 -9.819505E-01 -2.224104E-01 -2.057791E-02 -1.723983E-04 -5.020646E-02 -1.023284E-03 -3.570430E-01 -3.236156E-02 -2.642812E-02 -2.499237E-04 -6.566192E-01 -1.028336E-01 -1.658528E-02 -1.090997E-04 -4.052667E-02 -6.501756E-04 -3.157944E-01 -2.754029E-02 -2.510614E-03 -2.597981E-06 -6.619048E-01 -1.052488E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.796550E-01 -1.863344E-02 -1.041219E-02 -5.191551E-05 -6.609168E-01 -1.042598E-01 -6.108228E-03 -2.425637E-05 -1.502705E-02 -1.442032E-04 -2.179231E-01 -1.148681E-02 -1.158771E-02 -5.115165E-05 -5.338009E-01 -6.387573E-02 -6.955519E-03 -2.069739E-05 -1.714723E-02 -1.242632E-04 -2.723379E-01 -1.612703E-02 -1.661668E-02 -8.393477E-05 -6.115831E-01 -7.762931E-02 -8.158618E-03 -2.912656E-05 -2.012066E-02 -1.734434E-04 -4.177079E-01 -5.021689E-02 -1.465133E-02 -8.170592E-05 -8.821701E-01 -2.073297E-01 -5.279873E-03 -1.131685E-05 -1.297780E-02 -6.813348E-05 -4.389866E-01 -5.718767E-02 -2.509233E-02 -2.986289E-04 -8.525743E-01 -1.748816E-01 -1.369565E-02 -1.018308E-04 -3.355369E-02 -6.079070E-04 -4.137349E-01 -4.314157E-02 -2.371796E-02 -2.559421E-04 -7.149288E-01 -1.144426E-01 -1.335685E-02 -1.050731E-04 -3.269465E-02 -6.277716E-04 -6.493181E-01 -8.850590E-02 -4.003436E-02 -4.029382E-04 -1.240508E+00 -3.254748E-01 -2.412272E-02 -1.510168E-04 -5.916870E-02 -9.052554E-04 -4.999253E-01 -5.822974E-02 -2.648913E-02 -2.036552E-04 -8.603421E-01 -1.542102E-01 -1.503446E-02 -7.780397E-05 -3.680872E-02 -4.627887E-04 -2.140322E-01 -1.009989E-02 -9.821979E-04 -2.888126E-07 -5.412641E-01 -6.614023E-02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.473664E-01 -1.445695E-02 -1.115793E-02 -4.639483E-05 -6.402572E-01 -1.087519E-01 -6.977317E-03 -2.012165E-05 -1.726283E-02 -1.209389E-04 -4.106842E-01 -4.252374E-02 -2.865498E-02 -2.625513E-04 -6.937372E-01 -1.072413E-01 -1.818386E-02 -1.104345E-04 -4.446846E-02 -6.595035E-04 -4.211497E-01 -4.077958E-02 -2.971575E-03 -2.487030E-06 -8.520797E-01 -1.481605E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -5.226188E-01 -5.944362E-02 -2.960968E-02 -2.245340E-04 -9.222348E-01 -1.736139E-01 -1.631529E-02 -7.908945E-05 -3.982616E-02 -4.708490E-04 -4.418421E-01 -4.437957E-02 -2.517739E-02 -1.907600E-04 -7.787605E-01 -1.249305E-01 -1.536054E-02 -7.917968E-05 -3.755245E-02 -4.723672E-04 -4.343976E-01 -4.457981E-02 -3.388911E-03 -3.822692E-06 -8.737430E-01 -1.764940E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.598455E-01 -2.729560E-02 -2.418740E-02 -2.378985E-04 -7.302175E-01 -1.135251E-01 -1.616906E-02 -1.246680E-04 -3.949063E-02 -7.402107E-04 -2.619461E-01 -1.513254E-02 -8.926754E-03 -1.978809E-05 -6.435721E-01 -9.157538E-02 -4.651147E-03 -7.139204E-06 -1.149560E-02 -4.303315E-05 -3.477772E-01 -3.056585E-02 -1.223437E-02 -5.499474E-05 -7.995504E-01 -1.386715E-01 -6.975627E-03 -1.888125E-05 -1.734787E-02 -1.146221E-04 -3.619349E-01 -3.702197E-02 -1.807440E-02 -1.270513E-04 -7.778669E-01 -1.474144E-01 -1.099124E-02 -4.917455E-05 -2.701829E-02 -2.940738E-04 -3.162191E-01 -2.268893E-02 -1.158071E-02 -3.480324E-05 -7.692808E-01 -1.327980E-01 -4.095665E-03 -5.158750E-06 -1.022758E-02 -3.212100E-05 -5.342532E-01 -8.478330E-02 -2.903573E-02 -3.357498E-04 -1.120085E+00 -3.408745E-01 -1.690122E-02 -1.279478E-04 -4.141172E-02 -7.637947E-04 -4.496065E-01 -6.505133E-02 -2.635557E-02 -3.323123E-04 -9.612470E-01 -2.510212E-01 -1.538003E-02 -1.327695E-04 -3.782149E-02 -7.945656E-04 -4.847046E-01 -5.967696E-02 -2.535687E-02 -2.173087E-04 -1.077043E+00 -2.811943E-01 -1.097101E-02 -3.799483E-05 -2.709062E-02 -2.304602E-04 -5.175767E-01 -5.719466E-02 -1.973241E-02 -8.575798E-05 -9.679612E-01 -2.056860E-01 -8.303999E-03 -1.805765E-05 -2.040361E-02 -1.089188E-04 -5.517001E-01 -6.994072E-02 -2.497158E-02 -1.771114E-04 -1.098639E+00 -2.726418E-01 -1.399598E-02 -6.099098E-05 -3.430186E-02 -3.665835E-04 -2.863207E-01 -1.857525E-02 -8.336069E-03 -1.649811E-05 -6.476326E-01 -9.010693E-02 -3.429198E-03 -3.106979E-06 -8.565244E-03 -1.898164E-05 -2.620263E-01 -1.413830E-02 -1.486260E-02 -6.016669E-05 -5.979318E-01 -7.637631E-02 -7.005392E-03 -1.590920E-05 -1.730862E-02 -9.593066E-05 -3.655323E-01 -3.067786E-02 -2.564543E-02 -2.165772E-04 -7.572344E-01 -1.217887E-01 -1.473507E-02 -8.140802E-05 -3.619562E-02 -4.852029E-04 -3.419278E-01 -2.642670E-02 -2.272345E-02 -1.520173E-04 -6.406916E-01 -8.632502E-02 -1.398347E-02 -6.589014E-05 -3.414144E-02 -3.923320E-04 -4.462443E-01 -4.882939E-02 -3.221856E-02 -4.381937E-04 -7.714529E-01 -1.298248E-01 -2.030822E-02 -2.050592E-04 -4.959466E-02 -1.221874E-03 -4.241623E-01 -4.238067E-02 -3.017189E-02 -3.192439E-04 -8.184443E-01 -1.472953E-01 -1.653484E-02 -9.828819E-05 -4.040308E-02 -5.837728E-04 -5.468649E-01 -6.932849E-02 -3.506986E-02 -3.414126E-04 -9.081801E-01 -1.955422E-01 -2.067323E-02 -1.252268E-04 -5.051840E-02 -7.466097E-04 -4.049238E-01 -3.619626E-02 -1.820878E-02 -8.370629E-05 -7.947251E-01 -1.471574E-01 -6.827689E-03 -1.877378E-05 -1.682488E-02 -1.119968E-04 -3.181706E-01 -2.312073E-02 -1.853503E-02 -9.670338E-05 -7.307830E-01 -1.165409E-01 -1.133833E-02 -4.507577E-05 -2.784164E-02 -2.700020E-04 -4.535053E-01 -4.781822E-02 -2.298094E-02 -1.379435E-04 -9.393810E-01 -1.913101E-01 -1.088324E-02 -3.746573E-05 -2.670626E-02 -2.245210E-04 -3.711608E-01 -3.011209E-02 -2.135571E-02 -1.326869E-04 -7.941852E-01 -1.316708E-01 -1.330360E-02 -5.321889E-05 -3.253974E-02 -3.167152E-04 -4.121174E-01 -3.478939E-02 -1.586472E-02 -6.068678E-05 -1.040216E+00 -2.214218E-01 -5.758712E-03 -1.002333E-05 -1.426440E-02 -6.037119E-05 -4.435090E-01 -4.161468E-02 -1.602560E-02 -5.789996E-05 -1.002899E+00 -2.058070E-01 -7.221739E-03 -1.233021E-05 -1.798457E-02 -7.523251E-05 -4.605997E-01 -5.734630E-02 -1.933007E-02 -1.409861E-04 -1.082221E+00 -2.959635E-01 -9.105646E-03 -3.669942E-05 -2.256185E-02 -2.209209E-04 -4.760643E-01 -5.548670E-02 -2.305845E-02 -1.988737E-04 -1.108307E+00 -2.819143E-01 -1.141829E-02 -5.438996E-05 -2.821950E-02 -3.289724E-04 -2.990870E-01 -2.614044E-02 -1.379131E-02 -6.530395E-05 -6.526311E-01 -1.174214E-01 -6.340014E-03 -1.465241E-05 -1.577489E-02 -8.917934E-05 -4.539651E-01 -5.989053E-02 -3.706059E-02 -7.451853E-04 -9.479066E-01 -2.087790E-01 -2.371011E-02 -3.624597E-04 -5.802863E-02 -2.153033E-03 -3.550875E-01 -3.154848E-02 -1.517370E-02 -6.019907E-05 -8.233200E-01 -1.604220E-01 -7.096967E-03 -1.239328E-05 -1.749843E-02 -7.496910E-05 -2.669672E-01 -1.655119E-02 -9.921355E-03 -2.850701E-05 -6.229281E-01 -9.065592E-02 -3.525996E-03 -3.622432E-06 -8.763114E-03 -2.217997E-05 -3.117641E-01 -2.706928E-02 -1.301318E-02 -6.380468E-05 -7.069278E-01 -1.223940E-01 -5.520667E-03 -1.450549E-05 -1.364327E-02 -8.705049E-05 -4.253175E-01 -4.226465E-02 -3.130303E-02 -2.892976E-04 -8.847586E-01 -1.831350E-01 -1.869718E-02 -1.080033E-04 -4.581100E-02 -6.437392E-04 -4.373877E-01 -4.563513E-02 -2.171789E-02 -1.852469E-04 -8.427752E-01 -1.639163E-01 -1.193320E-02 -6.904423E-05 -2.934222E-02 -4.124494E-04 -3.309335E-01 -2.360277E-02 -1.782689E-02 -7.495262E-05 -7.435456E-01 -1.161667E-01 -9.806683E-03 -2.456418E-05 -2.407241E-02 -1.471923E-04 -3.295651E-01 -2.892136E-02 -9.136199E-03 -2.751683E-05 -7.402491E-01 -1.444989E-01 -4.232396E-03 -6.593472E-06 -1.064377E-02 -4.140318E-05 -2.646177E-01 -1.820511E-02 -6.560072E-03 -1.355487E-05 -6.853657E-01 -1.299412E-01 -2.501821E-03 -2.093278E-06 -6.398968E-03 -1.362528E-05 -5.276217E-01 -6.992447E-02 -4.094462E-02 -5.970189E-04 -1.098251E+00 -3.357754E-01 -2.710360E-02 -2.943539E-04 -6.624993E-02 -1.748479E-03 -4.706582E-01 -4.760382E-02 -1.885346E-02 -7.652927E-05 -9.303306E-01 -1.833640E-01 -9.384721E-03 -2.029091E-05 -2.290445E-02 -1.208163E-04 -5.382357E-01 -6.759212E-02 -2.981285E-02 -2.571507E-04 -1.218516E+00 -3.361214E-01 -1.807366E-02 -9.486632E-05 -4.459288E-02 -5.717156E-04 -5.926040E-01 -7.178398E-02 -4.360128E-02 -5.324114E-04 -1.307820E+00 -3.690548E-01 -2.600218E-02 -2.365448E-04 -6.382907E-02 -1.415541E-03 +2.737079E+00 +1.545362E+00 +7.475678E-02 +1.182688E-03 +3.895146E+00 +3.143927E+00 +3.051980E-02 +2.030656E-04 +7.566509E-02 +1.248142E-03 +2.564678E+00 +1.356531E+00 +6.888583E-02 +1.027172E-03 +3.639176E+00 +2.763465E+00 +2.785332E-02 +1.756457E-04 +6.905430E-02 +1.079605E-03 +2.513858E+00 +1.360648E+00 +7.106151E-02 +1.063532E-03 +3.598310E+00 +2.766916E+00 +2.957807E-02 +1.830650E-04 +7.333034E-02 +1.125208E-03 +2.680537E+00 +1.557625E+00 +7.458823E-02 +1.153071E-03 +3.874223E+00 +3.178628E+00 +3.085079E-02 +1.987973E-04 +7.648569E-02 +1.221907E-03 +2.747094E+00 +1.661126E+00 +7.366404E-02 +1.200019E-03 +3.949477E+00 +3.398210E+00 +2.983494E-02 +2.006053E-04 +7.396717E-02 +1.233020E-03 +2.832153E+00 +1.688117E+00 +7.768421E-02 +1.263525E-03 +4.057661E+00 +3.441857E+00 +3.181289E-02 +2.134911E-04 +7.887092E-02 +1.312222E-03 +2.818292E+00 +1.727700E+00 +8.151103E-02 +1.400727E-03 +4.087366E+00 +3.555489E+00 +3.440824E-02 +2.483234E-04 +8.530537E-02 +1.526319E-03 +2.673498E+00 +1.597867E+00 +8.179404E-02 +1.455604E-03 +4.005194E+00 +3.520971E+00 +3.564373E-02 +2.749065E-04 +8.836840E-02 +1.689712E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.694430E+00 +1.482997E+00 +7.661360E-02 +1.219010E-03 +3.956809E+00 +3.231298E+00 +3.211518E-02 +2.179122E-04 +7.962036E-02 +1.339397E-03 +2.572758E+00 +1.418791E+00 +7.213692E-02 +1.094985E-03 +3.692753E+00 +2.869867E+00 +2.991749E-02 +1.926648E-04 +7.417183E-02 +1.184214E-03 +2.477980E+00 +1.312803E+00 +6.912091E-02 +9.790394E-04 +3.581706E+00 +2.674317E+00 +2.863743E-02 +1.680509E-04 +7.099830E-02 +1.032924E-03 +2.845088E+00 +1.688617E+00 +8.173799E-02 +1.368439E-03 +4.131147E+00 +3.544636E+00 +3.438554E-02 +2.417440E-04 +8.524908E-02 +1.485879E-03 +2.793685E+00 +1.647743E+00 +8.194563E-02 +1.421503E-03 +4.186293E+00 +3.695916E+00 +3.501635E-02 +2.621854E-04 +8.681299E-02 +1.611522E-03 +2.638366E+00 +1.500052E+00 +8.011857E-02 +1.356165E-03 +4.000991E+00 +3.395409E+00 +3.487592E-02 +2.544883E-04 +8.646482E-02 +1.564211E-03 +2.842735E+00 +1.690237E+00 +8.154955E-02 +1.356837E-03 +4.156256E+00 +3.570439E+00 +3.435028E-02 +2.398488E-04 +8.516165E-02 +1.474230E-03 +2.196972E+00 +9.871590E-01 +6.781939E-02 +9.725975E-04 +3.352539E+00 +2.320436E+00 +2.976179E-02 +1.937147E-04 +7.378580E-02 +1.190667E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.641273E+00 +1.597870E+00 +7.598644E-02 +1.292899E-03 +3.853049E+00 +3.336280E+00 +3.203862E-02 +2.292746E-04 +7.943056E-02 +1.409235E-03 +2.708082E+00 +1.522839E+00 +7.654337E-02 +1.221093E-03 +3.905027E+00 +3.156770E+00 +3.189847E-02 +2.134574E-04 +7.908310E-02 +1.312015E-03 +2.691233E+00 +1.524379E+00 +8.054050E-02 +1.365756E-03 +3.962250E+00 +3.258368E+00 +3.462881E-02 +2.628049E-04 +8.585218E-02 +1.615329E-03 +3.018386E+00 +1.917223E+00 +8.348614E-02 +1.445746E-03 +4.283272E+00 +3.833787E+00 +3.429972E-02 +2.430307E-04 +8.503630E-02 +1.493787E-03 +2.929994E+00 +1.836911E+00 +8.927512E-02 +1.624433E-03 +4.372984E+00 +4.002348E+00 +3.882367E-02 +3.051257E-04 +9.625215E-02 +1.875454E-03 +3.119790E+00 +2.050856E+00 +9.534078E-02 +1.868390E-03 +4.698804E+00 +4.587809E+00 +4.157799E-02 +3.523492E-04 +1.030807E-01 +2.165713E-03 +2.868621E+00 +1.702964E+00 +8.398565E-02 +1.456555E-03 +4.247485E+00 +3.715607E+00 +3.580655E-02 +2.676357E-04 +8.877207E-02 +1.645022E-03 +2.497455E+00 +1.252375E+00 +6.446362E-02 +8.477811E-04 +3.507541E+00 +2.474088E+00 +2.542963E-02 +1.367733E-04 +6.304548E-02 +8.406768E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.623441E+00 +1.490238E+00 +8.737054E-02 +1.670677E-03 +4.075246E+00 +3.570201E+00 +3.969459E-02 +3.510115E-04 +9.841135E-02 +2.157491E-03 +2.429458E+00 +1.296272E+00 +7.433515E-02 +1.195439E-03 +3.603045E+00 +2.814355E+00 +3.233556E-02 +2.266091E-04 +8.016674E-02 +1.392852E-03 +2.655653E+00 +1.503631E+00 +7.556244E-02 +1.216313E-03 +3.876149E+00 +3.192723E+00 +3.167217E-02 +2.160892E-04 +7.852205E-02 +1.328191E-03 +2.687380E+00 +1.496815E+00 +7.570314E-02 +1.262722E-03 +3.940616E+00 +3.291028E+00 +3.159442E-02 +2.339022E-04 +7.832928E-02 +1.437679E-03 +2.990160E+00 +1.889612E+00 +7.623143E-02 +1.208898E-03 +4.207001E+00 +3.697140E+00 +2.984188E-02 +1.859848E-04 +7.398438E-02 +1.143155E-03 +2.853430E+00 +1.655915E+00 +7.908369E-02 +1.262135E-03 +4.101975E+00 +3.406862E+00 +3.260559E-02 +2.168450E-04 +8.083620E-02 +1.332837E-03 +2.730969E+00 +1.615691E+00 +7.764021E-02 +1.314394E-03 +3.991873E+00 +3.443169E+00 +3.252644E-02 +2.371617E-04 +8.063998E-02 +1.457714E-03 +2.187664E+00 +9.957750E-01 +6.436381E-02 +8.515751E-04 +3.270736E+00 +2.197812E+00 +2.754849E-02 +1.554780E-04 +6.829858E-02 +9.556448E-04 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.126226E+00 +2.054101E+00 +9.308386E-02 +1.840170E-03 +4.585435E+00 +4.425166E+00 +3.991071E-02 +3.454637E-04 +9.894716E-02 +2.123391E-03 +2.628975E+00 +1.442927E+00 +7.480586E-02 +1.136055E-03 +3.849243E+00 +3.050079E+00 +3.136784E-02 +1.990547E-04 +7.776755E-02 +1.223489E-03 +2.740162E+00 +1.737335E+00 +7.647229E-02 +1.263465E-03 +4.009845E+00 +3.586955E+00 +3.173845E-02 +2.147512E-04 +7.868637E-02 +1.319968E-03 +2.761943E+00 +1.619005E+00 +7.846740E-02 +1.320872E-03 +4.097351E+00 +3.568014E+00 +3.295230E-02 +2.361898E-04 +8.169577E-02 +1.451740E-03 +2.855074E+00 +1.670686E+00 +7.845369E-02 +1.263464E-03 +4.103374E+00 +3.452249E+00 +3.220431E-02 +2.141592E-04 +7.984135E-02 +1.316329E-03 +2.690178E+00 +1.491926E+00 +7.527503E-02 +1.160972E-03 +3.903606E+00 +3.122977E+00 +3.125741E-02 +2.022968E-04 +7.749378E-02 +1.243417E-03 +2.512911E+00 +1.314036E+00 +7.800028E-02 +1.259212E-03 +3.791186E+00 +2.970061E+00 +3.426379E-02 +2.436930E-04 +8.494722E-02 +1.497858E-03 +2.273876E+00 +1.107297E+00 +7.120819E-02 +1.019386E-03 +3.428794E+00 +2.426375E+00 +3.139941E-02 +1.998412E-04 +7.784582E-02 +1.228323E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.416875E+00 +1.198797E+00 +7.051645E-02 +1.018987E-03 +3.608689E+00 +2.679252E+00 +3.004052E-02 +1.872854E-04 +7.447684E-02 +1.151149E-03 +2.573490E+00 +1.402205E+00 +6.633005E-02 +9.194585E-04 +3.559859E+00 +2.675099E+00 +2.604699E-02 +1.426679E-04 +6.457603E-02 +8.769077E-04 +2.701686E+00 +1.530274E+00 +7.570621E-02 +1.220650E-03 +3.972619E+00 +3.322266E+00 +3.152781E-02 +2.138949E-04 +7.816415E-02 +1.314704E-03 +2.920710E+00 +1.813750E+00 +8.167632E-02 +1.397805E-03 +4.220218E+00 +3.751891E+00 +3.388045E-02 +2.397875E-04 +8.399686E-02 +1.473853E-03 +2.886624E+00 +1.697663E+00 +8.812015E-02 +1.584550E-03 +4.350341E+00 +3.846411E+00 +3.842467E-02 +3.055861E-04 +9.526294E-02 +1.878284E-03 +2.805388E+00 +1.631826E+00 +9.017775E-02 +1.681160E-03 +4.264591E+00 +3.742270E+00 +4.026469E-02 +3.387007E-04 +9.982475E-02 +2.081823E-03 +2.789842E+00 +1.599838E+00 +9.325901E-02 +1.771117E-03 +4.331678E+00 +3.825425E+00 +4.241710E-02 +3.690107E-04 +1.051610E-01 +2.268123E-03 +2.406721E+00 +1.197504E+00 +7.197982E-02 +1.055123E-03 +3.523223E+00 +2.545571E+00 +3.093417E-02 +1.962555E-04 +7.669239E-02 +1.206284E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.670387E+00 +1.493829E+00 +7.916152E-02 +1.323249E-03 +3.980792E+00 +3.341124E+00 +3.398399E-02 +2.477152E-04 +8.425355E-02 +1.522581E-03 +2.643712E+00 +1.525085E+00 +7.477643E-02 +1.211244E-03 +3.829765E+00 +3.171826E+00 +3.119267E-02 +2.143333E-04 +7.733327E-02 +1.317399E-03 +2.775846E+00 +1.674648E+00 +8.464107E-02 +1.549143E-03 +4.133594E+00 +3.716316E+00 +3.679183E-02 +2.932382E-04 +9.121478E-02 +1.802388E-03 +2.954816E+00 +1.930285E+00 +7.887852E-02 +1.287632E-03 +4.192638E+00 +3.786782E+00 +3.177353E-02 +2.052824E-04 +7.877335E-02 +1.261768E-03 +3.031795E+00 +1.932684E+00 +9.082125E-02 +1.719186E-03 +4.462842E+00 +4.170125E+00 +3.909991E-02 +3.173523E-04 +9.693701E-02 +1.950605E-03 +2.773807E+00 +1.592371E+00 +8.755961E-02 +1.597915E-03 +4.234664E+00 +3.713430E+00 +3.882039E-02 +3.159470E-04 +9.624401E-02 +1.941967E-03 +2.528366E+00 +1.320356E+00 +8.486472E-02 +1.488520E-03 +3.935024E+00 +3.188413E+00 +3.866268E-02 +3.104697E-04 +9.585301E-02 +1.908301E-03 +2.814891E+00 +1.783998E+00 +7.956633E-02 +1.440608E-03 +4.087076E+00 +3.738124E+00 +3.321370E-02 +2.578118E-04 +8.234384E-02 +1.584639E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.360566E+00 +1.164965E+00 +7.582328E-02 +1.239719E-03 +3.614813E+00 +2.742787E+00 +3.388042E-02 +2.553121E-04 +8.399678E-02 +1.569275E-03 +2.546108E+00 +1.399288E+00 +7.762813E-02 +1.316168E-03 +3.859937E+00 +3.260243E+00 +3.384404E-02 +2.538541E-04 +8.390659E-02 +1.560314E-03 +3.332352E+00 +2.369626E+00 +8.799788E-02 +1.625343E-03 +4.655099E+00 +4.594468E+00 +3.514406E-02 +2.612097E-04 +8.712961E-02 +1.605525E-03 +2.601466E+00 +1.427019E+00 +7.052544E-02 +1.078356E-03 +3.725846E+00 +2.956429E+00 +2.871825E-02 +1.843049E-04 +7.119865E-02 +1.132829E-03 +2.954221E+00 +1.775439E+00 +8.854750E-02 +1.593113E-03 +4.427465E+00 +3.982350E+00 +3.824403E-02 +2.969669E-04 +9.481508E-02 +1.825306E-03 +2.855301E+00 +1.652640E+00 +8.473899E-02 +1.471257E-03 +4.218821E+00 +3.612250E+00 +3.633488E-02 +2.751925E-04 +9.008191E-02 +1.691470E-03 +2.632066E+00 +1.437779E+00 +7.298646E-02 +1.093885E-03 +3.785199E+00 +2.966958E+00 +3.009667E-02 +1.863207E-04 +7.461606E-02 +1.145219E-03 +2.629725E+00 +1.564381E+00 +8.162764E-02 +1.547184E-03 +3.953052E+00 +3.585289E+00 +3.581386E-02 +3.025695E-04 +8.879019E-02 +1.859742E-03 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 tally 2: -2.410000E+00 -1.233100E+00 -2.410000E+00 -1.233100E+00 -8.400000E-01 -1.434000E-01 -8.400000E-01 -1.434000E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.262000E+01 -3.207480E+01 -1.262000E+01 -3.207480E+01 -6.000000E-02 -1.800000E-03 -6.000000E-02 -1.800000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -8.220000E+00 -1.365100E+01 -8.220000E+00 -1.365100E+01 -9.000000E-02 -2.300000E-03 -9.000000E-02 -2.300000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.430000E+00 -2.409500E+00 -3.430000E+00 -2.409500E+00 -4.000000E-02 -4.000000E-04 -4.000000E-02 -4.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.450000E+00 -4.253000E-01 -1.450000E+00 -4.253000E-01 -7.000000E-02 -1.900000E-03 -7.000000E-02 -1.900000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -1.570000E+00 -5.095000E-01 -1.570000E+00 -5.095000E-01 -9.000000E-02 -2.300000E-03 -9.000000E-02 -2.300000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.000000E-02 -1.900000E-03 -9.000000E-02 -1.900000E-03 -2.010000E+00 -8.355000E-01 -2.010000E+00 -8.355000E-01 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -2.000000E-02 -2.000000E-04 -2.000000E-02 -2.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-02 -6.000000E-04 -4.000000E-02 -6.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-02 -4.000000E-04 -4.000000E-02 -4.000000E-04 -5.000000E-02 -5.000000E-04 -5.000000E-02 -5.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -7.000000E-02 -2.100000E-03 -7.000000E-02 -2.100000E-03 -1.000000E-01 -2.600000E-03 -1.000000E-01 -2.600000E-03 -8.000000E-02 -1.600000E-03 -8.000000E-02 -1.600000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -8.600000E-01 -1.528000E-01 -8.600000E-01 -1.528000E-01 -1.800000E-01 -8.000000E-03 -1.800000E-01 -8.000000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.600000E-01 -1.420000E-02 -2.600000E-01 -1.420000E-02 -1.600000E-01 -6.200000E-03 -1.600000E-01 -6.200000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -5.000000E-02 -9.000000E-04 -5.000000E-02 -9.000000E-04 -1.200000E-01 -3.800000E-03 -1.200000E-01 -3.800000E-03 -2.000000E-02 -2.000000E-04 -2.000000E-02 -2.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.000000E-02 -2.300000E-03 -9.000000E-02 -2.300000E-03 -1.500000E-01 -7.300000E-03 -1.500000E-01 -7.300000E-03 -3.000000E-02 -5.000000E-04 -3.000000E-02 -5.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.400000E-01 -4.000000E-03 -1.400000E-01 -4.000000E-03 -1.000000E-01 -2.400000E-03 -1.000000E-01 -2.400000E-03 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-02 -6.000000E-04 -4.000000E-02 -6.000000E-04 -1.140000E+00 -2.858000E-01 -1.140000E+00 -2.858000E-01 +4.012713E+01 +3.286443E+02 +4.014931E+01 +3.290078E+02 +5.982856E+00 +7.510508E+00 +5.983297E+00 +7.511618E+00 +1.223283E+02 +3.075680E+03 +1.223283E+02 +3.075680E+03 diff --git a/tests/test_mg_tallies/test_mg_tallies.py b/tests/test_mg_tallies/test_mg_tallies.py index a9b1860c59..c54fb4d32d 100644 --- a/tests/test_mg_tallies/test_mg_tallies.py +++ b/tests/test_mg_tallies/test_mg_tallies.py @@ -18,11 +18,9 @@ class MGTalliesTestHarness(PyAPITestHarness): # Instantiate some tally filters energy_filter = openmc.Filter(type='energy', - bins=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, - 1.0E-3, 0.5, 1.0, 20.0]) + bins=[0.0, 20.0]) energyout_filter = openmc.Filter(type='energyout', - bins=[1E-11, 0.0635E-6, 10.0E-6, - 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) + bins=[0.0, 20.0]) mesh_filter = openmc.Filter() mesh_filter.mesh = mesh From c532cc1189725e1aeb9067cb384880ca1a7f8698 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 20 Nov 2015 05:02:00 -0500 Subject: [PATCH 047/149] Fixed bug in mg tallying --- src/tally.F90 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tally.F90 b/src/tally.F90 index 6b9ee4e277..96dc5b5837 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -2548,6 +2548,9 @@ contains else matching_bins(i) = p % last_g end if + ! Tallies are ordered in increasing groups, group indices + ! however are the opposite, so switch + matching_bins(i) = energy_groups - matching_bins(i) + 1 else ! make sure the correct energy is used if (t % estimator == ESTIMATOR_TRACKLENGTH) then @@ -2573,6 +2576,10 @@ contains if (t % energyout_matches_groups) then ! Since all groups are filters, the filter bin is the group matching_bins(i) = p % g + + ! Tallies are ordered in increasing groups, group indices + ! however are the opposite, so switch + matching_bins(i) = energy_groups - matching_bins(i) + 1 else ! determine outgoing energy bin n = t % filters(i) % n_bins From 72518ee07dbac5f0956876afaa2c0fa69cc80a06 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 21 Nov 2015 13:24:33 -0500 Subject: [PATCH 048/149] Fixed my merge issue. Thats what I get for doing a git conflict resolution during the PSU-UM football game. --- openmc/settings.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/openmc/settings.py b/openmc/settings.py index 7339a2e90d..a637816773 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -953,6 +953,16 @@ class SettingsFile(object): subelement = ET.SubElement(element, key) subelement.text = str(self._keff_trigger[key]).lower() + def _create_energy_mode_subelement(self): + if self._energy_mode is not None: + element = ET.SubElement(self._settings_file, "energy_mode") + element.text = str(self._energy_mode) + + def _create_max_order_subelement(self): + if self._max_order is not None: + element = ET.SubElement(self._settings_file, "max_order") + element.text = str(self._max_order) + def _create_source_subelement(self): self._create_source_space_subelement() self._create_source_energy_subelement() From 3381e8bd277f12dc7922a6b6007ff919ecdc0e3c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 24 Nov 2015 08:13:39 -0500 Subject: [PATCH 049/149] Moved some more methods from string to simple_string since they dont depend on global --- src/simple_string.F90 | 70 +++++++++++++++++++++++++++++++++++- src/string.F90 | 82 ++++--------------------------------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/simple_string.F90 b/src/simple_string.F90 index 478a755562..65eb58ac0b 100644 --- a/src/simple_string.F90 +++ b/src/simple_string.F90 @@ -1,6 +1,6 @@ module simple_string - use constants, only: ERROR_REAL, ERROR_INT + use constants, only: ERROR_REAL, ERROR_INT, MAX_LINE_LEN implicit none @@ -237,4 +237,72 @@ contains end function real_to_str +!=============================================================================== +! STR_TO_INT converts a string to an integer. +!=============================================================================== + + pure function str_to_int(str) result(num) + + character(*), intent(in) :: str + integer(8) :: num + + character(5) :: fmt + integer :: w + integer :: ioError + + ! Determine width of string + w = len_trim(str) + + ! Create format specifier for reading string + write(UNIT=fmt, FMT='("(I",I2,")")') w + + ! read string into integer + read(UNIT=str, FMT=fmt, IOSTAT=ioError) num + if (ioError > 0) num = ERROR_INT + + end function str_to_int + +!=============================================================================== +! STR_TO_REAL converts an arbitrary string to a real(8) +!=============================================================================== + + pure function str_to_real(string) result(num) + + character(*), intent(in) :: string + real(8) :: num + + integer :: ioError + + ! Read string + read(UNIT=string, FMT=*, IOSTAT=ioError) num + if (ioError > 0) num = ERROR_REAL + + end function str_to_real + +!=============================================================================== +! CONCATENATE takes an array of words and concatenates them together in one +! string with a single space between words +! +! Arguments: +! words = array of words +! n_words = total number of words +! string = concatenated string +!=============================================================================== + + pure function concatenate(words, n_words) result(string) + + integer, intent(in) :: n_words + character(*), intent(in) :: words(n_words) + character(MAX_LINE_LEN) :: string + + integer :: i ! index + + string = words(1) + if (n_words == 1) return + do i = 2, n_words + string = trim(string) // ' ' // words(i) + end do + + end function concatenate + end module simple_string \ No newline at end of file diff --git a/src/string.F90 b/src/string.F90 index 5822895979..eee49242d2 100644 --- a/src/string.F90 +++ b/src/string.F90 @@ -1,11 +1,12 @@ module string - use constants, only: MAX_WORDS, MAX_LINE_LEN, ERROR_INT, ERROR_REAL, & - OP_LEFT_PAREN, OP_RIGHT_PAREN, OP_COMPLEMENT, & - OP_INTERSECTION, OP_UNION - use error, only: fatal_error, warning - use global, only: master - use stl_vector, only: VectorInt + use constants, only: MAX_WORDS, MAX_LINE_LEN, ERROR_INT, ERROR_REAL, & + OP_LEFT_PAREN, OP_RIGHT_PAREN, OP_COMPLEMENT, & + OP_INTERSECTION, OP_UNION + use error, only: fatal_error, warning + use global, only: master + use simple_string, only: str_to_int, str_to_real + use stl_vector, only: VectorInt implicit none @@ -152,33 +153,6 @@ contains end if end subroutine tokenize -!=============================================================================== -! CONCATENATE takes an array of words and concatenates them together in one -! string with a single space between words -! -! Arguments: -! words = array of words -! n_words = total number of words -! string = concatenated string -!=============================================================================== - - pure function concatenate(words, n_words) result(string) - - integer, intent(in) :: n_words - character(*), intent(in) :: words(n_words) - character(MAX_LINE_LEN) :: string - - integer :: i ! index - - string = words(1) - if (n_words == 1) return - do i = 2, n_words - string = trim(string) // ' ' // words(i) - end do - - end function concatenate - - !=============================================================================== ! ZERO_PADDED returns a string of the input integer padded with zeros to the @@ -213,46 +187,4 @@ contains write(str, zp_form) num end function zero_padded -!=============================================================================== -! STR_TO_INT converts a string to an integer. -!=============================================================================== - - pure function str_to_int(str) result(num) - - character(*), intent(in) :: str - integer(8) :: num - - character(5) :: fmt - integer :: w - integer :: ioError - - ! Determine width of string - w = len_trim(str) - - ! Create format specifier for reading string - write(UNIT=fmt, FMT='("(I",I2,")")') w - - ! read string into integer - read(UNIT=str, FMT=fmt, IOSTAT=ioError) num - if (ioError > 0) num = ERROR_INT - - end function str_to_int - -!=============================================================================== -! STR_TO_REAL converts an arbitrary string to a real(8) -!=============================================================================== - - pure function str_to_real(string) result(num) - - character(*), intent(in) :: string - real(8) :: num - - integer :: ioError - - ! Read string - read(UNIT=string, FMT=*, IOSTAT=ioError) num - if (ioError > 0) num = ERROR_REAL - - end function str_to_real - end module string From 42d2673ab9c891c59f21d4f38d6afbf2267aefd9 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 25 Nov 2015 05:58:49 -0500 Subject: [PATCH 050/149] Made fission data optional in the MGXS library since it is not needed for tracking, only tallying. --- docs/source/usersguide/mgxs_library.rst | 3 +- src/macroxs.F90 | 2 - src/macroxs_header.F90 | 29 +++++--- src/mgxs_data.F90 | 93 +++++++++++++++---------- src/tally.F90 | 8 ++- 5 files changed, 82 insertions(+), 53 deletions(-) diff --git a/docs/source/usersguide/mgxs_library.rst b/docs/source/usersguide/mgxs_library.rst index f145f3bd0a..ab6be5cc38 100644 --- a/docs/source/usersguide/mgxs_library.rst +++ b/docs/source/usersguide/mgxs_library.rst @@ -244,7 +244,8 @@ attributes/sub-elements required to describe the meta-data: with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. - *Default*: None, this must be provided if the material is fissionable. + *Default*: None, this is required only if ``fission`` tallies are + requested and the material is fissionable. :k_fission: This element requires the group-wise kappa-fission cross section ordered by diff --git a/src/macroxs.F90 b/src/macroxs.F90 index 4dafd32c1b..c26e9e888b 100644 --- a/src/macroxs.F90 +++ b/src/macroxs.F90 @@ -32,7 +32,6 @@ contains xs % total = this % total(gin) xs % elastic = this % scattxs(gin) xs % absorption = this % absorption(gin) - xs % fission = this % fission(gin) xs % nu_fission = this % nu_fission(gin) type is (MacroXS_Angle) @@ -40,7 +39,6 @@ contains xs % total = this % total(gin, iazi, ipol) xs % elastic = this % scattxs(gin, iazi, ipol) xs % absorption = this % absorption(gin, iazi, ipol) - xs % fission = this % fission(gin, iazi, ipol) xs % nu_fission = this % nu_fission(gin, iazi, ipol) end select diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index b2d9a5fde6..95b61f695d 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -26,7 +26,7 @@ module macroxs_header end type MacroXS_Base abstract interface - subroutine macroxs_init_(this, mat, nuclides, groups, get_kfiss, & + subroutine macroxs_init_(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, & error_code, error_text) @@ -39,6 +39,7 @@ module macroxs_header type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from integer, intent(in) :: groups ! Number of E groups logical, intent(in) :: get_kfiss ! Should we get kfiss data? + logical, intent(in) :: get_fiss ! Should we get fiss data? integer, intent(in) :: max_order ! Maximum requested order integer, intent(in) :: scatt_type ! Legendre or Tabular Scatt? integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? @@ -119,7 +120,7 @@ contains ! MACROXS*_INIT sets the MacroXS Data !=============================================================================== - subroutine macroxs_iso_init(this, mat, nuclides, groups, get_kfiss, & + subroutine macroxs_iso_init(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, error_code, error_text) class(MacroXS_Iso), intent(inout) :: this ! The MacroXS to initialize @@ -127,6 +128,7 @@ contains type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from integer, intent(in) :: groups ! Number of E groups logical, intent(in) :: get_kfiss ! Should we get kfiss data? + logical, intent(in) :: get_fiss ! Should we get fiss data? integer, intent(in) :: max_order ! Maximum requested order integer, intent(in) :: scatt_type ! How is data presented integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? @@ -215,8 +217,10 @@ contains this % total = ZERO allocate(this % absorption(groups)) this % absorption = ZERO - allocate(this % fission(groups)) - this % fission = ZERO + if (get_fiss) then + allocate(this % fission(groups)) + this % fission = ZERO + end if if (get_kfiss) then allocate(this % k_fission(groups)) this % k_fission = ZERO @@ -261,7 +265,9 @@ contains sum(nuc % nu_fission(:,gin)) end do end if - this % fission = this % fission + atom_density * nuc % fission + if (get_fiss) then + this % fission = this % fission + atom_density * nuc % fission + end if if (get_kfiss) then this % k_fission = this % k_fission + atom_density * nuc % k_fission end if @@ -359,7 +365,7 @@ contains end subroutine macroxs_iso_init - subroutine macroxs_angle_init(this, mat, nuclides, groups, get_kfiss, & + subroutine macroxs_angle_init(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, error_code, error_text) class(MacroXS_Angle), intent(inout) :: this ! The MacroXS to initialize @@ -367,6 +373,7 @@ contains type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from integer, intent(in) :: groups ! Number of E groups logical, intent(in) :: get_kfiss ! Should we get kfiss data? + logical, intent(in) :: get_fiss ! Should we get fiss data? integer, intent(in) :: max_order ! Maximum requested order integer, intent(in) :: scatt_type ! Legendre or Tabular Scatt? integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? @@ -493,8 +500,10 @@ contains this % total = ZERO allocate(this % absorption(groups,nazi,npol)) this % absorption = ZERO - allocate(this % fission(groups,nazi,npol)) - this % fission = ZERO + if (get_fiss) then + allocate(this % fission(groups,nazi,npol)) + this % fission = ZERO + end if if (get_kfiss) then allocate(this % k_fission(groups,nazi,npol)) this % k_fission = ZERO @@ -542,7 +551,9 @@ contains sum(nuc % nu_fission(:,gin,:,:),dim=1) end do end if - this % fission = this % fission + atom_density * nuc % fission + if (get_fiss) then + this % fission = this % fission + atom_density * nuc % fission + end if if (get_kfiss) then this % k_fission = this % k_fission + atom_density * nuc % k_fission end if diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 345c6a95d0..d568ab7b55 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -37,7 +37,7 @@ contains logical :: file_exists integer :: error_code character(MAX_LINE_LEN) :: error_text, temp_str - logical :: get_kfiss + logical :: get_kfiss, get_fiss integer :: l ! Check if cross_sections.xml exists @@ -63,16 +63,20 @@ contains allocate(micro_xs(n_nuclides_total)) !$omp end parallel - ! Find out if we need kappa fission (are there any k_fiss tallies?) + ! Find out if we need fission & kappa fission + ! (i.e., are there any SCORE_FISSION or SCORE_KAPPA_FISSION tallies?) get_kfiss = .false. + get_fiss = .false. do i = 1, n_tallies do l = 1, tallies(i) % n_score_bins if (tallies(i) % score_bins(l) == SCORE_KAPPA_FISSION) then get_kfiss = .true. - exit + end if + if (tallies(i) % score_bins(l) == SCORE_FISSION) then + get_fiss = .true. end if end do - if (get_kfiss) & + if (get_kfiss .and. get_fiss) & exit end do @@ -123,7 +127,7 @@ contains ! Now read in the data specific to the type we just declared call nuclide_mg_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & - energy_groups, get_kfiss, error_code, & + energy_groups, get_kfiss, get_fiss, error_code, & error_text) ! Keep track of what listing is associated with this nuclide @@ -191,12 +195,13 @@ contains ! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed !=============================================================================== - subroutine nuclide_mg_init(this, node_xsdata, groups, get_kfiss, & + subroutine nuclide_mg_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) class(Nuclide_MG), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml integer, intent(in) :: groups ! Number of Energy groups logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Should we get fiss data? integer, intent(inout) :: error_code ! Code signifying error character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print @@ -293,21 +298,22 @@ contains select type(this) type is (Nuclide_Iso) - call nuclide_iso_init(this, node_xsdata, groups, get_kfiss, & + call nuclide_iso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) type is (Nuclide_Angle) - call nuclide_angle_init(this, node_xsdata, groups, get_kfiss, & + call nuclide_angle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) end select end subroutine nuclide_mg_init - subroutine nuclide_iso_init(this, node_xsdata, groups, get_kfiss, & + subroutine nuclide_iso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) class(Nuclide_Iso), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml integer, intent(in) :: groups ! Number of Energy groups logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Need fiss data? integer, intent(inout) :: error_code ! Code signifying error character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print @@ -317,7 +323,6 @@ contains ! Load the more specific data if (this % fissionable) then - allocate(this % fission(groups)) if (check_for_node(node_xsdata, "chi")) then ! Get chi @@ -352,12 +357,16 @@ contains return end if end if - if (check_for_node(node_xsdata, "fission")) then - call get_node_array(node_xsdata, "fission", this % fission) - else - error_code = 1 - error_text = "If fissionable, must provide fission!" - return + if (get_fiss) then + allocate(this % fission(groups)) + if (check_for_node(node_xsdata, "fission")) then + call get_node_array(node_xsdata, "fission", this % fission) + else + error_code = 1 + error_text = "Fission data missing, required due to fission& + & tallies in tallies.xml file!" + return + end if end if if (get_kfiss) then allocate(this % k_fission(groups)) @@ -429,13 +438,14 @@ contains end subroutine nuclide_iso_init - subroutine nuclide_angle_init(this, node_xsdata, groups, get_kfiss, & + subroutine nuclide_angle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) class(Nuclide_Angle), intent(inout) :: this ! Working Object - type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml - integer, intent(in) :: groups ! Number of Energy groups - logical, intent(in) :: get_kfiss ! Need Kappa-Fission? - integer, intent(inout) :: error_code ! Code signifying error + type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Should we get fiss data? + integer, intent(inout) :: error_code ! Code signifying error character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print real(8), allocatable :: temp_arr(:) @@ -535,16 +545,19 @@ contains return end if end if - if (check_for_node(node_xsdata, "fission")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) - call get_node_array(node_xsdata, "fission", temp_arr) - allocate(this % fission(groups, this % Nazi, this % Npol)) - this % fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "If fissionable, must provide fission!" - return + if (get_fiss) then + if (check_for_node(node_xsdata, "fission")) then + allocate(temp_arr(groups * this % Nazi * this % Npol)) + call get_node_array(node_xsdata, "fission", temp_arr) + allocate(this % fission(groups, this % Nazi, this % Npol)) + this % fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + deallocate(temp_arr) + else + error_code = 1 + error_text = "Fission data missing, required due to kappa-fission& + & tallies in tallies.xml file!" + return + end if end if if (get_kfiss) then if (check_for_node(node_xsdata, "k_fission")) then @@ -627,23 +640,27 @@ contains integer :: i ! loop index over nuclides integer :: l ! Loop over score bins type(Material), pointer :: mat ! current material - logical :: get_kfiss + logical :: get_kfiss, get_fiss integer :: error_code character(MAX_LINE_LEN) :: error_text integer :: representation integer :: scatt_type integer :: legendre_mu_points - ! Find out if we need kappa fission (are there any k_fiss tallies?) + ! Find out if we need fission & kappa fission + ! (i.e., are there any SCORE_FISSION or SCORE_KAPPA_FISSION tallies?) get_kfiss = .false. + get_fiss = .false. do i = 1, n_tallies do l = 1, tallies(i) % n_score_bins if (tallies(i) % score_bins(l) == SCORE_KAPPA_FISSION) then get_kfiss = .true. - exit + end if + if (tallies(i) % score_bins(l) == SCORE_FISSION) then + get_fiss = .true. end if end do - if (get_kfiss) & + if (get_kfiss .and. get_fiss) & exit end do @@ -675,9 +692,9 @@ contains end select call macro_xs(i_mat) % obj % init(mat, nuclides_MG, energy_groups, & - get_kfiss, max_order, scatt_type, & - legendre_mu_points, error_code, & - error_text) + get_kfiss, get_fiss, max_order, & + scatt_type, legendre_mu_points, & + error_code, error_text) ! Handle any errors if (error_code /= 0) then call fatal_error(trim(error_text)) diff --git a/src/tally.F90 b/src/tally.F90 index 31260f16a4..85a603419b 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -1114,7 +1114,9 @@ contains atom_density * flux end associate else - score = material_xs % fission * flux + score = flux * macro_xs(p % material) % obj % get_xs(p % g, & + 'fission', UVW=p % coord(i) % uvw) + end if end if @@ -1205,8 +1207,8 @@ contains * atom_density * flux end associate else - score = macro_xs(p % material) % obj % get_xs(p % g, 'k_fission', & - UVW=p % coord(i) % uvw) + score = flux * macro_xs(p % material) % obj % get_xs(p % g, & + 'k_fission', UVW=p % coord(i) % uvw) end if end if From ca602e8b97c1a34f92b86b3fc4c9dd50bc2fe079 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 25 Nov 2015 09:50:56 -0500 Subject: [PATCH 051/149] Fixed poor deallocation. :-( 6am coding == bugs. --- src/macroxs_header.F90 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index 95b61f695d..63e6fecaed 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -667,7 +667,11 @@ contains if (allocated(this % total)) then deallocate(this % total, this % absorption, & - this % nu_fission, this % fission) + this % nu_fission) + end if + + if (allocated(this % fission)) then + deallocate(this % fission) end if if (allocated(this % k_fission)) then @@ -689,7 +693,11 @@ contains if (allocated(this % total)) then deallocate(this % total, this % absorption, & - this % nu_fission, this % fission) + this % nu_fission) + end if + + if (allocated(this % fission)) then + deallocate(this % fission) end if if (allocated(this % k_fission)) then From 0911de76eb6ac6d8fded05b26cce1a343aac0a50 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 28 Nov 2015 20:18:13 -0500 Subject: [PATCH 052/149] Added MGXS support for void materials --- src/tracking.F90 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tracking.F90 b/src/tracking.F90 index 028ec3ee6c..24ade265be 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -91,8 +91,15 @@ contains else ! Since the MGXS can be angle dependent, this needs to be done ! After every collision for the MGXS mode - call calculate_mgxs(macro_xs(p % material) % obj, p % g, & - p % coord(p % n_coord) % uvw, material_xs) + if (p % material /= MATERIAL_VOID) then + call calculate_mgxs(macro_xs(p % material) % obj, p % g, & + p % coord(p % n_coord) % uvw, material_xs) + else + material_xs % total = ZERO + material_xs % elastic = ZERO + material_xs % absorption = ZERO + material_xs % nu_fission = ZERO + end if end if ! Find the distance to the nearest boundary From 05b600819aee5e3be8dd77bc6bf059acf562c63c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 7 Jan 2016 20:20:55 -0500 Subject: [PATCH 053/149] Updates to MGXS pyapi --- openmc/material.py | 3 +-- openmc/mgxs_library.py | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/openmc/material.py b/openmc/material.py index 4da4e0ae35..ca78bd61f2 100644 --- a/openmc/material.py +++ b/openmc/material.py @@ -339,8 +339,7 @@ class Material(object): # Ensure no nuclides, elements, or sab are added since these would be # incompatible with macroscopics - if ((len(self._nuclides.keys()) != 0) and - (len(self._elements.keys()) != 0) and (len(self._sab) != 0)): + if self._nuclides or self._elements or self._sab: msg = 'Unable to add a Macroscopic data set to Material ID="{0}" ' \ 'with a macroscopic value "{1}" as an incompatible data ' \ 'member (i.e., nuclide, element, or S(a,b) table) ' \ diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index d1c1f4e05f..5820c0ee52 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -20,6 +20,17 @@ REPRESENTATIONS = ['isotropic', 'angle'] def ndarray_to_string(arr): """Converts a numpy ndarray in to a join with spaces between entries similar to ' '.join(map(str,arr)) but applied to all sub-dimensions. + + Parameters + ---------- + arr : ndarray + Array to combine in to a string + + Returns + ------- + text : str + String representation of array in arr + """ shape = arr.shape @@ -67,8 +78,8 @@ def ndarray_to_string(arr): return text -class Xsdata(object): - """A multi-group cross section data set (xsdata) providing all the +class XSdata(object): + """A multi-group cross section data set providing all the multi-group data necessary for a multi-group OpenMC calculation. Parameters @@ -76,7 +87,6 @@ class Xsdata(object): name : str, optional Name of the mgxs data set. - representation : str Method used in generating the MGXS (isotropic or angle-dependent flux weighting). Defaults to 'isotropic' @@ -141,7 +151,6 @@ class Xsdata(object): def representation(self): return self._representation - @property def alias(self): return self._alias @@ -221,8 +230,8 @@ class Xsdata(object): check_type("energy_groups", energy_groups, EnergyGroups) # Check that there is one or more groups - if ((energy_groups.num_energy_groups.num_group is None) or - (energy_groups.num_energy_groups.num_group < 1)): + if ((energy_groups.num_groups is None) or + (energy_groups.num_groups < 1)): msg = 'energy_groups object incorrectly initialized.' raise ValueError(msg) @@ -429,7 +438,7 @@ class Xsdata(object): @nu_fission.setter def nu_fission(self, nu_fission): - # nu_fission ca nbe given as a vector or a matrix + # nu_fission can be given as a vector or a matrix # Vector is used when chi also exists. # Matrix is used when chi does not exist. # We have to check that the correct form is given, but only if @@ -563,6 +572,8 @@ class MGXSLibraryFile(object): Inverse of velocities, units of sec/cm filename : str XML file to write to. + xsdatas : Iterable of XSdata + Iterable of multi-Group cross section data objects """ def __init__(self, energy_groups): From 75093ea43d927e34ae8a9640e2361754567291ab Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 7 Jan 2016 20:31:56 -0500 Subject: [PATCH 054/149] Fixed failing build and renamed more Xsdatas to XSdata --- .../python/pincell_multigroup/build-xml.py | 4 +-- openmc/mgxs_library.py | 28 +++++++++---------- src/tally.F90 | 7 +++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py index bb4c2db14f..2145a68a54 100644 --- a/examples/python/pincell_multigroup/build-xml.py +++ b/examples/python/pincell_multigroup/build-xml.py @@ -20,7 +20,7 @@ groups = openmc.mgxs.EnergyGroups(group_edges=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) # Instantiate the 7-group (C5G7) cross section data -uo2_xsdata = openmc.Xsdata('UO2.300k', groups) +uo2_xsdata = openmc.XSdata('UO2.300k', groups) uo2_xsdata.order = 0 uo2_xsdata.total = np.array([0.1779492, 0.3298048, 0.4803882, 0.5543674, 0.3118013, 0.3951678, 0.5644058]) @@ -43,7 +43,7 @@ uo2_xsdata.nu_fission = np.array([2.005998E-02, 2.027303E-03, 1.570599E-02, uo2_xsdata.chi = np.array([5.8791E-01, 4.1176E-01, 3.3906E-04, 1.1761E-07, 0.0000E+00, 0.0000E+00, 0.0000E+00]) -h2o_xsdata = openmc.Xsdata('LWTR.300k', groups) +h2o_xsdata = openmc.XSdata('LWTR.300k', groups) h2o_xsdata.order = 0 h2o_xsdata.total = np.array([0.15920605, 0.412969593, 0.59030986, 0.58435, 0.718, 1.2544497, 2.650379]) diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 5820c0ee52..80cec82943 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -221,7 +221,7 @@ class XSdata(object): @name.setter def name(self, name): - check_type('name for Xsdata', name, basestring) + check_type('name for XSdata', name, basestring) self._name = name @energy_groups.setter @@ -247,7 +247,7 @@ class XSdata(object): @alias.setter def alias(self, alias): if alias is not None: - check_type('alias for Xsdata', alias, basestring) + check_type('alias for XSdata', alias, basestring) self._alias = alias else: self._alias = self._name @@ -604,24 +604,24 @@ class MGXSLibraryFile(object): self._energy_groups = energy_groups def add_xsdata(self, xsdata): - """Add an xsdata entry to the file. + """Add an XSdata entry to the file. Parameters ---------- - xsdata : Xsdata + xsdata : XSdata MGXS information to add """ # Check the type - if not isinstance(xsdata, Xsdata): - msg = 'Unable to add a non-Xsdata "{0}" to the ' \ + if not isinstance(xsdata, XSdata): + msg = 'Unable to add a non-XSdata "{0}" to the ' \ 'MGXSLibraryFile'.format(xsdata) raise ValueError(msg) # Make sure energy groups match. if xsdata.energy_groups != self._energy_groups: - msg = 'Energy groups of Xsdata do not match that of MGXSLibraryFile!' + msg = 'Energy groups of XSdata do not match that of MGXSLibraryFile!' raise ValueError(msg) self._xsdatas.append(xsdata) @@ -631,8 +631,8 @@ class MGXSLibraryFile(object): Parameters ---------- - xsdatas : tuple or list of Xsdata - Xsdatas to add + xsdatas : tuple or list of XSdata + XSdatas to add """ @@ -649,14 +649,14 @@ class MGXSLibraryFile(object): Parameters ---------- - xsdata : Xsdata - Xsdata to remove + xsdata : XSdata + XSdata to remove """ - if not isinstance(xsdata, Xsdata): - msg = 'Unable to remove a non-Xsdata "{0}" from the ' \ - 'XsdatasFile'.format(xsdata) + if not isinstance(xsdata, XSdata): + msg = 'Unable to remove a non-XSdata "{0}" from the ' \ + 'XSdatasFile'.format(xsdata) raise ValueError(msg) self._xsdatas.remove(xsdata) diff --git a/src/tally.F90 b/src/tally.F90 index f16a87000a..5d978bdcba 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -2483,6 +2483,7 @@ contains integer :: i ! loop index for filters integer :: j integer :: n ! number of bins for single filter + integer :: distribcell_index ! index in distribcell arrays integer :: offset ! offset for distribcell real(8) :: theta, phi ! Polar and Azimuthal Angles, respectively real(8) :: E @@ -2528,12 +2529,14 @@ contains case (FILTER_DISTRIBCELL) ! determine next distribcell bin + distribcell_index = cells(t % filters(i) % int_bins(1)) & + % distribcell_index matching_bins(i) = NO_BIN_FOUND offset = 0 do j = 1, p % n_coord if (cells(p % coord(j) % cell) % type == CELL_FILL) then offset = offset + cells(p % coord(j) % cell) % & - offset(t % filters(i) % offset) + offset(distribcell_index) elseif(cells(p % coord(j) % cell) % type == CELL_LATTICE) then if (lattices(p % coord(j + 1) % lattice) % obj & % are_valid_indices([& @@ -2541,7 +2544,7 @@ contains p % coord(j + 1) % lattice_y, & p % coord(j + 1) % lattice_z])) then offset = offset + lattices(p % coord(j + 1) % lattice) % obj % & - offset(t % filters(i) % offset, & + offset(distribcell_index, & p % coord(j + 1) % lattice_x, & p % coord(j + 1) % lattice_y, & p % coord(j + 1) % lattice_z) From 08fdb8a91d0d4b9fbfe94fc89eb134daecc27817 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 9 Jan 2016 05:43:28 -0500 Subject: [PATCH 055/149] satisfying @wbinventors pyapi comments --- openmc/material.py | 16 ++++++++-------- openmc/mgxs/groups.py | 2 +- openmc/mgxs_library.py | 16 ++++++++-------- openmc/settings.py | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/openmc/material.py b/openmc/material.py index ca78bd61f2..e429190dc1 100644 --- a/openmc/material.py +++ b/openmc/material.py @@ -332,7 +332,7 @@ class Material(object): Parameters ---------- - macroscopic : str or openmc.macroscopic.Macroscopic + macroscopic : str or Macroscopic Macroscopic to add """ @@ -371,7 +371,7 @@ class Material(object): Parameters ---------- - macroscopic : openmc.macroscopic.Macroscopic + macroscopic : Macroscopic Macroscopic to remove """ @@ -622,14 +622,14 @@ class Material(object): # Create element XML subelements subelements = self._get_elements_xml(self._elements, distrib=True) - for subelement_ele in subelements: - subelement.append(subelement_ele) + for subsubelement in subelements: + subelement.append(subsubelement) else: # Create macroscopic XML subelements - subelement_ele = self._get_macroscopic_xml(self, - self._macroscopic, - distrib=True) - subelement.append(subelement_ele) + subsubelement = self._get_macroscopic_xml(self, + self._macroscopic, + distrib=True) + subelement.append(subsubelement) if len(self._sab) > 0: for sab in self._sab: diff --git a/openmc/mgxs/groups.py b/openmc/mgxs/groups.py index e6838b36ba..3436c0e037 100644 --- a/openmc/mgxs/groups.py +++ b/openmc/mgxs/groups.py @@ -54,7 +54,7 @@ class EnergyGroups(object): def __eq__(self, other): if not isinstance(other, EnergyGroups): return False - elif (self.group_edges != other.group_edges).all(): + elif self.group_edges != other.group_edges: return False else: return True diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 80cec82943..605fc7064d 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -14,7 +14,7 @@ from openmc.checkvalue import check_type, check_value, check_greater_than, \ check_iterable_type from openmc.clean_xml import * -# MGXS Representations supported by OpenMC +# Supported incoming particle MGXS angular treatment representations REPRESENTATIONS = ['isotropic', 'angle'] def ndarray_to_string(arr): @@ -87,7 +87,7 @@ class XSdata(object): name : str, optional Name of the mgxs data set. - representation : str + representation : {'isotropic' or 'angle'} Method used in generating the MGXS (isotropic or angle-dependent flux weighting). Defaults to 'isotropic' @@ -99,11 +99,11 @@ class XSdata(object): Separate unique identifier for the xsdata object kT : float Temperature (in units of MeV) of this data set. - energy_groups : openmc.mgxs.EnergyGroups + energy_groups : EnergyGroups Energy group structure fissionable : boolean Whether or not this is a fissionable data set. - scatt_type : str + scatt_type : {'legendre', 'histogram', or 'tabular'} Angular distribution representation (legendre, histogram, or tabular) order : int Either the Legendre order, number of bins, or number of points used to @@ -111,9 +111,9 @@ class XSdata(object): transfer probability. tabular_legendre : dict Set how to treat the Legendre scattering kernel (tabular or leave in - Legendre polynomial form). Dict contains two keys: ``enable`` and - ``num_points``. ``enable`` is a boolean and ``num_points`` is the - number of points to use, if ``enable`` is True. + Legendre polynomial form). Dict contains two keys: 'enable' and + 'num_points'. 'enable' is a boolean and 'num_points' is the + number of points to use, if 'enable' is True. """ def __init__(self, name, energy_groups, representation="isotropic"): @@ -247,7 +247,7 @@ class XSdata(object): @alias.setter def alias(self, alias): if alias is not None: - check_type('alias for XSdata', alias, basestring) + check_type('alias', alias, basestring) self._alias = alias else: self._alias = self._name diff --git a/openmc/settings.py b/openmc/settings.py index 61017a7a5f..8a562a5455 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -79,7 +79,7 @@ class SettingsFile(object): Set whether the calculation should be continuous-energy or multi-group. Acceptable values are 'continuous-energy' or 'multi-group' max_order : int - Maximum scattering order to apply globally when in multi-grup mode. + Maximum scattering order to apply globally when in multi-group mode. ptables : bool Determine whether probability tables are used. run_cmfd : bool From a6b3eaec9fb311917b7606096e9d5513f69102bb Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 15 Jan 2016 18:02:44 -0500 Subject: [PATCH 056/149] Added Tally average aggregation operation to Python API --- openmc/aggregate.py | 14 ++-- openmc/tallies.py | 155 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 160 insertions(+), 9 deletions(-) diff --git a/openmc/aggregate.py b/openmc/aggregate.py index 67995a41f2..0e15c193c9 100644 --- a/openmc/aggregate.py +++ b/openmc/aggregate.py @@ -13,7 +13,7 @@ if sys.version_info[0] >= 3: basestring = str # Acceptable tally aggregation operations -_TALLY_AGGREGATE_OPS = ['sum', 'mean'] +_TALLY_AGGREGATE_OPS = ['sum', 'avg'] class AggregateScore(object): @@ -25,7 +25,7 @@ class AggregateScore(object): scores : Iterable of str or CrossScore The scores included in the aggregation aggregate_op : str - The tally aggregation operator (e.g., 'sum', 'mean', etc.) used + The tally aggregation operator (e.g., 'sum', 'avg', etc.) used to aggregate across a tally's scores with this AggregateScore Attributes @@ -33,7 +33,7 @@ class AggregateScore(object): scores : Iterable of str or CrossScore The scores included in the aggregation aggregate_op : str - The tally aggregation operator (e.g., 'sum', 'mean', etc.) used + The tally aggregation operator (e.g., 'sum', 'avg', etc.) used to aggregate across a tally's scores with this AggregateScore """ @@ -108,7 +108,7 @@ class AggregateNuclide(object): nuclides : Iterable of str or Nuclide or CrossNuclide The nuclides included in the aggregation aggregate_op : str - The tally aggregation operator (e.g., 'sum', 'mean', etc.) used + The tally aggregation operator (e.g., 'sum', 'avg', etc.) used to aggregate across a tally's nuclides with this AggregateNuclide Attributes @@ -116,7 +116,7 @@ class AggregateNuclide(object): nuclides : Iterable of str or Nuclide or CrossNuclide The nuclides included in the aggregation aggregate_op : str - The tally aggregation operator (e.g., 'sum', 'mean', etc.) used + The tally aggregation operator (e.g., 'sum', 'avg', etc.) used to aggregate across a tally's nuclides with this AggregateNuclide """ @@ -198,7 +198,7 @@ class AggregateFilter(object): bins : Iterable of tuple The filter bins included in the aggregation aggregate_op : str - The tally aggregation operator (e.g., 'sum', 'mean', etc.) used + The tally aggregation operator (e.g., 'sum', 'avg', etc.) used to aggregate across a tally filter's bins with this AggregateFilter Attributes @@ -208,7 +208,7 @@ class AggregateFilter(object): aggregate_filter : filter The filter included in the aggregation aggregate_op : str - The tally aggregation operator (e.g., 'sum', 'mean', etc.) used + The tally aggregation operator (e.g., 'sum', 'avg', etc.) used to aggregate across a tally filter's bins with this AggregateFilter bins : Iterable of tuple The filter bins included in the aggregation diff --git a/openmc/tallies.py b/openmc/tallies.py index 980c5fa2b5..30495398ac 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -2758,7 +2758,7 @@ class Tally(object): def summation(self, scores=[], filter_type=None, filter_bins=[], nuclides=[], remove_filter=False): """Vectorized sum of tally data across scores, filter bins and/or - nuclides using tally addition. + nuclides using tally aggregation. This method constructs a new tally to encapsulate the sum of the data represented by the summation of the data in this tally. The tally data @@ -2800,7 +2800,7 @@ class Tally(object): tally_sum._derived = True tally_sum._estimator = self.estimator tally_sum._num_realizations = self.num_realizations - tally_sum.with_batch_statistics = self.with_batch_statistics + tally_sum._with_batch_statistics = self.with_batch_statistics tally_sum._with_summary = self.with_summary tally_sum._sp_filename = self._sp_filename tally_sum._results_read = self._results_read @@ -2903,6 +2903,157 @@ class Tally(object): tally_sum.sparse = self.sparse return tally_sum + def average(self, scores=[], filter_type=None, + filter_bins=[], nuclides=[], remove_filter=False): + """Vectorized average of tally data across scores, filter bins and/or + nuclides using tally aggregation. + + This method constructs a new tally to encapsulate the average of the + data represented by the average of the data in this tally. The tally + data average is determined by the scores, filter bins and nuclides + specified in the input parameters. + + Parameters + ---------- + scores : list of str + A list of one or more score strings to average across + (e.g., ['absorption', 'nu-fission']; default is []) + filter_type : str + A filter type string (e.g., 'cell', 'energy') corresponding to the + filter bins to average across + filter_bins : Iterable of Integral or tuple + A list of the filter bins corresponding to the filter_type parameter + Each bin in the list is the integer ID for 'material', 'surface', + 'cell', 'cellborn', and 'universe' Filters. Each bin is an integer + for the cell instance ID for 'distribcell' Filters. Each bin is a + 2-tuple of floats for 'energy' and 'energyout' filters corresponding + to the energy boundaries of the bin of interest. Each bin is an + (x,y,z) 3-tuple for 'mesh' filters corresponding to the mesh cell of + interest. + nuclides : list of str + A list of nuclide name strings to average across + (e.g., ['U-235', 'U-238']; default is []) + remove_filter : bool + If a filter is being averaged over, this bool indicates whether to + remove that filter in the returned tally. Default is False. + + Returns + ------- + Tally + A new tally which encapsulates the average of data requested. + """ + + # Create new derived Tally for average + tally_avg = Tally() + tally_avg._derived = True + tally_avg._estimator = self.estimator + tally_avg._num_realizations = self.num_realizations + tally_avg._with_batch_statistics = self.with_batch_statistics + tally_avg._with_summary = self.with_summary + tally_avg._sp_filename = self._sp_filename + tally_avg._results_read = self._results_read + + # Get tally data arrays reshaped with one dimension per filter + mean = self.get_reshaped_data(value='mean') + std_dev = self.get_reshaped_data(value='std_dev') + + # Average across any filter bins specified by the user + if filter_type in _FILTER_TYPES: + find_filter = self.find_filter(filter_type) + + # If user did not specify filter bins, average across all bins + if len(filter_bins) == 0: + bin_indices = np.arange(find_filter.num_bins) + + if filter_type == 'distribcell': + filter_bins = np.arange(find_filter.num_bins) + else: + num_bins = find_filter.num_bins + filter_bins = \ + [(find_filter.get_bin(i)) for i in range(num_bins)] + + # Only average across bins specified by the user + else: + bin_indices = \ + [find_filter.get_bin_index(bin) for bin in filter_bins] + + # Average across the bins in the user-specified filter + for i, self_filter in enumerate(self.filters): + if self_filter.type == filter_type: + mean = np.take(mean, indices=bin_indices, axis=i) + std_dev = np.take(std_dev, indices=bin_indices, axis=i) + mean = np.mean(mean, axis=i, keepdims=True) + std_dev = np.mean(std_dev**2, axis=i, keepdims=True) + std_dev /= len(bin_indices) + std_dev = np.sqrt(std_dev) + + # Add AggregateFilter to the tally avg + if not remove_filter: + filter_sum = \ + AggregateFilter(self_filter, filter_bins, 'avg') + tally_avg.add_filter(filter_sum) + + # Add a copy of each filter not averaged across to the tally avg + else: + tally_avg.add_filter(copy.deepcopy(self_filter)) + + # Add a copy of this tally's filters to the tally avg + else: + tally_avg._filters = copy.deepcopy(self.filters) + + # Sum across any nuclides specified by the user + if len(nuclides) != 0: + nuclide_bins = [self.get_nuclide_index(nuclide) for nuclide in nuclides] + axis_index = self.num_filters + mean = np.take(mean, indices=nuclide_bins, axis=axis_index) + std_dev = np.take(std_dev, indices=nuclide_bins, axis=axis_index) + mean = np.mean(mean, axis=axis_index, keepdims=True) + std_dev = np.mean(std_dev**2, axis=axis_index, keepdims=True) + std_dev /= len(nuclide_bins) + std_dev = np.sqrt(std_dev) + + # Add AggregateNuclide to the tally avg + nuclide_avg = AggregateNuclide(nuclides, 'avg') + tally_avg.add_nuclide(nuclide_avg) + + # Add a copy of this tally's nuclides to the tally avg + else: + tally_avg._nuclides = copy.deepcopy(self.nuclides) + + # Sum across any scores specified by the user + if len(scores) != 0: + score_bins = [self.get_score_index(score) for score in scores] + axis_index = self.num_filters + 1 + mean = np.take(mean, indices=score_bins, axis=axis_index) + std_dev = np.take(std_dev, indices=score_bins, axis=axis_index) + mean = np.sum(mean, axis=axis_index, keepdims=True) + std_dev = np.sum(std_dev**2, axis=axis_index, keepdims=True) + std_dev /= len(score_bins) + std_dev = np.sqrt(std_dev) + + # Add AggregateScore to the tally avg + score_sum = AggregateScore(scores, 'avg') + tally_avg.add_score(score_sum) + + # Add a copy of this tally's scores to the tally avg + else: + tally_avg._scores = copy.deepcopy(self.scores) + + # Update the tally avg's filter strides + tally_avg._update_filter_strides() + + # Reshape condensed data arrays with one dimension for all filters + mean = np.reshape(mean, tally_avg.shape) + std_dev = np.reshape(std_dev, tally_avg.shape) + + # Assign tally avg's data with the new arrays + tally_avg._mean = mean + tally_avg._std_dev = std_dev + + # If original tally was sparse, sparsify the tally average + tally_avg.sparse = self.sparse + return tally_avg + def diagonalize_filter(self, new_filter): """Diagonalize the tally data array along a new axis of filter bins. From 473d3220dca2a6a71115477fb6c3a216f1d8d5f9 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 16 Jan 2016 13:48:06 -0500 Subject: [PATCH 057/149] Changes per comments of @smharper and @paulromano --- docs/source/usersguide/input.rst | 5 +- docs/source/usersguide/install.rst | 2 +- docs/source/usersguide/mgxs_library.rst | 73 +++---- docs/source/usersguide/output/source.rst | 5 +- docs/source/usersguide/output/statepoint.rst | 11 +- .../python/pincell_multigroup/build-xml.py | 17 +- examples/xml/pincell_multigroup/materials.xml | 4 +- examples/xml/pincell_multigroup/settings.xml | 6 - openmc/material.py | 11 +- openmc/mgxs/groups.py | 2 +- openmc/mgxs_library.py | 6 +- openmc/settings.py | 10 +- openmc/summary.py | 4 +- src/cmfd_input.F90 | 2 +- src/initialize.F90 | 2 +- src/input_xml.F90 | 191 +++++++++--------- src/mgxs_data.F90 | 18 +- src/state_point.F90 | 14 +- src/tally.F90 | 45 +++-- 19 files changed, 221 insertions(+), 207 deletions(-) diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index 754f815de4..6f73866e40 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -546,7 +546,8 @@ attributes/sub-elements: *Default*: 0.988 2.249 - .. note:: The above format should be used even when using the multi-group :ref:`energy_mode`. + .. note:: The above format should be used even when using the multi-group + :ref:`energy_mode`. :write_initial: An element specifying whether to write out the initial source bank used at @@ -1517,6 +1518,8 @@ The ```` element accepts the following sub-elements: .. note:: This score type is not used in the multi-group :ref:`energy_mode`. + .. _kappa_fission: + :kappa-fission: The recoverable energy production rate due to fission. The recoverable energy is defined as the fission product kinetic energy, prompt and diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index 2bfdbc5820..9a62eac3a3 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -385,7 +385,7 @@ ACE data as described below. The TALYS-based evaluated nuclear data library, TENDL_, is also openly available in ACE format. In multi-group mode, OpenMC utilizes an XML-based library format which can be -used to describe nuclidic- or material-specific quantities. +used to describe nuclide- or material-specific quantities. Using ENDF/B-VII.1 Cross Sections from NNDC ------------------------------------------- diff --git a/docs/source/usersguide/mgxs_library.rst b/docs/source/usersguide/mgxs_library.rst index ab6be5cc38..d0dc1e54f5 100644 --- a/docs/source/usersguide/mgxs_library.rst +++ b/docs/source/usersguide/mgxs_library.rst @@ -87,18 +87,19 @@ attributes/sub-elements required to describe the meta-data: *Default*: None, this must be provided. :alias: - The number of total fission source iterations per batch. + An alternative name to use for the microscopic or macroscopic data set. *Default*: If no alias is provided, it will adopt the value of ``name``. :kT: - The temperature the data was generated at. + The temperature times Boltzmann's constant (in units of MeV) at which the + data was generated. *Default*: Room temperature, 2.53E-8 MeV :fissionable: This element states whether or not the data in question is fissionable. - Accepted values are ``true`` or ``false``. + Accepted values are "true" or "false". *Default*: None, this element must be provided. @@ -108,42 +109,42 @@ attributes/sub-elements required to describe the meta-data: scalar flux weighting (or reduced to an equivalent representation) and thus are angle-independent, or if the data was generated with angular dependent fluxes and thus the data is angle-dependent. The options are - either ``isotropic`` or ``angle``. + either "isotropic" or "angle". - *Default*: ``isotropic`` + *Default*: "isotropic" :num_azimuthal: This element provides the number of equi-width bins that the azimuthal angular domain is subdivided in the case of angle-dependent cross sections - (i.e., ``angle`` is passed to the ``representation`` element). + (i.e., "angle" is passed to the ``representation`` element). - *Default*: If ``representation`` is ``angle``, this must be provided. If + *Default*: If ``representation`` is "angle", this must be provided. If not, this parameter is not used. :num_polar: This element provides the number of equi-width bins that the polar angular domain is subdivided in the case of angle-dependent cross sections - (i.e., ``angle`` is passed to the ``representation`` element). + (i.e., "angle" is passed to the ``representation`` element). - *Default*: If ``representation`` is ``angle``, this must be provided. If + *Default*: If ``representation`` is "angle", this must be provided. If not, this parameter is not used. :scatt_type: This element provides the representation of the angular distribution associated with each group-to-group transfer probability. The options are - either ``legendre``, ``histogram``, or ``tabular``. - The ``legendre`` option means the angular distribution has been - expanded via Legendre polynomials of the order provided in the ``order`` + either "legendre", "histogram", or "tabular". + The "legendre" option means the angular distribution has been + expanded via Legendre polynomials of the order provided in the "order" element. - The ``histogram`` option means the angular distribution is provided in + The "histogram" option means the angular distribution is provided in an equi-width histogram format with a number of bins as provided in the - ``order`` element. This is useful when the angular distribution was + "order" element. This is useful when the angular distribution was obtained from a Monte Carlo tally and thus is natively in the histogram format. - The ``tabular`` option means the angular distribution is provided in an + The "tabular" option means the angular distribution is provided in an equi-spaced point-wise representation. - *Default*: ``legendre`` + *Default*: "legendre" :order: This element provides either the Legendre order, number of bins, or number @@ -165,17 +166,17 @@ attributes/sub-elements required to describe the meta-data: :enable: This attribute/sub-element denotes whether or not the conversion to the - tabular format should be performed or not. A value of ``true`` means - the conversion should be performed, ``false`` means it should not. + tabular format should be performed or not. A value of "true" means + the conversion should be performed, "false" means it should not. - *Default*: ``true`` + *Default*: "true" :num_points: If the conversion is to take place the number of tabular points is required. This attribute/sub-element allows the user to set the desired number of points. - *Default*: ``33`` + *Default*: 33 The following attributes/sub-elements are the cross section values to be used during the transport process. @@ -183,9 +184,9 @@ attributes/sub-elements required to describe the meta-data: :total: This element requires the group-wise total cross section ordered by increasing group index (i.e., fast to thermal). If ``representation`` is - ``isotropic``, then the length of this list should equal the number of + "isotropic", then the length of this list should equal the number of groups described in the ``groups`` element. If ``representation`` is - ``angle``, then the length of this list should equal the number of groups + "angle", then the length of this list should equal the number of groups times the number of azimuthal angles times the number of polar angles, with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. @@ -196,9 +197,9 @@ attributes/sub-elements required to describe the meta-data: :absorption: This element requires the group-wise absorption cross section ordered by increasing group index (i.e., fast to thermal). If ``representation`` is - ``isotropic``, then the length of this list should equal the number of + "isotropic", then the length of this list should equal the number of groups described in the ``groups`` element. If ``representation`` is - ``angle``, then the length of this list should equal the number of groups + "angle", then the length of this list should equal the number of groups times the number of azimuthal angles times the number of polar angles, with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. @@ -210,9 +211,9 @@ attributes/sub-elements required to describe the meta-data: columns representing incoming group and rows representing the outgoing group. That is, down-scatter will be above the diagonal of the resultant matrix. This matrix is repeated for every Legendre order (in order of - increasing orders) if ``scatt_type`` is ``legendre``; otherwise, this + increasing orders) if ``scatt_type`` is "legendre"; otherwise, this matrix is repeated for every bin of the histogram or tabular - representation. Finally, if ``representation`` is ``angle``, the above + representation. Finally, if ``representation`` is "angle", the above is repeated for every azimuthal angle and every polar angle, in that order. @@ -232,32 +233,32 @@ attributes/sub-elements required to describe the meta-data: neglected). The following fission-specific data are only needed should ``fissionable`` - be ``true``. + be "true". :fission: This element requires the group-wise fission cross section ordered by increasing group index (i.e., fast to thermal). If ``representation`` is - ``isotropic``, then the length of this list should equal the number of + "isotropic", then the length of this list should equal the number of groups described in the ``groups`` element. If ``representation`` is - ``angle``, then the length of this list should equal the number of groups + "angle", then the length of this list should equal the number of groups times the number of azimuthal angles times the number of polar angles, with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. - *Default*: None, this is required only if ``fission`` tallies are + *Default*: None, this is required only if fission tallies are requested and the material is fissionable. - :k_fission: + :kappa_fission: This element requires the group-wise kappa-fission cross section ordered by increasing group index (i.e., fast to thermal). If ``representation`` is - ``isotropic``, then the length of this list should equal the number of + "isotropic", then the length of this list should equal the number of groups described in the ``groups`` element. If ``representation`` is - ``angle``, then the length of this list should equal the number of groups + "angle", then the length of this list should equal the number of groups times the number of azimuthal angles times the number of polar angles, with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. - *Default*: None, this is required only if ``kappa-fission`` tallies are + *Default*: None, this is required only if :ref:`kappa_fission` tallies are requested and the material is fissionable. :chi: @@ -267,9 +268,9 @@ attributes/sub-elements required to describe the meta-data: not depend on incoming energy. If the user does not wish to make this approximation, then this should not be provided and this information included in the ``nu_fission`` element instead. If ``representation`` is - ``isotropic``, then the length of this list should equal the number of + "isotropic", then the length of this list should equal the number of groups described in the ``groups`` element. If ``representation`` is - ``angle``, then the length of this list should equal the number of groups + "angle", then the length of this list should equal the number of groups times the number of azimuthal angles times the number of polar angles, with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. diff --git a/docs/source/usersguide/output/source.rst b/docs/source/usersguide/output/source.rst index 2981b0f662..e8867083c1 100644 --- a/docs/source/usersguide/output/source.rst +++ b/docs/source/usersguide/output/source.rst @@ -15,5 +15,6 @@ is that documented here. **/source_bank** (Compound type) Source bank information for each particle. The compound type has fields - ``wgt``, ``xyz``, ``uvw``, and ``E`` which represent the weight, position, - direction, and energy of the source particle, respectively. + ``wgt``, ``xyz``, ``uvw``, ``E``, ``g``, and ``delayed_group``, which + represent the weight, position, direction, energy, energy group, and + delayed_group of the source particle, respectively. diff --git a/docs/source/usersguide/output/statepoint.rst b/docs/source/usersguide/output/statepoint.rst index 15bc79f739..2921258c97 100644 --- a/docs/source/usersguide/output/statepoint.rst +++ b/docs/source/usersguide/output/statepoint.rst @@ -39,6 +39,12 @@ The current revision of the statepoint file format is 14. Pseudo-random number generator seed. +**/run_CE** (*int*) + + Flag to denote continuous-energy or multi-group mode. A value of 1 + indicates a continuous-energy run while a value of 0 indicates a + multi-group run. + **/run_mode** (*char[]*) Run mode used. A value of 1 indicates a fixed-source run and a value of 2 @@ -251,5 +257,6 @@ if (run_mode == 'k-eigenvalue' and source_present > 0) **/source_bank** (Compound type) Source bank information for each particle. The compound type has fields - ``wgt``, ``xyz``, ``uvw``, and ``E`` which represent the weight, - position, direction, and energy of the source particle, respectively. + ``wgt``, ``xyz``, ``uvw``, ``E``, ``g``, and ``delayed_group``, which + represent the weight, position, direction, energy, energy group, and + delayed_group of the source particle, respectively. diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py index 2145a68a54..ba15370c3b 100644 --- a/examples/python/pincell_multigroup/build-xml.py +++ b/examples/python/pincell_multigroup/build-xml.py @@ -20,7 +20,7 @@ groups = openmc.mgxs.EnergyGroups(group_edges=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) # Instantiate the 7-group (C5G7) cross section data -uo2_xsdata = openmc.XSdata('UO2.300k', groups) +uo2_xsdata = openmc.XSdata('UO2.300K', groups) uo2_xsdata.order = 0 uo2_xsdata.total = np.array([0.1779492, 0.3298048, 0.4803882, 0.5543674, 0.3118013, 0.3951678, 0.5644058]) @@ -43,7 +43,7 @@ uo2_xsdata.nu_fission = np.array([2.005998E-02, 2.027303E-03, 1.570599E-02, uo2_xsdata.chi = np.array([5.8791E-01, 4.1176E-01, 3.3906E-04, 1.1761E-07, 0.0000E+00, 0.0000E+00, 0.0000E+00]) -h2o_xsdata = openmc.XSdata('LWTR.300k', groups) +h2o_xsdata = openmc.XSdata('LWTR.300K', groups) h2o_xsdata.order = 0 h2o_xsdata.total = np.array([0.15920605, 0.412969593, 0.59030986, 0.58435, 0.718, 1.2544497, 2.650379]) @@ -57,7 +57,7 @@ scatter = [[[0.0444777, 0.1134000, 0.0007235, 0.0000037, 0.0000001, 0.0000000, 0 [0.0000000, 0.0000000, 0.0000000, 0.0000714, 0.1391380, 0.5118200, 0.0612290], [0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0022157, 0.6999130, 0.5373200], [0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, 0.1324400, 2.4807000]]] -h2o_xsdata.scatter = np.array(scatter[:][:]) +h2o_xsdata.scatter = np.array(scatter) mg_cross_sections_file = openmc.MGXSLibraryFile(groups) mg_cross_sections_file.add_xsdatas([uo2_xsdata,h2o_xsdata]) @@ -69,8 +69,8 @@ mg_cross_sections_file.export_to_xml() ############################################################################### # Instantiate some Macroscopic Data -uo2_data = openmc.Macroscopic('UO2', '300k') -h2o_data = openmc.Macroscopic('LWTR', '300k') +uo2_data = openmc.Macroscopic('UO2', '300K') +h2o_data = openmc.Macroscopic('LWTR', '300K') # Instantiate some Materials and register the appropriate Nuclides uo2 = openmc.Material(material_id=1, name='UO2 fuel') @@ -83,7 +83,7 @@ water.add_macroscopic(h2o_data) # Instantiate a MaterialsFile, register all Materials, and export to XML materials_file = openmc.MaterialsFile() -materials_file.default_xs = '300k' +materials_file.default_xs = '300K' materials_file.add_materials([uo2, water]) materials_file.export_to_xml() @@ -145,11 +145,6 @@ settings_file.inactive = inactive settings_file.particles = particles settings_file.set_source_space('box', [-0.63, -0.63, -1, \ 0.63, 0.63, 1]) -settings_file.entropy_lower_left = [-0.54, -0.54, -1.e50] -settings_file.entropy_upper_right = [0.54, 0.54, 1.e50] -settings_file.entropy_dimension = [10, 10, 1] -settings_file.export_to_xml() - ############################################################################### # Exporting to OpenMC tallies.xml File diff --git a/examples/xml/pincell_multigroup/materials.xml b/examples/xml/pincell_multigroup/materials.xml index 930fc09085..4b14f4a795 100644 --- a/examples/xml/pincell_multigroup/materials.xml +++ b/examples/xml/pincell_multigroup/materials.xml @@ -1,7 +1,7 @@ - - 71c + + 300K diff --git a/examples/xml/pincell_multigroup/settings.xml b/examples/xml/pincell_multigroup/settings.xml index 6bd27df3dd..dfd2fac813 100644 --- a/examples/xml/pincell_multigroup/settings.xml +++ b/examples/xml/pincell_multigroup/settings.xml @@ -27,12 +27,6 @@ - - - 2000 - true - - true true diff --git a/openmc/material.py b/openmc/material.py index e429190dc1..e51586205d 100644 --- a/openmc/material.py +++ b/openmc/material.py @@ -50,8 +50,8 @@ class Material(object): Density of the material (units defined separately) density_units : str Units used for `density`. Can be one of 'g/cm3', 'g/cc', 'kg/cm3', - 'atom/b-cm', 'atom/cm3', 'sum', or 'macro' (the latter only applies - if in multi-group mode). + 'atom/b-cm', 'atom/cm3', 'sum', or 'macro'. The 'macro' unit only + applies in the case of a multi-group calculation. """ @@ -346,7 +346,7 @@ class Material(object): 'has already been added'.format(self._id, macroscopic) raise ValueError(msg) - if not isinstance(macroscopic, (openmc.Macroscopic, str)): + if not isinstance(macroscopic, (openmc.Macroscopic, basestring)): msg = 'Unable to add a Macroscopic to Material ID="{0}" with a ' \ 'non-Macroscopic value "{1}"'.format(self._id, macroscopic) raise ValueError(msg) @@ -511,7 +511,7 @@ class Material(object): return xml_element - def _get_macroscopic_xml(self, macroscopic, distrib=False): + def _get_macroscopic_xml(self, macroscopic): xml_element = ET.Element("macroscopic") xml_element.set("name", macroscopic._name) @@ -626,8 +626,7 @@ class Material(object): subelement.append(subsubelement) else: # Create macroscopic XML subelements - subsubelement = self._get_macroscopic_xml(self, - self._macroscopic, + subsubelement = self._get_macroscopic_xml(self._macroscopic, distrib=True) subelement.append(subsubelement) diff --git a/openmc/mgxs/groups.py b/openmc/mgxs/groups.py index 3436c0e037..e6838b36ba 100644 --- a/openmc/mgxs/groups.py +++ b/openmc/mgxs/groups.py @@ -54,7 +54,7 @@ class EnergyGroups(object): def __eq__(self, other): if not isinstance(other, EnergyGroups): return False - elif self.group_edges != other.group_edges: + elif (self.group_edges != other.group_edges).all(): return False else: return True diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 605fc7064d..3b6b7753ea 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -15,7 +15,7 @@ from openmc.checkvalue import check_type, check_value, check_greater_than, \ from openmc.clean_xml import * # Supported incoming particle MGXS angular treatment representations -REPRESENTATIONS = ['isotropic', 'angle'] +_REPRESENTATIONS = ['isotropic', 'angle'] def ndarray_to_string(arr): """Converts a numpy ndarray in to a join with spaces between entries @@ -87,7 +87,7 @@ class XSdata(object): name : str, optional Name of the mgxs data set. - representation : {'isotropic' or 'angle'} + representation : {'isotropic', 'angle'} Method used in generating the MGXS (isotropic or angle-dependent flux weighting). Defaults to 'isotropic' @@ -241,7 +241,7 @@ class XSdata(object): @representation.setter def representation(self, representation): # Check it is of valid type. - check_value('representation', representation, REPRESENTATIONS) + check_value('representation', representation, _REPRESENTATIONS) self._representation = representation @alias.setter diff --git a/openmc/settings.py b/openmc/settings.py index 8a562a5455..cf8b674cf7 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -72,12 +72,10 @@ class SettingsFile(object): environment variable will be used for continuous-energy calculations and :envvar:`MG_CROSS_SECTIONS` will be used for multi-group calculations to find the path to the XML cross section file. - energy_grid : str - Set the method used to search energy grids. Acceptable values are - 'nuclide', 'logarithm', and 'material-union'. - energy_mode : str + energy_grid : {'nuclide', 'logarithm', 'material-union'} + Set the method used to search energy grids. + energy_mode : {'continuous-energy', 'multi-group'} Set whether the calculation should be continuous-energy or multi-group. - Acceptable values are 'continuous-energy' or 'multi-group' max_order : int Maximum scattering order to apply globally when in multi-group mode. ptables : bool @@ -495,7 +493,7 @@ class SettingsFile(object): @max_order.setter def max_order(self, max_order): check_type('maximum scattering order', max_order, Integral) - check_greater_than('maximum scattering order', max_order, 0) + check_greater_than('maximum scattering order', max_order, 0, True) self._max_order = max_order @source_file.setter diff --git a/openmc/summary.py b/openmc/summary.py index 80f9fc3976..e3a5743f95 100644 --- a/openmc/summary.py +++ b/openmc/summary.py @@ -60,7 +60,7 @@ class Summary(object): self.date_and_time = self._f['date_and_time'][...] # Read if continuous-energy or multi-group - self.run_CE = bool(self._f['run_CE'].value) + self.run_CE = (self._f['run_CE'].value == 1) self.n_batches = self._f['n_batches'].value self.n_particles = self._f['n_particles'].value @@ -278,7 +278,7 @@ class Summary(object): # Get the distribcell index ind = self._f['geometry/cells'][key]['distribcell_index'].value if ind != 0: - cell.distribcell_index = ind + cell.distribcell_index = ind # Add the Cell to the global dictionary of all Cells self.cells[index] = cell diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index 4588444d05..5e22d38559 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -108,7 +108,7 @@ contains do i = 1, ng found = .false. do g = 1, energy_groups + 1 - if (cmfd%egrid(i) == energy_bins(g)) then + if (cmfd % egrid(i) == energy_bins(g)) then found = .true. exit end if diff --git a/src/initialize.F90 b/src/initialize.F90 index 820367f821..ed57652fb2 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -16,7 +16,7 @@ module initialize hdf5_tallyresult_t, hdf5_integer8_t use input_xml, only: read_input_xml, cells_in_univ_dict, read_plots_xml use material_header, only: Material - use mgxs_data + use mgxs_data, only: read_mgxs, same_nuclide_mg_list, create_macro_xs use output, only: title, header, print_version, write_message, & print_usage, write_xs_summary, print_plot use random_lcg, only: initialize_prng diff --git a/src/input_xml.F90 b/src/input_xml.F90 index a6f836ac61..963cf4a829 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -109,7 +109,7 @@ contains temp_str = trim(to_lower(temp_str)) if (temp_str == "mg" .or. temp_str == "multi-group") then run_CE = .false. - else if (temp_str == "ce" .or. temp_str == "continuous") then + else if (temp_str == "ce" .or. temp_str == "continuous-energy") then run_CE = .true. end if end if @@ -406,7 +406,7 @@ contains inquire(FILE=path_source, EXIST=file_exists) if (.not. file_exists) then call fatal_error("Binary source file '" // trim(path_source) & - &// "' does not exist!") + // "' does not exist!") end if else @@ -433,7 +433,7 @@ contains coeffs_reqd = 3 case default call fatal_error("Invalid spatial distribution for external source: "& - &// trim(type)) + // trim(type)) end select ! Determine number of parameters specified @@ -481,7 +481,7 @@ contains external_source % type_angle = SRC_ANGLE_TABULAR case default call fatal_error("Invalid angular distribution for external source: "& - &// trim(type)) + // trim(type)) end select ! Determine number of parameters specified @@ -532,7 +532,7 @@ contains external_source % type_energy = SRC_ENERGY_TABULAR case default call fatal_error("Invalid energy distribution for external source: " & - &// trim(type)) + // trim(type)) end select ! Determine number of parameters specified @@ -926,7 +926,7 @@ contains ! check to make sure a nuclide is specified if (.not. check_for_node(node_scatterer, "nuclide")) then call fatal_error("No nuclide specified for scatterer " & - &// trim(to_str(i)) // " in settings.xml file!") + // trim(to_str(i)) // " in settings.xml file!") end if call get_node_value(node_scatterer, "nuclide", & nuclides_0K(i) % nuclide) @@ -940,7 +940,7 @@ contains if (.not. check_for_node(node_scatterer, "xs_label")) then call fatal_error("Must specify the temperature dependent name of & &scatterer " // trim(to_str(i)) & - &// " given in cross_sections.xml") + // " given in cross_sections.xml") end if call get_node_value(node_scatterer, "xs_label", & nuclides_0K(i) % name) @@ -948,7 +948,7 @@ contains ! check to make sure 0K xs name for which method is applied is given if (.not. check_for_node(node_scatterer, "xs_label_0K")) then call fatal_error("Must specify the 0K name of scatterer " & - &// trim(to_str(i)) // " given in cross_sections.xml") + // trim(to_str(i)) // " given in cross_sections.xml") end if call get_node_value(node_scatterer, "xs_label_0K", & nuclides_0K(i) % name_0K) @@ -1008,7 +1008,7 @@ contains default_expand = JENDL_40 case default call fatal_error("Unknown natural element expansion option: " & - &// trim(temp_str)) + // trim(temp_str)) end select end if @@ -1125,7 +1125,7 @@ contains ! Check to make sure 'id' hasn't been used if (cell_dict % has_key(c % id)) then call fatal_error("Two or more cells use the same unique ID: " & - &// to_str(c % id)) + // to_str(c % id)) end if ! Read material @@ -1146,14 +1146,14 @@ contains ! Check for error if (c % material == ERROR_INT) then call fatal_error("Invalid material specified on cell " & - &// to_str(c % id)) + // to_str(c % id)) end if end select ! Check to make sure that either material or fill was specified if (c % material == NONE .and. c % fill == NONE) then call fatal_error("Neither material nor fill was specified for cell " & - &// trim(to_str(c % id))) + // trim(to_str(c % id))) end if ! Check to make sure that both material and fill haven't been @@ -1213,7 +1213,7 @@ contains n = get_arraysize_double(node_cell, "rotation") if (n /= 3) then call fatal_error("Incorrect number of rotation parameters on cell " & - &// to_str(c % id)) + // to_str(c % id)) end if ! Copy rotation angles in x,y,z directions @@ -1241,7 +1241,7 @@ contains ! another universe if (c % fill == NONE) then call fatal_error("Cannot apply a translation to cell " & - &// trim(to_str(c % id)) // " because it is not filled with & + // trim(to_str(c % id)) // " because it is not filled with & &another universe") end if @@ -1357,7 +1357,7 @@ contains ! Check to make sure 'id' hasn't been used if (surface_dict % has_key(s%id)) then call fatal_error("Two or more surfaces use the same unique ID: " & - &// to_str(s%id)) + // to_str(s%id)) end if ! Copy surface name @@ -1372,10 +1372,10 @@ contains n = get_arraysize_double(node_surf, "coeffs") if (n < coeffs_reqd) then call fatal_error("Not enough coefficients specified for surface: " & - &// trim(to_str(s%id))) + // trim(to_str(s%id))) elseif (n > coeffs_reqd) then call fatal_error("Too many coefficients specified for surface: " & - &// trim(to_str(s%id))) + // trim(to_str(s%id))) end if allocate(coeffs(n)) @@ -1501,7 +1501,7 @@ contains ! Check to make sure 'id' hasn't been used if (lattice_dict % has_key(lat % id)) then call fatal_error("Two or more lattices use the same unique ID: " & - &// to_str(lat % id)) + // to_str(lat % id)) end if ! Copy lattice name @@ -1629,7 +1629,7 @@ contains ! Check to make sure 'id' hasn't been used if (lattice_dict % has_key(lat % id)) then call fatal_error("Two or more lattices use the same unique ID: " & - &// to_str(lat % id)) + // to_str(lat % id)) end if ! Copy lattice name @@ -1883,7 +1883,7 @@ contains ! Check to make sure 'id' hasn't been used if (material_dict % has_key(mat % id)) then call fatal_error("Two or more materials use the same unique ID: " & - &// to_str(mat % id)) + // to_str(mat % id)) end if ! Copy material name @@ -1906,7 +1906,7 @@ contains call get_node_ptr(node_mat, "density", node_dens) else call fatal_error("Must specify density element in material " & - &// trim(to_str(mat % id))) + // trim(to_str(mat % id))) end if ! Initialize value to zero @@ -1943,7 +1943,7 @@ contains sum_density = .false. if (val <= ZERO) then call fatal_error("Need to specify a positive density on material " & - &// trim(to_str(mat % id)) // ".") + // trim(to_str(mat % id)) // ".") end if ! Adjust material density based on specified units @@ -1958,7 +1958,7 @@ contains mat % density = 1.0e-24_8 * val case default call fatal_error("Unkwown units '" // trim(units) & - &// "' specified on material " // trim(to_str(mat % id))) + // "' specified on material " // trim(to_str(mat % id))) end select end if @@ -1981,7 +1981,7 @@ contains call get_node_list(node_mat, "macroscopic", node_macro_list) if (get_list_size(node_macro_list) > 1) then call fatal_error("Only one macroscopic object permitted per material, " & - &// trim(to_str(mat % id))) + // trim(to_str(mat % id))) else if (get_list_size(node_macro_list) == 1) then call get_list_item(node_macro_list, 1, node_nuc) @@ -1989,7 +1989,7 @@ contains ! Check for empty name on nuclide if (.not.check_for_node(node_nuc, "name")) then call fatal_error("No name specified on macroscopic data in material " & - &// trim(to_str(mat % id))) + // trim(to_str(mat % id))) end if ! Check for cross section @@ -2033,7 +2033,7 @@ contains call list_density % append(ONE) else call fatal_error("Units can only be macro for macroscopic data " & - &// trim(name)) + // trim(name)) end if else @@ -2048,7 +2048,7 @@ contains ! Check for empty name on nuclide if (.not.check_for_node(node_nuc, "name")) then call fatal_error("No name specified on nuclide in material " & - &// trim(to_str(mat % id))) + // trim(to_str(mat % id))) end if ! Check for cross section @@ -2079,7 +2079,7 @@ contains if (.not.check_for_node(node_nuc, "ao") .and. & .not.check_for_node(node_nuc, "wo")) then call fatal_error("No atom or weight percent specified for nuclide " & - &// trim(name)) + // trim(name)) elseif (check_for_node(node_nuc, "ao") .and. & check_for_node(node_nuc, "wo")) then call fatal_error("Cannot specify both atom and weight percents for a & @@ -2110,7 +2110,7 @@ contains ! Check for empty name on natural element if (.not.check_for_node(node_ele, "name")) then call fatal_error("No name specified on nuclide in material " & - &// trim(to_str(mat % id))) + // trim(to_str(mat % id))) end if call get_node_value(node_ele, "name", name) @@ -2131,7 +2131,7 @@ contains if (.not.check_for_node(node_ele, "ao") .and. & .not.check_for_node(node_ele, "wo")) then call fatal_error("No atom or weight percent specified for element " & - &// trim(name)) + // trim(name)) elseif (check_for_node(node_ele, "ao") .and. & check_for_node(node_ele, "wo")) then call fatal_error("Cannot specify both atom and weight percents for & @@ -2191,7 +2191,7 @@ contains name = trim(list_names % get_item(j)) if (.not. xs_listing_dict % has_key(to_lower(name))) then call fatal_error("Could not find nuclide " // trim(name) & - &// " in cross_sections data file!") + // " in cross_sections data file!") end if if (run_CE) then @@ -2199,7 +2199,7 @@ contains n = len_trim(name) if (name(n:n) /= 'c') then call fatal_error("Cross-section table " // trim(name) & - &// " is not a continuous-energy neutron table.") + // " is not a continuous-energy neutron table.") end if end if @@ -2238,7 +2238,7 @@ contains if (.not. (all(mat % atom_density >= ZERO) .or. & all(mat % atom_density <= ZERO))) then call fatal_error("Cannot mix atom and weight percents in material " & - &// to_str(mat % id)) + // to_str(mat % id)) end if ! Determine density if it is a sum value @@ -2286,7 +2286,7 @@ contains ! Check that this nuclide is listed in the cross_sections.xml file if (.not. xs_listing_dict % has_key(to_lower(name))) then call fatal_error("Could not find S(a,b) table " // trim(name) & - &// " in cross_sections.xml file!") + // " in cross_sections.xml file!") end if ! Find index in xs_listing and set the name and alias according to the @@ -2448,7 +2448,7 @@ contains ! Check to make sure 'id' hasn't been used if (mesh_dict % has_key(m % id)) then call fatal_error("Two or more meshes use the same unique ID: " & - &// to_str(m % id)) + // to_str(m % id)) end if ! Read mesh type @@ -2589,7 +2589,7 @@ contains ! Check to make sure 'id' hasn't been used if (tally_dict % has_key(t % id)) then call fatal_error("Two or more tallies use the same unique ID: " & - &// to_str(t % id)) + // to_str(t % id)) end if ! Copy tally name @@ -2630,7 +2630,7 @@ contains end if else call fatal_error("Bins not set in filter on tally " & - &// trim(to_str(t % id))) + // trim(to_str(t % id))) end if ! Determine type of filter @@ -2722,7 +2722,7 @@ contains m => meshes(i_mesh) else call fatal_error("Could not find mesh " // trim(to_str(id)) & - &// " specified on tally " // trim(to_str(t % id))) + // " specified on tally " // trim(to_str(t % id))) end if ! Determine number of bins -- this is assuming that the tally is @@ -2906,8 +2906,8 @@ contains case default ! Specified tally filter is invalid, raise error call fatal_error("Unknown filter type '" & - &// trim(temp_str) // "' on tally " & - &// trim(to_str(t % id)) // ".") + // trim(temp_str) // "' on tally " & + // trim(to_str(t % id)) // ".") end select @@ -3003,8 +3003,8 @@ contains ! Check if no nuclide was found if (.not. associated(pair_list)) then call fatal_error("Could not find the nuclide " & - &// trim(word) // " specified in tally " & - &// trim(to_str(t % id)) // " in any material.") + // trim(word) // " specified in tally " & + // trim(to_str(t % id)) // " in any material.") end if deallocate(pair_list) @@ -3072,12 +3072,12 @@ contains ! maximum order. ! The above scheme will essentially take the absolute value if (master) call warning("Invalid scattering order of " & - &// trim(to_str(n_order)) // " requested. Setting to the & + // trim(to_str(n_order)) // " requested. Setting to the & &maximum permissible value, " & - &// trim(to_str(MAX_ANG_ORDER))) + // trim(to_str(MAX_ANG_ORDER))) n_order = MAX_ANG_ORDER sarray(j) = trim(MOMENT_STRS(imomstr)) & - &// trim(to_str(MAX_ANG_ORDER)) + // trim(to_str(MAX_ANG_ORDER)) end if ! Find total number of bins for this case if (imomstr >= YN_LOC) then @@ -3139,9 +3139,9 @@ contains ! maximum order. ! The above scheme will essentially take the absolute value if (master) call warning("Invalid scattering order of " & - &// trim(to_str(n_order)) // " requested. Setting to & + // trim(to_str(n_order)) // " requested. Setting to & &the maximum permissible value, " & - &// trim(to_str(MAX_ANG_ORDER))) + // trim(to_str(MAX_ANG_ORDER))) n_order = MAX_ANG_ORDER end if score_name = trim(MOMENT_N_STRS(imomstr)) // "n" @@ -3293,9 +3293,21 @@ contains case ('n2n', '(n,2n)') t % score_bins(j) = N_2N + ! Disallow for MG mode since data not present + if (.not. run_CE) then + call fatal_error("Cannot tally (n,2n) reaction rate in & + &multi-group mode") + end if + case ('n3n', '(n,3n)') t % score_bins(j) = N_3N + ! Disallow for MG mode since data not present + if (.not. run_CE) then + call fatal_error("Cannot tally (n,3n) reaction rate in & + &multi-group mode") + end if + case ('n4n', '(n,4n)') t % score_bins(j) = N_4N @@ -3480,13 +3492,13 @@ contains t % score_bins(j) = MT else call fatal_error("Invalid MT on : " & - &// trim(sarray(l))) + // trim(sarray(l))) end if else ! Specified score was not an integer call fatal_error("Unknown scoring function: " & - &// trim(sarray(l))) + // trim(sarray(l))) end if end select @@ -3507,7 +3519,7 @@ contains deallocate(sarray) else call fatal_error("No specified on tally " & - &// trim(to_str(t % id)) // ".") + // trim(to_str(t % id)) // ".") end if ! If settings.xml trigger is turned on, create tally triggers @@ -3768,7 +3780,7 @@ contains inquire(FILE=filename, EXIST=file_exists) if (.not. file_exists) then call fatal_error("Plots XML file '" // trim(filename) & - &// "' does not exist!") + // "' does not exist!") end if ! Display output message @@ -3800,7 +3812,7 @@ contains ! Check to make sure 'id' hasn't been used if (plot_dict % has_key(pl % id)) then call fatal_error("Two or more plots use the same unique ID: " & - &// to_str(pl % id)) + // to_str(pl % id)) end if ! Copy plot type @@ -3815,7 +3827,7 @@ contains pl % type = PLOT_TYPE_VOXEL case default call fatal_error("Unsupported plot type '" // trim(temp_str) & - &// "' in plot " // trim(to_str(pl % id))) + // "' in plot " // trim(to_str(pl % id))) end select ! Set output file path @@ -3835,14 +3847,14 @@ contains call get_node_array(node_plot, "pixels", pl % pixels(1:2)) else call fatal_error(" must be length 2 in slice plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if else if (pl % type == PLOT_TYPE_VOXEL) then if (get_arraysize_integer(node_plot, "pixels") == 3) then call get_node_array(node_plot, "pixels", pl % pixels(1:3)) else call fatal_error(" must be length 3 in voxel plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if end if @@ -3850,13 +3862,13 @@ contains if (check_for_node(node_plot, "background")) then if (pl % type == PLOT_TYPE_VOXEL) then if (master) call warning("Background color ignored in voxel plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if if (get_arraysize_integer(node_plot, "background") == 3) then call get_node_array(node_plot, "background", pl % not_found % rgb) else call fatal_error("Bad background RGB in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if else pl % not_found % rgb = (/ 255, 255, 255 /) @@ -3877,7 +3889,7 @@ contains pl % basis = PLOT_BASIS_YZ case default call fatal_error("Unsupported plot basis '" // trim(temp_str) & - &// "' in plot " // trim(to_str(pl % id))) + // "' in plot " // trim(to_str(pl % id))) end select end if @@ -3886,7 +3898,7 @@ contains call get_node_array(node_plot, "origin", pl % origin) else call fatal_error("Origin must be length 3 in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if ! Copy plotting width @@ -3895,14 +3907,14 @@ contains call get_node_array(node_plot, "width", pl % width(1:2)) else call fatal_error(" must be length 2 in slice plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if else if (pl % type == PLOT_TYPE_VOXEL) then if (get_arraysize_double(node_plot, "width") == 3) then call get_node_array(node_plot, "width", pl % width(1:3)) else call fatal_error(" must be length 3 in voxel plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if end if @@ -3912,7 +3924,7 @@ contains if (pl % level < 0) then call fatal_error("Bad universe level in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if else pl % level = PLOT_LEVEL_LOWEST @@ -3946,7 +3958,7 @@ contains case default call fatal_error("Unsupported plot color type '" // trim(temp_str) & - &// "' in plot " // trim(to_str(pl % id))) + // "' in plot " // trim(to_str(pl % id))) end select ! Get the number of nodes and get a list of them @@ -3969,7 +3981,7 @@ contains ! Check and make sure 3 values are specified for RGB if (get_arraysize_double(node_col, "rgb") /= 3) then call fatal_error("Bad RGB in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if ! Ensure that there is an id for this color specification @@ -3988,7 +4000,7 @@ contains call get_node_array(node_col, "rgb", pl % colors(col_id) % rgb) else call fatal_error("Could not find cell " // trim(to_str(col_id)) & - &// " specified in plot " // trim(to_str(pl % id))) + // " specified in plot " // trim(to_str(pl % id))) end if else if (pl % color_by == PLOT_COLOR_MATS) then @@ -3998,8 +4010,8 @@ contains call get_node_array(node_col, "rgb", pl % colors(col_id) % rgb) else call fatal_error("Could not find material " & - &// trim(to_str(col_id)) // " specified in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(col_id)) // " specified in plot " & + // trim(to_str(pl % id))) end if end if @@ -4013,7 +4025,7 @@ contains if (pl % type == PLOT_TYPE_VOXEL) then call warning("Meshlines ignored in voxel plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if select case(n_meshlines) @@ -4047,7 +4059,7 @@ contains ! Check and make sure 3 values are specified for RGB if (get_arraysize_double(node_meshlines, "color") /= 3) then call fatal_error("Bad RGB for meshlines color in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if call get_node_array(node_meshlines, "color", & @@ -4064,7 +4076,7 @@ contains if (.not. associated(ufs_mesh)) then call fatal_error("No UFS mesh for meshlines on plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if pl % meshlines_mesh => ufs_mesh @@ -4085,7 +4097,7 @@ contains if (.not. associated(entropy_mesh)) then call fatal_error("No entropy mesh for meshlines on plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if if (.not. allocated(entropy_mesh % dimension)) then @@ -4114,18 +4126,18 @@ contains end if else call fatal_error("Could not find mesh " & - &// trim(to_str(meshid)) // " specified in meshlines for & + // trim(to_str(meshid)) // " specified in meshlines for & &plot " // trim(to_str(pl % id))) end if case default call fatal_error("Invalid type for meshlines on plot " & - &// trim(to_str(pl % id)) // ": " // trim(meshtype)) + // trim(to_str(pl % id)) // ": " // trim(meshtype)) end select case default call fatal_error("Mutliple meshlines specified in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end select end if @@ -4137,13 +4149,13 @@ contains if (pl % type == PLOT_TYPE_VOXEL) then if (master) call warning("Mask ignored in voxel plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if select case(n_masks) case default call fatal_error("Mutliple masks specified in plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) case (1) ! Get pointer to mask @@ -4154,7 +4166,7 @@ contains n_comp = get_arraysize_integer(node_mask, "components") if (n_comp == 0) then call fatal_error("Missing in mask of plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if allocate(iarray(n_comp)) call get_node_array(node_mask, "components", iarray) @@ -4170,7 +4182,7 @@ contains iarray(j) = cell_dict % get_key(col_id) else call fatal_error("Could not find cell " & - &// trim(to_str(col_id)) // " specified in the mask in & + // trim(to_str(col_id)) // " specified in the mask in & &plot " // trim(to_str(pl % id))) end if @@ -4180,7 +4192,7 @@ contains iarray(j) = material_dict % get_key(col_id) else call fatal_error("Could not find material " & - &// trim(to_str(col_id)) // " specified in the mask in & + // trim(to_str(col_id)) // " specified in the mask in & &plot " // trim(to_str(pl % id))) end if @@ -4194,7 +4206,7 @@ contains call get_node_array(node_mask, "background", pl % colors(j) % rgb) else call fatal_error("Missing in mask of plot " & - &// trim(to_str(pl % id))) + // trim(to_str(pl % id))) end if end if end do @@ -4239,7 +4251,7 @@ contains if (.not. file_exists) then ! Could not find cross_sections.xml file call fatal_error("Cross sections XML file '" & - &// trim(path_cross_sections) // "' does not exist!") + // trim(path_cross_sections) // "' does not exist!") end if call write_message("Reading cross sections XML file...", 5) @@ -4269,7 +4281,7 @@ contains filetype = ASCII else call fatal_error("Unknown filetype in cross_sections.xml: " & - &// trim(temp_str)) + // trim(temp_str)) end if ! copy default record length and entries for binary files @@ -4367,8 +4379,8 @@ contains do i = 1, n_res_scatterers_total if (.not. xs_listing_dict % has_key(trim(nuclides_0K(i) % name_0K))) then call fatal_error("Could not find nuclide " & - &// trim(nuclides_0K(i) % name_0K) & - &// " in cross_sections.xml file!") + // trim(nuclides_0K(i) % name_0K) & + // " in cross_sections.xml file!") end if end do @@ -4385,14 +4397,13 @@ contains type(Node), pointer :: doc => null() type(Node), pointer :: node_xsdata => null() type(NodeList), pointer :: node_xsdata_list => null() - ! character(MAX_LINE_LEN) :: temp_str ! Check if cross_sections.xml exists inquire(FILE=path_cross_sections, EXIST=file_exists) if (.not. file_exists) then ! Could not find cross_sections.xml file call fatal_error("Cross sections XML file '" & - &// trim(path_cross_sections) // "' does not exist!") + // trim(path_cross_sections) // "' does not exist!") end if call write_message("Reading cross sections XML file...", 5) @@ -4417,7 +4428,7 @@ contains allocate(energy_bin_avg(energy_groups)) do i = 1, energy_groups - energy_bin_avg(i) = 0.5_8 * (energy_bins(i) + energy_bins(i + 1)) + energy_bin_avg(i) = HALF * (energy_bins(i) + energy_bins(i + 1)) end do allocate(inverse_velocities(energy_groups)) @@ -4440,8 +4451,8 @@ contains ! Allocate xs_listings array if (n_listings == 0) then - call fatal_error("No XSDATA listings present in cross_sections.xml & - &file!") + call fatal_error("At least one element must be present in & + &cross_sections.xml file!") else allocate(xs_listings(n_listings)) end if @@ -4474,7 +4485,7 @@ contains if (check_for_node(node_xsdata, "kT")) then call get_node_value(node_xsdata, "kT", listing % kT) else - listing % kT = 2.53E-8_8 + listing % kT = 293.6_8 * K_BOLTZMANN end if ! determine type of cross section diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index d568ab7b55..8109087363 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -370,12 +370,12 @@ contains end if if (get_kfiss) then allocate(this % k_fission(groups)) - if (check_for_node(node_xsdata, "k_fission")) then - call get_node_array(node_xsdata, "k_fission", this % k_fission) + if (check_for_node(node_xsdata, "kappa_fission")) then + call get_node_array(node_xsdata, "kappa_fission", this % k_fission) else error_code = 1 - error_text = "k_fission data missing, required due to kappa-fission& - & tallies in tallies.xml file!" + error_text = "kappa_fission data missing, required due to & + &kappa-fission tallies in tallies.xml file!" return end if end if @@ -554,22 +554,22 @@ contains deallocate(temp_arr) else error_code = 1 - error_text = "Fission data missing, required due to kappa-fission& + error_text = "Fission data missing, required due to fission& & tallies in tallies.xml file!" return end if end if if (get_kfiss) then - if (check_for_node(node_xsdata, "k_fission")) then + if (check_for_node(node_xsdata, "kappa_fission")) then allocate(temp_arr(groups * this % Nazi * this % Npol)) - call get_node_array(node_xsdata, "k_fission", temp_arr) + call get_node_array(node_xsdata, "kappa_fission", temp_arr) allocate(this % k_fission(groups, this % Nazi, this % Npol)) this % k_fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) deallocate(temp_arr) else error_code = 1 - error_text = "k_fission data missing, required due to kappa-fission& - & tallies in tallies.xml file!" + error_text = "kappa_fission data missing, required due to & + &kappa-fission tallies in tallies.xml file!" return end if end if diff --git a/src/state_point.F90 b/src/state_point.F90 index 4b58cb7704..a49c88cad6 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -727,14 +727,12 @@ contains ! It is not impossible for a state point to be generated from a CE run but ! to be loaded in to an MG run (or vice versa), check to prevent that. call read_dataset(file_id, "run_CE", sp_run_CE) - if (sp_run_CE == 0) then - if (run_CE) & - call fatal_error("State point file is from multi-group run but & - & current run is continous-energy!") - else if (sp_run_CE == 1) then - if (.not. run_CE) & - call fatal_error("State point file is from continuous-energy run but & - & current run is multi-group!") + if (sp_run_CE == 0 .and. run_CE) then + call fatal_error("State point file is from multi-group run but & + & current run is continous-energy!") + else if (sp_run_CE == 1 .and. .not. run_CE) then + call fatal_error("State point file is from continuous-energy run but & + & current run is multi-group!") end if ! Read and overwrite run information except number of batches diff --git a/src/tally.F90 b/src/tally.F90 index 5d978bdcba..842b7644ea 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -778,7 +778,6 @@ contains end if end if - end select !######################################################################### @@ -807,6 +806,14 @@ contains real(8) :: macro_total ! material macro total xs real(8) :: macro_scatt ! material macro scatt xs real(8) :: micro_abs ! nuclidic microscopic abs + real(8) :: p_uvw(3) ! Particle's current uvw + + ! Set the direction, if needed for nuclidic data, so that nuc % get_xs + ! knows wihch direction it should be using for direction-dependent + ! mgxs + if (i_nuclide > 0) then + p_uvw = p % coord(p % n_coord) % uvw + end if i = 0 SCORE_LOOP: do q = 1, t % n_user_score_bins @@ -860,7 +867,7 @@ contains else if (i_nuclide > 0) then associate (nuc => nuclides_MG(i_nuclide) % obj) - score = nuc % get_xs(p % g, 'total', UVW=p % coord(i) % uvw) * & + score = nuc % get_xs(p % g, 'total', UVW=p_uvw) * & atom_density * flux end associate else @@ -902,7 +909,7 @@ contains ! Note SCORE_SCATTER_N not available for tracklength/collision. if (i_nuclide > 0) then associate (nuc => nuclides_MG(i_nuclide) % obj) - score = nuc % get_xs(p % g, 'scatter', UVW=p % coord(i) % uvw) * & + score = nuc % get_xs(p % g, 'scatter', UVW=p_uvw) * & atom_density * flux end associate else @@ -1069,7 +1076,7 @@ contains else if (i_nuclide > 0) then associate (nuc => nuclides_MG(i_nuclide) % obj) - score = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) & + score = nuc % get_xs(p % g, 'absorption', UVW=p_uvw) & * atom_density * flux end associate else @@ -1085,10 +1092,10 @@ contains ! calculate fraction of absorptions that would have resulted in ! fission associate (nuc => nuclides_MG(i_nuclide) % obj) - micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p_uvw) if (micro_abs > ZERO) then score = p % absorb_wgt * & - nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) & + nuc % get_xs(p % g, 'fission', UVW=p_uvw) & / micro_abs else score = ZERO @@ -1102,20 +1109,20 @@ contains ! fission reaction rate associate (nuc => nuclides_MG(i_nuclide) % obj) score = p % last_wgt & - * nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) & - / nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) + * nuc % get_xs(p % g, 'fission', UVW=p_uvw) & + / nuc % get_xs(p % g, 'absorption', UVW=p_uvw) end associate end if else if (i_nuclide > 0) then associate (nuc => nuclides_MG(i_nuclide) % obj) - score = nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) * & + score = nuc % get_xs(p % g, 'fission', UVW=p_uvw) * & atom_density * flux end associate else score = flux * macro_xs(p % material) % obj % get_xs(p % g, & - 'fission', UVW=p % coord(i) % uvw) + 'fission', UVW=p_uvw) end if end if @@ -1139,10 +1146,10 @@ contains ! calculate fraction of absorptions that would have resulted in ! nu-fission associate (nuc => nuclides_MG(i_nuclide) % obj) - micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p_uvw) if (micro_abs > ZERO) then score = p % absorb_wgt * & - nuc % get_xs(p % g, 'fission', UVW=p % coord(i) % uvw) / & + nuc % get_xs(p % g, 'fission', UVW=p_uvw) / & micro_abs else score = ZERO @@ -1162,7 +1169,7 @@ contains else if (i_nuclide > 0) then associate (nuc => nuclides_MG(i_nuclide) % obj) - score = nuc % get_xs(p % g, 'nu_fission', UVW=p % coord(i) % uvw) & + score = nuc % get_xs(p % g, 'nu_fission', UVW=p_uvw) & * atom_density * flux end associate else @@ -1180,10 +1187,10 @@ contains ! calculate fraction of absorptions that would have resulted in ! fission scale by kappa-fission associate (nuc => nuclides_MG(i_nuclide) % obj) - micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) + micro_abs = nuc % get_xs(p % g, 'absorption', UVW=p_uvw) if (micro_abs > ZERO) then score = p % absorb_wgt * & - nuc % get_xs(p % g, 'k_fission', UVW=p % coord(i) % uvw) / & + nuc % get_xs(p % g, 'k_fission', UVW=p_uvw) / & micro_abs end if end associate @@ -1195,20 +1202,20 @@ contains ! the fission energy production rate associate (nuc => nuclides_MG(i_nuclide) % obj) score = p % last_wgt * & - nuc % get_xs(p % g, 'k_fission', UVW=p % coord(i) % uvw) / & - nuc % get_xs(p % g, 'absorption', UVW=p % coord(i) % uvw) + nuc % get_xs(p % g, 'k_fission', UVW=p_uvw) / & + nuc % get_xs(p % g, 'absorption', UVW=p_uvw) end associate end if else if (i_nuclide > 0) then associate (nuc => nuclides_MG(i_nuclide) % obj) - score = nuc % get_xs(p % g, 'k_fission', UVW=p % coord(i) % uvw) & + score = nuc % get_xs(p % g, 'k_fission', UVW=p_uvw) & * atom_density * flux end associate else score = flux * macro_xs(p % material) % obj % get_xs(p % g, & - 'k_fission', UVW=p % coord(i) % uvw) + 'k_fission', UVW=p_uvw) end if end if From 79dea15ddfbe9b1726cb166af34cc12d37ca5900 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 13 Nov 2015 12:59:26 -0600 Subject: [PATCH 058/149] Allow fission to create secondary neutrons in fixed source simulations. --- src/particle_header.F90 | 2 +- src/physics.F90 | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 0b9b251ee5..30f5e8bb64 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -86,7 +86,7 @@ module particle_header logical :: write_track = .false. ! Secondary particles created - integer :: n_secondary = 0 + integer(8) :: n_secondary = 0 type(Bank) :: secondary_bank(MAX_SECONDARY) contains diff --git a/src/physics.F90 b/src/physics.F90 index 31eb981abb..03a4cb6086 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -88,9 +88,14 @@ contains ! change when sampling fission sites. The following block handles all ! absorption (including fission) - if (nuc % fissionable .and. run_mode == MODE_EIGENVALUE) then + if (nuc % fissionable) then call sample_fission(i_nuclide, i_reaction) - call create_fission_sites(p, i_nuclide, i_reaction) + if (run_mode == MODE_EIGENVALUE) then + call create_fission_sites(p, i_nuclide, i_reaction, fission_bank, n_bank) + elseif (run_mode == MODE_FIXEDSOURCE) then + call create_fission_sites(p, i_nuclide, i_reaction, & + p%secondary_bank, p%n_secondary) + end if end if ! If survival biasing is being used, the following subroutine adjusts the @@ -1071,10 +1076,12 @@ contains ! neutrons produced from fission and creates appropriate bank sites. !=============================================================================== - subroutine create_fission_sites(p, i_nuclide, i_reaction) + subroutine create_fission_sites(p, i_nuclide, i_reaction, bank_array, size_bank) type(Particle), intent(inout) :: p integer, intent(in) :: i_nuclide integer, intent(in) :: i_reaction + type(Bank), intent(inout) :: bank_array(:) + integer(8), intent(inout) :: size_bank integer :: nu_d(MAX_DELAYED_GROUPS) ! number of delayed neutrons born integer :: i ! loop index @@ -1124,26 +1131,26 @@ contains end if ! Check for fission bank size getting hit - if (n_bank + nu > size(fission_bank)) then + if (size_bank + nu > size(bank_array)) then if (master) call warning("Maximum number of sites in fission bank & &reached. This can result in irreproducible results using different & &numbers of processes/threads.") end if ! Bank source neutrons - if (nu == 0 .or. n_bank == size(fission_bank)) return + if (nu == 0 .or. size_bank == size(bank_array)) return ! Initialize counter of delayed neutrons encountered for each delayed group ! to zero. nu_d(:) = 0 p % fission = .true. ! Fission neutrons will be banked - do i = int(n_bank,4) + 1, int(min(n_bank + nu, int(size(fission_bank),8)),4) + do i = int(size_bank,4) + 1, int(min(size_bank + nu, int(size(bank_array),8)),4) ! Bank source neutrons by copying particle data - fission_bank(i) % xyz = p % coord(1) % xyz + bank_array(i) % xyz = p % coord(1) % xyz ! Set weight of fission bank site - fission_bank(i) % wgt = ONE/weight + bank_array(i) % wgt = ONE/weight ! Sample cosine of angle -- fission neutrons are always emitted ! isotropically. Sometimes in ACE data, fission reactions actually have @@ -1153,17 +1160,16 @@ contains ! Sample azimuthal angle uniformly in [0,2*pi) phi = TWO*PI*prn() - fission_bank(i) % uvw(1) = mu - fission_bank(i) % uvw(2) = sqrt(ONE - mu*mu) * cos(phi) - fission_bank(i) % uvw(3) = sqrt(ONE - mu*mu) * sin(phi) + bank_array(i) % uvw(1) = mu + bank_array(i) % uvw(2) = sqrt(ONE - mu*mu) * cos(phi) + bank_array(i) % uvw(3) = sqrt(ONE - mu*mu) * sin(phi) ! Sample secondary energy distribution for fission reaction and set energy ! in fission bank - fission_bank(i) % E = sample_fission_energy(nuc, nuc%reactions(& - i_reaction), p) + bank_array(i) % E = sample_fission_energy(nuc, nuc%reactions(i_reaction), p) ! Set the delayed group of the neutron - fission_bank(i) % delayed_group = p % delayed_group + bank_array(i) % delayed_group = p % delayed_group ! Increment the number of neutrons born delayed if (p % delayed_group > 0) then @@ -1172,7 +1178,7 @@ contains end do ! increment number of bank sites - n_bank = min(n_bank + nu, int(size(fission_bank),8)) + size_bank = min(size_bank + nu, int(size(bank_array),8)) ! Store total and delayed weight banked for analog fission tallies p % n_bank = nu From 0e0984a5ff770ce2274ad1d1c5b0c98e8c621e48 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 19 Nov 2015 14:54:52 -0600 Subject: [PATCH 059/149] Check if secondary particle bank limit is reached during subcritical multiplication --- src/physics.F90 | 16 ++++++++++++---- src/tracking.F90 | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/physics.F90 b/src/physics.F90 index 03a4cb6086..c6ecf4fe66 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -1130,11 +1130,19 @@ contains nu = int(nu_t) + 1 end if - ! Check for fission bank size getting hit + ! Check for bank size getting hit. For fixed source calculations, this is a + ! fatal error. For eigenvalue calculations, it just means that k-effective + ! was too high for a single batch. if (size_bank + nu > size(bank_array)) then - if (master) call warning("Maximum number of sites in fission bank & - &reached. This can result in irreproducible results using different & - &numbers of processes/threads.") + if (run_mode == MODE_FIXEDSOURCE) then + call fatal_error("Secondary particle bank size limit reached. If you & + &are running a subcritical multiplication problem, k-effective & + &may be too close to one.") + else + if (master) call warning("Maximum number of sites in fission bank & + &reached. This can result in irreproducible results using different & + &numbers of processes/threads.") + end if end if ! Bank source neutrons diff --git a/src/tracking.F90 b/src/tracking.F90 index 2e4503e139..7cc761055b 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -202,6 +202,7 @@ contains if (p % n_secondary > 0) then call p % initialize_from_source(p % secondary_bank(p % n_secondary)) p % n_secondary = p % n_secondary - 1 + n_event = 0 ! Enter new particle in particle track file if (p % write_track) call add_particle_track() From 2fc95bb5633bda3fe282ed5c13ee4896cd347eb7 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 25 Jan 2016 09:12:55 -0600 Subject: [PATCH 060/149] Include fissionable material in fixed source test --- tests/test_fixed_source/materials.xml | 1 + tests/test_fixed_source/results_true.dat | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/test_fixed_source/materials.xml b/tests/test_fixed_source/materials.xml index 5242021d34..ab7a76bc00 100644 --- a/tests/test_fixed_source/materials.xml +++ b/tests/test_fixed_source/materials.xml @@ -4,6 +4,7 @@ + diff --git a/tests/test_fixed_source/results_true.dat b/tests/test_fixed_source/results_true.dat index 0940301886..b3def050e8 100644 --- a/tests/test_fixed_source/results_true.dat +++ b/tests/test_fixed_source/results_true.dat @@ -1,6 +1,6 @@ tally 1: -4.538791E+02 -2.073271E+04 +4.563929E+02 +2.091711E+04 leakage: -9.830000E+00 -9.663900E+00 +9.780000E+00 +9.566400E+00 From 26c5e5e66b52c2768a6639c52745f2ca8d4e0533 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 29 Jan 2016 17:06:58 -0600 Subject: [PATCH 061/149] Fix spacing around % as pointed out by @wbinventor --- src/physics.F90 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/physics.F90 b/src/physics.F90 index c6ecf4fe66..da2682ebf7 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -94,7 +94,7 @@ contains call create_fission_sites(p, i_nuclide, i_reaction, fission_bank, n_bank) elseif (run_mode == MODE_FIXEDSOURCE) then call create_fission_sites(p, i_nuclide, i_reaction, & - p%secondary_bank, p%n_secondary) + p % secondary_bank, p % n_secondary) end if end if @@ -1174,7 +1174,8 @@ contains ! Sample secondary energy distribution for fission reaction and set energy ! in fission bank - bank_array(i) % E = sample_fission_energy(nuc, nuc%reactions(i_reaction), p) + bank_array(i) % E = sample_fission_energy(nuc, & + nuc % reactions(i_reaction), p) ! Set the delayed group of the neutron bank_array(i) % delayed_group = p % delayed_group From c746d7a9faea3de7641bc4b0a08268fdd66569d6 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 30 Jan 2016 11:44:54 -0500 Subject: [PATCH 062/149] Fixed issue with 3D lattice distribcell offsets --- openmc/summary.py | 1 - openmc/universe.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openmc/summary.py b/openmc/summary.py index eb14d3bb81..29c30c2936 100644 --- a/openmc/summary.py +++ b/openmc/summary.py @@ -368,7 +368,6 @@ class Summary(object): lattice.universes = universes if offsets is not None: - offsets = np.swapaxes(offsets, 0, 2) lattice.offsets = offsets # Add the Lattice to the global dictionary of all Lattices diff --git a/openmc/universe.py b/openmc/universe.py index 237ddce1f7..319acc3302 100644 --- a/openmc/universe.py +++ b/openmc/universe.py @@ -1101,8 +1101,8 @@ class RectLattice(Lattice): # For 3D Lattices else: - offset = self._offsets[i[1]-1, i[2]-1, i[3]-1, distribcell_index-1] - offset += self._universes[i[1]-1][i[2]-1][i[3]-1].get_cell_instance( + offset = self._offsets[i[3]-1, i[2]-1, i[1]-1, distribcell_index-1] + offset += self._universes[i[3]-1][i[2]-1][i[1]-1].get_cell_instance( path, distribcell_index) return offset From 1bd815c52966c9285881d8c6ebca313dcac6c563 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 30 Jan 2016 13:57:06 -0500 Subject: [PATCH 063/149] Fixed distribcell offsets for 2D lattices --- openmc/summary.py | 1 + openmc/universe.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openmc/summary.py b/openmc/summary.py index 29c30c2936..3e10f8edbd 100644 --- a/openmc/summary.py +++ b/openmc/summary.py @@ -367,6 +367,7 @@ class Summary(object): # Set the universes for the lattice lattice.universes = universes + # Set the distribcell offsets for the lattice if offsets is not None: lattice.offsets = offsets diff --git a/openmc/universe.py b/openmc/universe.py index 319acc3302..74c438615c 100644 --- a/openmc/universe.py +++ b/openmc/universe.py @@ -1095,7 +1095,7 @@ class RectLattice(Lattice): # For 2D Lattices if len(self._dimension) == 2: - offset = self._offsets[i[1]-1, i[2]-1, 0, distribcell_index-1] + offset = self._offsets[i[3]-1, i[2]-1, i[1]-1, distribcell_index-1] offset += self._universes[i[1]-1][i[2]-1].get_cell_instance(path, distribcell_index) From fb0e166e1cd78caad2304701c525c528ae05967f Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 30 Jan 2016 15:06:55 -0500 Subject: [PATCH 064/149] Fixed issue with double subdomain-avg MGXS --- openmc/arithmetic.py | 3 ++- openmc/mgxs/library.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index 65e12c5d27..8574c4873e 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -823,7 +823,8 @@ class AggregateFilter(object): """ - if filter_bin not in self.bins: + if filter_bin not in self.bins and \ + filter_bin != self._aggregate_filter.bins: msg = 'Unable to get the bin index for AggregateFilter since ' \ '"{0}" is not one of the bins'.format(filter_bin) raise ValueError(msg) diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py index 4b8d8a9149..e87b4bdaef 100644 --- a/openmc/mgxs/library.py +++ b/openmc/mgxs/library.py @@ -568,8 +568,9 @@ class Library(object): for domain in self.domains: for mgxs_type in self.mgxs_types: mgxs = subdomain_avg_library.get_mgxs(domain, mgxs_type) - avg_mgxs = mgxs.get_subdomain_avg_xs() - subdomain_avg_library.all_mgxs[domain.id][mgxs_type] = avg_mgxs + if mgxs.domain_type == 'distribcell': + avg_mgxs = mgxs.get_subdomain_avg_xs() + subdomain_avg_library.all_mgxs[domain.id][mgxs_type] = avg_mgxs return subdomain_avg_library From cc571091a3709452d3f4ae9dafac5554c4a5df73 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sun, 31 Jan 2016 17:47:21 -0500 Subject: [PATCH 065/149] Hotfix for OpenMC-OpenCG lattice conversions with y index reversal for OpenCG --- openmc/opencg_compatible.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py index 0bda48c160..a5573d9eb4 100644 --- a/openmc/opencg_compatible.py +++ b/openmc/opencg_compatible.py @@ -922,6 +922,9 @@ def get_opencg_lattice(openmc_lattice): universe_id = universes[z][y][x].id universe_array[z][y][x] = unique_universes[universe_id] + # Reverse y-dimension in array to match ordering in OpenCG + universe_array = universe_array[:, ::-1, :] + opencg_lattice = opencg.Lattice(lattice_id, name) opencg_lattice.dimension = dimension opencg_lattice.width = pitch From 55f5fa18a3b0d3e3a94eaa2df3d423dfbea427c9 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 1 Feb 2016 12:58:15 -0600 Subject: [PATCH 066/149] Fix CSS override for RTD documentation builds --- docs/source/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 65db07b25e..6ca551a431 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -154,7 +154,8 @@ html_title = "OpenMC Documentation" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] -html_context = {'css_files': ['_static/theme_overrides.css']} +def setup(app): + app.add_stylesheet('theme_overrides.css') # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. From ec05e52089cdc8506db4d09cfd253381db2959c1 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Mon, 1 Feb 2016 15:56:40 -0500 Subject: [PATCH 067/149] Fixed issue in Pandas DataFrame compatibility with OpenCG lattice indexing --- openmc/filter.py | 4 +++- openmc/opencg_compatible.py | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openmc/filter.py b/openmc/filter.py index a0c777fa07..54814a6b6f 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -673,9 +673,11 @@ class Filter(object): # Assign entry to Lattice Multi-index column else: + # Reverse y index per lattice ordering in OpenCG level_dict[lat_id_key][offset] = coords._lattice._id level_dict[lat_x_key][offset] = coords._lat_x - level_dict[lat_y_key][offset] = coords._lat_y + level_dict[lat_y_key][offset] = \ + coords._lattice.dimension[1] - coords._lat_y - 1 level_dict[lat_z_key][offset] = coords._lat_z # Move to next node in LocalCoords linked list diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py index a5573d9eb4..0bda48c160 100644 --- a/openmc/opencg_compatible.py +++ b/openmc/opencg_compatible.py @@ -922,9 +922,6 @@ def get_opencg_lattice(openmc_lattice): universe_id = universes[z][y][x].id universe_array[z][y][x] = unique_universes[universe_id] - # Reverse y-dimension in array to match ordering in OpenCG - universe_array = universe_array[:, ::-1, :] - opencg_lattice = opencg.Lattice(lattice_id, name) opencg_lattice.dimension = dimension opencg_lattice.width = pitch From e413bf30e5f6437ac3a48f78ede9ed2a834a8050 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Mon, 1 Feb 2016 19:24:43 -0500 Subject: [PATCH 068/149] Fixed issue with discrepancy in indexing of y-dimension in lattice universes and offsets --- openmc/summary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/summary.py b/openmc/summary.py index 3e10f8edbd..d22e367c95 100644 --- a/openmc/summary.py +++ b/openmc/summary.py @@ -369,7 +369,7 @@ class Summary(object): # Set the distribcell offsets for the lattice if offsets is not None: - lattice.offsets = offsets + lattice.offsets = offsets[:, ::-1, :] # Add the Lattice to the global dictionary of all Lattices self.lattices[index] = lattice From a62dc7868f26ffcbcc8fc78129ec760257c6bc15 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Tue, 2 Feb 2016 15:53:27 -0500 Subject: [PATCH 069/149] Added test for distribcell tallies in an asymmetric lattice --- tests/test_asymmetric_lattice/inputs_true.dat | 1 + .../test_asymmetric_lattice/results_true.dat | 1 + .../test_asymmetric_lattice.py | 127 ++++++++++++++++++ 3 files changed, 129 insertions(+) create mode 100644 tests/test_asymmetric_lattice/inputs_true.dat create mode 100644 tests/test_asymmetric_lattice/results_true.dat create mode 100644 tests/test_asymmetric_lattice/test_asymmetric_lattice.py diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat new file mode 100644 index 0000000000..70073c6bd2 --- /dev/null +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -0,0 +1 @@ +dd39c0ae6327e6e74cb077d56e37c112611b95c4c10d96203e672b3e7f928211cc991ec7ebbf9eeadabd968dcdcb651b250233169b62d43ef6994ab9a46cb34a \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/results_true.dat b/tests/test_asymmetric_lattice/results_true.dat new file mode 100644 index 0000000000..d809e6409d --- /dev/null +++ b/tests/test_asymmetric_lattice/results_true.dat @@ -0,0 +1 @@ +7e75ad5b7979e65e52ce564bfbd8fac819013ef8ba35fe184569b452dd9a1ba98d267b6e33d357fdd1c943f201125ff8a4f8601147b87036525870528063dcae \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py new file mode 100644 index 0000000000..7b83a590ef --- /dev/null +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python + +import os +import sys +import glob +import hashlib +sys.path.insert(0, os.pardir) +from testing_harness import PyAPITestHarness +import openmc +from openmc.source import Source +from openmc.stats import Box + + +class AsymmetricLatticeTestHarness(PyAPITestHarness): + + def _build_inputs(self): + """Build an axis-asymmetric lattice of fuel assemblies""" + + # Build full core geometry from underlying input set + self._input_set.build_default_materials_and_geometry() + + # Extract all universes from the full core geometry + geometry = self._input_set.geometry.geometry + all_univs = geometry.get_all_universes() + print(all_univs.keys()) + + # Extract universes encapsulating fuel and water assemblies + water = all_univs[7] + fuel = all_univs[8] + + # Construct a 3x3 lattice of fuel assemblies + core_lat = openmc.RectLattice(name='3x3 Core Lattice', lattice_id=202) + core_lat.dimension = (3, 3) + core_lat.lower_left = (-32.13, -32.13) + core_lat.pitch = (21.42, 21.42) + core_lat.universes = [[fuel, water, water], + [fuel, fuel, fuel], + [water, water, water]] + + # Create bounding surfaces + min_x = openmc.XPlane(x0=-32.13, boundary_type='reflective') + max_x = openmc.XPlane(x0=+32.13, boundary_type='reflective') + min_y = openmc.YPlane(y0=-32.13, boundary_type='reflective') + max_y = openmc.YPlane(y0=+32.13, boundary_type='reflective') + min_z = openmc.ZPlane(z0=0, boundary_type='reflective') + max_z = openmc.ZPlane(z0=+32.13, boundary_type='reflective') + + # Define root universe + root_univ = openmc.Universe(universe_id=0, name='root universe') + root_cell = openmc.Cell(cell_id=1) + root_cell.region = +min_x & -max_x & +min_y & -max_y & +min_z & -max_z + root_cell.fill = core_lat + root_univ.add_cell(root_cell) + + # Over-ride geometry in the input set with this 3x3 lattice + self._input_set.geometry.geometry.root_universe = root_univ + + # Initialize a "distribcell" filter for the cold fuel pin cell + distrib_filter = openmc.Filter(type='distribcell', bins=[27]) + + # Initialize the tallies + tally = openmc.Tally(name='distribcell tally', tally_id=27) + tally.add_filter(distrib_filter) + tally.add_score('nu-fission') + + # Initialize the tallies file + tallies_file = openmc.TalliesFile() + tallies_file.add_tally(tally) + + # Assign the tallies file to the input set + self._input_set.tallies = tallies_file + + # Specify summary output and correct source sampling box + self._input_set.build_default_settings() + self._input_set.settings.output = {'summary': True} + self._input_set.settings.source = Source(space=Box( + [0, 0, 0], [32.13, 32.13, 32.13])) + + # Write input XML files + self._input_set.export() + + def _get_results(self, hash_output=True): + """Digest info in statepoint and summary and return as a string.""" + + # Read the statepoint file + statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name))[0] + sp = openmc.StatePoint(statepoint) + + # Read the summary file + summary = glob.glob(os.path.join(os.getcwd(), 'summary.h5'))[0] + su = openmc.Summary(summary) + sp.link_with_summary(su) + + # Extract the tally of interest + tally = sp.get_tally(name='distribcell tally') + + # Create a string of all mean, std. dev. values for both tallies + outstr = '' + outstr += ', '.join(map(str, tally.mean.flatten())) + '\n' + outstr += ', '.join(map(str, tally.std_dev.flatten())) + '\n' + + # Extract fuel assembly lattices from the summary + all_cells = su.openmc_geometry.get_all_cells() + fuel = all_cells[80].fill + core = all_cells[1].fill + + # Append a string of lattice distribcell offsets to the string + outstr += ', '.join(map(str, fuel.offsets.flatten())) + '\n' + outstr += ', '.join(map(str, core.offsets.flatten())) + '\n' + + # Hash the results if necessary + if hash_output: + sha512 = hashlib.sha512() + sha512.update(outstr.encode('utf-8')) + outstr = sha512.hexdigest() + + return outstr + + def _cleanup(self): + super(AsymmetricLatticeTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + + +if __name__ == '__main__': + harness = AsymmetricLatticeTestHarness('statepoint.10.h5', True) + harness.main() From 63744db9097e6d59ab9c9fdd357d398bcbcbb8ae Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 3 Feb 2016 10:36:16 -0500 Subject: [PATCH 070/149] Fixing bugs, partially there --- src/ace.F90 | 8 +++-- src/distribution_multivariate.F90 | 6 ++-- src/distribution_univariate.F90 | 10 +++--- src/energy_distribution.F90 | 2 +- src/interpolation.F90 | 6 ++-- src/nuclide_header.F90 | 42 +++++++++-------------- src/output.F90 | 2 +- src/physics.F90 | 4 +-- src/physics_common.F90 | 53 ----------------------------- src/physics_mg.F90 | 6 +--- src/sab_header.F90 | 43 ++++++++++++------------ src/spectra.F90 | 56 ++++++++++++++++++++++++++++++- 12 files changed, 113 insertions(+), 125 deletions(-) diff --git a/src/ace.F90 b/src/ace.F90 index a92d8b8c5a..57564f0b91 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -1,6 +1,6 @@ module ace - use ace_header, only: Nuclide, Reaction, SAlphaBeta, XsListing + use ace_header, only: Reaction use constants use distribution_univariate, only: Uniform, Equiprobable, Tabular use endf, only: is_fission, is_disappearance @@ -11,13 +11,15 @@ module ace use global use list_header, only: ListInt use material_header, only: Material + use nuclide_header use output, only: write_message + use sab_header use set_header, only: SetChar use secondary_header, only: AngleEnergy use secondary_correlated, only: CorrelatedAngleEnergy use secondary_kalbach, only: KalbachMann use secondary_uncorrelated, only: UncorrelatedAngleEnergy - use string, only: to_str, to_lower + use simple_string, only: to_str, to_lower implicit none @@ -1472,7 +1474,7 @@ contains !=============================================================================== subroutine generate_nu_fission(nuc) - type(Nuclide), intent(inout) :: nuc + type(Nuclide_CE), intent(inout) :: nuc integer :: i ! index on nuclide energy grid real(8) :: E ! energy diff --git a/src/distribution_multivariate.F90 b/src/distribution_multivariate.F90 index c288c40c19..e7be36db84 100644 --- a/src/distribution_multivariate.F90 +++ b/src/distribution_multivariate.F90 @@ -1,9 +1,9 @@ module distribution_multivariate - use constants, only: ONE, TWO, PI + use constants, only: ONE, TWO, PI use distribution_univariate, only: Distribution - use math, only: rotate_angle - use random_lcg, only: prn + use random_lcg, only: prn + use spectra, only: rotate_angle implicit none diff --git a/src/distribution_univariate.F90 b/src/distribution_univariate.F90 index f596536d0b..274c6b1155 100644 --- a/src/distribution_univariate.F90 +++ b/src/distribution_univariate.F90 @@ -1,11 +1,11 @@ module distribution_univariate - use constants, only: ZERO, ONE, HALF, HISTOGRAM, LINEAR_LINEAR, & + use constants, only: ZERO, ONE, HALF, HISTOGRAM, LINEAR_LINEAR, & MAX_LINE_LEN, MAX_WORD_LEN - use error, only: fatal_error - use math, only: maxwell_spectrum, watt_spectrum - use random_lcg, only: prn - use string, only: to_lower + use error, only: fatal_error + use random_lcg, only: prn + use spectra, only: maxwell_spectrum, watt_spectrum + use simple_string, only: to_lower use xml_interface implicit none diff --git a/src/energy_distribution.F90 b/src/energy_distribution.F90 index db3dcc4411..7d136ab10e 100644 --- a/src/energy_distribution.F90 +++ b/src/energy_distribution.F90 @@ -3,9 +3,9 @@ module energy_distribution use constants, only: ZERO, ONE, TWO, PI, HISTOGRAM, LINEAR_LINEAR use endf_header, only: Tab1 use interpolation, only: interpolate_tab1 - use math, only: maxwell_spectrum, watt_spectrum use random_lcg, only: prn use search, only: binary_search + use spectra, only: maxwell_spectrum, watt_spectrum !=============================================================================== ! ENERGYDISTRIBUTION (abstract) defines an energy distribution that is a diff --git a/src/interpolation.F90 b/src/interpolation.F90 index 5f87870677..49d3de7fe8 100644 --- a/src/interpolation.F90 +++ b/src/interpolation.F90 @@ -1,9 +1,9 @@ module interpolation use constants - use endf_header, only: Tab1 - use search, only: binary_search - use string, only: to_str + use endf_header, only: Tab1 + use search, only: binary_search + use simple_string, only: to_str implicit none diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index a632f0fc13..72e1a4dc66 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -94,7 +94,7 @@ module nuclide_header integer :: n_precursor ! # of delayed neutron precursors real(8), allocatable :: nu_d_data(:) real(8), allocatable :: nu_d_precursor_data(:) - type(DistEnergy), pointer :: nu_d_edist(:) => null() + type(AngleEnergyContainer), allocatable :: nu_d_edist(:) ! Unresolved resonance data logical :: urr_present @@ -308,16 +308,7 @@ module nuclide_header integer :: i ! Loop counter - if (associated(this % nu_d_edist)) then - do i = 1, size(this % nu_d_edist) - call this % nu_d_edist(i) % clear() - end do - deallocate(this % nu_d_edist) - end if - - if (associated(this % urr_data)) then - deallocate(this % urr_data) - end if + if (associated(this % urr_data)) deallocate(this % urr_data) if (allocated(this % reactions)) then do i = 1, size(this % reactions) @@ -389,7 +380,6 @@ module nuclide_header subroutine nuclide_ce_print(this, unit) class(Nuclide_CE), intent(in) :: this - type(Nuclide), intent(in) :: nuc integer, intent(in), optional :: unit integer :: i ! loop index over nuclides @@ -410,36 +400,36 @@ module nuclide_header size_xs = 0 ! Basic nuclide information - write(unit_,*) 'Nuclide ' // trim(nuc % name) - write(unit_,*) ' zaid = ' // trim(to_str(nuc % zaid)) - write(unit_,*) ' awr = ' // trim(to_str(nuc % awr)) - write(unit_,*) ' kT = ' // trim(to_str(nuc % kT)) - write(unit_,*) ' # of grid points = ' // trim(to_str(nuc % n_grid)) - write(unit_,*) ' Fissionable = ', nuc % fissionable - write(unit_,*) ' # of fission reactions = ' // trim(to_str(nuc % n_fission)) - write(unit_,*) ' # of reactions = ' // trim(to_str(nuc % n_reaction)) + write(unit_,*) 'Nuclide ' // trim(this % name) + write(unit_,*) ' zaid = ' // trim(to_str(this % zaid)) + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + write(unit_,*) ' kT = ' // trim(to_str(this % kT)) + write(unit_,*) ' # of grid points = ' // trim(to_str(this % n_grid)) + write(unit_,*) ' Fissionable = ', this % fissionable + write(unit_,*) ' # of fission reactions = ' // trim(to_str(this % n_fission)) + write(unit_,*) ' # of reactions = ' // trim(to_str(this % n_reaction)) ! Information on each reaction write(unit_,*) ' Reaction Q-value COM IE' - do i = 1, nuc % n_reaction - associate (rxn => nuc % reactions(i)) + do i = 1, this % n_reaction + associate (rxn => this % reactions(i)) write(unit_,'(3X,A11,1X,F8.3,3X,L1,3X,I6)') & reaction_name(rxn % MT), rxn % Q_value, rxn % scatter_in_cm, & rxn % threshold ! Accumulate data size - size_xs = size_xs + (nuc % n_grid - rxn%threshold + 1) * 8 + size_xs = size_xs + (this % n_grid - rxn%threshold + 1) * 8 end associate end do ! Add memory required for summary reactions (total, absorption, fission, ! nu-fission) - size_xs = 8 * nuc % n_grid * 4 + size_xs = 8 * this % n_grid * 4 ! Write information about URR probability tables size_urr = 0 - if (nuc % urr_present) then - urr => nuc % urr_data + if (this % urr_present) then + urr => this % urr_data write(unit_,*) ' Unresolved resonance probability table:' write(unit_,*) ' # of energies = ' // trim(to_str(urr % n_energy)) write(unit_,*) ' # of probabilities = ' // trim(to_str(urr % n_prob)) diff --git a/src/output.F90 b/src/output.F90 index 826bff10cb..5379555ff0 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -2,7 +2,7 @@ module output use, intrinsic :: ISO_FORTRAN_ENV - use ace_header, only: Nuclide, Reaction, UrrData + use ace_header, only: Reaction, UrrData use constants use endf, only: reaction_name use error, only: fatal_error, warning diff --git a/src/physics.F90 b/src/physics.F90 index 9afd6146e4..2212269209 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -1,6 +1,6 @@ module physics - use ace_header, only: Reaction, DistEnergy + use ace_header, only: Reaction use constants use cross_section, only: elastic_xs_0K use endf, only: reaction_name @@ -1343,7 +1343,7 @@ contains p % wgt = yield * p % wgt else do i = 1, rxn % multiplicity - 1 - call p % create_secondary(p % coord(1) % uvw, NEUTRON) + call p % create_secondary(p % coord(1) % uvw, NEUTRON, run_CE=.True.) end do end if diff --git a/src/physics_common.F90 b/src/physics_common.F90 index 9fa45d324b..98d240c077 100644 --- a/src/physics_common.F90 +++ b/src/physics_common.F90 @@ -30,57 +30,4 @@ contains end subroutine russian_roulette -!=============================================================================== -! ROTATE_ANGLE rotates direction cosines through a polar angle whose cosine is -! mu and through an azimuthal angle sampled uniformly. Note that this is done -! with direct sampling rather than rejection as is done in MCNP and SERPENT. -!=============================================================================== - - function rotate_angle(uvw0, mu, phi) result(uvw) - real(8), intent(in) :: uvw0(3) ! directional cosine - real(8), intent(in) :: mu ! cosine of angle in lab or CM - real(8), optional :: phi ! azimuthal angle - real(8) :: uvw(3) ! rotated directional cosine - - real(8) :: phi_ ! azimuthal angle - real(8) :: sinphi ! sine of azimuthal angle - real(8) :: cosphi ! cosine of azimuthal angle - real(8) :: a ! sqrt(1 - mu^2) - real(8) :: b ! sqrt(1 - w^2) - real(8) :: u0 ! original cosine in x direction - real(8) :: v0 ! original cosine in y direction - real(8) :: w0 ! original cosine in z direction - - ! Copy original directional cosines - u0 = uvw0(1) - v0 = uvw0(2) - w0 = uvw0(3) - - ! Sample azimuthal angle in [0,2pi) if none provided - if (present(phi)) then - phi_ = phi - else - phi_ = TWO * PI * prn() - end if - - ! Precompute factors to save flops - sinphi = sin(phi_) - cosphi = cos(phi_) - a = sqrt(max(ZERO, ONE - mu*mu)) - b = sqrt(max(ZERO, ONE - w0*w0)) - - ! Need to treat special case where sqrt(1 - w**2) is close to zero by - ! expanding about the v component rather than the w component - if (b > 1e-10) then - uvw(1) = mu*u0 + a*(u0*w0*cosphi - v0*sinphi)/b - uvw(2) = mu*v0 + a*(v0*w0*cosphi + u0*sinphi)/b - uvw(3) = mu*w0 - a*b*cosphi - else - b = sqrt(ONE - v0*v0) - uvw(1) = mu*u0 + a*(u0*v0*cosphi + w0*sinphi)/b - uvw(2) = mu*v0 - a*b*cosphi - uvw(3) = mu*w0 + a*(v0*w0*cosphi - u0*sinphi)/b - end if - - end function rotate_angle end module physics_common diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 5d6167d788..a5272e1f47 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -16,6 +16,7 @@ module physics_mg use random_lcg, only: prn use scattdata_header use simple_string, only: to_str + use spectra, only: rotate_angle implicit none @@ -71,7 +72,6 @@ contains ! absorption (including fission) if (mat % fissionable) then - call sample_fission(i_nuclide, i_reaction) if (run_mode == MODE_EIGENVALUE) then call create_fission_sites(p, fission_bank, n_bank) elseif (run_mode == MODE_FIXEDSOURCE) then @@ -234,10 +234,6 @@ contains ! Bank source neutrons if (nu == 0 .or. size_bank == size(bank_array)) return - ! Initialize counter of delayed neutrons encountered for each delayed group - ! to zero. - nu_d(:) = 0 - p % fission = .true. ! Fission neutrons will be banked do i = int(size_bank,4) + 1, int(min(size_bank + nu, int(size(bank_array),8)),4) ! Bank source neutrons by copying particle data diff --git a/src/sab_header.F90 b/src/sab_header.F90 index b303fee688..a2d70d4f21 100644 --- a/src/sab_header.F90 +++ b/src/sab_header.F90 @@ -66,19 +66,18 @@ module sab_header contains - !=============================================================================== ! PRINT_SAB_TABLE displays information about a S(a,b) table containing data ! describing thermal scattering from bound materials such as hydrogen in water. !=============================================================================== subroutine print_sab_table(this, unit) - type(SAlphaBeta), intent(in) :: sab + class(SAlphaBeta), intent(in) :: this integer, intent(in), optional :: unit integer :: size_sab ! memory used by S(a,b) table integer :: unit_ ! unit to write to - integer :: i ! Loop counter for parsing through sab % zaid + integer :: i ! Loop counter for parsing through this % zaid integer :: char_count ! Counter for the number of characters on a line ! set default unit for writing information @@ -89,11 +88,11 @@ module sab_header end if ! Basic S(a,b) table information - write(unit_,*) 'S(a,b) Table ' // trim(sab % name) + write(unit_,*) 'S(a,b) Table ' // trim(this % name) write(unit_,'(A)',advance="no") ' zaids = ' ! Initialize the counter based on the above string char_count = 11 - do i = 1, sab % n_zaid + do i = 1, this % n_zaid ! Deal with a line thats too long if (char_count >= 73) then ! 73 = 80 - (5 ZAID chars + 1 space + 1 comma) ! End the line @@ -103,44 +102,44 @@ module sab_header ! reset the counter to 11 char_count = 11 end if - if (i < sab % n_zaid) then + if (i < this % n_zaid) then ! Include a comma - write(unit_,'(A)',advance="no") trim(to_str(sab % zaid(i))) // ", " - char_count = char_count + len(trim(to_str(sab % zaid(i)))) + 2 + write(unit_,'(A)',advance="no") trim(to_str(this % zaid(i))) // ", " + char_count = char_count + len(trim(to_str(this % zaid(i)))) + 2 else ! Don't include a comma, since we are all done - write(unit_,'(A)',advance="no") trim(to_str(sab % zaid(i))) + write(unit_,'(A)',advance="no") trim(to_str(this % zaid(i))) end if end do write(unit_,*) "" ! Move to next line - write(unit_,*) ' awr = ' // trim(to_str(sab % awr)) - write(unit_,*) ' kT = ' // trim(to_str(sab % kT)) + write(unit_,*) ' awr = ' // trim(to_str(this % awr)) + write(unit_,*) ' kT = ' // trim(to_str(this % kT)) ! Inelastic data write(unit_,*) ' # of Incoming Energies (Inelastic) = ' // & - trim(to_str(sab % n_inelastic_e_in)) + trim(to_str(this % n_inelastic_e_in)) write(unit_,*) ' # of Outgoing Energies (Inelastic) = ' // & - trim(to_str(sab % n_inelastic_e_out)) + trim(to_str(this % n_inelastic_e_out)) write(unit_,*) ' # of Outgoing Angles (Inelastic) = ' // & - trim(to_str(sab % n_inelastic_mu)) + trim(to_str(this % n_inelastic_mu)) write(unit_,*) ' Threshold for Inelastic = ' // & - trim(to_str(sab % threshold_inelastic)) + trim(to_str(this % threshold_inelastic)) ! Elastic data - if (sab % n_elastic_e_in > 0) then + if (this % n_elastic_e_in > 0) then write(unit_,*) ' # of Incoming Energies (Elastic) = ' // & - trim(to_str(sab % n_elastic_e_in)) + trim(to_str(this % n_elastic_e_in)) write(unit_,*) ' # of Outgoing Angles (Elastic) = ' // & - trim(to_str(sab % n_elastic_mu)) + trim(to_str(this % n_elastic_mu)) write(unit_,*) ' Threshold for Elastic = ' // & - trim(to_str(sab % threshold_elastic)) + trim(to_str(this % threshold_elastic)) end if ! Determine memory used by S(a,b) table and write out - size_sab = 8 * (sab % n_inelastic_e_in * (2 + sab % n_inelastic_e_out * & - (1 + sab % n_inelastic_mu)) + sab % n_elastic_e_in * & - (2 + sab % n_elastic_mu)) + size_sab = 8 * (this % n_inelastic_e_in * (2 + this % n_inelastic_e_out * & + (1 + this % n_inelastic_mu)) + this % n_elastic_e_in * & + (2 + this % n_elastic_mu)) write(unit_,*) ' Memory Used = ' // trim(to_str(size_sab)) // ' bytes' ! Blank line at end diff --git a/src/spectra.F90 b/src/spectra.F90 index acdde78206..7f96bb69e5 100644 --- a/src/spectra.F90 +++ b/src/spectra.F90 @@ -1,6 +1,6 @@ module spectra -use constants, only: ONE, TWO, PI +use constants, only: ZERO, ONE, TWO, PI use random_lcg, only: prn implicit none @@ -55,4 +55,58 @@ contains end function watt_spectrum +!=============================================================================== +! ROTATE_ANGLE rotates direction cosines through a polar angle whose cosine is +! mu and through an azimuthal angle sampled uniformly. Note that this is done +! with direct sampling rather than rejection as is done in MCNP and SERPENT. +!=============================================================================== + + function rotate_angle(uvw0, mu, phi) result(uvw) + real(8), intent(in) :: uvw0(3) ! directional cosine + real(8), intent(in) :: mu ! cosine of angle in lab or CM + real(8), optional :: phi ! azimuthal angle + real(8) :: uvw(3) ! rotated directional cosine + + real(8) :: phi_ ! azimuthal angle + real(8) :: sinphi ! sine of azimuthal angle + real(8) :: cosphi ! cosine of azimuthal angle + real(8) :: a ! sqrt(1 - mu^2) + real(8) :: b ! sqrt(1 - w^2) + real(8) :: u0 ! original cosine in x direction + real(8) :: v0 ! original cosine in y direction + real(8) :: w0 ! original cosine in z direction + + ! Copy original directional cosines + u0 = uvw0(1) + v0 = uvw0(2) + w0 = uvw0(3) + + ! Sample azimuthal angle in [0,2pi) if none provided + if (present(phi)) then + phi_ = phi + else + phi_ = TWO * PI * prn() + end if + + ! Precompute factors to save flops + sinphi = sin(phi_) + cosphi = cos(phi_) + a = sqrt(max(ZERO, ONE - mu*mu)) + b = sqrt(max(ZERO, ONE - w0*w0)) + + ! Need to treat special case where sqrt(1 - w**2) is close to zero by + ! expanding about the v component rather than the w component + if (b > 1e-10) then + uvw(1) = mu*u0 + a*(u0*w0*cosphi - v0*sinphi)/b + uvw(2) = mu*v0 + a*(v0*w0*cosphi + u0*sinphi)/b + uvw(3) = mu*w0 - a*b*cosphi + else + b = sqrt(ONE - v0*v0) + uvw(1) = mu*u0 + a*(u0*v0*cosphi + w0*sinphi)/b + uvw(2) = mu*v0 - a*b*cosphi + uvw(3) = mu*w0 + a*(v0*w0*cosphi - u0*sinphi)/b + end if + + end function rotate_angle + end module spectra \ No newline at end of file From f83d6344ca79ff4aa0a155a74f81ad392b11bc4e Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 3 Feb 2016 10:42:24 -0500 Subject: [PATCH 071/149] Wow. I think I survived that merge... that was brutal --- src/constants.F90 | 4 ++-- src/input_xml.F90 | 15 --------------- src/mgxs_data.F90 | 18 +++++++++--------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/constants.F90 b/src/constants.F90 index 6d4d2a0d54..0c208e6d34 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -214,8 +214,8 @@ module constants ! MGXS Table Types integer, parameter :: & - ISOTROPIC = 1, & ! Isotropically Weighted Data - ANGLE = 2 ! Data by Angular Bins + MGXS_ISOTROPIC = 1, & ! Isotropically Weighted Data + MGXS_ANGLE = 2 ! Data by Angular Bins ! Fission neutron emission (nu) type integer, parameter :: & diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 81e5896306..fde77f498e 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -428,22 +428,7 @@ contains &// "' does not exist!") end if - ! Read parameters for spatial distribution - if (n < coeffs_reqd) then - call fatal_error("Not enough parameters specified for spatial & - &distribution of external source.") - elseif (n > coeffs_reqd) then - call fatal_error("Too many parameters specified for spatial & - &distribution of external source.") - elseif (n > 0) then - allocate(external_source % params_space(n)) - call get_node_array(node_dist, "parameters", & - external_source % params_space) - end if else - call fatal_error("No spatial distribution specified for external & - &source.") - end if ! Spatial distribution for external source if (check_for_node(node_source, "space")) then diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 8109087363..f48238afa9 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -106,22 +106,22 @@ contains call get_node_value(node_xsdata, "representation", temp_str) temp_str = trim(to_lower(temp_str)) if (temp_str == 'isotropic' .or. temp_str == 'iso') then - representation = ISOTROPIC + representation = MGXS_ISOTROPIC else if (temp_str == 'angle') then - representation = ANGLE + representation = MGXS_ANGLE else call fatal_error("Invalid Data Representation!") end if else ! Default to isotropic representation - representation = ISOTROPIC + representation = MGXS_ISOTROPIC end if ! Now allocate accordingly select case(representation) - case(ISOTROPIC) + case(MGXS_ISOTROPIC) allocate(Nuclide_Iso :: nuclides_MG(i_nuclide) % obj) - case(ANGLE) + case(MGXS_ANGLE) allocate(Nuclide_Angle :: nuclides_MG(i_nuclide) % obj) end select @@ -677,17 +677,17 @@ contains legendre_mu_points = nuclides_MG(mat % nuclide(1)) % obj % legendre_mu_points select type(nuc => nuclides_MG(mat % nuclide(1)) % obj) type is (Nuclide_Iso) - representation = ISOTROPIC + representation = MGXS_ISOTROPIC type is (Nuclide_Angle) - representation = ANGLE + representation = MGXS_ANGLE end select scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type ! Now allocate accordingly select case(representation) - case(ISOTROPIC) + case(MGXS_ISOTROPIC) allocate(MacroXS_Iso :: macro_xs(i_mat) % obj) - case(ANGLE) + case(MGXS_ANGLE) allocate(MacroXS_Angle :: macro_xs(i_mat) % obj) end select From dd18376d3f8de550ff2c0e74ea8fd7d8ee301cf9 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 3 Feb 2016 11:18:50 -0500 Subject: [PATCH 072/149] Made source only fissionable for asymmetric lattice test --- openmc/tallies.py | 2 +- tests/test_asymmetric_lattice/inputs_true.dat | 2 +- tests/test_asymmetric_lattice/results_true.dat | 2 +- .../test_asymmetric_lattice.py | 12 +++++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/openmc/tallies.py b/openmc/tallies.py index 3c4d99c730..3294a1d062 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -2748,7 +2748,7 @@ class Tally(object): bin_indices.append(bin_index) num_bins += 1 - find_filter.bins = set(find_filter.bins[bin_indices]) + find_filter.bins = np.unique(find_filter.bins[bin_indices]) find_filter.num_bins = num_bins # Update the new tally's filter strides diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat index 70073c6bd2..552c8d039e 100644 --- a/tests/test_asymmetric_lattice/inputs_true.dat +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -1 +1 @@ -dd39c0ae6327e6e74cb077d56e37c112611b95c4c10d96203e672b3e7f928211cc991ec7ebbf9eeadabd968dcdcb651b250233169b62d43ef6994ab9a46cb34a \ No newline at end of file +fe07eb28fd0dbb56edaecd510f5e8e4db7271e5c9aecf3d880cce92b69872a0aacf825b8e88cd2e9b1ff709f578b269b1835f53cf2561a390062e1e7e03b5276 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/results_true.dat b/tests/test_asymmetric_lattice/results_true.dat index d809e6409d..0cf2315ea4 100644 --- a/tests/test_asymmetric_lattice/results_true.dat +++ b/tests/test_asymmetric_lattice/results_true.dat @@ -1 +1 @@ -7e75ad5b7979e65e52ce564bfbd8fac819013ef8ba35fe184569b452dd9a1ba98d267b6e33d357fdd1c943f201125ff8a4f8601147b87036525870528063dcae \ No newline at end of file +cea61172ecad5554ef86f52d6adad6ad5e21931cf3d67feb37b8bf9d75e618786f638685e458051d4a39afe1a924fd651cf6674a88cf1f1842fd69cd851e1f17 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index 7b83a590ef..3b9e2029b2 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -22,7 +22,6 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Extract all universes from the full core geometry geometry = self._input_set.geometry.geometry all_univs = geometry.get_all_universes() - print(all_univs.keys()) # Extract universes encapsulating fuel and water assemblies water = all_univs[7] @@ -55,7 +54,7 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Over-ride geometry in the input set with this 3x3 lattice self._input_set.geometry.geometry.root_universe = root_univ - # Initialize a "distribcell" filter for the cold fuel pin cell + # Initialize a "distribcell" filter for the fuel pin cell distrib_filter = openmc.Filter(type='distribcell', bins=[27]) # Initialize the tallies @@ -70,11 +69,14 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Assign the tallies file to the input set self._input_set.tallies = tallies_file - # Specify summary output and correct source sampling box + self._input_set.build_default_settings() + + # Specify summary output and correct source sampling box + source = Source(space=Box([-32, -32, 0], [32, 32, 32])) + source.only_fissionable = True + self._input_set.settings.source = source self._input_set.settings.output = {'summary': True} - self._input_set.settings.source = Source(space=Box( - [0, 0, 0], [32.13, 32.13, 32.13])) # Write input XML files self._input_set.export() From 1aa80bbac86be7f1e13072e82caaec836a71aa89 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 3 Feb 2016 13:00:55 -0500 Subject: [PATCH 073/149] I think I fixed the failing tests. Travis, do your thing --- openmc/settings.py | 2 ++ tests/input_set.py | 3 ++- tests/test_mg_basic/inputs_true.dat | 2 +- tests/test_mg_max_order/inputs_true.dat | 2 +- tests/test_mg_max_order/test_mg_max_order.py | 8 ++++---- tests/test_mg_nuclide/inputs_true.dat | 2 +- tests/test_mg_nuclide/test_mg_nuclide.py | 2 +- tests/test_mg_tallies/inputs_true.dat | 2 +- tests/testing_harness.py | 2 +- 9 files changed, 14 insertions(+), 11 deletions(-) diff --git a/openmc/settings.py b/openmc/settings.py index 2e4a3f3ce8..2777e8cc14 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -1063,6 +1063,8 @@ class SettingsFile(object): self._create_confidence_intervals() self._create_cross_sections_subelement() self._create_energy_grid_subelement() + self._create_energy_mode_subelement() + self._create_max_order_subelement() self._create_ptables_subelement() self._create_run_cmfd_subelement() self._create_seed_subelement() diff --git a/tests/input_set.py b/tests/input_set.py index 956fa81ce1..daff38ba1e 100644 --- a/tests/input_set.py +++ b/tests/input_set.py @@ -641,7 +641,8 @@ class MGInputSet(InputSet): self.settings.batches = 10 self.settings.inactive = 5 self.settings.particles = 100 - self.settings.set_source_space('box', (0.0, 0.0, 0.0, 10.0, 10.0, 2.0)) + self.settings.source = Source(space=Box([0.0, 0.0, 0.0], + [10.0, 10.0, 2.0])) self.settings.energy_mode = "multi-group" self.settings.cross_sections = "../1d_mgxs.xml" diff --git a/tests/test_mg_basic/inputs_true.dat b/tests/test_mg_basic/inputs_true.dat index 549172b1a9..fdbdb1c968 100644 --- a/tests/test_mg_basic/inputs_true.dat +++ b/tests/test_mg_basic/inputs_true.dat @@ -1 +1 @@ -be47096ff6382e07c58c67870eb1c77402c961ee8cb9a4671b52627f6432fe282403e70f5825c90764758fcabe5a480653a961e24d7a0349929283848e79667d \ No newline at end of file +04b4a5099f0097bbe02983c67dea691d0d0d4ece7fb7c264b9b2c29955baa9e870b6fa999480da08ead1e5a0c078ae33ce1b0a5c8594ad465aedf9bf3933e104 \ No newline at end of file diff --git a/tests/test_mg_max_order/inputs_true.dat b/tests/test_mg_max_order/inputs_true.dat index 3529d50921..1ad336e195 100644 --- a/tests/test_mg_max_order/inputs_true.dat +++ b/tests/test_mg_max_order/inputs_true.dat @@ -1 +1 @@ -7bd8b00b5aaad3913e0022269cf6ef92dfd0051bd79fb136838ea5a65d322d9711b454e62ef03dcf2b9dd75e31a4febcc633f968d7d07dcb6da2e0d36daf45db \ No newline at end of file +abe20c626d613e73ccb1a3f8468ad1b9aecca528afa9e8131a411d754eb86b8ab64a6fb1fdc9c0b8b8158ff7c82f548de5912041bf035aa5a2d4532cfe0c9510 \ No newline at end of file diff --git a/tests/test_mg_max_order/test_mg_max_order.py b/tests/test_mg_max_order/test_mg_max_order.py index 423f068f71..2f5ee4e4e6 100644 --- a/tests/test_mg_max_order/test_mg_max_order.py +++ b/tests/test_mg_max_order/test_mg_max_order.py @@ -70,16 +70,16 @@ class MGNuclideInputSet(MGInputSet): self.geometry.geometry = geometry -class MGNuclideTestHarness(PyAPITestHarness): +class MGMaxOrderTestHarness(PyAPITestHarness): def __init__(self, statepoint_name, tallies_present, mg=False): - TestHarness.__init__(self, statepoint_name, tallies_present) + PyAPITestHarness.__init__(self, statepoint_name, tallies_present) self._input_set = MGNuclideInputSet() def _build_inputs(self): - super(MGNuclideTestHarness, self)._build_inputs() + super(MGMaxOrderTestHarness, self)._build_inputs() # Set P1 scattering self._input_set.settings.max_order = 1 if __name__ == '__main__': - harness = MGNuclideTestHarness('statepoint.10.*', False, mg=True) + harness = MGMaxOrderTestHarness('statepoint.10.*', False, mg=True) harness.main() diff --git a/tests/test_mg_nuclide/inputs_true.dat b/tests/test_mg_nuclide/inputs_true.dat index ea61b92221..eb643bbaf4 100644 --- a/tests/test_mg_nuclide/inputs_true.dat +++ b/tests/test_mg_nuclide/inputs_true.dat @@ -1 +1 @@ -f3d614294177f34186bf0d439330d144438ac6a2402af9b5433efb7bf6a311043140c487c86f4d3cae9d51742f5042823d224c9da6365da6c8972b44edb7fb71 \ No newline at end of file +c9f9e7211bfb2af58130bedfd64592d093b7bfa424953eba433ecf08940595a96b8de7a892f12d1ab465cebd8e5dd784114c1b1299b534ed329df92752c9ed1f \ No newline at end of file diff --git a/tests/test_mg_nuclide/test_mg_nuclide.py b/tests/test_mg_nuclide/test_mg_nuclide.py index 736473bd9f..deb784bad9 100644 --- a/tests/test_mg_nuclide/test_mg_nuclide.py +++ b/tests/test_mg_nuclide/test_mg_nuclide.py @@ -71,7 +71,7 @@ class MGNuclideInputSet(MGInputSet): class MGNuclideTestHarness(PyAPITestHarness): def __init__(self, statepoint_name, tallies_present, mg=False): - TestHarness.__init__(self, statepoint_name, tallies_present) + PyAPITestHarness.__init__(self, statepoint_name, tallies_present) self._input_set = MGNuclideInputSet() def _build_inputs(self): diff --git a/tests/test_mg_tallies/inputs_true.dat b/tests/test_mg_tallies/inputs_true.dat index 063b36923d..304d2e8880 100644 --- a/tests/test_mg_tallies/inputs_true.dat +++ b/tests/test_mg_tallies/inputs_true.dat @@ -1 +1 @@ -dcde495bd5d0ace409154be3529ae91d454e92f7060e38f00bc0880350d53c889b87edcfd481e6c8bcec2450bdf780e6fdc52240978eb1c67a6ef290ad85442d \ No newline at end of file +ca8490e0e4549fed727ddc75b6d92cfe5162e11b905218a0afaa3ce2ee0763e2ff38074de27aaa678818624f49c5823650475dfa8f66f502a98fc03145399c0d \ No newline at end of file diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 78e6e1076d..7d6dbc914f 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -244,7 +244,7 @@ class ParticleRestartTestHarness(TestHarness): class PyAPITestHarness(TestHarness): def __init__(self, statepoint_name, tallies_present=False, mg=False): - super(PyAPITestHarness, self).__init__(statepoint_name, tallies_present) + super(PyAPITestHarness, self).__init__(statepoint_name, tallies_present) self.parser.add_option('--build-inputs', dest='build_only', action='store_true', default=False) if mg: From 89910d71fd75dcd7013837df7369752fbfef47f1 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 3 Feb 2016 13:20:01 -0500 Subject: [PATCH 074/149] Removed need for simple string, merged back in with string --- src/ace.F90 | 2 +- src/cmfd_data.F90 | 30 ++-- src/cmfd_execute.F90 | 22 +-- src/cmfd_input.F90 | 6 +- src/distribution_univariate.F90 | 10 +- src/eigenvalue.F90 | 16 +- src/endf.F90 | 2 +- src/geometry.F90 | 2 +- src/initialize.F90 | 49 +++-- src/input_xml.F90 | 4 +- src/interpolation.F90 | 6 +- src/mgxs_data.F90 | 10 +- src/nuclide_header.F90 | 3 +- src/output.F90 | 2 +- src/particle_restart_write.F90 | 6 +- src/physics.F90 | 2 +- src/physics_mg.F90 | 2 +- src/plot.F90 | 2 +- src/sab_header.F90 | 2 +- src/simple_string.F90 | 308 -------------------------------- src/simulation.F90 | 2 +- src/source.F90 | 2 +- src/state_point.F90 | 3 +- src/string.F90 | 305 ++++++++++++++++++++++++++++++- src/summary.F90 | 2 +- src/tally.F90 | 2 +- src/track_output.F90 | 4 +- src/tracking.F90 | 2 +- src/trigger.F90 | 12 +- 29 files changed, 403 insertions(+), 417 deletions(-) delete mode 100644 src/simple_string.F90 diff --git a/src/ace.F90 b/src/ace.F90 index 57564f0b91..45b58a8d54 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -19,7 +19,7 @@ module ace use secondary_correlated, only: CorrelatedAngleEnergy use secondary_kalbach, only: KalbachMann use secondary_uncorrelated, only: UncorrelatedAngleEnergy - use simple_string, only: to_str, to_lower + use string, only: to_str, to_lower implicit none diff --git a/src/cmfd_data.F90 b/src/cmfd_data.F90 index b624e839d7..347351e318 100644 --- a/src/cmfd_data.F90 +++ b/src/cmfd_data.F90 @@ -49,17 +49,17 @@ contains subroutine compute_xs() - use constants, only: FILTER_MESH, FILTER_ENERGYIN, FILTER_ENERGYOUT, & - FILTER_SURFACE, IN_RIGHT, OUT_RIGHT, IN_FRONT, & - OUT_FRONT, IN_TOP, OUT_TOP, CMFD_NOACCEL, ZERO, & - ONE, TINY_BIT - use error, only: fatal_error - use global, only: cmfd, n_cmfd_tallies, cmfd_tallies, meshes,& - matching_bins - use mesh, only: mesh_indices_to_bin - use mesh_header, only: RegularMesh - use simple_string, only: to_str - use tally_header, only: TallyObject + use constants, only: FILTER_MESH, FILTER_ENERGYIN, FILTER_ENERGYOUT, & + FILTER_SURFACE, IN_RIGHT, OUT_RIGHT, IN_FRONT, & + OUT_FRONT, IN_TOP, OUT_TOP, CMFD_NOACCEL, ZERO, & + ONE, TINY_BIT + use error, only: fatal_error + use global, only: cmfd, n_cmfd_tallies, cmfd_tallies, meshes,& + matching_bins + use mesh, only: mesh_indices_to_bin + use mesh_header, only: RegularMesh + use string, only: to_str + use tally_header, only: TallyObject integer :: nx ! number of mesh cells in x direction integer :: ny ! number of mesh cells in y direction @@ -625,10 +625,10 @@ contains subroutine compute_dhat() - use constants, only: CMFD_NOACCEL, ZERO - use global, only: cmfd, cmfd_coremap, dhat_reset - use output, only: write_message - use simple_string, only: to_str + use constants, only: CMFD_NOACCEL, ZERO + use global, only: cmfd, cmfd_coremap, dhat_reset + use output, only: write_message + use string, only: to_str integer :: nx ! maximum number of cells in x direction integer :: ny ! maximum number of cells in y direction diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90 index af6991e47d..b7d0cc3879 100644 --- a/src/cmfd_execute.F90 +++ b/src/cmfd_execute.F90 @@ -89,9 +89,9 @@ contains subroutine calc_fission_source() - use constants, only: CMFD_NOACCEL, ZERO, TWO - use global, only: cmfd, cmfd_coremap, master, entropy_on, current_batch - use simple_string, only: to_str + use constants, only: CMFD_NOACCEL, ZERO, TWO + use global, only: cmfd, cmfd_coremap, master, entropy_on, current_batch + use string, only: to_str #ifdef MPI use global, only: mpi_err @@ -213,14 +213,14 @@ contains subroutine cmfd_reweight(new_weights) - use constants, only: ZERO, ONE - use error, only: warning, fatal_error - use global, only: meshes, source_bank, work, n_user_meshes, cmfd, & - master - use mesh_header, only: RegularMesh - use mesh, only: count_bank_sites, get_mesh_indices - use search, only: binary_search - use simple_string, only: to_str + use constants, only: ZERO, ONE + use error, only: warning, fatal_error + use global, only: meshes, source_bank, work, n_user_meshes, cmfd, & + master + use mesh_header, only: RegularMesh + use mesh, only: count_bank_sites, get_mesh_indices + use search, only: binary_search + use string, only: to_str #ifdef MPI use global, only: mpi_err diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index 5e22d38559..2d9df4182c 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -45,10 +45,10 @@ contains subroutine read_cmfd_xml() use constants, only: ZERO, ONE - use error, only: fatal_error, warning + use error, only: fatal_error, warning use global - use output, only: write_message - use simple_string, only: to_lower + use output, only: write_message + use string, only: to_lower use xml_interface use, intrinsic :: ISO_FORTRAN_ENV diff --git a/src/distribution_univariate.F90 b/src/distribution_univariate.F90 index 274c6b1155..0ec2959c3b 100644 --- a/src/distribution_univariate.F90 +++ b/src/distribution_univariate.F90 @@ -1,11 +1,11 @@ module distribution_univariate - use constants, only: ZERO, ONE, HALF, HISTOGRAM, LINEAR_LINEAR, & + use constants, only: ZERO, ONE, HALF, HISTOGRAM, LINEAR_LINEAR, & MAX_LINE_LEN, MAX_WORD_LEN - use error, only: fatal_error - use random_lcg, only: prn - use spectra, only: maxwell_spectrum, watt_spectrum - use simple_string, only: to_lower + use error, only: fatal_error + use random_lcg, only: prn + use spectra, only: maxwell_spectrum, watt_spectrum + use string, only: to_lower use xml_interface implicit none diff --git a/src/eigenvalue.F90 b/src/eigenvalue.F90 index 7ed6c34f01..e735bc8d8a 100644 --- a/src/eigenvalue.F90 +++ b/src/eigenvalue.F90 @@ -4,15 +4,15 @@ module eigenvalue use message_passing #endif - use constants, only: ZERO - use error, only: fatal_error, warning + use constants, only: ZERO + use error, only: fatal_error, warning use global - use math, only: t_percentile - use mesh, only: count_bank_sites - use mesh_header, only: RegularMesh - use random_lcg, only: prn, set_particle_seed, prn_skip - use search, only: binary_search - use simple_string, only: to_str + use math, only: t_percentile + use mesh, only: count_bank_sites + use mesh_header, only: RegularMesh + use random_lcg, only: prn, set_particle_seed, prn_skip + use search, only: binary_search + use string, only: to_str implicit none diff --git a/src/endf.F90 b/src/endf.F90 index 0539e8b9d2..64f26539a9 100644 --- a/src/endf.F90 +++ b/src/endf.F90 @@ -1,7 +1,7 @@ module endf use constants - use simple_string, only: to_str + use string, only: to_str implicit none diff --git a/src/geometry.F90 b/src/geometry.F90 index 53e2f29fc2..8a38f982b5 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -10,7 +10,7 @@ module geometry use particle_restart_write, only: write_particle_restart use surface_header use stl_vector, only: VectorInt - use simple_string, only: to_str + use string, only: to_str use tally, only: score_surface_current implicit none diff --git a/src/initialize.F90 b/src/initialize.F90 index 00e5bab443..74bba03e72 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -1,32 +1,31 @@ module initialize - use ace, only: read_ace_xs, same_nuclide_list - use bank_header, only: Bank + use ace, only: read_ace_xs, same_nuclide_list + use bank_header, only: Bank use constants - use dict_header, only: DictIntInt, ElemKeyValueII - use set_header, only: SetInt - use energy_grid, only: logarithmic_grid, grid_method, unionized_grid - use error, only: fatal_error, warning - use geometry, only: neighbor_lists, count_instance, calc_offsets, & - maximum_levels - use geometry_header, only: Cell, Universe, Lattice, RectLattice, HexLattice,& - &BASE_UNIVERSE + use dict_header, only: DictIntInt, ElemKeyValueII + use set_header, only: SetInt + use energy_grid, only: logarithmic_grid, grid_method, unionized_grid + use error, only: fatal_error, warning + use geometry, only: neighbor_lists, count_instance, calc_offsets, & + maximum_levels + use geometry_header, only: Cell, Universe, Lattice, RectLattice, HexLattice,& + &BASE_UNIVERSE use global - use hdf5_interface, only: file_open, read_dataset, file_close, hdf5_bank_t,& - hdf5_tallyresult_t, hdf5_integer8_t - use input_xml, only: read_input_xml, cells_in_univ_dict, read_plots_xml - use material_header, only: Material - use mgxs_data, only: read_mgxs, same_nuclide_mg_list, create_macro_xs - use output, only: title, header, print_version, write_message, & - print_usage, write_xs_summary, print_plot - use random_lcg, only: initialize_prng - use state_point, only: load_state_point - use simple_string, only: to_str, starts_with, ends_with - use string, only: str_to_int - use summary, only: write_summary - use tally_header, only: TallyObject, TallyResult, TallyFilter - use tally_initialize, only: configure_tallies - use tally, only: init_tally_routines + use hdf5_interface, only: file_open, read_dataset, file_close, hdf5_bank_t,& + hdf5_tallyresult_t, hdf5_integer8_t + use input_xml, only: read_input_xml, cells_in_univ_dict, read_plots_xml + use material_header, only: Material + use mgxs_data, only: read_mgxs, same_nuclide_mg_list, create_macro_xs + use output, only: title, header, print_version, write_message, & + print_usage, write_xs_summary, print_plot + use random_lcg, only: initialize_prng + use state_point, only: load_state_point + use string, only: to_str, starts_with, ends_with, str_to_int + use summary, only: write_summary + use tally_header, only: TallyObject, TallyResult, TallyFilter + use tally_initialize,only: configure_tallies + use tally, only: init_tally_routines #ifdef MPI use message_passing diff --git a/src/input_xml.F90 b/src/input_xml.F90 index fde77f498e..e726b6f403 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -17,8 +17,8 @@ module input_xml use random_lcg, only: prn, seed use surface_header use stl_vector, only: VectorInt - use simple_string, only: to_lower, to_str, starts_with, ends_with - use string, only: str_to_int, str_to_real, tokenize + use string, only: str_to_int, str_to_real, tokenize, & + to_lower, to_str, starts_with, ends_with use tally_header, only: TallyObject, TallyFilter use tally_initialize, only: add_tallies use xml_interface diff --git a/src/interpolation.F90 b/src/interpolation.F90 index 49d3de7fe8..5f87870677 100644 --- a/src/interpolation.F90 +++ b/src/interpolation.F90 @@ -1,9 +1,9 @@ module interpolation use constants - use endf_header, only: Tab1 - use search, only: binary_search - use simple_string, only: to_str + use endf_header, only: Tab1 + use search, only: binary_search + use string, only: to_str implicit none diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index f48238afa9..880764edad 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -1,14 +1,14 @@ module mgxs_data use constants - use error, only: fatal_error + use error, only: fatal_error use global use macroxs_header - use material_header, only: Material + use material_header, only: Material use nuclide_header - use output, only: write_message - use set_header, only: SetChar - use simple_string, only: to_lower + use output, only: write_message + use set_header, only: SetChar + use string, only: to_lower use xml_interface implicit none diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 72e1a4dc66..398e91eb20 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -7,8 +7,7 @@ module nuclide_header use endf, only: reaction_name use list_header, only: ListInt use math, only: evaluate_legendre - !use scattdata_header - use simple_string + use string implicit none diff --git a/src/output.F90 b/src/output.F90 index 5379555ff0..29844076e6 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -16,7 +16,7 @@ module output use particle_header, only: LocalCoord, Particle use plot_header use sab_header, only: SAlphaBeta - use simple_string, only: to_upper, to_str + use string, only: to_upper, to_str use tally_header, only: TallyObject implicit none diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index 324e96bc7a..e1a280e9fa 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -1,10 +1,10 @@ module particle_restart_write - use bank_header, only: Bank + use bank_header, only: Bank use global use hdf5_interface - use particle_header, only: Particle - use simple_string, only: to_str + use particle_header, only: Particle + use string, only: to_str use hdf5 diff --git a/src/physics.F90 b/src/physics.F90 index 2212269209..cb216467cd 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -18,7 +18,7 @@ module physics use random_lcg, only: prn use search, only: binary_search use secondary_uncorrelated, only: UncorrelatedAngleEnergy - use simple_string, only: to_str + use string, only: to_str use spectra implicit none diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index a5272e1f47..a8a9084171 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -15,7 +15,7 @@ module physics_mg use physics_common use random_lcg, only: prn use scattdata_header - use simple_string, only: to_str + use string, only: to_str use spectra, only: rotate_angle implicit none diff --git a/src/plot.F90 b/src/plot.F90 index cdddc6d706..796cce6afa 100644 --- a/src/plot.F90 +++ b/src/plot.F90 @@ -14,7 +14,7 @@ module plot use ppmlib, only: Image, init_image, allocate_image, & deallocate_image, set_pixel use progress_header, only: ProgressBar - use simple_string, only: to_str + use string, only: to_str use hdf5 diff --git a/src/sab_header.F90 b/src/sab_header.F90 index a2d70d4f21..56617dd01d 100644 --- a/src/sab_header.F90 +++ b/src/sab_header.F90 @@ -3,7 +3,7 @@ module sab_header use, intrinsic :: ISO_FORTRAN_ENV use constants - use simple_string, only: to_str + use string, only: to_str implicit none diff --git a/src/simple_string.F90 b/src/simple_string.F90 deleted file mode 100644 index 65eb58ac0b..0000000000 --- a/src/simple_string.F90 +++ /dev/null @@ -1,308 +0,0 @@ -module simple_string - - use constants, only: ERROR_REAL, ERROR_INT, MAX_LINE_LEN - - implicit none - - interface to_str - module procedure int4_to_str, int8_to_str, real_to_str - end interface - -contains - -!=============================================================================== -! TO_LOWER converts a string to all lower case characters -!=============================================================================== - - pure function to_lower(word) result(word_lower) - character(*), intent(in) :: word - character(len=len(word)) :: word_lower - - integer :: i - integer :: ic - - do i = 1, len(word) - ic = ichar(word(i:i)) - if (ic >= 65 .and. ic <= 90) then - word_lower(i:i) = char(ic+32) - else - word_lower(i:i) = word(i:i) - end if - end do - - end function to_lower - -!=============================================================================== -! TO_UPPER converts a string to all upper case characters -!=============================================================================== - - pure function to_upper(word) result(word_upper) - character(*), intent(in) :: word - character(len=len(word)) :: word_upper - - integer :: i - integer :: ic - - do i = 1, len(word) - ic = ichar(word(i:i)) - if (ic >= 97 .and. ic <= 122) then - word_upper(i:i) = char(ic-32) - else - word_upper(i:i) = word(i:i) - end if - end do - - end function to_upper - -!=============================================================================== -! IS_NUMBER determines whether a string of characters is all 0-9 characters -!=============================================================================== - - pure function is_number(word) result(number) - character(*), intent(in) :: word - logical :: number - - integer :: i - integer :: ic - - number = .true. - do i = 1, len_trim(word) - ic = ichar(word(i:i)) - if (ic < 48 .or. ic >= 58) number = .false. - end do - - end function is_number - -!=============================================================================== -! STARTS_WITH determines whether a string starts with a certain -! sequence of characters -!=============================================================================== - - pure logical function starts_with(str, seq) - character(*), intent(in) :: str ! string to check - character(*), intent(in) :: seq ! sequence of characters - - integer :: i - integer :: i_start - integer :: str_len - integer :: seq_len - - str_len = len_trim(str) - seq_len = len_trim(seq) - - ! determine how many spaces are at beginning of string - i_start = 0 - do i = 1, str_len - if (str(i:i) == ' ' .or. str(i:i) == achar(9)) cycle - i_start = i - exit - end do - - ! Check if string starts with sequence using INDEX intrinsic - if (index(str(1:str_len), seq(1:seq_len)) == i_start) then - starts_with = .true. - else - starts_with = .false. - end if - - end function starts_with - -!=============================================================================== -! ENDS_WITH determines whether a string ends with a certain sequence -! of characters -!=============================================================================== - - pure logical function ends_with(str, seq) - character(*), intent(in) :: str ! string to check - character(*), intent(in) :: seq ! sequence of characters - - integer :: i_start - integer :: str_len - integer :: seq_len - - str_len = len_trim(str) - seq_len = len_trim(seq) - - ! determine how many spaces are at beginning of string - i_start = str_len - seq_len + 1 - - ! Check if string starts with sequence using INDEX intrinsic - if (index(str(1:str_len), seq(1:seq_len), .true.) == i_start) then - ends_with = .true. - else - ends_with = .false. - end if - - end function ends_with - -!=============================================================================== -! COUNT_DIGITS returns the number of digits needed to represent the input -! integer. -!=============================================================================== - - pure function count_digits(num) result(n_digits) - integer, intent(in) :: num - integer :: n_digits - - n_digits = 1 - do while (num / 10**(n_digits) /= 0 .and. abs(num / 10 **(n_digits-1)) /= 1& - &.and. n_digits /= 10) - ! Note that 10 digits is the maximum needed to represent an integer(4) so - ! the loop automatically exits when n_digits = 10. - n_digits = n_digits + 1 - end do - - end function count_digits - -!=============================================================================== -! INT4_TO_STR converts an integer(4) to a string. -!=============================================================================== - - pure function int4_to_str(num) result(str) - - integer, intent(in) :: num - character(11) :: str - - write (str, '(I11)') num - str = adjustl(str) - - end function int4_to_str - -!=============================================================================== -! INT8_TO_STR converts an integer(8) to a string. -!=============================================================================== - - pure function int8_to_str(num) result(str) - - integer(8), intent(in) :: num - character(21) :: str - - write (str, '(I21)') num - str = adjustl(str) - - end function int8_to_str - -!=============================================================================== -! REAL_TO_STR converts a real(8) to a string based on how large the value is and -! how many significant digits are desired. By default, six significants digits -! are used. -!=============================================================================== - - pure function real_to_str(num, sig_digits) result(string) - - real(8), intent(in) :: num ! number to convert - integer, optional, intent(in) :: sig_digits ! # of significant digits - character(15) :: string ! string returned - - integer :: decimal ! number of places after decimal - integer :: width ! total field width - real(8) :: num2 ! absolute value of number - character(9) :: fmt ! format specifier for writing number - - ! set default field width - width = 15 - - ! set number of places after decimal - if (present(sig_digits)) then - decimal = sig_digits - else - decimal = 6 - end if - - ! Create format specifier for writing character - num2 = abs(num) - if (num2 == 0.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, 1 - elseif (num2 < 1.0e-1_8) then - write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 - elseif (num2 >= 1.0e-1_8 .and. num2 < 1.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, decimal - elseif (num2 >= 1.0_8 .and. num2 < 10.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-1, 0) - elseif (num2 >= 10.0_8 .and. num2 < 100.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-2, 0) - elseif (num2 >= 100.0_8 .and. num2 < 1000.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-3, 0) - elseif (num2 >= 100.0_8 .and. num2 < 10000.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-4, 0) - elseif (num2 >= 10000.0_8 .and. num2 < 100000.0_8) then - write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-5, 0) - else - write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 - end if - - ! Write string and left adjust - write(string, fmt) num - string = adjustl(string) - - end function real_to_str - -!=============================================================================== -! STR_TO_INT converts a string to an integer. -!=============================================================================== - - pure function str_to_int(str) result(num) - - character(*), intent(in) :: str - integer(8) :: num - - character(5) :: fmt - integer :: w - integer :: ioError - - ! Determine width of string - w = len_trim(str) - - ! Create format specifier for reading string - write(UNIT=fmt, FMT='("(I",I2,")")') w - - ! read string into integer - read(UNIT=str, FMT=fmt, IOSTAT=ioError) num - if (ioError > 0) num = ERROR_INT - - end function str_to_int - -!=============================================================================== -! STR_TO_REAL converts an arbitrary string to a real(8) -!=============================================================================== - - pure function str_to_real(string) result(num) - - character(*), intent(in) :: string - real(8) :: num - - integer :: ioError - - ! Read string - read(UNIT=string, FMT=*, IOSTAT=ioError) num - if (ioError > 0) num = ERROR_REAL - - end function str_to_real - -!=============================================================================== -! CONCATENATE takes an array of words and concatenates them together in one -! string with a single space between words -! -! Arguments: -! words = array of words -! n_words = total number of words -! string = concatenated string -!=============================================================================== - - pure function concatenate(words, n_words) result(string) - - integer, intent(in) :: n_words - character(*), intent(in) :: words(n_words) - character(MAX_LINE_LEN) :: string - - integer :: i ! index - - string = words(1) - if (n_words == 1) return - do i = 2, n_words - string = trim(string) // ' ' // words(i) - end do - - end function concatenate - -end module simple_string \ No newline at end of file diff --git a/src/simulation.F90 b/src/simulation.F90 index d1b96d8b08..4a419df906 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -19,7 +19,7 @@ module simulation use random_lcg, only: set_particle_seed use source, only: initialize_source use state_point, only: write_state_point, write_source_point - use simple_string, only: to_str + use string, only: to_str use tally, only: synchronize_tallies, setup_active_usertallies, & reset_result use trigger, only: check_triggers diff --git a/src/source.F90 b/src/source.F90 index 7f56b240b7..601232192a 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -13,7 +13,7 @@ module source use particle_header, only: Particle use random_lcg, only: prn, set_particle_seed, prn_set_stream use search, only: binary_search - use simple_string, only: to_str + use string, only: to_str use spectra use state_point, only: read_source_bank, write_source_bank diff --git a/src/state_point.F90 b/src/state_point.F90 index a46450fc5a..2249e3d45e 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -18,8 +18,7 @@ module state_point use global use hdf5_interface use output, only: write_message, time_stamp - use simple_string, only: to_str, count_digits - use string, only: zero_padded + use string, only: to_str, count_digits, zero_padded use tally_header, only: TallyObject use mesh_header, only: RegularMesh use dict_header, only: ElemKeyValueII, ElemKeyValueCI diff --git a/src/string.F90 b/src/string.F90 index e5f09a50d4..b51763a611 100644 --- a/src/string.F90 +++ b/src/string.F90 @@ -1,13 +1,16 @@ module string - use constants, only: MAX_WORDS, MAX_LINE_LEN, ERROR_INT, ERROR_REAL, & + use constants, only: MAX_WORDS, MAX_LINE_LEN, ERROR_INT, ERROR_REAL, & OP_LEFT_PAREN, OP_RIGHT_PAREN, OP_COMPLEMENT, OP_INTERSECTION, OP_UNION - use error, only: fatal_error, warning - use simple_string, only: str_to_int, str_to_real - use stl_vector, only: VectorInt + use error, only: fatal_error, warning + use stl_vector, only: VectorInt implicit none + interface to_str + module procedure int4_to_str, int8_to_str, real_to_str + end interface + contains !=============================================================================== @@ -151,6 +154,75 @@ contains end if end subroutine tokenize +!=============================================================================== +! CONCATENATE takes an array of words and concatenates them together in one +! string with a single space between words +! +! Arguments: +! words = array of words +! n_words = total number of words +! string = concatenated string +!=============================================================================== + + pure function concatenate(words, n_words) result(string) + + integer, intent(in) :: n_words + character(*), intent(in) :: words(n_words) + character(MAX_LINE_LEN) :: string + + integer :: i ! index + + string = words(1) + if (n_words == 1) return + do i = 2, n_words + string = trim(string) // ' ' // words(i) + end do + + end function concatenate + +!=============================================================================== +! TO_LOWER converts a string to all lower case characters +!=============================================================================== + + pure function to_lower(word) result(word_lower) + character(*), intent(in) :: word + character(len=len(word)) :: word_lower + + integer :: i + integer :: ic + + do i = 1, len(word) + ic = ichar(word(i:i)) + if (ic >= 65 .and. ic <= 90) then + word_lower(i:i) = char(ic+32) + else + word_lower(i:i) = word(i:i) + end if + end do + + end function to_lower + +!=============================================================================== +! TO_UPPER converts a string to all upper case characters +!=============================================================================== + + pure function to_upper(word) result(word_upper) + character(*), intent(in) :: word + character(len=len(word)) :: word_upper + + integer :: i + integer :: ic + + do i = 1, len(word) + ic = ichar(word(i:i)) + if (ic >= 97 .and. ic <= 122) then + word_upper(i:i) = char(ic-32) + else + word_upper(i:i) = word(i:i) + end if + end do + + end function to_upper !=============================================================================== ! ZERO_PADDED returns a string of the input integer padded with zeros to the @@ -185,4 +257,229 @@ contains write(str, zp_form) num end function zero_padded +!=============================================================================== +! IS_NUMBER determines whether a string of characters is all 0-9 characters +!=============================================================================== + + pure function is_number(word) result(number) + character(*), intent(in) :: word + logical :: number + + integer :: i + integer :: ic + + number = .true. + do i = 1, len_trim(word) + ic = ichar(word(i:i)) + if (ic < 48 .or. ic >= 58) number = .false. + end do + + end function is_number + +!=============================================================================== +! STARTS_WITH determines whether a string starts with a certain +! sequence of characters +!=============================================================================== + + pure logical function starts_with(str, seq) + character(*), intent(in) :: str ! string to check + character(*), intent(in) :: seq ! sequence of characters + + integer :: i + integer :: i_start + integer :: str_len + integer :: seq_len + + str_len = len_trim(str) + seq_len = len_trim(seq) + + ! determine how many spaces are at beginning of string + i_start = 0 + do i = 1, str_len + if (str(i:i) == ' ' .or. str(i:i) == achar(9)) cycle + i_start = i + exit + end do + + ! Check if string starts with sequence using INDEX intrinsic + if (index(str(1:str_len), seq(1:seq_len)) == i_start) then + starts_with = .true. + else + starts_with = .false. + end if + + end function starts_with + +!=============================================================================== +! ENDS_WITH determines whether a string ends with a certain sequence +! of characters +!=============================================================================== + + pure logical function ends_with(str, seq) + character(*), intent(in) :: str ! string to check + character(*), intent(in) :: seq ! sequence of characters + + integer :: i_start + integer :: str_len + integer :: seq_len + + str_len = len_trim(str) + seq_len = len_trim(seq) + + ! determine how many spaces are at beginning of string + i_start = str_len - seq_len + 1 + + ! Check if string starts with sequence using INDEX intrinsic + if (index(str(1:str_len), seq(1:seq_len), .true.) == i_start) then + ends_with = .true. + else + ends_with = .false. + end if + + end function ends_with + +!=============================================================================== +! COUNT_DIGITS returns the number of digits needed to represent the input +! integer. +!=============================================================================== + + pure function count_digits(num) result(n_digits) + integer, intent(in) :: num + integer :: n_digits + + n_digits = 1 + do while (num / 10**(n_digits) /= 0 .and. abs(num / 10 **(n_digits-1)) /= 1& + &.and. n_digits /= 10) + ! Note that 10 digits is the maximum needed to represent an integer(4) so + ! the loop automatically exits when n_digits = 10. + n_digits = n_digits + 1 + end do + + end function count_digits + +!=============================================================================== +! INT4_TO_STR converts an integer(4) to a string. +!=============================================================================== + + pure function int4_to_str(num) result(str) + + integer, intent(in) :: num + character(11) :: str + + write (str, '(I11)') num + str = adjustl(str) + + end function int4_to_str + +!=============================================================================== +! INT8_TO_STR converts an integer(8) to a string. +!=============================================================================== + + pure function int8_to_str(num) result(str) + + integer(8), intent(in) :: num + character(21) :: str + + write (str, '(I21)') num + str = adjustl(str) + + end function int8_to_str + +!=============================================================================== +! STR_TO_INT converts a string to an integer. +!=============================================================================== + + pure function str_to_int(str) result(num) + + character(*), intent(in) :: str + integer(8) :: num + + character(5) :: fmt + integer :: w + integer :: ioError + + ! Determine width of string + w = len_trim(str) + + ! Create format specifier for reading string + write(UNIT=fmt, FMT='("(I",I2,")")') w + + ! read string into integer + read(UNIT=str, FMT=fmt, IOSTAT=ioError) num + if (ioError > 0) num = ERROR_INT + + end function str_to_int + +!=============================================================================== +! STR_TO_REAL converts an arbitrary string to a real(8) +!=============================================================================== + + pure function str_to_real(string) result(num) + + character(*), intent(in) :: string + real(8) :: num + + integer :: ioError + + ! Read string + read(UNIT=string, FMT=*, IOSTAT=ioError) num + if (ioError > 0) num = ERROR_REAL + + end function str_to_real + +!=============================================================================== +! REAL_TO_STR converts a real(8) to a string based on how large the value is and +! how many significant digits are desired. By default, six significants digits +! are used. +!=============================================================================== + + pure function real_to_str(num, sig_digits) result(string) + + real(8), intent(in) :: num ! number to convert + integer, optional, intent(in) :: sig_digits ! # of significant digits + character(15) :: string ! string returned + + integer :: decimal ! number of places after decimal + integer :: width ! total field width + real(8) :: num2 ! absolute value of number + character(9) :: fmt ! format specifier for writing number + + ! set default field width + width = 15 + + ! set number of places after decimal + if (present(sig_digits)) then + decimal = sig_digits + else + decimal = 6 + end if + + ! Create format specifier for writing character + num2 = abs(num) + if (num2 == 0.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, 1 + elseif (num2 < 1.0e-1_8) then + write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 + elseif (num2 >= 1.0e-1_8 .and. num2 < 1.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, decimal + elseif (num2 >= 1.0_8 .and. num2 < 10.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-1, 0) + elseif (num2 >= 10.0_8 .and. num2 < 100.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-2, 0) + elseif (num2 >= 100.0_8 .and. num2 < 1000.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-3, 0) + elseif (num2 >= 100.0_8 .and. num2 < 10000.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-4, 0) + elseif (num2 >= 10000.0_8 .and. num2 < 100000.0_8) then + write(fmt, '("(F",I2,".",I2,")")') width, max(decimal-5, 0) + else + write(fmt, '("(ES",I2,".",I2,")")') width, decimal - 1 + end if + + ! Write string and left adjust + write(string, fmt) num + string = adjustl(string) + + end function real_to_str + end module string diff --git a/src/summary.F90 b/src/summary.F90 index 2f255a4fc5..e662aa473b 100644 --- a/src/summary.F90 +++ b/src/summary.F90 @@ -12,7 +12,7 @@ module summary use nuclide_header use output, only: time_stamp use surface_header - use simple_string, only: to_str + use string, only: to_str use tally_header, only: TallyObject use hdf5 diff --git a/src/tally.F90 b/src/tally.F90 index 842b7644ea..bbe099c3e4 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -13,7 +13,7 @@ module tally use output, only: header use particle_header, only: LocalCoord, Particle use search, only: binary_search - use simple_string, only: to_str + use string, only: to_str use tally_header, only: TallyResult, TallyMapItem, TallyMapElement use fission, only: nu_total, nu_delayed, yield_delayed use interpolation, only: interpolate_tab1 diff --git a/src/track_output.F90 b/src/track_output.F90 index 87dbfbfa44..1411738622 100644 --- a/src/track_output.F90 +++ b/src/track_output.F90 @@ -7,8 +7,8 @@ module track_output use global use hdf5_interface - use particle_header, only: Particle - use simple_string, only: to_str + use particle_header, only: Particle + use string, only: to_str use hdf5 diff --git a/src/tracking.F90 b/src/tracking.F90 index 992cc2ca95..0b2719ef5d 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -13,7 +13,7 @@ module tracking use physics, only: collision use physics_mg, only: collision_mg use random_lcg, only: prn - use simple_string, only: to_str + use string, only: to_str use tally, only: score_analog_tally, score_tracklength_tally, & score_collision_tally, score_surface_current use track_output, only: initialize_particle_track, write_particle_track, & diff --git a/src/trigger.F90 b/src/trigger.F90 index 967d74b14e..ed362154b4 100644 --- a/src/trigger.F90 +++ b/src/trigger.F90 @@ -6,12 +6,12 @@ module trigger use constants use global - use simple_string, only: to_str - use output, only: warning, write_message - use mesh, only: mesh_indices_to_bin - use mesh_header, only: RegularMesh - use trigger_header, only: TriggerObject - use tally, only: TallyObject + use string, only: to_str + use output, only: warning, write_message + use mesh, only: mesh_indices_to_bin + use mesh_header, only: RegularMesh + use trigger_header, only: TriggerObject + use tally, only: TallyObject implicit none From 989569ac5e4adb3eb8ea989768c87d5e3e1943fd Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 3 Feb 2016 13:25:51 -0500 Subject: [PATCH 075/149] Removing need for spectra (putting back in math) --- src/distribution_multivariate.F90 | 2 +- src/distribution_univariate.F90 | 2 +- src/energy_distribution.F90 | 10 +-- src/math.F90 | 106 +++++++++++++++++++++++++++- src/physics.F90 | 2 +- src/physics_mg.F90 | 2 +- src/source.F90 | 2 +- src/spectra.F90 | 112 ------------------------------ 8 files changed, 115 insertions(+), 123 deletions(-) delete mode 100644 src/spectra.F90 diff --git a/src/distribution_multivariate.F90 b/src/distribution_multivariate.F90 index e7be36db84..694fac3013 100644 --- a/src/distribution_multivariate.F90 +++ b/src/distribution_multivariate.F90 @@ -3,7 +3,7 @@ module distribution_multivariate use constants, only: ONE, TWO, PI use distribution_univariate, only: Distribution use random_lcg, only: prn - use spectra, only: rotate_angle + use math, only: rotate_angle implicit none diff --git a/src/distribution_univariate.F90 b/src/distribution_univariate.F90 index 0ec2959c3b..f3e4fdee2e 100644 --- a/src/distribution_univariate.F90 +++ b/src/distribution_univariate.F90 @@ -4,7 +4,7 @@ module distribution_univariate MAX_LINE_LEN, MAX_WORD_LEN use error, only: fatal_error use random_lcg, only: prn - use spectra, only: maxwell_spectrum, watt_spectrum + use math, only: maxwell_spectrum, watt_spectrum use string, only: to_lower use xml_interface diff --git a/src/energy_distribution.F90 b/src/energy_distribution.F90 index 7d136ab10e..2cfc1b1841 100644 --- a/src/energy_distribution.F90 +++ b/src/energy_distribution.F90 @@ -1,11 +1,11 @@ module energy_distribution - use constants, only: ZERO, ONE, TWO, PI, HISTOGRAM, LINEAR_LINEAR - use endf_header, only: Tab1 + use constants, only: ZERO, ONE, TWO, PI, HISTOGRAM, LINEAR_LINEAR + use endf_header, only: Tab1 use interpolation, only: interpolate_tab1 - use random_lcg, only: prn - use search, only: binary_search - use spectra, only: maxwell_spectrum, watt_spectrum + use math, only: maxwell_spectrum, watt_spectrum + use random_lcg, only: prn + use search, only: binary_search !=============================================================================== ! ENERGYDISTRIBUTION (abstract) defines an energy distribution that is a diff --git a/src/math.F90 b/src/math.F90 index 9ed82dabb2..aedf182358 100644 --- a/src/math.F90 +++ b/src/math.F90 @@ -1,6 +1,7 @@ module math use constants + use random_lcg, only: prn implicit none @@ -580,7 +581,8 @@ contains end function expand_harmonic !=============================================================================== -! EVALUATE_LEGENDRE +! EVALUATE_LEGENDRE Find the value of f(x) given a set of Legendre coefficients +! and the value of x !=============================================================================== pure function evaluate_legendre(data, x) result(val) real(8), intent(in) :: data(:) @@ -596,4 +598,106 @@ contains end function evaluate_legendre +!=============================================================================== +! ROTATE_ANGLE rotates direction cosines through a polar angle whose cosine is +! mu and through an azimuthal angle sampled uniformly. Note that this is done +! with direct sampling rather than rejection as is done in MCNP and SERPENT. +!=============================================================================== + + function rotate_angle(uvw0, mu, phi) result(uvw) + real(8), intent(in) :: uvw0(3) ! directional cosine + real(8), intent(in) :: mu ! cosine of angle in lab or CM + real(8), optional :: phi ! azimuthal angle + real(8) :: uvw(3) ! rotated directional cosine + + real(8) :: phi_ ! azimuthal angle + real(8) :: sinphi ! sine of azimuthal angle + real(8) :: cosphi ! cosine of azimuthal angle + real(8) :: a ! sqrt(1 - mu^2) + real(8) :: b ! sqrt(1 - w^2) + real(8) :: u0 ! original cosine in x direction + real(8) :: v0 ! original cosine in y direction + real(8) :: w0 ! original cosine in z direction + + ! Copy original directional cosines + u0 = uvw0(1) + v0 = uvw0(2) + w0 = uvw0(3) + + ! Sample azimuthal angle in [0,2pi) if none provided + if (present(phi)) then + phi_ = phi + else + phi_ = TWO * PI * prn() + end if + + ! Precompute factors to save flops + sinphi = sin(phi_) + cosphi = cos(phi_) + a = sqrt(max(ZERO, ONE - mu*mu)) + b = sqrt(max(ZERO, ONE - w0*w0)) + + ! Need to treat special case where sqrt(1 - w**2) is close to zero by + ! expanding about the v component rather than the w component + if (b > 1e-10) then + uvw(1) = mu*u0 + a*(u0*w0*cosphi - v0*sinphi)/b + uvw(2) = mu*v0 + a*(v0*w0*cosphi + u0*sinphi)/b + uvw(3) = mu*w0 - a*b*cosphi + else + b = sqrt(ONE - v0*v0) + uvw(1) = mu*u0 + a*(u0*v0*cosphi + w0*sinphi)/b + uvw(2) = mu*v0 - a*b*cosphi + uvw(3) = mu*w0 + a*(v0*w0*cosphi - u0*sinphi)/b + end if + + end function rotate_angle + +!=============================================================================== +! MAXWELL_SPECTRUM samples an energy from the Maxwell fission distribution based +! on a direct sampling scheme. The probability distribution function for a +! Maxwellian is given as p(x) = 2/(T*sqrt(pi))*sqrt(x/T)*exp(-x/T). This PDF can +! be sampled using rule C64 in the Monte Carlo Sampler LA-9721-MS. +!=============================================================================== + + function maxwell_spectrum(T) result(E_out) + + real(8), intent(in) :: T ! tabulated function of incoming E + real(8) :: E_out ! sampled energy + + real(8) :: r1, r2, r3 ! random numbers + real(8) :: c ! cosine of pi/2*r3 + + r1 = prn() + r2 = prn() + r3 = prn() + + ! determine cosine of pi/2*r + c = cos(PI/TWO*r3) + + ! determine outgoing energy + E_out = -T*(log(r1) + log(r2)*c*c) + + end function maxwell_spectrum + +!=============================================================================== +! WATT_SPECTRUM samples the outgoing energy from a Watt energy-dependent fission +! spectrum. Although fitted parameters exist for many nuclides, generally the +! continuous tabular distributions (LAW 4) should be used in lieu of the Watt +! spectrum. This direct sampling scheme is an unpublished scheme based on the +! original Watt spectrum derivation (See F. Brown's MC lectures). +!=============================================================================== + + function watt_spectrum(a, b) result(E_out) + + real(8), intent(in) :: a ! Watt parameter a + real(8), intent(in) :: b ! Watt parameter b + real(8) :: E_out ! energy of emitted neutron + + real(8) :: w ! sampled from Maxwellian + + w = maxwell_spectrum(a) + E_out = w + a*a*b/4. + (TWO*prn() - ONE)*sqrt(a*a*b*w) + + end function watt_spectrum + end module math diff --git a/src/physics.F90 b/src/physics.F90 index cb216467cd..13a311d5e3 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -9,6 +9,7 @@ module physics use global use interpolation, only: interpolate_tab1 use material_header, only: Material + use math use mesh, only: get_mesh_indices use nuclide_header use output, only: write_message @@ -19,7 +20,6 @@ module physics use search, only: binary_search use secondary_uncorrelated, only: UncorrelatedAngleEnergy use string, only: to_str - use spectra implicit none diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index a8a9084171..048f3ce54f 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -8,6 +8,7 @@ module physics_mg use macroxs_header, only: MacroXS_Base, MacroXSContainer use macroxs, only: sample_fission_energy, sample_scatter use material_header, only: Material + use math, only: rotate_angle use mesh, only: get_mesh_indices use output, only: write_message use particle_header, only: Particle @@ -16,7 +17,6 @@ module physics_mg use random_lcg, only: prn use scattdata_header use string, only: to_str - use spectra, only: rotate_angle implicit none diff --git a/src/source.F90 b/src/source.F90 index 601232192a..1fb9de5c58 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -14,7 +14,7 @@ module source use random_lcg, only: prn, set_particle_seed, prn_set_stream use search, only: binary_search use string, only: to_str - use spectra + use math use state_point, only: read_source_bank, write_source_bank #ifdef MPI diff --git a/src/spectra.F90 b/src/spectra.F90 deleted file mode 100644 index 7f96bb69e5..0000000000 --- a/src/spectra.F90 +++ /dev/null @@ -1,112 +0,0 @@ -module spectra - -use constants, only: ZERO, ONE, TWO, PI -use random_lcg, only: prn - -implicit none - -contains - -!=============================================================================== -! MAXWELL_SPECTRUM samples an energy from the Maxwell fission distribution based -! on a direct sampling scheme. The probability distribution function for a -! Maxwellian is given as p(x) = 2/(T*sqrt(pi))*sqrt(x/T)*exp(-x/T). This PDF can -! be sampled using rule C64 in the Monte Carlo Sampler LA-9721-MS. -!=============================================================================== - - function maxwell_spectrum(T) result(E_out) - - real(8), intent(in) :: T ! tabulated function of incoming E - real(8) :: E_out ! sampled energy - - real(8) :: r1, r2, r3 ! random numbers - real(8) :: c ! cosine of pi/2*r3 - - r1 = prn() - r2 = prn() - r3 = prn() - - ! determine cosine of pi/2*r - c = cos(PI/TWO*r3) - - ! determine outgoing energy - E_out = -T*(log(r1) + log(r2)*c*c) - - end function maxwell_spectrum - -!=============================================================================== -! WATT_SPECTRUM samples the outgoing energy from a Watt energy-dependent fission -! spectrum. Although fitted parameters exist for many nuclides, generally the -! continuous tabular distributions (LAW 4) should be used in lieu of the Watt -! spectrum. This direct sampling scheme is an unpublished scheme based on the -! original Watt spectrum derivation (See F. Brown's MC lectures). -!=============================================================================== - - function watt_spectrum(a, b) result(E_out) - - real(8), intent(in) :: a ! Watt parameter a - real(8), intent(in) :: b ! Watt parameter b - real(8) :: E_out ! energy of emitted neutron - - real(8) :: w ! sampled from Maxwellian - - w = maxwell_spectrum(a) - E_out = w + a*a*b/4.0_8 + (TWO*prn() - ONE)*sqrt(a*a*b*w) - - end function watt_spectrum - -!=============================================================================== -! ROTATE_ANGLE rotates direction cosines through a polar angle whose cosine is -! mu and through an azimuthal angle sampled uniformly. Note that this is done -! with direct sampling rather than rejection as is done in MCNP and SERPENT. -!=============================================================================== - - function rotate_angle(uvw0, mu, phi) result(uvw) - real(8), intent(in) :: uvw0(3) ! directional cosine - real(8), intent(in) :: mu ! cosine of angle in lab or CM - real(8), optional :: phi ! azimuthal angle - real(8) :: uvw(3) ! rotated directional cosine - - real(8) :: phi_ ! azimuthal angle - real(8) :: sinphi ! sine of azimuthal angle - real(8) :: cosphi ! cosine of azimuthal angle - real(8) :: a ! sqrt(1 - mu^2) - real(8) :: b ! sqrt(1 - w^2) - real(8) :: u0 ! original cosine in x direction - real(8) :: v0 ! original cosine in y direction - real(8) :: w0 ! original cosine in z direction - - ! Copy original directional cosines - u0 = uvw0(1) - v0 = uvw0(2) - w0 = uvw0(3) - - ! Sample azimuthal angle in [0,2pi) if none provided - if (present(phi)) then - phi_ = phi - else - phi_ = TWO * PI * prn() - end if - - ! Precompute factors to save flops - sinphi = sin(phi_) - cosphi = cos(phi_) - a = sqrt(max(ZERO, ONE - mu*mu)) - b = sqrt(max(ZERO, ONE - w0*w0)) - - ! Need to treat special case where sqrt(1 - w**2) is close to zero by - ! expanding about the v component rather than the w component - if (b > 1e-10) then - uvw(1) = mu*u0 + a*(u0*w0*cosphi - v0*sinphi)/b - uvw(2) = mu*v0 + a*(v0*w0*cosphi + u0*sinphi)/b - uvw(3) = mu*w0 - a*b*cosphi - else - b = sqrt(ONE - v0*v0) - uvw(1) = mu*u0 + a*(u0*v0*cosphi + w0*sinphi)/b - uvw(2) = mu*v0 - a*b*cosphi - uvw(3) = mu*w0 + a*(v0*w0*cosphi - u0*sinphi)/b - end if - - end function rotate_angle - -end module spectra \ No newline at end of file From bd195ca069a2893c605c9c4d8dda9afede2a479d Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 3 Feb 2016 14:13:41 -0500 Subject: [PATCH 076/149] Now setting the source space Box to be fissionable in asymmetric lattice test --- tests/test_asymmetric_lattice/inputs_true.dat | 2 +- tests/test_asymmetric_lattice/results_true.dat | 2 +- tests/test_asymmetric_lattice/test_asymmetric_lattice.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat index 552c8d039e..e3b00b185c 100644 --- a/tests/test_asymmetric_lattice/inputs_true.dat +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -1 +1 @@ -fe07eb28fd0dbb56edaecd510f5e8e4db7271e5c9aecf3d880cce92b69872a0aacf825b8e88cd2e9b1ff709f578b269b1835f53cf2561a390062e1e7e03b5276 \ No newline at end of file +b9b4222c4beea80fe6083590f6b785303d174972d80671fb661bac8e030db6f4a61648240cfad6162799361fc0e08a23c61d31aff844d978528d6dad5b5fbc63 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/results_true.dat b/tests/test_asymmetric_lattice/results_true.dat index 0cf2315ea4..ec4b883886 100644 --- a/tests/test_asymmetric_lattice/results_true.dat +++ b/tests/test_asymmetric_lattice/results_true.dat @@ -1 +1 @@ -cea61172ecad5554ef86f52d6adad6ad5e21931cf3d67feb37b8bf9d75e618786f638685e458051d4a39afe1a924fd651cf6674a88cf1f1842fd69cd851e1f17 \ No newline at end of file +b5f96919ca474cd1c9c9d0acde3b8aac4a1cf636443c72a38b6c5a4221a8ce3e90182aaef2f664e44b9175ca257a89db2328b63e19388ee0e5006de4b3d92ce6 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index 3b9e2029b2..0080078aa3 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -74,7 +74,7 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Specify summary output and correct source sampling box source = Source(space=Box([-32, -32, 0], [32, 32, 32])) - source.only_fissionable = True + source.space.only_fissionable = True self._input_set.settings.source = source self._input_set.settings.output = {'summary': True} From cd921b74bf3b7febb34da50a36c7a414170c0f8e Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 3 Feb 2016 14:14:52 -0500 Subject: [PATCH 077/149] Now setting the source space Box to be fissionable in asymmetric lattice test --- tests/test_asymmetric_lattice/inputs_true.dat | 2 +- tests/test_asymmetric_lattice/results_true.dat | 2 +- tests/test_asymmetric_lattice/test_asymmetric_lattice.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat index 552c8d039e..e3b00b185c 100644 --- a/tests/test_asymmetric_lattice/inputs_true.dat +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -1 +1 @@ -fe07eb28fd0dbb56edaecd510f5e8e4db7271e5c9aecf3d880cce92b69872a0aacf825b8e88cd2e9b1ff709f578b269b1835f53cf2561a390062e1e7e03b5276 \ No newline at end of file +b9b4222c4beea80fe6083590f6b785303d174972d80671fb661bac8e030db6f4a61648240cfad6162799361fc0e08a23c61d31aff844d978528d6dad5b5fbc63 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/results_true.dat b/tests/test_asymmetric_lattice/results_true.dat index 0cf2315ea4..ec4b883886 100644 --- a/tests/test_asymmetric_lattice/results_true.dat +++ b/tests/test_asymmetric_lattice/results_true.dat @@ -1 +1 @@ -cea61172ecad5554ef86f52d6adad6ad5e21931cf3d67feb37b8bf9d75e618786f638685e458051d4a39afe1a924fd651cf6674a88cf1f1842fd69cd851e1f17 \ No newline at end of file +b5f96919ca474cd1c9c9d0acde3b8aac4a1cf636443c72a38b6c5a4221a8ce3e90182aaef2f664e44b9175ca257a89db2328b63e19388ee0e5006de4b3d92ce6 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index 3b9e2029b2..0080078aa3 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -74,7 +74,7 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Specify summary output and correct source sampling box source = Source(space=Box([-32, -32, 0], [32, 32, 32])) - source.only_fissionable = True + source.space.only_fissionable = True self._input_set.settings.source = source self._input_set.settings.output = {'summary': True} From 0b80ef0509b1baab5de9a5e5494541b472d66313 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 3 Feb 2016 16:50:09 -0500 Subject: [PATCH 078/149] Added MGXS slice class method --- openmc/mgxs/mgxs.py | 87 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index f241274581..b199933863 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -66,6 +66,10 @@ class MGXS(object): The energy group structure for energy condensation by_nuclide : bool If true, computes cross sections for each nuclide in domain + nuclides : Iterable of basestring + The user-specified nuclides to compute cross sections. If by_nuclide + is True but nuclides are not specified by the user, all nuclides in the + spatial domain will be used. name : str, optional Name of the multi-group cross section. Used as a label to identify tallies in OpenMC 'tallies.xml' file. @@ -122,6 +126,7 @@ class MGXS(object): self._name = '' self._rxn_type = None self._by_nuclide = None + self._nuclides = None self._domain = None self._domain_type = None self._energy_groups = None @@ -150,6 +155,7 @@ class MGXS(object): clone._name = self.name clone._rxn_type = self.rxn_type clone._by_nuclide = self.by_nuclide + clone._nuclides = self._nuclides clone._domain = self.domain clone._domain_type = self.domain_type clone._energy_groups = copy.deepcopy(self.energy_groups, memo) @@ -259,6 +265,11 @@ class MGXS(object): cv.check_type('by_nuclide', by_nuclide, bool) self._by_nuclide = by_nuclide + @nuclides.setter + def nuclides(self, nuclides): + cv.check_iterable_type('nuclides', nuclides, basestring) + self._nuclides = nuclides + @domain.setter def domain(self, domain): cv.check_type('domain', domain, tuple(_DOMAINS)) @@ -386,8 +397,14 @@ class MGXS(object): if self.domain is None: raise ValueError('Unable to get all nuclides without a domain') - nuclides = self.domain.get_all_nuclides() - return nuclides.keys() + # If the user defined nuclides, return them + if self._nuclides: + return self._nuclides + + # Otherwise, return all nuclides in the spatial domain + else: + nuclides = self.domain.get_all_nuclides() + return nuclides.keys() def get_nuclide_density(self, nuclide): """Get the atomic number density in units of atoms/b-cm for a nuclide @@ -550,7 +567,7 @@ class MGXS(object): # If computing xs for each nuclide, replace CrossNuclides with originals if self.by_nuclide: self.xs_tally._nuclides = [] - nuclides = self.domain.get_all_nuclides() + nuclides = self.get_all_nuclides() for nuclide in nuclides: self.xs_tally.add_nuclide(openmc.Nuclide(nuclide)) @@ -865,6 +882,70 @@ class MGXS(object): avg_xs.sparse = self.sparse return avg_xs + def get_slice(self, nuclides=[], groups=[]): + """Build a sliced MGXS for the specified nuclides and energy groups. + + This method constructs a new MGXS to encapsulate a subset of the data + represented by this MGXS. The subset of data to include in the tally + slice is determined by the nuclides and energy groups specified in + the input parameters. + + Parameters + ---------- + nuclides : list of str + A list of nuclide name strings + (e.g., ['U-235', 'U-238']; default is []) + groups : list of Integral + A list of energy group indices starting at 1 for the high energies + (e.g., [1, 2, 3]; default is []) + + Returns + ------- + MGXS + A new tally which encapsulates the subset of data requested for the + nuclide(s) and/or energy group(s) requested in the parameters. + + """ + + cv.check_iterable_type('nuclides', nuclides, basestring) + cv.check_iterable_type('energy_groups', groups, Integral) + + # Build lists of filters and filter bins to slice + if len(groups) == 0: + filters = [] + filter_bins = [] + else: + filter_bins = [] + for group in groups: + group_bounds = self.energy_groups.get_group_bounds(group) + filter_bins.append(group_bounds) + filter_bins = [tuple(filter_bins)] + filters = ['energy'] + + # Clone this MGXS to initialize the sliced version + slice_xs = copy.deepcopy(self) + slice_xs._rxn_rate_tally = None + slice_xs._xs_tally = None + + # Slice each of the tallies across nuclides and energy groups + for tally_type, tally in slice_xs.tallies.items(): + slice_nuclides = [nuc for nuc in nuclides if nuc in tally.nuclides] + tally_slice = tally.get_slice(filters=filters, + filter_bins=filter_bins, nuclides=slice_nuclides) + slice_xs.tallies[tally_type] = tally_slice + + # Assign sliced energy group structure to sliced MGXS + if groups: + energy_filter = slice_xs.tallies.values()[0].find_filter('energy') + slice_xs.energy_groups.group_edges = energy_filter.bins + + # Assign sliced nuclides to sliced MGXS + if nuclides: + slice_xs.nuclides = nuclides + + slice_xs.sparse = self.sparse + return slice_xs + def print_xs(self, subdomains='all', nuclides='all', xs_type='macro'): """Print a string representation for the multi-group cross section. From a5c51aa71532297afca8c0f9577bac2bf8153664 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 3 Feb 2016 17:20:12 -0500 Subject: [PATCH 079/149] Added slice method to ScatterMatrixXS along with new Tally.contains_filter(...) --- openmc/mgxs/mgxs.py | 54 +++++++++++++++++++++++++++++++++++++++++++-- openmc/tallies.py | 26 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index b199933863..d4d949d1b2 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -930,8 +930,11 @@ class MGXS(object): # Slice each of the tallies across nuclides and energy groups for tally_type, tally in slice_xs.tallies.items(): slice_nuclides = [nuc for nuc in nuclides if nuc in tally.nuclides] - tally_slice = tally.get_slice(filters=filters, - filter_bins=filter_bins, nuclides=slice_nuclides) + if len(groups) != 0 and tally.contains_filter('energy'): + tally_slice = tally.get_slice(filters=filters, + filter_bins=filter_bins, nuclides=slice_nuclides) + else: + tally_slice = tally.get_slice(nuclides=slice_nuclides) slice_xs.tallies[tally_type] = tally_slice # Assign sliced energy group structure to sliced MGXS @@ -1822,6 +1825,53 @@ class ScatterMatrixXS(MGXS): cv.check_value('correction', correction, ('P0', None)) self._correction = correction + def get_slice(self, nuclides=[], groups=[]): + """Build a sliced MGXS for the specified nuclides and energy groups. + + This method constructs a new MGXS to encapsulate a subset of the data + represented by this MGXS. The subset of data to include in the tally + slice is determined by the nuclides and energy groups specified in + the input parameters. + + Parameters + ---------- + nuclides : list of str + A list of nuclide name strings + (e.g., ['U-235', 'U-238']; default is []) + groups : list of Integral + A list of energy group indices starting at 1 for the high energies + (e.g., [1, 2, 3]; default is []) + + Returns + ------- + MGXS + A new tally which encapsulates the subset of data requested for the + nuclide(s) and/or energy group(s) requested in the parameters. + + """ + + slice_xs = super(ScatterMatrixXS, self).get_slice(nuclides, groups) + slice_xs._rxn_rate_tally = None + slice_xs._xs_tally = None + + # Build lists of filters and filter bins to slice + if len(groups) != 0: + filter_bins = [] + for group in groups: + group_bounds = self.energy_groups.get_group_bounds(group) + filter_bins.append(group_bounds) + filter_bins = [tuple(filter_bins)] + + # Slice each of the tallies across nuclides and energy groups + for tally_type, tally in slice_xs.tallies.items(): + if tally.contains_filter('energyout'): + tally_slice = tally.get_slice(filters=['energyout'], + filter_bins=filter_bins) + slice_xs.tallies[tally_type] = tally_slice + + slice_xs.sparse = self.sparse + return slice_xs + def get_xs(self, in_groups='all', out_groups='all', subdomains='all', nuclides='all', xs_type='macro', order_groups='increasing', value='mean'): diff --git a/openmc/tallies.py b/openmc/tallies.py index 1ad62e33ab..66b99cb00c 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -846,6 +846,32 @@ class Tally(object): return element + def contains_filter(self, filter_type): + """Looks for a filter in the tally that matches a specified type + + Parameters + ---------- + filter_type : str + Type of the filter, e.g. 'mesh' + + Returns + ------- + filter_found : bool + True if the tally contains a filter of the requested type; + otherwise false + + """ + + filter_found = False + + # Look through all of this Tally's Filters for the type requested + for test_filter in self.filters: + if test_filter.type == filter_type: + filter_found = True + break + + return filter_found + def find_filter(self, filter_type): """Return a filter in the tally that matches a specified type From d66f2b108aaa23b0c69fc192f372a7b009c1c256 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 3 Feb 2016 18:10:33 -0500 Subject: [PATCH 080/149] Added Chi.get_slice(...) method --- openmc/mgxs/mgxs.py | 70 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index d4d949d1b2..272d5e0402 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -939,8 +939,12 @@ class MGXS(object): # Assign sliced energy group structure to sliced MGXS if groups: - energy_filter = slice_xs.tallies.values()[0].find_filter('energy') - slice_xs.energy_groups.group_edges = energy_filter.bins + new_group_edges = [] + for group in groups: + group_edges = self.energy_groups.get_group_bounds(group) + new_group_edges.extend(group_edges) + new_group_edges = np.unique(new_group_edges) + slice_xs.energy_groups.group_edges = sorted(new_group_edges) # Assign sliced nuclides to sliced MGXS if nuclides: @@ -1850,11 +1854,12 @@ class ScatterMatrixXS(MGXS): """ + # Call super class method and null out derived tallies slice_xs = super(ScatterMatrixXS, self).get_slice(nuclides, groups) slice_xs._rxn_rate_tally = None slice_xs._xs_tally = None - # Build lists of filters and filter bins to slice + # Slice energy groups if needed if len(groups) != 0: filter_bins = [] for group in groups: @@ -1862,7 +1867,7 @@ class ScatterMatrixXS(MGXS): filter_bins.append(group_bounds) filter_bins = [tuple(filter_bins)] - # Slice each of the tallies across nuclides and energy groups + # Slice each of the tallies across energyout groups for tally_type, tally in slice_xs.tallies.items(): if tally.contains_filter('energyout'): tally_slice = tally.get_slice(filters=['energyout'], @@ -2215,6 +2220,63 @@ class Chi(MGXS): return self._xs_tally + def get_slice(self, nuclides=[], groups=[]): + """Build a sliced MGXS for the specified nuclides and energy groups. + + This method constructs a new MGXS to encapsulate a subset of the data + represented by this MGXS. The subset of data to include in the tally + slice is determined by the nuclides and energy groups specified in + the input parameters. + + Parameters + ---------- + nuclides : list of str + A list of nuclide name strings + (e.g., ['U-235', 'U-238']; default is []) + groups : list of Integral + A list of energy group indices starting at 1 for the high energies + (e.g., [1, 2, 3]; default is []) + + Returns + ------- + MGXS + A new tally which encapsulates the subset of data requested for the + nuclide(s) and/or energy group(s) requested in the parameters. + + """ + + # Temporarily remove energy filter from nu-fission-in since its + # group structure will work in super MGXS.get_slice(...) method + nu_fission_in = self.tallies['nu-fission-in'] + energy_filter = nu_fission_in.find_filter('energy') + nu_fission_in.remove_filter(energy_filter) + + # Call super class method and null out derived tallies + slice_xs = super(Chi, self).get_slice(nuclides, groups) + slice_xs._rxn_rate_tally = None + slice_xs._xs_tally = None + + # Slice energy groups if needed + if len(groups) != 0: + filter_bins = [] + for group in groups: + group_bounds = self.energy_groups.get_group_bounds(group) + filter_bins.append(group_bounds) + filter_bins = [tuple(filter_bins)] + + # Slice nu-fission-out tally along energyout filter + nu_fission_out = slice_xs.tallies['nu-fission-out'] + tally_slice = nu_fission_out.get_slice(filters=['energyout'], + filter_bins=filter_bins) + slice_xs._tallies['nu-fission-out'] = tally_slice + + # Add energy filter back to nu-fission-in tallies + self.tallies['nu-fission-in'].add_filter(energy_filter) + slice_xs._tallies['nu-fission-in'].add_filter(energy_filter) + + slice_xs.sparse = self.sparse + return slice_xs + def get_xs(self, groups='all', subdomains='all', nuclides='all', xs_type='macro', order_groups='increasing', value='mean'): """Returns an array of the fission spectrum. From 628daeb48a2bafc7f40dbddc8642d7e9c1d3199f Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 4 Feb 2016 09:11:47 -0500 Subject: [PATCH 081/149] Now require numpy >=1.9 in install_requires per request by @paulromano --- setup.py | 2 +- tests/test_asymmetric_lattice/test_asymmetric_lattice.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0bf4549c03..87fdff68cf 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ kwargs = {'name': 'openmc', if have_setuptools: kwargs.update({ # Required dependencies - 'install_requires': ['numpy', 'h5py', 'matplotlib'], + 'install_requires': ['numpy>=1.9', 'h5py', 'matplotlib'], # Optional dependencies 'extras_require': { diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index 0080078aa3..5a1d47ef85 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -69,7 +69,7 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Assign the tallies file to the input set self._input_set.tallies = tallies_file - + # Build default settings self._input_set.build_default_settings() # Specify summary output and correct source sampling box From 0439b6cc6d3f7d6f51441f3edfd1c88eface0f88 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 4 Feb 2016 09:13:06 -0500 Subject: [PATCH 082/149] Now require numpy >=1.9 in install_requires per request by @paulromano --- setup.py | 2 +- tests/test_asymmetric_lattice/test_asymmetric_lattice.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0bf4549c03..87fdff68cf 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ kwargs = {'name': 'openmc', if have_setuptools: kwargs.update({ # Required dependencies - 'install_requires': ['numpy', 'h5py', 'matplotlib'], + 'install_requires': ['numpy>=1.9', 'h5py', 'matplotlib'], # Optional dependencies 'extras_require': { diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index 0080078aa3..5a1d47ef85 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -69,7 +69,7 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Assign the tallies file to the input set self._input_set.tallies = tallies_file - + # Build default settings self._input_set.build_default_settings() # Specify summary output and correct source sampling box From 076117c3aa1d1d73d0fde21ca9c230725848d0e0 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 4 Feb 2016 19:30:11 -0500 Subject: [PATCH 083/149] MGXS Library now properly deep copies domains dictionary --- openmc/mgxs/library.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py index e87b4bdaef..a38e42d245 100644 --- a/openmc/mgxs/library.py +++ b/openmc/mgxs/library.py @@ -116,11 +116,11 @@ class Library(object): clone._by_nuclide = self.by_nuclide clone._mgxs_types = self.mgxs_types clone._domain_type = self.domain_type - clone._domains = self.domains + clone._domains = copy.deepcopy(self.domains) clone._correction = self.correction clone._energy_groups = copy.deepcopy(self.energy_groups, memo) clone._tally_trigger = copy.deepcopy(self.tally_trigger, memo) - clone._all_mgxs = self.all_mgxs + clone._all_mgxs = copy.deepcopy(self.all_mgxs) clone._sp_filename = self._sp_filename clone._keff = self._keff clone._sparse = self.sparse From 86d5600eb25e75b60bcdbfab175a71c7d45e8598 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 5 Feb 2016 05:37:50 -0500 Subject: [PATCH 084/149] fixes per @smharpers comments --- docs/source/usersguide/mgxs_library.rst | 25 +- .../python/pincell_multigroup/build-xml.py | 2 +- openmc/macroscopic.py | 2 +- src/global.F90 | 4 - src/input_xml.F90 | 2 +- src/macroxs.F90 | 2 +- src/macroxs_header.F90 | 213 +----------------- src/math.F90 | 2 +- src/mgxs_data.F90 | 3 +- src/nuclide_header.F90 | 10 +- src/particle_header.F90 | 1 - src/scattdata_header.F90 | 87 ++----- src/tally.F90 | 148 ++++++------ 13 files changed, 124 insertions(+), 377 deletions(-) diff --git a/docs/source/usersguide/mgxs_library.rst b/docs/source/usersguide/mgxs_library.rst index d0dc1e54f5..478b060024 100644 --- a/docs/source/usersguide/mgxs_library.rst +++ b/docs/source/usersguide/mgxs_library.rst @@ -114,20 +114,25 @@ attributes/sub-elements required to describe the meta-data: *Default*: "isotropic" :num_azimuthal: - This element provides the number of equi-width bins that the azimuthal - angular domain is subdivided in the case of angle-dependent cross sections - (i.e., "angle" is passed to the ``representation`` element). + This element provides the number of equal width angular bins that the + azimuthal angular domain is subdivided in the case of angle-dependent + cross sections (i.e., "angle" is passed to the ``representation`` element). + Note that these bins are equal in azimuthal angle widths, not equal in the + cosine of the azimuthal angle widths. - *Default*: If ``representation`` is "angle", this must be provided. If - not, this parameter is not used. + *Default*: If ``representation`` is "angle", this must be provided. This + parameter is not used for other ``representation`` types. :num_polar: - This element provides the number of equi-width bins that the polar angular - domain is subdivided in the case of angle-dependent cross sections - (i.e., "angle" is passed to the ``representation`` element). + This element provides the number of equal width angular bins that the + polar angular domain is subdivided in the case of angle-dependent + cross sections (i.e., "angle" is passed to the ``representation`` element). + Note that these bins are equal in polar angle widths, not equal in the + cosine of the polar angle widths. - *Default*: If ``representation`` is "angle", this must be provided. If - not, this parameter is not used. + + *Default*: If ``representation`` is "angle", this must be provided. This + parameter is not used for other ``representation`` types. :scatt_type: This element provides the representation of the angular distribution diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py index ba15370c3b..17fbae9941 100644 --- a/examples/python/pincell_multigroup/build-xml.py +++ b/examples/python/pincell_multigroup/build-xml.py @@ -72,7 +72,7 @@ mg_cross_sections_file.export_to_xml() uo2_data = openmc.Macroscopic('UO2', '300K') h2o_data = openmc.Macroscopic('LWTR', '300K') -# Instantiate some Materials and register the appropriate Nuclides +# Instantiate some Materials and register the appropriate Macroscopic objects uo2 = openmc.Material(material_id=1, name='UO2 fuel') uo2.set_density('macro', 1.0) uo2.add_macroscopic(uo2_data) diff --git a/openmc/macroscopic.py b/openmc/macroscopic.py index 094fa50421..9f67a50ba4 100644 --- a/openmc/macroscopic.py +++ b/openmc/macroscopic.py @@ -8,7 +8,7 @@ if sys.version_info[0] >= 3: class Macroscopic(object): - """A nuclide that can be used in a material. + """A Macroscopic object that can be used in a material. Parameters ---------- diff --git a/src/global.F90 b/src/global.F90 index 9b68eab6a4..dda4e0aea2 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -490,10 +490,6 @@ contains end if if (allocated(macro_xs)) then - ! First call the clear routines - do i = 1, size(macro_xs) - call macro_xs(i) % obj % clear() - end do deallocate(macro_xs) end if diff --git a/src/input_xml.F90 b/src/input_xml.F90 index e726b6f403..2a21bac215 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2071,7 +2071,7 @@ contains call get_list_item(node_macro_list, 1, node_nuc) ! Check for empty name on nuclide - if (.not.check_for_node(node_nuc, "name")) then + if (.not. check_for_node(node_nuc, "name")) then call fatal_error("No name specified on macroscopic data in material " & // trim(to_str(mat % id))) end if diff --git a/src/macroxs.F90 b/src/macroxs.F90 index c26e9e888b..f44f87f66f 100644 --- a/src/macroxs.F90 +++ b/src/macroxs.F90 @@ -140,7 +140,7 @@ contains !=============================================================================== subroutine macroxs_sample_scatter(scatt, gin, gout, mu, wgt) - Class(ScattData_Base), intent(in) :: scatt ! Scattering Object to Use + class(ScattData_Base), intent(in) :: scatt ! Scattering Object to Use integer, intent(in) :: gin ! Incoming neutron group integer, intent(out) :: gout ! Sampled outgoin group real(8), intent(out) :: mu ! Sampled change in angle diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index 63e6fecaed..17ee8a1e0e 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -19,10 +19,9 @@ module macroxs_header integer :: order ! Type-Bound procedures - contains - procedure(macroxs_init_), deferred, pass :: init ! initializes object - procedure(macroxs_clear_), deferred, pass :: clear ! Deallocates object - procedure(macroxs_get_xs_), deferred, pass :: get_xs ! Return xs + contains + procedure(macroxs_init_), deferred, pass :: init ! initializes object + procedure(macroxs_get_xs_), deferred, pass :: get_xs ! Return xs end type MacroXS_Base abstract interface @@ -79,11 +78,10 @@ module macroxs_header real(8), allocatable :: scattxs(:) ! scattering xs real(8), allocatable :: chi(:,:) ! fission spectra - ! Type-Bound procedures - contains - procedure, pass :: init => macroxs_iso_init ! inits object - procedure, pass :: clear => macroxs_iso_clear ! Deallocates object - procedure, pass :: get_xs => macroxs_iso_get_xs ! Returns xs + ! Type-Bound procedures + contains + procedure, pass :: init => macroxs_iso_init ! inits object + procedure, pass :: get_xs => macroxs_iso_get_xs ! Returns xs end type MacroXS_Iso type, extends(MacroXS_Base) :: MacroXS_Angle @@ -99,11 +97,10 @@ module macroxs_header real(8), allocatable :: polar(:) ! polar angles real(8), allocatable :: azimuthal(:) ! azimuthal angles - ! Type-Bound procedures - contains - procedure, pass :: init => macroxs_angle_init ! inits object - procedure, pass :: clear => macroxs_angle_clear ! Deallocates object - procedure, pass :: get_xs => macroxs_angle_get_xs ! Returns xs + ! Type-Bound procedures + contains + procedure, pass :: init => macroxs_angle_init ! inits object + procedure, pass :: get_xs => macroxs_angle_get_xs ! Returns xs end type MacroXS_Angle !=============================================================================== @@ -657,68 +654,6 @@ contains end subroutine macroxs_angle_init -!=============================================================================== -! MACROXS*_CLEAR resets and deallocates data in MacroXS. -!=============================================================================== - - subroutine macroxs_iso_clear(this) - - class(MacroXS_Iso), intent(inout) :: this ! The MacroXS to clear - - if (allocated(this % total)) then - deallocate(this % total, this % absorption, & - this % nu_fission) - end if - - if (allocated(this % fission)) then - deallocate(this % fission) - end if - - if (allocated(this % k_fission)) then - deallocate(this % k_fission) - end if - - call this % scatter % clear() - - if (allocated(this % chi)) then - deallocate(this % chi) - end if - - end subroutine macroxs_iso_clear - - subroutine macroxs_angle_clear(this) - - class(MacroXS_Angle), intent(inout) :: this ! The MacroXS to clear - integer :: i, j - - if (allocated(this % total)) then - deallocate(this % total, this % absorption, & - this % nu_fission) - end if - - if (allocated(this % fission)) then - deallocate(this % fission) - end if - - if (allocated(this % k_fission)) then - deallocate(this % k_fission) - end if - - do i = 1, size(this % scatter,dim=2) - do j = 1, size(this % scatter,dim=1) - call this % scatter(j,i) % obj % clear() - end do - end do - if (allocated(this % scatter)) then - deallocate(this % scatter) - end if - - if (allocated(this % chi)) then - deallocate(this % chi) - end if - - end subroutine macroxs_angle_clear - !=============================================================================== ! MACROXS_*_GET_XS returns the requested data type !=============================================================================== @@ -790,130 +725,4 @@ contains end function macroxs_angle_get_xs -!=============================================================================== -! THIN_GRID thins an (x,y) set while also thinning an associated y2 -!=============================================================================== - - subroutine thin_grid(xout, yout, yout2, tol, compression, maxerr) - real(8), allocatable, intent(inout) :: xout(:) ! Resultant x grid - real(8), allocatable, intent(inout) :: yout(:) ! Resultant y values - real(8), allocatable, intent(inout) :: yout2(:) ! Secondary y values - real(8), intent(in) :: tol ! Desired fractional error to maintain - real(8), intent(out) :: compression ! Data reduction fraction - real(8), intent(inout) :: maxerr ! Maximum error due to compression - - real(8), allocatable :: xin(:) ! Incoming x grid - real(8), allocatable :: yin(:) ! Incoming y values - real(8), allocatable :: yin2(:) ! Secondary Incoming y values - integer :: k, klo, khi - integer :: all_ok - real(8) :: x1, y1, x2, y2, x, y, testval - integer :: num_keep, remove_it - real(8) :: initial_size - real(8) :: error - real(8) :: x_frac - - initial_size = real(size(xout), 8) - - allocate(xin(size(xout))) - xin = xout - allocate(yin(size(yout))) - yin = yout - allocate(yin2(size(yout2))) - yin2 = yout2 - - all_ok = size(yin) - maxerr = 0.0_8 - - ! This loop will step through each entry in dim==3 and check to see if - ! all of the values in other 2 dims can be replaced with linear interp. - ! If not, the value will be saved to a new array, if so, it will be - ! skipped. - - xout = 0.0_8 - yout = 0.0_8 - - ! Keep first point's data - xout(1) = xin(1) - yout(1) = yin(1) - yout2(1) = yin2(1) - - ! Initialize data - num_keep = 1 - klo = 1 - khi = 3 - k = 2 - do while (khi <= size(xin)) - remove_it = 0 - x1 = xin(klo) - x2 = xin(khi) - x = xin(k) - x_frac = 1.0_8 / (x2 - x1) * (x - x1) ! Linear interp. - - ! Check for removal. Otherwise, it stays. This is accomplished by leaving - ! remove_it as 0, entering the else portion of if(remove_it==all_ok) - y1 = yin(klo) - y2 = yin(khi) - y = yin(k) - - testval = y1 + (y2 - y1) * x_frac - error = abs(testval - y) - if (y /= 0.0_8) then - error = error / y - end if - if (error <= tol) then - remove_it = remove_it + 1 - if (error > maxerr) then - maxerr = abs(testval - y) - end if - end if - ! Now place the point in to the proper bin and advance iterators. - if (remove_it /= 0) then - ! Then don't put it in the new grid but advance iterators - k = k + 1 - khi = khi + 1 - else - ! Put it in new grid and advance iterators accordingly - num_keep = num_keep + 1 - xout(num_keep) = xin(k) - yout(num_keep) = yin(k) - yout2(num_keep) = yin2(k) - klo = k - k = k + 1 - khi = khi + 1 - end if - end do - ! Save the last point's data - num_keep = num_keep + 1 - xout(num_keep) = xin(size(xin)) - yout(num_keep) = yin(size(xin)) - yout2(num_keep) = yin2(size(xin)) - - ! Finally, xout and yout were sized to match xin and yin since we knew - ! they would be no larger than those. Now we must resize these arrays - ! and copy only the useful data in. Will use xin/yin for temp arrays. - xin = xout(1:num_keep) - yin = yout(1:num_keep) - yin2 = yout2(1:num_keep) - - deallocate(xout) - deallocate(yout) - deallocate(yout2) - allocate(xout(num_keep)) - allocate(yout(size(yin))) - allocate(yout2(size(yin2))) - - xout = xin(1:num_keep) - yout = yin(1:num_keep) - yout2 = yin2(1:num_keep) - - ! Clean up - deallocate(xin) - deallocate(yin) - deallocate(yin2) - - compression = (initial_size - real(size(xout),8)) / initial_size - - end subroutine thin_grid - end module macroxs_header diff --git a/src/math.F90 b/src/math.F90 index aedf182358..36c65a2402 100644 --- a/src/math.F90 +++ b/src/math.F90 @@ -558,7 +558,7 @@ contains end function calc_rn !=============================================================================== -! EXPAND_HARMONIC expands a given series of harmonics +! EXPAND_HARMONIC expands a given series of real spherical harmonics !=============================================================================== pure function expand_harmonic(data, order, uvw) result(val) real(8), intent(in) :: data(:) diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 880764edad..f73f3f5a27 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -76,8 +76,7 @@ contains get_fiss = .true. end if end do - if (get_kfiss .and. get_fiss) & - exit + if (get_kfiss .and. get_fiss) exit end do ! ========================================================================== diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 398e91eb20..95f9833b4c 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -155,7 +155,7 @@ module nuclide_header end function nuclide_calc_f_ end interface - !=============================================================================== +!=============================================================================== ! NUCLIDE_ISO contains the base MGXS data for a nuclide specifically for ! isotropically weighted MGXS !=============================================================================== @@ -688,11 +688,12 @@ module nuclide_header end function nuclide_angle_get_xs !=============================================================================== -! NUCLIDE_*_CALC_F Finds the value of f(mu), the scattering probability, given mu +! NUCLIDE_*_CALC_F Finds the value of f(mu), the scattering angle probability, +! given mu !=============================================================================== - pure function nuclide_mg_iso_calc_f(this, gin, gout, mu, uvw, i_azi, i_pol) & - result(f) + pure function nuclide_mg_iso_calc_f(this, gin, gout, mu, uvw, i_azi, i_pol) & + result(f) class(Nuclide_Iso), intent(in) :: this integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group @@ -791,6 +792,7 @@ module nuclide_header end if end function nuclide_mg_angle_calc_f + !=============================================================================== ! find_angle finds the closest angle on the data grid and returns that index !=============================================================================== diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 0e9fc0263a..0426acd924 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -132,7 +132,6 @@ contains this % fission = .false. this % delayed_group = 0 this % n_delayed_bank(:) = 0 - ! Initialize this % g so there is always at least some initialized value this % g = 1 ! Set up base level coordinates diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index 29ab616e0a..091a77741a 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -16,11 +16,10 @@ module scattdata_header real(8), allocatable :: mult(:,:) ! (Gout x Gin) real(8), allocatable :: data(:,:,:) ! (Order/Nmu x Gout x Gin) - ! Type-Bound procedures - contains - procedure(init_), deferred, pass :: init ! Initializes ScattData - procedure(calc_f_), deferred, pass :: calc_f ! Calculates f, given mu - procedure(clear_), deferred, pass :: clear ! Deallocates ScattData + ! Type-Bound procedures + contains + procedure(init_), deferred, pass :: init ! Initializes ScattData + procedure(calc_f_), deferred, pass :: calc_f ! Calculates f, given mu end type ScattData_Base abstract interface @@ -42,37 +41,29 @@ module scattdata_header real(8) :: f ! Return value of f(mu) end function calc_f_ - - subroutine clear_(this) - import ScattData_Base - class(ScattData_Base), intent(inout) :: this ! The ScattData to clear - end subroutine clear_ end interface type, extends(ScattData_Base) :: ScattData_Legendre - contains - procedure, pass :: init => scattdata_legendre_init - procedure, pass :: calc_f => scattdata_legendre_calc_f - procedure, pass :: clear => scattdata_legendre_clear + contains + procedure, pass :: init => scattdata_legendre_init + procedure, pass :: calc_f => scattdata_legendre_calc_f end type ScattData_Legendre type, extends(ScattData_Base) :: ScattData_Histogram real(8), allocatable :: mu(:) ! Mu bins real(8) :: dmu ! Mu spacing - contains - procedure, pass :: init => scattdata_histogram_init - procedure, pass :: calc_f => scattdata_histogram_calc_f - procedure, pass :: clear => scattdata_histogram_clear + contains + procedure, pass :: init => scattdata_histogram_init + procedure, pass :: calc_f => scattdata_histogram_calc_f end type ScattData_Histogram type, extends(ScattData_Base) :: ScattData_Tabular real(8), allocatable :: mu(:) ! Mu bins real(8) :: dmu ! Mu spacing real(8), allocatable :: fmu(:,:,:) ! PDF of f(mu) - contains - procedure, pass :: init => scattdata_tabular_init - procedure, pass :: calc_f => scattdata_tabular_calc_f - procedure, pass :: clear => scattdata_tabular_clear + contains + procedure, pass :: init => scattdata_tabular_init + procedure, pass :: calc_f => scattdata_tabular_calc_f end type ScattData_Tabular !=============================================================================== @@ -239,56 +230,6 @@ contains end subroutine scattdata_tabular_init -!=============================================================================== -! SCATTDATA_CLEAR resets and deallocates data in ScattData. -!=============================================================================== - - subroutine scattdata_base_clear(this) - class(ScattData_Base), intent(inout) :: this - - if (allocated(this % energy)) then - deallocate(this % energy) - end if - - if (allocated(this % mult)) then - deallocate(this % mult) - end if - - if (allocated(this % data)) then - deallocate(this % data) - end if - - end subroutine scattdata_base_clear - - subroutine scattdata_legendre_clear(this) - class(ScattData_Legendre), intent(inout) :: this - - call scattdata_base_clear(this) - - end subroutine scattdata_legendre_clear - - subroutine scattdata_histogram_clear(this) - class(ScattData_Histogram), intent(inout) :: this - - call scattdata_base_clear(this) - - if (allocated(this % mu)) then - deallocate(this % mu) - end if - - end subroutine scattdata_histogram_clear - - subroutine scattdata_tabular_clear(this) - class(ScattData_Tabular), intent(inout) :: this - - call scattdata_base_clear(this) - - if (allocated(this % mu)) then - deallocate(this % mu) - end if - - end subroutine scattdata_tabular_clear - !=============================================================================== ! SCATTDATA_*_CALC_F Calculates the value of f given mu (and gin,gout pair) !=============================================================================== @@ -350,6 +291,4 @@ contains end function scattdata_tabular_calc_f - - end module scattdata_header \ No newline at end of file diff --git a/src/tally.F90 b/src/tally.F90 index bbe099c3e4..e127cf0378 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -26,6 +26,8 @@ module tally integer :: position(N_FILTER_TYPES - 3) = 0 ! Tally map positioning array +!$omp threadprivate(position) + procedure(score_general_intfc), pointer :: score_general => null() procedure(get_scoring_bins_intfc), pointer :: get_scoring_bins => null() @@ -52,8 +54,6 @@ module tally end interface -!$omp threadprivate(position) - contains !=============================================================================== @@ -1255,97 +1255,95 @@ contains real(8) :: uvw(3) select case(score_bin) - - - case (SCORE_SCATTER_N, SCORE_NU_SCATTER_N) - ! Find the scattering order for a singly requested moment, and - ! store its moment contribution. - if (t % moment_order(i) == 1) then - score = score * p % mu ! avoid function call overhead - else - score = score * calc_pn(t % moment_order(i), p % mu) - endif + case (SCORE_SCATTER_N, SCORE_NU_SCATTER_N) + ! Find the scattering order for a singly requested moment, and + ! store its moment contribution. + if (t % moment_order(i) == 1) then + score = score * p % mu ! avoid function call overhead + else + score = score * calc_pn(t % moment_order(i), p % mu) + endif !$omp atomic - t % results(score_index, filter_index) % value = & - t % results(score_index, filter_index) % value + score + t % results(score_index, filter_index) % value = & + t % results(score_index, filter_index) % value + score - case(SCORE_SCATTER_YN, SCORE_NU_SCATTER_YN) - score_index = score_index - 1 - num_nm = 1 - ! Find the order for a collection of requested moments - ! and store the moment contribution of each - do n = 0, t % moment_order(i) - ! determine scoring bin index - score_index = score_index + num_nm - ! Update number of total n,m bins for this n (m = [-n: n]) - num_nm = 2 * n + 1 + case(SCORE_SCATTER_YN, SCORE_NU_SCATTER_YN) + score_index = score_index - 1 + num_nm = 1 + ! Find the order for a collection of requested moments + ! and store the moment contribution of each + do n = 0, t % moment_order(i) + ! determine scoring bin index + score_index = score_index + num_nm + ! Update number of total n,m bins for this n (m = [-n: n]) + num_nm = 2 * n + 1 - ! multiply score by the angular flux moments and store + ! multiply score by the angular flux moments and store !$omp critical (score_general_scatt_yn) - t % results(score_index: score_index + num_nm - 1, filter_index) & - % value = t & - % results(score_index: score_index + num_nm - 1, filter_index)& - % value & - + score * calc_pn(n, p % mu) * calc_rn(n, p % last_uvw) + t % results(score_index: score_index + num_nm - 1, filter_index) & + % value = t & + % results(score_index: score_index + num_nm - 1, filter_index)& + % value & + + score * calc_pn(n, p % mu) * calc_rn(n, p % last_uvw) !$omp end critical (score_general_scatt_yn) - end do - i = i + (t % moment_order(i) + 1)**2 - 1 + end do + i = i + (t % moment_order(i) + 1)**2 - 1 - case(SCORE_FLUX_YN, SCORE_TOTAL_YN) - score_index = score_index - 1 - num_nm = 1 - if (t % estimator == ESTIMATOR_ANALOG .or. & - t % estimator == ESTIMATOR_COLLISION) then - uvw = p % last_uvw - else if (t % estimator == ESTIMATOR_TRACKLENGTH) then - uvw = p % coord(1) % uvw - end if - ! Find the order for a collection of requested moments - ! and store the moment contribution of each - do n = 0, t % moment_order(i) - ! determine scoring bin index - score_index = score_index + num_nm - ! Update number of total n,m bins for this n (m = [-n: n]) - num_nm = 2 * n + 1 + case(SCORE_FLUX_YN, SCORE_TOTAL_YN) + score_index = score_index - 1 + num_nm = 1 + if (t % estimator == ESTIMATOR_ANALOG .or. & + t % estimator == ESTIMATOR_COLLISION) then + uvw = p % last_uvw + else if (t % estimator == ESTIMATOR_TRACKLENGTH) then + uvw = p % coord(1) % uvw + end if + ! Find the order for a collection of requested moments + ! and store the moment contribution of each + do n = 0, t % moment_order(i) + ! determine scoring bin index + score_index = score_index + num_nm + ! Update number of total n,m bins for this n (m = [-n: n]) + num_nm = 2 * n + 1 - ! multiply score by the angular flux moments and store + ! multiply score by the angular flux moments and store !$omp critical (score_general_flux_tot_yn) - t % results(score_index: score_index + num_nm - 1, filter_index) & - % value = t & - % results(score_index: score_index + num_nm - 1, filter_index)& - % value & - + score * calc_rn(n, uvw) + t % results(score_index: score_index + num_nm - 1, filter_index) & + % value = t & + % results(score_index: score_index + num_nm - 1, filter_index)& + % value & + + score * calc_rn(n, uvw) !$omp end critical (score_general_flux_tot_yn) - end do - i = i + (t % moment_order(i) + 1)**2 - 1 + end do + i = i + (t % moment_order(i) + 1)**2 - 1 - case (SCORE_SCATTER_PN, SCORE_NU_SCATTER_PN) - score_index = score_index - 1 - ! Find the scattering order for a collection of requested moments - ! and store the moment contribution of each - do n = 0, t % moment_order(i) - ! determine scoring bin index - score_index = score_index + 1 + case (SCORE_SCATTER_PN, SCORE_NU_SCATTER_PN) + score_index = score_index - 1 + ! Find the scattering order for a collection of requested moments + ! and store the moment contribution of each + do n = 0, t % moment_order(i) + ! determine scoring bin index + score_index = score_index + 1 - ! get the score and tally it -!$omp atomic - t % results(score_index, filter_index) % value = & - t % results(score_index, filter_index) % value & - + score * calc_pn(n, p % mu) - end do - i = i + t % moment_order(i) - - - case default + ! get the score and tally it !$omp atomic t % results(score_index, filter_index) % value = & - t % results(score_index, filter_index) % value + score + t % results(score_index, filter_index) % value & + + score * calc_pn(n, p % mu) + end do + i = i + t % moment_order(i) - end select + case default +!$omp atomic + t % results(score_index, filter_index) % value = & + t % results(score_index, filter_index) % value + score + + + end select end subroutine expand_and_score From 4d27f7eab042f050bbe83dfa20e57cf1a23f0146 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 5 Feb 2016 21:13:54 -0500 Subject: [PATCH 085/149] Renaming Nuclide_* to Nuclide* --- src/ace.F90 | 18 ++--- src/cross_section.F90 | 6 +- src/energy_grid.F90 | 6 +- src/fission.F90 | 10 +-- src/global.F90 | 2 +- src/initialize.F90 | 4 +- src/macroxs.F90 | 2 +- src/macroxs_header.F90 | 18 ++--- src/mgxs_data.F90 | 40 +++++----- src/nuclide_header.F90 | 162 ++++++++++++++++++++--------------------- src/output.F90 | 4 +- src/physics.F90 | 18 ++--- 12 files changed, 145 insertions(+), 145 deletions(-) diff --git a/src/ace.F90 b/src/ace.F90 index 45b58a8d54..5012c9b884 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -54,7 +54,7 @@ contains character(12) :: name ! name of isotope, e.g. 92235.03c character(12) :: alias ! alias of nuclide, e.g. U-235.03c type(Material), pointer :: mat - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc type(SAlphaBeta), pointer :: sab type(SetChar) :: already_read @@ -265,7 +265,7 @@ contains character(10) :: mat ! material identifier character(70) :: comment ! comment for ACE table character(MAX_FILE_LEN) :: filename ! path to ACE cross section library - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc type(SAlphaBeta), pointer :: sab type(XsListing), pointer :: listing @@ -422,7 +422,7 @@ contains !=============================================================================== subroutine read_esz(nuc, data_0K) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc logical, intent(in) :: data_0K ! are we reading 0K data? integer :: NE ! number of energy points for total and elastic cross sections @@ -510,7 +510,7 @@ contains !=============================================================================== subroutine read_nu_data(nuc) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc integer :: i ! loop index integer :: JXS2 ! location for fission nu data @@ -714,7 +714,7 @@ contains !=============================================================================== subroutine read_reactions(nuc) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc integer :: i ! loop indices integer :: i_fission ! index in nuc % index_fission @@ -894,7 +894,7 @@ contains !=============================================================================== subroutine read_angular_dist(nuc) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc integer :: LOCB ! location of angular distribution for given MT integer :: NE ! number of incoming energies @@ -998,7 +998,7 @@ contains !=============================================================================== subroutine read_energy_dist(nuc) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc integer :: i ! loop index integer :: n @@ -1386,7 +1386,7 @@ contains !=============================================================================== subroutine read_unr_res(nuc) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc integer :: JXS23 ! location of URR data integer :: lc ! locator @@ -1474,7 +1474,7 @@ contains !=============================================================================== subroutine generate_nu_fission(nuc) - type(Nuclide_CE), intent(inout) :: nuc + type(NuclideCE), intent(inout) :: nuc integer :: i ! index on nuclide energy grid real(8) :: E ! energy diff --git a/src/cross_section.F90 b/src/cross_section.F90 index e6422de1f8..4f5d2252ce 100644 --- a/src/cross_section.F90 +++ b/src/cross_section.F90 @@ -148,7 +148,7 @@ contains integer :: i_low ! lower logarithmic mapping index integer :: i_high ! upper logarithmic mapping index real(8) :: f ! interp factor on nuclide energy grid - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc type(Material), pointer :: mat ! Set pointer to nuclide and material @@ -367,7 +367,7 @@ contains real(8) :: inelastic ! inelastic cross section logical :: same_nuc ! do we know the xs for this nuclide at this energy? type(UrrData), pointer :: urr - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc micro_xs(i_nuclide) % use_ptable = .true. @@ -534,7 +534,7 @@ contains pure function elastic_xs_0K(E, nuc) result(xs_out) real(8), intent(in) :: E ! trial energy - type(Nuclide_CE), intent(in) :: nuc ! target nuclide at temperature + type(NuclideCE), intent(in) :: nuc ! target nuclide at temperature real(8) :: xs_out ! 0K xs at trial energy integer :: i_grid ! index on nuclide energy grid diff --git a/src/energy_grid.F90 b/src/energy_grid.F90 index fa56b04956..248462f70c 100644 --- a/src/energy_grid.F90 +++ b/src/energy_grid.F90 @@ -27,7 +27,7 @@ contains integer :: i ! index in nuclides array integer :: j ! index in materials array type(ListReal) :: list - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc type(Material), pointer :: mat call write_message("Creating unionized energy grid...", 5) @@ -70,7 +70,7 @@ contains real(8) :: E_max ! Maximum energy in MeV real(8) :: E_min ! Minimum energy in MeV real(8), allocatable :: umesh(:) ! Equally log-spaced energy grid - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc ! Set minimum/maximum energies E_max = energy_max_neutron @@ -179,7 +179,7 @@ contains integer :: index_e ! index on union energy grid real(8) :: union_energy ! energy on union grid real(8) :: energy ! energy on nuclide grid - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc type(Material), pointer :: mat do k = 1, n_materials diff --git a/src/fission.F90 b/src/fission.F90 index 98cccc5582..77ee641787 100644 --- a/src/fission.F90 +++ b/src/fission.F90 @@ -1,6 +1,6 @@ module fission - use nuclide_header, only: Nuclide_CE + use nuclide_header, only: NuclideCE use constants use error, only: fatal_error use interpolation, only: interpolate_tab1 @@ -16,7 +16,7 @@ contains !=============================================================================== pure function nu_total(nuc, E) result(nu) - type(Nuclide_CE), intent(in) :: nuc ! nuclide from which to find nu + type(NuclideCE), intent(in) :: nuc ! nuclide from which to find nu real(8), intent(in) :: E ! energy of incoming neutron real(8) :: nu ! number of total neutrons emitted per fission @@ -49,7 +49,7 @@ contains !=============================================================================== pure function nu_prompt(nuc, E) result(nu) - type(Nuclide_CE), intent(in) :: nuc ! nuclide from which to find nu + type(NuclideCE), intent(in) :: nuc ! nuclide from which to find nu real(8), intent(in) :: E ! energy of incoming neutron real(8) :: nu ! number of prompt neutrons emitted per fission @@ -86,7 +86,7 @@ contains !=============================================================================== pure function nu_delayed(nuc, E) result(nu) - type(Nuclide_CE), intent(in) :: nuc ! nuclide from which to find nu + type(NuclideCE), intent(in) :: nuc ! nuclide from which to find nu real(8), intent(in) :: E ! energy of incoming neutron real(8) :: nu ! number of delayed neutrons emitted per fission @@ -109,7 +109,7 @@ contains !=============================================================================== pure function yield_delayed(nuc, E, g) result(yield) - type(Nuclide_CE), intent(in) :: nuc ! nuclide from which to find nu + type(NuclideCE), intent(in) :: nuc ! nuclide from which to find nu real(8), intent(in) :: E ! energy of incoming neutron real(8) :: yield ! delayed neutron precursor yield integer, intent(in) :: g ! the delayed neutron precursor group diff --git a/src/global.F90 b/src/global.F90 index dda4e0aea2..dcbf7b1e48 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -86,7 +86,7 @@ module global ! CONTINUOUS-ENERGY CROSS SECTION RELATED VARIABLES ! Cross section arrays - type(Nuclide_CE), allocatable, target :: nuclides(:) ! Nuclide cross-sections + type(NuclideCE), allocatable, target :: nuclides(:) ! Nuclide cross-sections type(SAlphaBeta), allocatable, target :: sab_tables(:) ! S(a,b) tables integer :: n_sab_tables ! Number of S(a,b) thermal scattering tables diff --git a/src/initialize.F90 b/src/initialize.F90 index 74bba03e72..88a10fb550 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -16,7 +16,7 @@ module initialize hdf5_tallyresult_t, hdf5_integer8_t use input_xml, only: read_input_xml, cells_in_univ_dict, read_plots_xml use material_header, only: Material - use mgxs_data, only: read_mgxs, same_nuclide_mg_list, create_macro_xs + use mgxs_data, only: read_mgxs, same_NuclideMG_list, create_macro_xs use output, only: title, header, print_version, write_message, & print_usage, write_xs_summary, print_plot use random_lcg, only: initialize_prng @@ -126,7 +126,7 @@ contains if (run_CE) then call same_nuclide_list() else - call same_nuclide_mg_list() + call same_NuclideMG_list() end if ! Construct information needed for nuclear data diff --git a/src/macroxs.F90 b/src/macroxs.F90 index f44f87f66f..170f5fb19a 100644 --- a/src/macroxs.F90 +++ b/src/macroxs.F90 @@ -6,7 +6,7 @@ module macroxs use material_header, only: Material use math use nuclide_header, only: find_angle, MaterialMacroXS, NuclideMicroXS, & - Nuclide_MG, NuclideMGContainer + NuclideMG, NuclideMGContainer use random_lcg, only: prn use scattdata_header use search diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index 17ee8a1e0e..95053789f5 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -135,7 +135,7 @@ contains integer :: i ! loop index over nuclides integer :: gin, gout ! group indices real(8) :: atom_density ! atom density of a nuclide - ! class(Nuclide_Base), pointer :: nuc ! current nuclide + ! class(NuclideBase), pointer :: nuc ! current nuclide integer :: imu real(8) :: norm integer :: mat_max_order, order, l @@ -239,7 +239,7 @@ contains ! Perform our operations which depend upon the type select type(nuc => nuclides(mat % nuclide(i)) % obj) - type is (Nuclide_Iso) + type is (NuclideIso) ! Add contributions to total, absorption, and fission data (if necessary) this % total = this % total + atom_density * nuc % total @@ -305,9 +305,9 @@ contains nuc % mult(gout,gin) end do end do - type is (Nuclide_Angle) + type is (NuclideAngle) error_code = 1 - error_text = "Invalid Passing of Nuclide_Angle to MacroXS_Iso Object" + error_text = "Invalid Passing of NuclideAngle to MacroXS_Iso Object" return end select end do @@ -393,12 +393,12 @@ contains error_text = '' ! Get the number of each polar and azi angles and make sure all the - ! Nuclide_Angle types have the same number of these angles + ! NuclideAngle types have the same number of these angles npol = -1 nazi = -1 do i = 1, mat % n_nuclides select type(nuc => nuclides(mat % nuclide(i)) % obj) - type is (Nuclide_Angle) + type is (NuclideAngle) if (npol == -1) then npol = nuc % Npol nazi = nuc % Nazi @@ -522,11 +522,11 @@ contains ! Perform our operations which depend upon the type select type(nuc => nuclides(mat % nuclide(i)) % obj) - type is (Nuclide_Iso) + type is (NuclideIso) error_code = 1 - error_text = "Invalid Passing of Nuclide_Iso to MacroXS_Angle Object" + error_text = "Invalid Passing of NuclideIso to MacroXS_Angle Object" return - type is (Nuclide_Angle) + type is (NuclideAngle) ! Add contributions to total, absorption, and fission data (if necessary) this % total = this % total + atom_density * nuc % total this % absorption = this % absorption + & diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index f73f3f5a27..d9c397f5bb 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -119,13 +119,13 @@ contains ! Now allocate accordingly select case(representation) case(MGXS_ISOTROPIC) - allocate(Nuclide_Iso :: nuclides_MG(i_nuclide) % obj) + allocate(NuclideIso :: nuclides_MG(i_nuclide) % obj) case(MGXS_ANGLE) - allocate(Nuclide_Angle :: nuclides_MG(i_nuclide) % obj) + allocate(NuclideAngle :: nuclides_MG(i_nuclide) % obj) end select ! Now read in the data specific to the type we just declared - call nuclide_mg_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & + call NuclideMG_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & energy_groups, get_kfiss, get_fiss, error_code, & error_text) @@ -175,7 +175,7 @@ contains ! in multiple entries in the nuclides array for a single zaid number. !=============================================================================== - subroutine same_nuclide_mg_list() + subroutine same_NuclideMG_list() integer :: i ! index in nuclides array integer :: j ! index in nuclides array @@ -188,15 +188,15 @@ contains end do end do - end subroutine same_nuclide_mg_list + end subroutine same_NuclideMG_list !=============================================================================== ! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed !=============================================================================== - subroutine nuclide_mg_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + subroutine NuclideMG_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) - class(Nuclide_MG), intent(inout) :: this ! Working Object + class(NuclideMG), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml integer, intent(in) :: groups ! Number of Energy groups logical, intent(in) :: get_kfiss ! Need Kappa-Fission? @@ -296,19 +296,19 @@ contains end if select type(this) - type is (Nuclide_Iso) - call nuclide_iso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + type is (NuclideIso) + call NuclideIso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) - type is (Nuclide_Angle) - call nuclide_angle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + type is (NuclideAngle) + call NuclideAngle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) end select - end subroutine nuclide_mg_init + end subroutine NuclideMG_init - subroutine nuclide_iso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + subroutine NuclideIso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) - class(Nuclide_Iso), intent(inout) :: this ! Working Object + class(NuclideIso), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml integer, intent(in) :: groups ! Number of Energy groups logical, intent(in) :: get_kfiss ! Need Kappa-Fission? @@ -435,11 +435,11 @@ contains this % mult = ONE end if - end subroutine nuclide_iso_init + end subroutine NuclideIso_init - subroutine nuclide_angle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + subroutine NuclideAngle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) - class(Nuclide_Angle), intent(inout) :: this ! Working Object + class(NuclideAngle), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml integer, intent(in) :: groups ! Number of Energy groups logical, intent(in) :: get_kfiss ! Need Kappa-Fission? @@ -627,7 +627,7 @@ contains this % mult = ONE end if - end subroutine nuclide_angle_init + end subroutine NuclideAngle_init !=============================================================================== @@ -675,9 +675,9 @@ contains ! how we allocate the scatter object within macroxs legendre_mu_points = nuclides_MG(mat % nuclide(1)) % obj % legendre_mu_points select type(nuc => nuclides_MG(mat % nuclide(1)) % obj) - type is (Nuclide_Iso) + type is (NuclideIso) representation = MGXS_ISOTROPIC - type is (Nuclide_Angle) + type is (NuclideAngle) representation = MGXS_ANGLE end select scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 95f9833b4c..fc9c53ff30 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -12,12 +12,12 @@ module nuclide_header implicit none !=============================================================================== -! NUCLIDE_BASE contains the base nuclidic data for a nuclide, which does not depend +! NuclideBase contains the base nuclidic data for a nuclide, which does not depend ! upon how the nuclear data is represented (i.e., CE, or any variant of MG). -! The extended types, Nuclide_CE and Nuclide_MG deal with the rest +! The extended types, NuclideCE and NuclideMG deal with the rest !=============================================================================== - type, abstract :: Nuclide_Base + type, abstract :: NuclideBase character(12) :: name ! name of nuclide, e.g. 92235.03c integer :: zaid ! Z and A identifier, e.g. 92235 real(8) :: awr ! Atomic Weight Ratio @@ -31,26 +31,26 @@ module nuclide_header logical :: fissionable ! nuclide is fissionable? contains - procedure(nuclide_base_clear_), deferred, pass :: clear ! Deallocates Nuclide - procedure(print_nuclide_), deferred, pass :: print ! Writes nuclide info - end type Nuclide_Base + procedure(nuclidebase_clear_), deferred, pass :: clear ! Deallocates Nuclide + procedure(print_nuclide_), deferred, pass :: print ! Writes nuclide info + end type NuclideBase abstract interface - subroutine nuclide_base_clear_(this) - import Nuclide_Base - class(Nuclide_Base), intent(inout) :: this - end subroutine nuclide_base_clear_ + subroutine nuclidebase_clear_(this) + import NuclideBase + class(NuclideBase), intent(inout) :: this + end subroutine nuclidebase_clear_ subroutine print_nuclide_(this, unit) - import Nuclide_Base - class(Nuclide_Base),intent(in) :: this + import NuclideBase + class(NuclideBase),intent(in) :: this integer, optional, intent(in) :: unit end subroutine print_nuclide_ end interface - type, extends(Nuclide_Base) :: Nuclide_CE + type, extends(NuclideBase) :: NuclideCE ! Energy grid information integer :: n_grid ! # of nuclide grid points integer, allocatable :: grid_index(:) ! log grid mapping indices @@ -108,29 +108,29 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclide_ce_clear - procedure, pass :: print => nuclide_ce_print - end type Nuclide_CE + procedure, pass :: clear => nuclidece_clear + procedure, pass :: print => nuclidece_print + end type NuclideCE - type, abstract, extends(Nuclide_Base) :: Nuclide_MG + type, abstract, extends(NuclideBase) :: NuclideMG ! Scattering Order Information - integer :: order ! Order of data (Scattering for Nuclide_Iso, - ! Number of angles for all in Nuclide_Angle) + integer :: order ! Order of data (Scattering for NuclideIso, + ! Number of angles for all in NuclideAngle) integer :: scatt_type ! either legendre, histogram, or tabular. integer :: legendre_mu_points ! Number of tabular points to use to represent ! Legendre distribs, -1 if sample with the ! Legendres themselves ! Type-Bound procedures contains - procedure(nuclide_mg_get_xs_), deferred, pass :: get_xs ! Get the xs - procedure(nuclide_calc_f_), deferred, pass :: calc_f ! Calculates f, given mu - end type Nuclide_MG + procedure(nuclidemg_get_xs), deferred, pass :: get_xs ! Get the xs + procedure(nuclide_calc_f_), deferred, pass :: calc_f ! Calculates f, given mu + end type NuclideMG abstract interface - function nuclide_mg_get_xs_(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & + function nuclidemg_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) - import Nuclide_MG - class(Nuclide_MG), intent(in) :: this + import NuclideMG + class(NuclideMG), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group @@ -139,11 +139,11 @@ module nuclide_header integer, optional, intent(in) :: i_azi ! Azimuthal Index integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs - end function nuclide_mg_get_xs_ + end function nuclidemg_get_xs pure function nuclide_calc_f_(this, gin, gout, mu, uvw, i_azi, i_pol) result(f) - import Nuclide_MG - class(Nuclide_MG), intent(in) :: this + import NuclideMG + class(NuclideMG), intent(in) :: this integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group real(8), intent(in) :: mu ! Angle of interest @@ -156,11 +156,11 @@ module nuclide_header end interface !=============================================================================== -! NUCLIDE_ISO contains the base MGXS data for a nuclide specifically for +! NuclideIso contains the base MGXS data for a nuclide specifically for ! isotropically weighted MGXS !=============================================================================== - type, extends(Nuclide_MG) :: Nuclide_Iso + type, extends(NuclideMG) :: NuclideIso ! Microscopic cross sections real(8), allocatable :: total(:) ! total cross section @@ -174,18 +174,18 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclide_iso_clear ! Deallocates Nuclide - procedure, pass :: print => nuclide_iso_print ! Writes nuclide info - procedure, pass :: get_xs => nuclide_iso_get_xs ! Gets Size of Data w/in Object - procedure, pass :: calc_f => nuclide_mg_iso_calc_f ! Calcs f given mu - end type Nuclide_Iso + procedure, pass :: clear => nuclideiso_clear ! Deallocates Nuclide + procedure, pass :: print => nuclideiso_print ! Writes nuclide info + procedure, pass :: get_xs => nuclideiso_get_xs ! Gets Size of Data w/in Object + procedure, pass :: calc_f => nuclideiso_calc_f ! Calcs f given mu + end type NuclideIso !=============================================================================== -! NUCLIDE_ANGLE contains the base MGXS data for a nuclide specifically for +! NuclideAngle contains the base MGXS data for a nuclide specifically for ! explicit angle-dependent weighted MGXS !=============================================================================== - type, extends(Nuclide_MG) :: Nuclide_Angle + type, extends(NuclideMG) :: NuclideAngle ! Microscopic cross sections. Dimensions are: (Npol, Nazi, Nl, Ng, Ng) real(8), allocatable :: total(:,:,:) ! total cross section @@ -205,23 +205,23 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclide_angle_clear ! Deallocates Nuclide - procedure, pass :: print => nuclide_angle_print ! Gets Size of Data w/in Object - procedure, pass :: get_xs => nuclide_angle_get_xs ! Gets Size of Data w/in Object - procedure, pass :: calc_f => nuclide_mg_angle_calc_f ! Calcs f given mu - end type Nuclide_Angle + procedure, pass :: clear => nuclideangle_clear ! Deallocates Nuclide + procedure, pass :: print => nuclideangle_print ! Gets Size of Data w/in Object + procedure, pass :: get_xs => nuclideangle_get_xs ! Gets Size of Data w/in Object + procedure, pass :: calc_f => nuclideangle_calc_f ! Calcs f given mu + end type NuclideAngle !=============================================================================== ! NUCLIDEMGCONTAINER pointer array for storing Nuclides !=============================================================================== type NuclideMGContainer - class(Nuclide_MG), pointer :: obj + class(NuclideMG), pointer :: obj end type NuclideMGContainer !=============================================================================== ! NUCLIDE0K temporarily contains all 0K cross section data and other parameters -! needed to treat resonance scattering before transferring them to NUCLIDE_CE +! needed to treat resonance scattering before transferring them to NuclideCE !=============================================================================== type Nuclide0K @@ -297,13 +297,13 @@ module nuclide_header contains !=============================================================================== -! NUCLIDE_*_CLEAR resets and deallocates data in Nuclide_Base, Nuclide_Iso -! or Nuclide_Angle +! NUCLIDE_*_CLEAR resets and deallocates data in NuclideBase, NuclideIso +! or NuclideAngle !=============================================================================== - subroutine nuclide_ce_clear(this) + subroutine nuclidece_clear(this) - class(Nuclide_CE), intent(inout) :: this ! The Nuclide object to clear + class(NuclideCE), intent(inout) :: this ! The Nuclide object to clear integer :: i ! Loop counter @@ -317,11 +317,11 @@ module nuclide_header call this % reaction_index % clear() - end subroutine nuclide_ce_clear + end subroutine nuclidece_clear - subroutine nuclide_iso_clear(this) + subroutine nuclideiso_clear(this) - class(Nuclide_Iso), intent(inout) :: this ! The Nuclide object to clear + class(NuclideIso), intent(inout) :: this ! The Nuclide object to clear ! Cler the extended information if (allocated(this % total)) then @@ -340,11 +340,11 @@ module nuclide_header deallocate(this % mult) end if - end subroutine nuclide_iso_clear + end subroutine nuclideiso_clear - subroutine nuclide_angle_clear(this) + subroutine nuclideangle_clear(this) - class(Nuclide_Angle), intent(inout) :: this ! The Nuclide object to clear + class(NuclideAngle), intent(inout) :: this ! The Nuclide object to clear ! Cler the extended information if (allocated(this % total)) then @@ -370,15 +370,15 @@ module nuclide_header deallocate(this % mult) end if - end subroutine nuclide_angle_clear + end subroutine nuclideangle_clear !=============================================================================== ! PRINT_NUCLIDE_* displays information about a continuous-energy neutron ! cross_section table and its reactions and secondary angle/energy distributions !=============================================================================== - subroutine nuclide_ce_print(this, unit) - class(Nuclide_CE), intent(in) :: this + subroutine nuclidece_print(this, unit) + class(NuclideCE), intent(in) :: this integer, intent(in), optional :: unit integer :: i ! loop index over nuclides @@ -451,10 +451,10 @@ module nuclide_header ! Blank line at end of nuclide write(unit_,*) - end subroutine nuclide_ce_print + end subroutine nuclidece_print - subroutine nuclide_mg_print(this, unit_) - class(Nuclide_MG), intent(in) :: this + subroutine nuclidemg_print(this, unit_) + class(NuclideMG), intent(in) :: this integer, intent(in) :: unit_ character(MAX_LINE_LEN) :: temp_str @@ -484,11 +484,11 @@ module nuclide_header end if write(unit_,*) ' Fissionable = ', this % fissionable - end subroutine nuclide_mg_print + end subroutine nuclidemg_print - subroutine nuclide_iso_print(this, unit) + subroutine nuclideiso_print(this, unit) - class(Nuclide_Iso), intent(in) :: this + class(NuclideIso), intent(in) :: this integer, optional, intent(in) :: unit integer :: unit_ ! unit to write to @@ -502,7 +502,7 @@ module nuclide_header end if ! Write Basic Nuclide Information - call nuclide_mg_print(this, unit_) + call nuclidemg_print(this, unit_) ! Determine size of mgxs and scattering matrices size_scattmat = (size(this % scatter) + size(this % mult)) * 8 @@ -524,11 +524,11 @@ module nuclide_header ! Blank line at end of nuclide write(unit_,*) - end subroutine nuclide_iso_print + end subroutine nuclideiso_print - subroutine nuclide_angle_print(this, unit) + subroutine nuclideangle_print(this, unit) - class(Nuclide_Angle), intent(in) :: this + class(NuclideAngle), intent(in) :: this integer, optional, intent(in) :: unit integer :: unit_ ! unit to write to @@ -542,7 +542,7 @@ module nuclide_header end if ! Write Basic Nuclide Information - call nuclide_mg_print(this, unit_) + call nuclidemg_print(this, unit_) write(unit_,*) ' # of Polar Angles = ' // trim(to_str(this % Npol)) write(unit_,*) ' # of Azimuthal Angles = ' // trim(to_str(this % Nazi)) @@ -567,15 +567,15 @@ module nuclide_header write(unit_,*) - end subroutine nuclide_angle_print + end subroutine nuclideangle_print !=============================================================================== ! NUCLIDE_*_GET_XS Returns the requested data type !=============================================================================== - function nuclide_iso_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & + function nuclideiso_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) - class(Nuclide_Iso), intent(in) :: this + class(NuclideIso), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group @@ -622,11 +622,11 @@ module nuclide_header xs = this % total(g) - this % absorption(g) end select end if - end function nuclide_iso_get_xs + end function nuclideiso_get_xs - function nuclide_angle_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & + function nuclideangle_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) - class(Nuclide_Angle), intent(in) :: this + class(NuclideAngle), intent(in) :: this integer, intent(in) :: g ! Incoming Energy group character(*), intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Group @@ -685,16 +685,16 @@ module nuclide_header end select end if - end function nuclide_angle_get_xs + end function nuclideangle_get_xs !=============================================================================== ! NUCLIDE_*_CALC_F Finds the value of f(mu), the scattering angle probability, ! given mu !=============================================================================== - pure function nuclide_mg_iso_calc_f(this, gin, gout, mu, uvw, i_azi, i_pol) & + pure function nuclideiso_calc_f(this, gin, gout, mu, uvw, i_azi, i_pol) & result(f) - class(Nuclide_Iso), intent(in) :: this + class(NuclideIso), intent(in) :: this integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group real(8), intent(in) :: mu ! Angle of interest @@ -737,11 +737,11 @@ module nuclide_header end if - end function nuclide_mg_iso_calc_f + end function nuclideiso_calc_f - pure function nuclide_mg_angle_calc_f(this, gin, gout, mu, uvw, i_azi, & + pure function nuclideangle_calc_f(this, gin, gout, mu, uvw, i_azi, & i_pol) result(f) - class(Nuclide_Angle), intent(in) :: this + class(NuclideAngle), intent(in) :: this integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group real(8), intent(in) :: mu ! Angle of interest @@ -791,7 +791,7 @@ module nuclide_header end if - end function nuclide_mg_angle_calc_f + end function nuclideangle_calc_f !=============================================================================== ! find_angle finds the closest angle on the data grid and returns that index diff --git a/src/output.F90 b/src/output.F90 index 29844076e6..125fe010bc 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -350,10 +350,10 @@ contains call sab_tables(i) % print(unit=unit_xs) end do SAB_TABLES_LOOP else - NUCLIDE_MG_LOOP: do i = 1, n_nuclides_total + NuclideMG_LOOP: do i = 1, n_nuclides_total ! Print information about nuclide call nuclides_mg(i) % obj % print(unit=unit_xs) - end do NUCLIDE_MG_LOOP + end do NuclideMG_LOOP end if ! Close cross section summary file diff --git a/src/physics.F90 b/src/physics.F90 index 13a311d5e3..e41b3b4e9e 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -75,7 +75,7 @@ contains integer :: i_nuclide ! index in nuclides array integer :: i_nuc_mat ! index in material's nuclides array integer :: i_reaction ! index in nuc % reactions array - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc call sample_nuclide(p, 'total ', i_nuclide, i_nuc_mat) @@ -198,7 +198,7 @@ contains real(8) :: f real(8) :: prob real(8) :: cutoff - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc ! Get pointer to nuclide nuc => nuclides(i_nuclide) @@ -296,7 +296,7 @@ contains real(8) :: uvw_new(3) ! outgoing uvw for iso-in-lab scattering real(8) :: uvw_old(3) ! incoming uvw for iso-in-lab scattering real(8) :: phi ! azimuthal angle for iso-in-lab scattering - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc ! copy incoming direction uvw_old(:) = p % coord(1) % uvw @@ -411,7 +411,7 @@ contains real(8) :: v_cm(3) ! velocity of center-of-mass real(8) :: v_t(3) ! velocity of target nucleus real(8) :: uvw_cm(3) ! directional cosines in center-of-mass - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc ! get pointer to nuclide nuc => nuclides(i_nuclide) @@ -737,7 +737,7 @@ contains !=============================================================================== subroutine sample_target_velocity(nuc, v_target, E, uvw, v_neut, wgt, xs_eff) - type(Nuclide_CE), intent(in) :: nuc ! target nuclide at temperature T + type(NuclideCE), intent(in) :: nuc ! target nuclide at temperature T real(8), intent(out) :: v_target(3) ! target velocity real(8), intent(in) :: v_neut(3) ! neutron velocity real(8), intent(in) :: E ! particle energy @@ -982,7 +982,7 @@ contains !=============================================================================== subroutine sample_cxs_target_velocity(nuc, v_target, E, uvw) - type(Nuclide_CE), intent(in) :: nuc ! target nuclide at temperature + type(NuclideCE), intent(in) :: nuc ! target nuclide at temperature real(8), intent(out) :: v_target(3) real(8), intent(in) :: E real(8), intent(in) :: uvw(3) @@ -1070,7 +1070,7 @@ contains real(8) :: phi ! fission neutron azimuthal angle real(8) :: weight ! weight adjustment for ufs method logical :: in_mesh ! source site in ufs mesh? - type(Nuclide_CE), pointer :: nuc + type(NuclideCE), pointer :: nuc ! Get pointers nuc => nuclides(i_nuclide) @@ -1180,7 +1180,7 @@ contains function sample_fission_energy(nuc, rxn, p) result(E_out) - type(Nuclide_CE), intent(in) :: nuc + type(NuclideCE), intent(in) :: nuc type(Reaction), intent(in) :: rxn type(Particle), intent(inout) :: p ! Particle causing fission real(8) :: E_out ! outgoing energy of fission neutron @@ -1293,7 +1293,7 @@ contains !=============================================================================== subroutine inelastic_scatter(nuc, rxn, p) - type(Nuclide_CE), intent(in) :: nuc + type(NuclideCE), intent(in) :: nuc type(Reaction), intent(in) :: rxn type(Particle), intent(inout) :: p From cf213cf86e5b2f23fabc608922cf084271652b4b Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 5 Feb 2016 21:25:42 -0500 Subject: [PATCH 086/149] Clearing up the clear routines from NuclideMG extended types. Now THATS punny --- src/global.F90 | 4 --- src/nuclide_header.F90 | 69 +++--------------------------------------- 2 files changed, 4 insertions(+), 69 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index dcbf7b1e48..02f53a4f7d 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -482,10 +482,6 @@ contains end if if (allocated(nuclides_MG)) then - ! First call the clear routines - do i = 1, size(nuclides_MG) - call nuclides_MG(i) % obj % clear() - end do deallocate(nuclides_MG) end if diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index fc9c53ff30..095155a33b 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -31,17 +31,11 @@ module nuclide_header logical :: fissionable ! nuclide is fissionable? contains - procedure(nuclidebase_clear_), deferred, pass :: clear ! Deallocates Nuclide procedure(print_nuclide_), deferred, pass :: print ! Writes nuclide info end type NuclideBase abstract interface - subroutine nuclidebase_clear_(this) - import NuclideBase - class(NuclideBase), intent(inout) :: this - end subroutine nuclidebase_clear_ - subroutine print_nuclide_(this, unit) import NuclideBase class(NuclideBase),intent(in) :: this @@ -174,7 +168,6 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclideiso_clear ! Deallocates Nuclide procedure, pass :: print => nuclideiso_print ! Writes nuclide info procedure, pass :: get_xs => nuclideiso_get_xs ! Gets Size of Data w/in Object procedure, pass :: calc_f => nuclideiso_calc_f ! Calcs f given mu @@ -205,7 +198,6 @@ module nuclide_header ! Type-Bound procedures contains - procedure, pass :: clear => nuclideangle_clear ! Deallocates Nuclide procedure, pass :: print => nuclideangle_print ! Gets Size of Data w/in Object procedure, pass :: get_xs => nuclideangle_get_xs ! Gets Size of Data w/in Object procedure, pass :: calc_f => nuclideangle_calc_f ! Calcs f given mu @@ -297,7 +289,7 @@ module nuclide_header contains !=============================================================================== -! NUCLIDE_*_CLEAR resets and deallocates data in NuclideBase, NuclideIso +! NUCLIDECE_CLEAR resets and deallocates data in NuclideBase, NuclideIso ! or NuclideAngle !=============================================================================== @@ -319,61 +311,8 @@ module nuclide_header end subroutine nuclidece_clear - subroutine nuclideiso_clear(this) - - class(NuclideIso), intent(inout) :: this ! The Nuclide object to clear - - ! Cler the extended information - if (allocated(this % total)) then - deallocate(this % total, this % absorption, this % scatter) - end if - if (allocated(this % fission)) then - deallocate(this % fission, this % nu_fission) - end if - if (allocated(this % k_fission)) then - deallocate(this % k_fission) - end if - if (allocated(this % chi)) then - deallocate(this % chi) - end if - if (allocated(this % mult)) then - deallocate(this % mult) - end if - - end subroutine nuclideiso_clear - - subroutine nuclideangle_clear(this) - - class(NuclideAngle), intent(inout) :: this ! The Nuclide object to clear - - ! Cler the extended information - if (allocated(this % total)) then - deallocate(this % total, this % absorption, this % scatter) - end if - if (allocated(this % fission)) then - deallocate(this % fission, this % nu_fission) - end if - if (allocated(this % k_fission)) then - deallocate(this % k_fission) - end if - if (allocated(this % chi)) then - deallocate(this % chi) - end if - - if (allocated(this % polar)) then - deallocate(this % polar) - end if - if (allocated(this % azimuthal)) then - deallocate(this % azimuthal) - end if - if (allocated(this % mult)) then - deallocate(this % mult) - end if - - end subroutine nuclideangle_clear - !=============================================================================== -! PRINT_NUCLIDE_* displays information about a continuous-energy neutron +! NUCLIDE*_PRINT displays information about a continuous-energy neutron ! cross_section table and its reactions and secondary angle/energy distributions !=============================================================================== @@ -570,7 +509,7 @@ module nuclide_header end subroutine nuclideangle_print !=============================================================================== -! NUCLIDE_*_GET_XS Returns the requested data type +! NUCLIDE*_GET_XS Returns the requested data type !=============================================================================== function nuclideiso_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & @@ -688,7 +627,7 @@ module nuclide_header end function nuclideangle_get_xs !=============================================================================== -! NUCLIDE_*_CALC_F Finds the value of f(mu), the scattering angle probability, +! NUCLIDE*_CALC_F Finds the value of f(mu), the scattering angle probability, ! given mu !=============================================================================== From 7543e9df661623b424b6f3d5a9c12ca48cf1742c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 6 Feb 2016 08:12:12 -0500 Subject: [PATCH 087/149] Updating output file revision numbers as i neglected to do so earlier --- docs/source/usersguide/output/particle_restart.rst | 10 ++++++++-- docs/source/usersguide/output/statepoint.rst | 2 +- src/constants.F90 | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/source/usersguide/output/particle_restart.rst b/docs/source/usersguide/output/particle_restart.rst index e0d89a5156..eeb40a526e 100644 --- a/docs/source/usersguide/output/particle_restart.rst +++ b/docs/source/usersguide/output/particle_restart.rst @@ -4,7 +4,7 @@ Particle Restart File Format ============================ -The current revision of the particle restart file format is 1. +The current revision of the particle restart file format is 2. **/filetype** (*char[]*) @@ -46,7 +46,13 @@ The current revision of the particle restart file format is 1. **/energy** (*double*) - Energy of the particle in MeV. + Energy of the particle in MeV. This is always provided but only used + for continuous-energy mode. + +**/energy_group** (*double*) + + Energy group of the particle. This is always provided but only used + for multi-group mode. **/xyz** (*double[3]*) diff --git a/docs/source/usersguide/output/statepoint.rst b/docs/source/usersguide/output/statepoint.rst index 2921258c97..2251619653 100644 --- a/docs/source/usersguide/output/statepoint.rst +++ b/docs/source/usersguide/output/statepoint.rst @@ -4,7 +4,7 @@ State Point File Format ======================= -The current revision of the statepoint file format is 14. +The current revision of the statepoint file format is 15. **/filetype** (*char[]*) diff --git a/src/constants.F90 b/src/constants.F90 index 0c208e6d34..b93abae2b7 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -11,10 +11,10 @@ module constants integer, parameter :: VERSION_RELEASE = 1 ! Revision numbers for binary files - integer, parameter :: REVISION_STATEPOINT = 14 - integer, parameter :: REVISION_PARTICLE_RESTART = 1 + integer, parameter :: REVISION_STATEPOINT = 15 + integer, parameter :: REVISION_PARTICLE_RESTART = 2 integer, parameter :: REVISION_TRACK = 1 - integer, parameter :: REVISION_SUMMARY = 2 + integer, parameter :: REVISION_SUMMARY = 3 ! ============================================================================ ! ADJUSTABLE PARAMETERS From 7fa2be860af63d2118fb9a7451e5ad56f05f6129 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 6 Feb 2016 15:04:56 -0500 Subject: [PATCH 088/149] Improved modular functionalization of tally merging --- openmc/filter.py | 23 +++- openmc/tallies.py | 287 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 267 insertions(+), 43 deletions(-) diff --git a/openmc/filter.py b/openmc/filter.py index 54814a6b6f..430b2415f0 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -257,9 +257,17 @@ class Filter(object): elif self.type == 'mesh': return False - # Different energy bins are not mergeable + # Different energy bins structures must be mutually exclusive and + # share only one shared bin edge at the minimum or maximum energy elif 'energy' in self.type: - return False + # This low energy edge coincides with other's high energy edge + if self.bins[0] == other.bins[-1]: + return True + # This high energy edge coincides with other's low energy edge + elif self.bins[-1] == other.bins[0]: + return True + else: + return False else: return True @@ -288,9 +296,14 @@ class Filter(object): merged_filter = copy.deepcopy(self) # Merge unique filter bins - merged_bins = list(set(np.concatenate((self.bins, other.bins)))) - merged_filter.bins = merged_bins - merged_filter.num_bins = len(merged_bins) + merged_bins = set(np.concatenate((self.bins, other.bins))) + merged_filter.bins = list(sorted(merged_bins)) + + # Count bins in the merged filter + if 'energy' in merged_filter.type: + merged_filter.num_bins = len(merged_bins) -1 + else: + merged_filter.num_bins = len(merged_bins) return merged_filter diff --git a/openmc/tallies.py b/openmc/tallies.py index 66b99cb00c..dabbeb04ae 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -673,66 +673,162 @@ class Tally(object): self._nuclides.remove(nuclide) - def can_merge(self, tally): - """Determine if another tally can be merged with this one + def _can_merge_filters(self, other): + """Determine if another tally's filters can be merged with this one's + + The types of filters between the two tallies must match identically. + The bins in all of the filters must match identically, or be mergeable + in only one filter. This is a helper method for the can_merge(...) + and merge(...) methods. Parameters ---------- - tally : Tally - Tally to check for merging + other : Tally + Tally to check for mergeable scores """ - if not isinstance(tally, Tally): + # Two tallys must have the same number of filters + if len(self.filters) != len(other.filters): return False - # Must have same estimator - if self.estimator != tally.estimator: - return False - - # Must have same nuclides - if len(self.nuclides) != len(tally.nuclides): - return False - - for nuclide in self.nuclides: - if nuclide not in tally.nuclides: - return False - - # Must have same or mergeable filters - if len(self.filters) != len(tally.filters): - return False - - # Check if only one tally contains a delayed group filter - tally1_dg = False - for filter1 in self.filters: - if filter1.type == 'delayedgroup': - tally1_dg = True - - tally2_dg = False - for filter2 in tally.filters: - if filter2.type == 'delayedgroup': - tally2_dg = True - # Return False if only one tally has a delayed group filter - if (tally1_dg or tally2_dg) and not (tally1_dg and tally2_dg): + tally1_dg = self.contains_filter('delayedgroup') + tally2_dg = other.contains_filter('delayedgroup') + if sum(tally1_dg, tally2_dg) == 1: return False # Look to see if all filters are the same, or one or more can be merged for filter1 in self.filters: mergeable_filter = False - for filter2 in tally.filters: - if filter1 == filter2 or filter1.can_merge(filter2): + for filter2 in other.filters: + + # If filters match, they are mergeable + if filter1 == filter2: mergeable_filter = True break + # If filters are first mergeable filters encountered + elif filter1.can_merge(filter2) and not merge_filters: + merge_filters = True + mergeable_filter = True + break + + # If filters are the second mergeable filters encountered + elif filter1.can_merge(filter2) and merge_filters: + return False + # If no mergeable filter was found, the tallies are not mergeable if not mergeable_filter: return False - # Tallies are mergeable if all conditional checks passed + # Tally filters are mergeable if all conditional checks passed return True + def _can_merge_nuclides(self, other): + """Determine if another tally's nuclides can be merged with this one's + + The nuclides between the two tallies must be mutually exclusive or + identically matching. This is a helper method for the can_merge(...) + and merge(...) methods. + + Parameters + ---------- + other : Tally + Tally to check for mergeable nuclides + + """ + + no_nuclides_match = True + all_nuclides_match = True + + # Search for each of this tally's nuclides in the other tally + for nuclide in self.nuclides: + if nuclide not in other.nuclides: + all_nuclides_match = False + else: + no_nuclides_match = False + + # Search for each of the other tally's nuclides in this tally + for nuclide in other.nuclides: + if nuclide not in self.nuclides: + all_nuclides_match = False + else: + no_nuclides_match = False + + # Either all nuclides should match, or none should + if no_nuclides_match: + return True + if not no_nuclides_match and not all_nuclides_match: + return False + + def _can_merge_scores(self, other): + """Determine if another tally's scores can be merged with this one's + + The scores between the two tallies must be mutually exclusive or + identically matching. This is a helper method for the can_merge(...) + and merge(...) methods. + + Parameters + ---------- + other : Tally + Tally to check for mergeable scores + + """ + + no_scores_match = True + all_scores_match = True + + # Search for each of this tally's scores in the other tally + for score in self.scores: + if score not in other.scores: + all_scores_match = False + else: + no_scores_match = False + + # Search for each of the other tally's scores in this tally + for score in other.scores: + if score not in self.scores: + all_scores_match = False + else: + no_scores_match = False + + # Either all scores should match, or none should + if no_scores_match: + return True + elif not no_scores_match and not all_scores_match: + return False + + def can_merge(self, other): + """Determine if another tally can be merged with this one + + Parameters + ---------- + other : Tally + Tally to check for merging + + """ + + if not isinstance(other, Tally): + return False + + # Must have same estimator + if self.estimator != other.estimator: + return False + + # Variables to indicate matching filter bins, nuclides and scores + merge_filters = self._can_merge_filters(other) + merge_nuclides = self._can_merge_nuclides(other) + merge_scores = self._can_merge_scores(other) + + # Tallies are mergeable if only one of filters, nuclides and + # scores is mergeable + if sum(merge_filters, merge_nuclides, merge_scores) == 1: + return True + else: + return False + def merge(self, tally): """Merge another tally with this one @@ -778,6 +874,116 @@ class Tally(object): return merged_tally + def join(self, other): + """Join another tally with this one + + Parameters + ---------- + tally : Tally + Tally to join with this one + + Returns + ------- + joined_tally : Tally + Joined tallies + + """ + + if not self.can_merge(other): + msg = 'Unable to join tally ID="{0}" with ' + \ + '"{1}"'.format(other.id, self.id) + raise ValueError(msg) + + # Create deep copy of tally to return as merged tally + joined_tally = copy.deepcopy(self) + + # Differentiate Tally with a new auto-generated Tally ID + joined_tally.id = None + + # Create deep copy of other tally to use for array concatenation + other_copy = copy.deepcopy(other) + + # If two tallies can be merged along a filter's bins + if self._can_merge_filters(other): + + # Search for mergeable filters + for i, filter1 in enumerate(self.filters): + for j, filter2 in enumerate(other.filters): + if filter1 != filter2 and filter1.can_merge(filter2): + other_copy._swap_filters(other_copy.filters[i], filter1) + joined_tally.filters[i] = filter1.merge(filter2) + join_axis = i + break + + # If two tallies can be merged along nuclide bins + elif self._can_merge_nuclides(other): + join_axis = self.num_filters + + # Add unique nuclides from other tally to merged tally + for nuclide in other.nuclides: + if nuclide not in joined_tally.nuclides: + joined_tally.add_score(nuclide) + + # If two tallies can be merged along score bins + elif self._can_merge_scores(other): + join_axis = self.num_filters + 1 + + # Add unique scores from other tally to merged tally + for score in other.scores: + if score not in joined_tally.scores: + joined_tally.add_score(score) + + else: + raise ValueError('Unable to merge tallies') + + # Update filter strides in joined tally + joined_tally._update_filter_strides() + + # Concatenate sum arrays if present in both tallies + if self.sum is not None and other_copy.sum is not None: + self_sum = self.get_reshaped_data(value='sum') + other_sum = other_copy.get_reshaped_data(value='sum') + joined_tally._sum = \ + np.concatenate((self_sum, other_sum), axis=join_axis) + joined_tally._sum = \ + np.reshape(joined_tally._sum, joined_tally.shape) + + # Concatenate sum_sq arrays if present in both tallies + if self.sum_sq is not None and other.sum_sq is not None: + self_sum_sq = self.get_reshaped_data(value='sum_sq') + other_sum_sq = other_copy.get_reshaped_data(value='sum_sq') + joined_tally._sum_sq = \ + np.concatenate((self_sum_sq, other_sum_sq), axis=join_axis) + joined_tally._sum_sq = \ + np.reshape(joined_tally._sum_sq, joined_tally.shape) + + # Concatenate mean arrays if present in both tallies + if self.mean is not None and other.mean is not None: + self_mean = self.get_reshaped_data(value='mean') + other_mean = other_copy.get_reshaped_data(value='mean') + joined_tally._mean = \ + np.concatenate((self_mean, other_mean), axis=join_axis) + joined_tally._mean = \ + np.reshape(joined_tally._mean, joined_tally.shape) + + # Concatenate std. dev. arrays if present in both tallies + if self.std_dev is not None and other.std_dev is not None: + self_std_dev = self.get_reshaped_data(value='std_dev') + other_std_dev = other_copy.get_reshaped_data(value='std_dev') + joined_tally._std_dev = \ + np.concatenate((self_std_dev, other_std_dev), axis=join_axis) + joined_tally._std_dev = \ + np.reshape(joined_tally._std_dev, joined_tally.shape) + + # Sparsify joined tally if both tallies are sparse + joined_tally.sparse = self.sparse and other.sparse + + # Add triggers from other tally to merged tally + for trigger in other.triggers: + joined_tally.add_trigger(trigger) + + return joined_tally + def get_tally_xml(self): """Return XML representation of the tally @@ -1980,8 +2186,7 @@ class Tally(object): # Check that the filters exist in the tally and are not the same if filter1 == filter2: - msg = 'Unable to swap a filter with itself' - raise ValueError(msg) + return elif filter1 not in self.filters: msg = 'Unable to swap "{0}" filter1 in Tally ID="{1}" since it ' \ 'does not contain such a filter'.format(filter1.type, self.id) @@ -2012,6 +2217,8 @@ class Tally(object): else: filter2_bins = [filter2.get_bin(i) for i in range(filter2.num_bins)] + # FIXME: Why doesn't this swap data for sum and sum_sq??? + # Adjust the mean data array to relect the new filter order if self.mean is not None: for bin1, bin2 in itertools.product(filter1_bins, filter2_bins): @@ -2083,6 +2290,8 @@ class Tally(object): self.nuclides[nuclide1_index] = nuclide2 self.nuclides[nuclide2_index] = nuclide1 + # FIXME: Why doesn't this swap data for sum and sum_sq??? + # Adjust the mean data array to relect the new nuclide order if self.mean is not None: nuclide1_mean = self.mean[:, nuclide1_index, :].copy() @@ -2155,6 +2364,8 @@ class Tally(object): self.scores[score1_index] = score2 self.scores[score2_index] = score1 + # FIXME: Why doesn't this swap data for sum and sum_sq??? + # Adjust the mean data array to relect the new nuclide order if self.mean is not None: score1_mean = self.mean[:, :, score1_index].copy() From 76f9c462b583b0567c8fbeca89066527996d8740 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 6 Feb 2016 15:09:02 -0500 Subject: [PATCH 089/149] Removed old tally merge method --- openmc/tallies.py | 49 ++--------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/openmc/tallies.py b/openmc/tallies.py index dabbeb04ae..51633186e7 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -684,7 +684,7 @@ class Tally(object): Parameters ---------- other : Tally - Tally to check for mergeable scores + Tally to check for mergeable filters """ @@ -829,52 +829,7 @@ class Tally(object): else: return False - def merge(self, tally): - """Merge another tally with this one - - Parameters - ---------- - tally : Tally - Tally to merge with this one - - Returns - ------- - merged_tally : Tally - Merged tallies - - """ - - if not self.can_merge(tally): - msg = 'Unable to merge tally ID="{0}" with ' + \ - '"{1}"'.format(tally.id, self.id) - raise ValueError(msg) - - # Create deep copy of tally to return as merged tally - merged_tally = copy.deepcopy(self) - - # Differentiate Tally with a new auto-generated Tally ID - merged_tally.id = None - - # Merge filters - for i, filter1 in enumerate(merged_tally.filters): - for filter2 in tally.filters: - if filter1 != filter2 and filter1.can_merge(filter2): - merged_filter = filter1.merge(filter2) - merged_tally.filters[i] = merged_filter - break - - # Add unique scores from second tally to merged tally - for score in tally.scores: - if score not in merged_tally.scores: - merged_tally.add_score(score) - - # Add triggers from second tally to merged tally - for trigger in tally.triggers: - merged_tally.add_trigger(trigger) - - return merged_tally - - def join(self, other): + def merge(self, other): """Join another tally with this one Parameters From 596c819be7650c299d4f97d673e009e5f719382b Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 6 Feb 2016 15:54:53 -0500 Subject: [PATCH 090/149] 2 more revision nmbers to update in python api --- openmc/particle_restart.py | 4 ++-- openmc/statepoint.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openmc/particle_restart.py b/openmc/particle_restart.py index 72bf3ac3de..4aad111325 100644 --- a/openmc/particle_restart.py +++ b/openmc/particle_restart.py @@ -43,11 +43,11 @@ class Particle(object): if 'filetype' not in self._f or self._f[ 'filetype'].value.decode() != 'particle restart': raise IOError('{} is not a particle restart file.'.format(filename)) - if self._f['revision'].value != 1: + if self._f['revision'].value != 2: raise IOError('Particle restart file has a file revision of {} ' 'which is not consistent with the revision this ' 'version of OpenMC expects ({}).'.format( - self._f['revision'].value, 1)) + self._f['revision'].value, 2)) @property def current_batch(self): diff --git a/openmc/statepoint.py b/openmc/statepoint.py index f5b5b2e72d..003b088180 100644 --- a/openmc/statepoint.py +++ b/openmc/statepoint.py @@ -103,11 +103,11 @@ class StatePoint(object): raise IOError('Could not read statepoint file. This most likely ' 'means the statepoint file was produced by a different ' 'version of OpenMC than the one you are using.') - if self._f['revision'].value != 14: + if self._f['revision'].value != 15: raise IOError('Statepoint file has a file revision of {} ' 'which is not consistent with the revision this ' 'version of OpenMC expects ({}).'.format( - self._f['revision'].value, 14)) + self._f['revision'].value, 15)) # Set flags for what data has been read self._meshes_read = False From 0710e35233180ac750c178697d66829d5493b7d1 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sat, 6 Feb 2016 15:10:13 -0500 Subject: [PATCH 091/149] Output Pandas energy bins as two columns of floats --- .../pythonapi/examples/mgxs-part-i.ipynb | 201 +- .../examples/pandas-dataframes.ipynb | 1664 +++++++++-------- .../pythonapi/examples/tally-arithmetic.ipynb | 521 +++--- openmc/filter.py | 31 +- openmc/mgxs/mgxs.py | 21 +- 5 files changed, 1280 insertions(+), 1158 deletions(-) diff --git a/docs/source/pythonapi/examples/mgxs-part-i.ipynb b/docs/source/pythonapi/examples/mgxs-part-i.ipynb index 94deeec7b4..319c6d1dfd 100644 --- a/docs/source/pythonapi/examples/mgxs-part-i.ipynb +++ b/docs/source/pythonapi/examples/mgxs-part-i.ipynb @@ -518,8 +518,9 @@ " Copyright: 2011-2015 Massachusetts Institute of Technology\n", " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", - " Git SHA1: ea9fb637f63f9374c7436456141afa850b84acf9\n", - " Date/Time: 2016-01-14 07:16:05\n", + " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", + " Date/Time: 2016-02-06 15:29:23\n", + " MPI Processes: 1\n", "\n", " ===========================================================================\n", " ========================> INITIALIZATION <=========================\n", @@ -604,20 +605,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 1.1720E+00 seconds\n", - " Reading cross sections = 9.0300E-01 seconds\n", - " Total time in simulation = 1.7319E+01 seconds\n", - " Time in transport only = 1.7310E+01 seconds\n", - " Time in inactive batches = 1.9120E+00 seconds\n", - " Time in active batches = 1.5407E+01 seconds\n", - " Time synchronizing fission bank = 2.0000E-03 seconds\n", + " Total time for initialization = 3.7300E-01 seconds\n", + " Reading cross sections = 9.8000E-02 seconds\n", + " Total time in simulation = 8.5810E+00 seconds\n", + " Time in transport only = 8.5650E+00 seconds\n", + " Time in inactive batches = 1.2990E+00 seconds\n", + " Time in active batches = 7.2820E+00 seconds\n", + " Time synchronizing fission bank = 4.0000E-03 seconds\n", " Sampling source sites = 2.0000E-03 seconds\n", - " SEND/RECV source sites = 0.0000E+00 seconds\n", + " SEND/RECV source sites = 2.0000E-03 seconds\n", " Time accumulating tallies = 0.0000E+00 seconds\n", - " Total time for finalization = 1.0000E-03 seconds\n", - " Total time elapsed = 1.8507E+01 seconds\n", - " Calculation Rate (inactive) = 13075.3 neutrons/second\n", - " Calculation Rate (active) = 6490.56 neutrons/second\n", + " Total time for finalization = 0.0000E+00 seconds\n", + " Total time elapsed = 8.9680E+00 seconds\n", + " Calculation Rate (inactive) = 19245.6 neutrons/second\n", + " Calculation Rate (active) = 13732.5 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -794,19 +795,19 @@ " \n", " \n", " 1\n", - " 1\n", - " 1\n", - " total\n", - " 0.668323\n", - " 0.001264\n", + " 1\n", + " 1\n", + " total\n", + " 0.668323\n", + " 0.001264\n", " \n", " \n", " 0\n", - " 1\n", - " 2\n", - " total\n", - " 1.293258\n", - " 0.007624\n", + " 1\n", + " 2\n", + " total\n", + " 1.293258\n", + " 0.007624\n", " \n", " \n", "\n", @@ -896,7 +897,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -906,30 +908,32 @@ " \n", " \n", " 0\n", - " 1\n", - " (0.0e+00 - 6.3e-07)\n", - " total\n", - " (((total / flux) - (absorption / flux)) - (sca...\n", - " 4.884981e-15\n", - " 0.011274\n", + " 1\n", + " 0.000000\n", + " 0.000001\n", + " total\n", + " (((total / flux) - (absorption / flux)) - (sca...\n", + " 4.884981e-15\n", + " 0.011274\n", " \n", " \n", " 1\n", - " 1\n", - " (6.3e-07 - 2.0e+01)\n", - " total\n", - " (((total / flux) - (absorption / flux)) - (sca...\n", - " 1.221245e-15\n", - " 0.001802\n", + " 1\n", + " 0.000001\n", + " 20.000000\n", + " total\n", + " (((total / flux) - (absorption / flux)) - (sca...\n", + " 1.221245e-15\n", + " 0.001802\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide \\\n", - "0 1 (0.0e+00 - 6.3e-07) total \n", - "1 1 (6.3e-07 - 2.0e+01) total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.000000 0.000001 total \n", + "1 1 0.000001 20.000000 total \n", "\n", " score mean std. dev. \n", "0 (((total / flux) - (absorption / flux)) - (sca... 4.884981e-15 0.011274 \n", @@ -972,7 +976,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -982,34 +987,36 @@ " \n", " \n", " 0\n", - " 1\n", - " (0.0e+00 - 6.3e-07)\n", - " total\n", - " ((absorption / flux) / (total / flux))\n", - " 0.076219\n", - " 0.000651\n", + " 1\n", + " 0.000000\n", + " 0.000001\n", + " total\n", + " ((absorption / flux) / (total / flux))\n", + " 0.076219\n", + " 0.000651\n", " \n", " \n", " 1\n", - " 1\n", - " (6.3e-07 - 2.0e+01)\n", - " total\n", - " ((absorption / flux) / (total / flux))\n", - " 0.019319\n", - " 0.000086\n", + " 1\n", + " 0.000001\n", + " 20.000000\n", + " total\n", + " ((absorption / flux) / (total / flux))\n", + " 0.019319\n", + " 0.000086\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide score \\\n", - "0 1 (0.0e+00 - 6.3e-07) total ((absorption / flux) / (total / flux)) \n", - "1 1 (6.3e-07 - 2.0e+01) total ((absorption / flux) / (total / flux)) \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.000000 0.000001 total \n", + "1 1 0.000001 20.000000 total \n", "\n", - " mean std. dev. \n", - "0 0.076219 0.000651 \n", - "1 0.019319 0.000086 " + " score mean std. dev. \n", + "0 ((absorption / flux) / (total / flux)) 0.076219 0.000651 \n", + "1 ((absorption / flux) / (total / flux)) 0.019319 0.000086 " ] }, "execution_count": 24, @@ -1041,7 +1048,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -1051,34 +1059,36 @@ " \n", " \n", " 0\n", - " 1\n", - " (0.0e+00 - 6.3e-07)\n", - " total\n", - " ((scatter / flux) / (total / flux))\n", - " 0.923781\n", - " 0.007714\n", + " 1\n", + " 0.000000\n", + " 0.000001\n", + " total\n", + " ((scatter / flux) / (total / flux))\n", + " 0.923781\n", + " 0.007714\n", " \n", " \n", " 1\n", - " 1\n", - " (6.3e-07 - 2.0e+01)\n", - " total\n", - " ((scatter / flux) / (total / flux))\n", - " 0.980681\n", - " 0.002617\n", + " 1\n", + " 0.000001\n", + " 20.000000\n", + " total\n", + " ((scatter / flux) / (total / flux))\n", + " 0.980681\n", + " 0.002617\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide score \\\n", - "0 1 (0.0e+00 - 6.3e-07) total ((scatter / flux) / (total / flux)) \n", - "1 1 (6.3e-07 - 2.0e+01) total ((scatter / flux) / (total / flux)) \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.000000 0.000001 total \n", + "1 1 0.000001 20.000000 total \n", "\n", - " mean std. dev. \n", - "0 0.923781 0.007714 \n", - "1 0.980681 0.002617 " + " score mean std. dev. \n", + "0 ((scatter / flux) / (total / flux)) 0.923781 0.007714 \n", + "1 ((scatter / flux) / (total / flux)) 0.980681 0.002617 " ] }, "execution_count": 25, @@ -1117,7 +1127,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -1127,30 +1138,32 @@ " \n", " \n", " 0\n", - " 1\n", - " (0.0e+00 - 6.3e-07)\n", - " total\n", - " (((absorption / flux) / (total / flux)) + ((sc...\n", - " 1\n", - " 0.007741\n", + " 1\n", + " 0.000000\n", + " 0.000001\n", + " total\n", + " (((absorption / flux) / (total / flux)) + ((sc...\n", + " 1\n", + " 0.007741\n", " \n", " \n", " 1\n", - " 1\n", - " (6.3e-07 - 2.0e+01)\n", - " total\n", - " (((absorption / flux) / (total / flux)) + ((sc...\n", - " 1\n", - " 0.002619\n", + " 1\n", + " 0.000001\n", + " 20.000000\n", + " total\n", + " (((absorption / flux) / (total / flux)) + ((sc...\n", + " 1\n", + " 0.002619\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide \\\n", - "0 1 (0.0e+00 - 6.3e-07) total \n", - "1 1 (6.3e-07 - 2.0e+01) total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.000000 0.000001 total \n", + "1 1 0.000001 20.000000 total \n", "\n", " score mean std. dev. \n", "0 (((absorption / flux) / (total / flux)) + ((sc... 1 0.007741 \n", diff --git a/docs/source/pythonapi/examples/pandas-dataframes.ipynb b/docs/source/pythonapi/examples/pandas-dataframes.ipynb index 60c2c1c403..16fa16f21b 100644 --- a/docs/source/pythonapi/examples/pandas-dataframes.ipynb +++ b/docs/source/pythonapi/examples/pandas-dataframes.ipynb @@ -382,7 +382,7 @@ "outputs": [ { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ABDg0IE0OQtyQAAAPZSURBVGje7Zs7buMwEIZ9iey5\n0gyNjQpXKTYudIScgkdQYTfut1idwkdQkQNsYQO2Qj0sPiVK+mlQDmwgwIcgg8Cc4fCTSK5W4OeF\nkM8rHv+2I/rgxPZEPZgR7XtQxKdXYuUXJSUnBQ/9WCgo4vOSJ+WFUvF7E08mlia+rn7VcKXP8sRs\nzFX8b2MdX2y6v1Tw6MZUw4H4ojfIjD8mvn/qRL5p4+vvlMqvp2EhR8WBzfiz20hXORmP9fi/bM9E\neUFvV5H/0yRkeSbiGRfFJErxD9ENdz7Mbhig/h89fvtFdMiI/ePUIXV4lXju8K3DKv9NThOZ3q2K\nmUy6grxFES8rjeyic+FFQav+ncg3fXjH+Ts+/iibztFqOiZuZP/Z3OafPX40NGgST2r+uvQkXXp6\ncKvmr+r0e1Eef5um3+JHP3IFF1D/seNZJgaDmvY0Gav1s+2f1fqpIcublfKGt6apotG/NVx3SInW\ntLX+7Vg/Pv1YqOsnun6JSVdOXT/X7vk75f938QP+8OmSBs0fXtymMhJbf8qlPynYmpKCh7OB1fzN\nalOj1sl0ZAruHLiA+RM73pDe/VjMVP89+aTXwjyc/x5n+u991895/utrJTy8/06TXh0r/5JOa2Jm\nYmqi4r/vUm/H4wLmT+z4anhr05X+q6KUXhtzr/9qSff5L5uMT//V/NdU4YuBTPa/8P67l/6r44ds\n+hYuoP5jx9ciy6XTWlibBrmx8V/TdMfjkP+6pOsu/lvM9N90sf7r+f6m/65n+S8p/itN15v0UkW3\n/+48+PRfJX6S9Joo4g+G/1qYG9KroqP/WypcuvyXPf13wH89/hHef7MB6R3Cqn55U4rv4kfH3zaS\ngQuYP7HjVf89tXrbO+hfLdr+Ozv/SP1dgtQ/Ov8C+i/3+q/Zf2D/HWi6bjT6rym9I/v/03/b+LHS\n4cTg/utTsV7/net/Afzz4f0XGX84/2j9xZ4/sePR/of2X7D/o+vPo/sv6h9B/Bfxr9j1Hz2eN/hO\n8/wfff4A848+f/1A/530/I0+/8PvH9D3H9HnT+R49P0b+v4PfP/4E/wXfP8Mvf9G37/D/ovuP8Se\nP7Hj0f0vdP8tqP9O339cyv7p3P1fdP8Z3v9G999j13/seMax8x/o+ZN7+O+E8zdP/8XOf8Hnz9Dz\nb7HnT+x49PxlCp7/BM+fOv13wvnXBfivt2lMvD8TyH/Hnb+Gz3+j589jz5/Y8ej9h4D+W7qQmf57\nefqv239n3T+C7z+h969i13/seMax+3/o/cMcu/8Y2H9n3p+J6r98pv8m4fwXuH+M3n+OO3++AX9c\nlR+4PhbRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTAxLTE0VDA3OjA4OjE5LTA2OjAwSFm98wAA\nACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMS0xNFQwNzowODoxOS0wNjowMDkEBU8AAAAASUVORK5C\nYII=\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBhQuBnxwGisAAAPZSURBVGje7Zs7buMwEIZ9iey5\n0gyNjQpXKTYudIScgkdQYTfut1idwkdQkQNsYQO2Qj0sPiVK+mlQDmwgwIcgg8Cc4fCTSK5W4OeF\nkM8rHv+2I/rgxPZEPZgR7XtQxKdXYuUXJSUnBQ/9WCgo4vOSJ+WFUvF7E08mlia+rn7VcKXP8sRs\nzFX8b2MdX2y6v1Tw6MZUw4H4ojfIjD8mvn/qRL5p4+vvlMqvp2EhR8WBzfiz20hXORmP9fi/bM9E\neUFvV5H/0yRkeSbiGRfFJErxD9ENdz7Mbhig/h89fvtFdMiI/ePUIXV4lXju8K3DKv9NThOZ3q2K\nmUy6grxFES8rjeyic+FFQav+ncg3fXjH+Ts+/iibztFqOiZuZP/Z3OafPX40NGgST2r+uvQkXXp6\ncKvmr+r0e1Eef5um3+JHP3IFF1D/seNZJgaDmvY0Gav1s+2f1fqpIcublfKGt6apotG/NVx3SInW\ntLX+7Vg/Pv1YqOsnun6JSVdOXT/X7vk75f938QP+8OmSBs0fXtymMhJbf8qlPynYmpKCh7OB1fzN\nalOj1sl0ZAruHLiA+RM73pDe/VjMVP89+aTXwjyc/x5n+u991895/utrJTy8/06TXh0r/5JOa2Jm\nYmqi4r/vUm/H4wLmT+z4anhr05X+q6KUXhtzr/9qSff5L5uMT//V/NdU4YuBTPa/8P67l/6r44ds\n+hYuoP5jx9ciy6XTWlibBrmx8V/TdMfjkP+6pOsu/lvM9N90sf7r+f6m/65n+S8p/itN15v0UkW3\n/+48+PRfJX6S9Joo4g+G/1qYG9KroqP/WypcuvyXPf13wH89/hHef7MB6R3Cqn55U4rv4kfH3zaS\ngQuYP7HjVf89tXrbO+hfLdr+Ozv/SP1dgtQ/Ov8C+i/3+q/Zf2D/HWi6bjT6rym9I/v/03/b+LHS\n4cTg/utTsV7/net/Afzz4f0XGX84/2j9xZ4/sePR/of2X7D/o+vPo/sv6h9B/Bfxr9j1Hz2eN/hO\n8/wfff4A848+f/1A/530/I0+/8PvH9D3H9HnT+R49P0b+v4PfP/4E/wXfP8Mvf9G37/D/ovuP8Se\nP7Hj0f0vdP8tqP9O339cyv7p3P1fdP8Z3v9G999j13/seMax8x/o+ZN7+O+E8zdP/8XOf8Hnz9Dz\nb7HnT+x49PxlCp7/BM+fOv13wvnXBfivt2lMvD8TyH/Hnb+Gz3+j589jz5/Y8ej9h4D+W7qQmf57\nefqv239n3T+C7z+h969i13/seMax+3/o/cMcu/8Y2H9n3p+J6r98pv8m4fwXuH+M3n+OO3++AX9c\nlR+4PhbRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTAyLTA2VDE1OjQ2OjA2LTA1OjAwkB0d7wAA\nACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMi0wNlQxNTo0NjowNi0wNTowMOFApVMAAAAASUVORK5C\nYII=\n", "text/plain": [ "" ] @@ -571,8 +571,9 @@ " Copyright: 2011-2015 Massachusetts Institute of Technology\n", " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", - " Git SHA1: ea9fb637f63f9374c7436456141afa850b84acf9\n", - " Date/Time: 2016-01-14 07:08:19\n", + " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", + " Date/Time: 2016-02-06 15:46:08\n", + " MPI Processes: 1\n", "\n", " ===========================================================================\n", " ========================> INITIALIZATION <=========================\n", @@ -636,20 +637,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 1.2110E+00 seconds\n", - " Reading cross sections = 9.4900E-01 seconds\n", - " Total time in simulation = 1.0453E+01 seconds\n", - " Time in transport only = 1.0440E+01 seconds\n", - " Time in inactive batches = 1.5590E+00 seconds\n", - " Time in active batches = 8.8940E+00 seconds\n", - " Time synchronizing fission bank = 4.0000E-03 seconds\n", + " Total time for initialization = 3.1900E-01 seconds\n", + " Reading cross sections = 8.7000E-02 seconds\n", + " Total time in simulation = 4.8710E+00 seconds\n", + " Time in transport only = 4.8580E+00 seconds\n", + " Time in inactive batches = 7.1900E-01 seconds\n", + " Time in active batches = 4.1520E+00 seconds\n", + " Time synchronizing fission bank = 3.0000E-03 seconds\n", " Sampling source sites = 3.0000E-03 seconds\n", - " SEND/RECV source sites = 1.0000E-03 seconds\n", - " Time accumulating tallies = 0.0000E+00 seconds\n", + " SEND/RECV source sites = 0.0000E+00 seconds\n", + " Time accumulating tallies = 1.0000E-03 seconds\n", " Total time for finalization = 0.0000E+00 seconds\n", - " Total time elapsed = 1.1681E+01 seconds\n", - " Calculation Rate (inactive) = 8017.96 neutrons/second\n", - " Calculation Rate (active) = 4216.33 neutrons/second\n", + " Total time elapsed = 5.1990E+00 seconds\n", + " Calculation Rate (inactive) = 17385.3 neutrons/second\n", + " Calculation Rate (active) = 9031.79 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -774,13 +775,13 @@ "name": "stdout", "output_type": "stream", "text": [ - "[[[ 0.21161313]]\n", + "[[[ 0.18257268]]\n", "\n", - " [[ 0.07979747]]\n", + " [[ 0.07111957]]\n", "\n", - " [[ 0.40532194]]\n", + " [[ 0.40880276]]\n", "\n", - " [[ 0.19458598]]]\n" + " [[ 0.16407535]]]\n" ] } ], @@ -806,253 +807,287 @@ "
\n", "\n", " \n", - " \n", + " \n", " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", "
mesh 1energy [MeV](mesh 1, x)(mesh 1, y)(mesh 1, z)energy low [MeV]energy high [MeV]scoremeanstd. dev.
xyz
0111(0.0e+00 - 6.3e-07)fission0.0001650.0000350 1 1 1 0.000000 0.000001 fission 0.000202 0.000037
1111(0.0e+00 - 6.3e-07)nu-fission0.0004030.0000851 1 1 1 0.000000 0.000001 nu-fission 0.000492 0.000090
2111(6.3e-07 - 2.0e+01)fission0.0000770.0000042 1 1 1 0.000001 20.000000 fission 0.000076 0.000004
3111(6.3e-07 - 2.0e+01)nu-fission0.0002070.0000113 1 1 1 0.000001 20.000000 nu-fission 0.000204 0.000010
4121(0.0e+00 - 6.3e-07)fission0.0003500.0000434 1 2 1 0.000000 0.000001 fission 0.000375 0.000039
5121(0.0e+00 - 6.3e-07)nu-fission0.0008530.0001055 1 2 1 0.000000 0.000001 nu-fission 0.000914 0.000094
6121(6.3e-07 - 2.0e+01)fission0.0001060.0000156 1 2 1 0.000001 20.000000 fission 0.000107 0.000013
7121(6.3e-07 - 2.0e+01)nu-fission0.0002740.0000397 1 2 1 0.000001 20.000000 nu-fission 0.000278 0.000032
8131(0.0e+00 - 6.3e-07)fission0.0005520.0000608 1 3 1 0.000000 0.000001 fission 0.000564 0.000056
9131(0.0e+00 - 6.3e-07)nu-fission0.0013460.0001469 1 3 1 0.000000 0.000001 nu-fission 0.001374 0.000137
10131(6.3e-07 - 2.0e+01)fission0.0001480.000008 1 3 1 0.000001 20.000000 fission 0.000149 0.000007
11131(6.3e-07 - 2.0e+01)nu-fission0.0003840.000021 1 3 1 0.000001 20.000000 nu-fission 0.000388 0.000018
12141(0.0e+00 - 6.3e-07)fission0.0006820.000054 1 4 1 0.000000 0.000001 fission 0.000669 0.000044
13141(0.0e+00 - 6.3e-07)nu-fission0.0016620.000132 1 4 1 0.000000 0.000001 nu-fission 0.001631 0.000108
14141(6.3e-07 - 2.0e+01)fission0.0001620.000012 1 4 1 0.000001 20.000000 fission 0.000165 0.000011
15141(6.3e-07 - 2.0e+01)nu-fission0.0004240.000031 1 4 1 0.000001 20.000000 nu-fission 0.000433 0.000029
16151(0.0e+00 - 6.3e-07)fission0.0009110.000076 1 5 1 0.000000 0.000001 fission 0.000932 0.000069
17151(0.0e+00 - 6.3e-07)nu-fission0.0022210.000186 1 5 1 0.000000 0.000001 nu-fission 0.002270 0.000168
18151(6.3e-07 - 2.0e+01)fission0.0001780.000013 1 5 1 0.000001 20.000000 fission 0.000183 0.000011
19151(6.3e-07 - 2.0e+01)nu-fission0.0004640.000032 1 5 1 0.000001 20.000000 nu-fission 0.000477 0.000028
\n", "
" ], "text/plain": [ - " mesh 1 energy [MeV] score mean std. dev.\n", - " x y z \n", - "0 1 1 1 (0.0e+00 - 6.3e-07) fission 0.000165 0.000035\n", - "1 1 1 1 (0.0e+00 - 6.3e-07) nu-fission 0.000403 0.000085\n", - "2 1 1 1 (6.3e-07 - 2.0e+01) fission 0.000077 0.000004\n", - "3 1 1 1 (6.3e-07 - 2.0e+01) nu-fission 0.000207 0.000011\n", - "4 1 2 1 (0.0e+00 - 6.3e-07) fission 0.000350 0.000043\n", - "5 1 2 1 (0.0e+00 - 6.3e-07) nu-fission 0.000853 0.000105\n", - "6 1 2 1 (6.3e-07 - 2.0e+01) fission 0.000106 0.000015\n", - "7 1 2 1 (6.3e-07 - 2.0e+01) nu-fission 0.000274 0.000039\n", - "8 1 3 1 (0.0e+00 - 6.3e-07) fission 0.000552 0.000060\n", - "9 1 3 1 (0.0e+00 - 6.3e-07) nu-fission 0.001346 0.000146\n", - "10 1 3 1 (6.3e-07 - 2.0e+01) fission 0.000148 0.000008\n", - "11 1 3 1 (6.3e-07 - 2.0e+01) nu-fission 0.000384 0.000021\n", - "12 1 4 1 (0.0e+00 - 6.3e-07) fission 0.000682 0.000054\n", - "13 1 4 1 (0.0e+00 - 6.3e-07) nu-fission 0.001662 0.000132\n", - "14 1 4 1 (6.3e-07 - 2.0e+01) fission 0.000162 0.000012\n", - "15 1 4 1 (6.3e-07 - 2.0e+01) nu-fission 0.000424 0.000031\n", - "16 1 5 1 (0.0e+00 - 6.3e-07) fission 0.000911 0.000076\n", - "17 1 5 1 (0.0e+00 - 6.3e-07) nu-fission 0.002221 0.000186\n", - "18 1 5 1 (6.3e-07 - 2.0e+01) fission 0.000178 0.000013\n", - "19 1 5 1 (6.3e-07 - 2.0e+01) nu-fission 0.000464 0.000032" + " (mesh 1, x) (mesh 1, y) (mesh 1, z) energy low [MeV] \\\n", + "0 1 1 1 0.000000 \n", + "1 1 1 1 0.000000 \n", + "2 1 1 1 0.000001 \n", + "3 1 1 1 0.000001 \n", + "4 1 2 1 0.000000 \n", + "5 1 2 1 0.000000 \n", + "6 1 2 1 0.000001 \n", + "7 1 2 1 0.000001 \n", + "8 1 3 1 0.000000 \n", + "9 1 3 1 0.000000 \n", + "10 1 3 1 0.000001 \n", + "11 1 3 1 0.000001 \n", + "12 1 4 1 0.000000 \n", + "13 1 4 1 0.000000 \n", + "14 1 4 1 0.000001 \n", + "15 1 4 1 0.000001 \n", + "16 1 5 1 0.000000 \n", + "17 1 5 1 0.000000 \n", + "18 1 5 1 0.000001 \n", + "19 1 5 1 0.000001 \n", + "\n", + " energy high [MeV] score mean std. dev. \n", + "0 0.000001 fission 0.000202 0.000037 \n", + "1 0.000001 nu-fission 0.000492 0.000090 \n", + "2 20.000000 fission 0.000076 0.000004 \n", + "3 20.000000 nu-fission 0.000204 0.000010 \n", + "4 0.000001 fission 0.000375 0.000039 \n", + "5 0.000001 nu-fission 0.000914 0.000094 \n", + "6 20.000000 fission 0.000107 0.000013 \n", + "7 20.000000 nu-fission 0.000278 0.000032 \n", + "8 0.000001 fission 0.000564 0.000056 \n", + "9 0.000001 nu-fission 0.001374 0.000137 \n", + "10 20.000000 fission 0.000149 0.000007 \n", + "11 20.000000 nu-fission 0.000388 0.000018 \n", + "12 0.000001 fission 0.000669 0.000044 \n", + "13 0.000001 nu-fission 0.001631 0.000108 \n", + "14 20.000000 fission 0.000165 0.000011 \n", + "15 20.000000 nu-fission 0.000433 0.000029 \n", + "16 0.000001 fission 0.000932 0.000069 \n", + "17 0.000001 nu-fission 0.002270 0.000168 \n", + "18 20.000000 fission 0.000183 0.000011 \n", + "19 20.000000 nu-fission 0.000477 0.000028 " ] }, "execution_count": 25, @@ -1077,9 +1112,9 @@ "outputs": [ { "data": { - "image/png": "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\n/j8k35yq9tqQdwAAAABJRU5ErkJggg==\n", + "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -1102,26 +1137,18 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 27, "metadata": {}, "output_type": "execute_result" }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "/usr/local/lib/python2.7/dist-packages/matplotlib/collections.py:590: FutureWarning: elementwise comparison failed; returning scalar instead, but in the future will perform elementwise comparison\n", - " if self._edgecolors == str('face'):\n" - ] - }, { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAU0AAAEZCAYAAAAT73clAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAIABJREFUeJzt3Xu0XWV57/Hvj5BwhxiiCblogtkgQYRQC6m0QpVijJaU\nWuQyjgh6ak5p7OlQe5Cjp96OqLW1HZTCyKiIDFugWC6NlsitpxZRsZGQokkgG9iSBNhASLjmuvOc\nP+YMrKzMudZ65157r71Xfp8x9sha73yf+b5zZ+XJvLzrfRURmJlZa/bpdAfMzEYTJ00zswROmmZm\nCZw0zcwSOGmamSVw0jQzS+Ck2WUkHS3pAUkvSPq4pKskfXYQ+7tU0t+3s49mo5k8TrO7SLoa2BQR\nn+x0X9pNUh/wkYj4t073xfZePtPsPm8CVna6E6kkjWmhWgAa6r6YNeKk2UUk/RtwGnBFfnneI+nb\nkr6Ub58o6fuSNkraIOk/amIvkbQuj1st6V15+eclfaem3pmSfpnv4/9JekvNtj5Jn5S0QtImSTdI\n2q+krxdKulfSNyQ9C3xO0pGS/k3Ss5KekfQPkg7L638HeCPwPUkvSvpUXj5X0o/z/jwg6dR2/17N\najlpdpGIeBdwD/DHEXFoRKwhOzvbdQ/mk8BaYCLwBuBSyO6DAn8MvD0iDgXOAPp27XbX/iUdBVwH\n/Em+j9vIkti+NXXPBt4DzATeBlzYoMsnAY/kfbmM7Czyy8ARwDHAdODz+bF9CHgceH9EHBIRfylp\nKvB94IsR8TrgU8BNkia2+jszS+Wk2Z3KLmG3kSWkGRExEBH35uUDwH7AsZLGRsTjEfFowb7OAb4f\nEXdHxADwl8ABwDtq6lweEU9FxEbge8AJDfr5RET8XUTsjIgtEfFIvu/tEfEs8NdAozPH/wbcFhE/\nAIiIu4BlwPwGMWaD4qTZneqf7u1KfF8HeoE7JD0i6RKAiOgF/pTsrK5f0vWSjijY7xSysz3yuCA7\nc51aU+epmtebgYMb9HPtbp2UJuWX9OskPQ98Bzi8QfybgLPzS/ONkjYCpwCTG8SYDYqT5l4kIl6K\niE9FxJuBM4FP7Lp3GRHXR8RvkSWiAL5WsIv1+XYAJInsEnp9WZPNulT3/jKys963RsRhwIfY/TNa\nX/9x4DsR8bqan0Mi4i+atGtWmZNmd1LRa0nvlzQrT3YvkCWoAUlHSXpX/tBmK7Al31bvu8D78rpj\nye6RbgF+3EI/WnEw8DLwQn6/8s/qtvcDb655/w/A70o6Q9IYSftLOi2PNRsSTprdKepe73o/C7gT\neJEs0f1dRPyQ7H7mV4BngCfJHvJcWh8fEQ+R3Uf827zu+4DfjYgdDfpRdrZZtO0LwInA82T3Q2+q\nq/MV4LP5pfgnImIdsAD438DTZGeen8SfaxtCHtxuZpbA/yObmSVw0jQzS+CkaWaWwEnTzCzBvs2r\nDD9Jfjpl1iERMahJUVL//Q62veE2IpNmZm1J+R8CBdM7nj4tvYlPp4dMe/ea9CDgYq5MjtnE+MLy\nWz5wA2fddG7htnP4p+R2TlyzKjmGZekhABxZIeaJ4uIPfA1uuqQk5uUK7fwwPWTDNekxh/9+egwA\nJR+9DzwGN80siTksrQlV+B0U+b8t1qs80WsHdeTyXNK8fCadNbu+ymdm3WNsiz+j0bCfaebzJl4B\nnE729bv/lLQkIiqc7pjZSDSCL2EHrRPHdhLQGxF9AJJuIPtWR4tJs2eo+jVqHH7M6zvdhRHhmAp3\nZLrRMft3ugd7OqDTHRhCnUiaU9n9huU64OTWw500J8520gSYPb3TPRgZZo/ApDlaL71b0Ymk2eKT\ntT+sed3Da8my5AnEU41mECtxd3rIK/1PNa9U4AFWp7fFgYXl6+8te0gGS3k+uZ3VVQ7p0eZVClV5\njraxuPjeRr/SrRXa6U0PeXFneswhjzevU6js99DoodeWxrtc+TKseqVifxrw5Xl7rSebTmyX6WRn\nm3UaLYB41p5Fkytcq707PeTAik/PTygdDVCu7Ok5wOzz31ZY/t5W73LUOHFNyePpRkbA03OA899Z\nsqHK0/Pt6SEb7kmPOfyN6TFAw/8Izn9dyYYOPT33mWZ7LQN6JM0g++dwDnBeB/phZkPEZ5ptFBE7\nJC0CbgfGAFf7yblZd+nmM82OjNOMiKURcXREzIqIr3SiD2Y2dAYzTrOVcdySLs+3r5A0p9XYfLXU\nnZIm1JRdmtdfLemMZsfWzWfRZtYhVYcctTKOW9J8YFZE9Eg6GbgKmNssVtJ04HeAX9XsazbZLcLZ\nZCN77pJ0VESUPuIbwUnz0JLyA4u3za3QRIXlt8YUrgLR3H4VHue+UvLR28q40m0bGq5DVuIX6SH8\nvEIMVHsQVDYv/M4G225Ob+axW9JjfpAewh89ViEI+PwDxeUPAg//qnjbadWaGrRBJJZWxnGfCVwL\nEBH3SRovaTLZstGNYr8B/C/gX2r2tQC4PiK2A32SevM+/LSsg57lyMzabhCX50XjuOvXfCqrM6Us\nVtICYF1E/Ffdvqaw++idovZ2M4LPNM1stBpEYml1hqSWZ0aSdADZOlK/02J8wz44aZpZ2w3i6Xkr\n47jr60zL64wtiX0zMANYkS3EyjTg5/n90KJ9lS1JDfjy3MyGwL4t/hR4dRy3pHFkD2mW1NVZAlwA\nIGkusCki+stiI+IXETEpImZGxEyyRHpiHrMEOFfSOEkzyb56+LNmx2Zm1lZVzzTLxnFLWphvXxwR\nt0manz+0eRm4qFFsUTM17a2UdCOwkuyx4sXRZIleJ00za7vBzHIUEUuBpXVli+veL2o1tqDOkXXv\nLwMua7V/Tppm1nbd/I0gJ00za7tuTizdfGxm1iFjW80sZV9OGMGcNM2s7fZ10jQza93YMZ3uwdBx\n0jSztmv5THMUGsGHdkhJ+f7F29JXk4BN6SFr+6stTPPYpBnJMe/gx4XlwTrewebCbUfxUHI7a85K\nn/W+5+SCyfZb8acVYs6uEFNhEpKZ70qP+WCVmc4rXpJ+vmSq7uv64PwZJUGpS2vcm1i/xNj92rOf\nkWgEJ00zG7W6OLN08aGZWcd0cWbp4kMzs47p4szSxYdmZh3jp+dmZgm6OLN08aGZWcf46bmZWYIu\nzixdfGhm1jFdnFm6+NDMrGP8IMjMLEEXZxavEWRm7TeIRYIkzZO0WtIaSZeU1Lk8375C0pxmsZK+\nlNd9QNLdkqbn5TMkbZa0PP+5stmhOWmaWftVTJqSxgBXAPOA2cB5ko6pqzMfmBURPcDHgKtaiP2L\niDg+Ik4AbgU+V7PL3oiYk/9c3MqhmZm1V/UhRyeRJbE+AEk3AAuA2gXSzgSuBYiI+ySNlzQZmFkW\nGxEv1sQfDDxbtYMjOGmWTQUzULxt/wqrkuyfHjJjUl96ELCBickx3+PMwvI+fspzzC3c9nZ+ntxO\nz5oKMxY9kR4CwMkVYr5bUv448GTJtir/aNekhxxe/FfU2HMVYgAmlJQ/22Db3RXbGqzqmWUqsLbm\n/Tr2/NQU1ZkKTGkUK+nLwIeAV2C3f0AzJS0Hngc+GxE/atRBX56bWfuNafFnTw2Xz62h1C5FxGci\n4o3At4G/zoufAKZHxBzgE8B1ksrmpQScNM1sKFR/ELQeqJ20djrZGWOjOtPyOq3EAlwH/DpARGyL\niI356/uBR4CeRofmpGlm7Vc9aS4DevKn2uOAc4AldXWWABcASJoLbIqI/kaxkmoT4QJgeV4+MX+A\nhKQjyRLmo80OzcysvSoObo+IHZIWAbfne7k6IlZJWphvXxwRt0maL6kXeBm4qFFsvuuvSDqa7KHI\nI8Af5eXvBL4oaTuwE1gYEQ3XdHDSNLP2G0RmiYilwNK6ssV17xe1GpuX/0FJ/ZuBm1P656RpZu1X\nYWTKaOGkaWbt5++em5kl6OLM0sWHZmYd08WZpYsPzcw6xpfnZmYJujizdPGhmVnHdHFmGbmHtm/J\nBBw794V9CrZtqdDGD9JDNrz18AoNwfWrP5Ic87XjP15YHvRxQsmMFP28Ibmdh3qOSo6Z1fNIcgzA\nW/b/VXpQ8dwkcAdwRsm2+u+QtOLICjHpv264rEIMwIUl5T8gmwytyNbENr6ZWL+MF1YzM0vQxZml\niw/NzDqmizNLFx+amXWMn56bmSXo4szSxYdmZh3TxZmliw/NzDrGl+dmZgk8y5GZWYIuzixdfGhm\n1jFdfHnuNYLMrP2qrxGEpHmSVktaI+mSkjqX59tXSJrTLFbSl/K6D0i6W9L0mm2X5vVXSyr7jtmr\nnDTNrP0qJs18kbMryL4YOhs4T9IxdXXmA7Miogf4GHBVC7F/ERHHR8QJwK3A5/KY2WQLsM3O466U\n1DAvOmmaWftVX/f8JKA3IvoiYjtwA9nqkbXOBK4FiIj7gPGSJjeKjYgXa+IPBp7NXy8Aro+I7RHR\nB/Tm+yk1cu9pTispf4nskOvNqtDGs82r1Hv+rskVGoJT35c+O8jPeXth+a/Yzs6SbZN4Ormd43gw\nOeYAXkmOAXjh7SUTsTRw6I3bizdsAB4vCVqb3AzcUiHm7AoxB1WIgdfWT6y3AfiXkm3TS8qHWvWn\n51PZ/W9vHXByC3WmAlMaxUr6MvAhYDOvJcYpwE8L9lXKZ5pm1n7VzzSjxRaU2qWI+ExEvBG4Bvib\nRlUb7acjZ5qS+oAXyNYg3h4RDU+HzWyUqZ5Z1rP7+fF0srO/RnWm5XXGthALcB1wW4N9rW/UwU6d\naQZwWkTMccI060LVn54vA3okzZA0juwhTf3sqEuACwAkzQU2RUR/o1hJPTXxC4DlNfs6V9I4STOB\nHuBnzQ6tU5JPr81slKiYWSJih6RFwO1kF/BXR8QqSQvz7Ysj4jZJ8yX1Ai8DFzWKzXf9FUlHk13d\nPkJ+hzgiVkq6EVgJ7AAujoiRd3lOdqZ5l6QBYHFE/H2H+mFmQ2EQg9sjYimwtK5scd37Ra3G5uV/\n0KC9y0iYT79TSfOUiHhS0uuBOyWtjoh7OtQXM2u3kTsuZ9A6cmgR8WT+5zOSbiF7/L970uz/wGuv\nxx4D42Znr7fcW7zTX1boSMlIloYq/sb6n1+RHLOF5wvLn713TWnMT0hfg2ddSTuNHFJpUSY4aOfO\n5JgDflpcfu/DDYL6kpvJHk2mqvK5668QA6Xr/dz7UsX9AStfgFUvNq+XzGsEtY+kA4ExEfGipIPI\nlsb6wh4VJ91UvpODz9+z7NgKnany7/60CjHApPdNSI9p8K/rTef/RmH5b7AxuZ3jKmSLwyv9jwOv\nG0j/pR86ZqB02/mnlGx4LrmZSuN2K33uNlWIgezuXYnzy9b7SxynqSpjVYv4TLOtJgG3SNrV/j9G\nxB0d6IeZDRUnzfaJiMeAE4a7XTMbRk6aZmatiy6eGs5J08zabqCLM8vIPbS+BtuKbtj/okIbOyrE\nVLyxcGCFCS7Gsa2wfF92lG6r0s49/FZyzK+xLDkG4MAxm5Nj1p93SGH5c7GV9ecVP6adOqXCk6Aq\nf7dVnhJXG3hQ3r9eyieseaJiW4PkpGlmlmDrfuNarFn8n/9I5qRpZm03MKZ7b2o6aZpZ2w108SJB\nTppm1nY7nDTNzFo30MWppXuPzMw6xpfnZmYJnDTNzBJspdUhR6OPk6aZtZ3vaZqZJejmy3Mv4Wtm\nbTfAmJZ+ikiaJ2m1pDWSLimpc3m+fYWkOc1iJX1d0qq8/s2SDsvLZ0jaLGl5/nNls2Nz0jSzttvB\nmJZ+6kkaA1wBzANmA+dJOqauznxgVkT0AB8Drmoh9g7g2Ig4HngYuLRml735yrhzIuLiZsc2gi/P\nHyspf7p427KZ6U2cmx5y8B88kx4EPMTRyTFlM7c/Qx87eXPhtjGUz3JeZhPjk2Me5LjkGKh2r2vO\nwPLC8gN27uSQgZLvLh9TXNzQkRVirkgPeeGBCu0Ah5ZNvvEy2fqKRf4qsZHbmldpxSDuaZ5ElsT6\nACTdQLbk7qqaOmcC1wJExH2SxkuaDMwsi42IO2vi7wNq1tNJ4zNNM2u7QVyeTwXW1rxfl5e1UmdK\nC7EAH2H3/x5m5pfm/y7pN5sd2wg+0zSz0Wpb9SFHDdccr6EqO5f0GWBbRFyXFz0BTI+IjZJOBG6V\ndGxElC4356RpZm03iO+er2f35eCmk50xNqozLa8ztlGspAuB+cC7d5VFxDby+eki4n5JjwA9wP1l\nHfTluZm13QD7tvRTYBnQkz/VHgecAyypq7MEuABA0lxgU0T0N4qVNA/4M2BBRLw6DbSkifkDJCQd\nSZYwH210bD7TNLO2qzpOMyJ2SFoE3A6MAa6OiFWSFubbF0fEbZLmS+olewx2UaPYfNd/C4wD7sxX\nwv1J/qT8VOALkrYDO4GFEdFwkWUnTTNru8EMbo+IpcDSurLFde8XtRqbl/eU1L8JuCmlf06aZtZ2\nnk/TzCzBtkorzo0OTppm1nbd/N1zJ00zaztfnpuZJfDUcGZmCXx53hEHlpTvV7xty55FTe1ID3lp\n9esrNAQvvZQe9+i02cUb+p+k95HfLtz0T29eW1jeyCGUfmOs1BTKZo9o7NTHfpYcs31CcfnYLXDA\nS8UTlPzwDSclt3Pq2vS+cUp6yKGFg1+aW/PfpxWWP3XdK6w5v/jfyzJ+LbGVf0msX8xJ08wsgZOm\nmVmCrR5yZGbWOp9pmpkl6Oak2XSWI0l/Iul1w9EZM+sOVZe7GA1aOdOcBPynpPuBbwG3R0SrE4Wa\n2V6om8dpNj3TjIjPAEeRJcwLgTWSLpNUvEiNme31BrMa5UjX0iTEEbETeAroBwaA1wH/LOnrQ9g3\nMxulujlpNj2HlvQ/yWZJ3gB8E/hURGyXtA+whmw2ZDOzV22tvkbQiNfKjYcJwO9HxK9qCyNip6Tf\nHZpumdlotrff0/xcfcKs2bay/V0ys9FuMJfnkuZJWi1pjaRLSupcnm9fIWlOs1hJX5e0Kq9/s6TD\narZdmtdfLemMZsfmhdXMrO2qJs18kbMrgHnAbOA8ScfU1ZkPzMqXsPgYcFULsXcAx0bE8cDDwKV5\nzGyyBdhm53FX5rceSzlpmlnbDWKc5klAb0T0RcR24AZgQV2dM4FrASLiPmC8pMmNYiPizvyBNsB9\nZMv+km+/PiK2R0Qf0Jvvp9QIvvFQ1rV9ircdXKGJ8RVivl8hBmBGesg+b3mlsDz234YOLt62kpKZ\nkRqYTvrMSE8wJTkG4KmZhzWvVGfyvc8Xlu+7Fsb+ojjm1H3TZyz67snvT44ZP73hwoWFqs4QNZ7i\ntsaxtXROsNO5u1JbgzWIe5pTYbcP5Drg5BbqTAWmtBAL8BHg+vz1FOCnBfsqNYKTppmNVoMYTtTq\nF2dUZeeSPgNsi4jrqvbBSdPM2m5b9SFH64HpNe+nk539NaozLa8ztlGspAuB+cC7m+xrfaMO+p6m\nmbXdIO5pLgN6JM2QNI7sIc2SujpLyMaOI2kusCki+hvFSppHNqZ8QURsqdvXuZLGSZoJ9AAN7+34\nTNPM2q7qPc2I2CFpEXA7MAa4OiJWSVqYb18cEbdJmi+pF3gZuKhRbL7rvwXGAXdKAvhJRFwcESsl\n3QisJFvL4eJmc2s4aZpZ2w3mK5IRsRRYWle2uO79olZj8/LSRUYi4jLgslb756RpZm03Wr9X3gon\nTTNru9E6V2YrnDTNrO26+bvn3XtkZtYxgxhyNOI5aZpZ2/ny3MwsgS/PzcwS+Ol5R5R9k2lj8bYt\nh6c38UB6CG+tEFOxrZ2nl3zwBkTsKN52NA8lt/NmHkmOeYijk2MArsnGISeZc8rywvIVv+pnwimT\nCrfdznuS2xmuiUvKJt5oZjlzCstX8jjjeWPhttO5q1Jbg+WkaWaWwEmzAknfAt4HPB0Rx+VlE4B/\nAt4E9AEfjIhq/+2a2Yi1lf063YUhM5QTdlxDNhNyrU8Dd0bEUcDd+Xsz6zLdvBrlkCXNiLiH7AZk\nrVdnXM7//L2hat/MOqebk+Zw39OclE/hBNka6sV38c1sVPM4zSEQESGpwRRMn6h5fWT+A6WPobeU\nrHvQSMOpRktUmi8a2F4h5pZtxeXLflIa8viE9GUettLfvFKdDZV+eTBQ4Qn1ppL+rSxZBgNgdYXh\nCs+wITlmn5YnGn/NCxWfnj/J44XlD99b3u8XKPkM7YpdOcCaVTsb1qnC4zTbp1/S5Ih4StIRwNPl\nVb/RYDfz9yza/23pvWm4EkiJYyvEAGxpXmUPZzUIOuvcwuI3Tk3/K60y5GjtbpNdt+44DkqOmcPm\n0m2/fX7xxco2Tkhup8qQozEMJMe8o9HHvoGHSoYVAbzj/LIhRw8ntXGEyv8jSjFaL71bMdwzty8B\nPpy//jBw6zC3b2bDwPc0K5B0PXAqMFHSWuDPga8CN0r6KPmQo6Fq38w6Z+u27p2wYyifnp8XEVMi\nYlxETI+IayLiuYg4PSKOiogzPEbTrDsN7Ni3pZ8ikuZJWi1pjaRLSupcnm9fIWlOs1hJZ0v6paQB\nSSfWlM+QtFnS8vznymbH1r13a82sYwZKvubbjKQxwBXA6WSPav9T0pKatX6QNB+YFRE9kk4GrgLm\nNol9EDgLWMyeeiOi+DuqBZw0zaztqiZN4CSyJNYHIOkGYAGwqqbOq+O9I+I+SeMlTQZmlsVGxOq8\nrGq/XjWCk2ZfSfkzJdsqPD3fkR7CjAoxAL0VYvr2Ly5/Zlzptn89uGBkQRO/fdi/J8dUmagC4EUO\nSY7ZQPFkLKtYwQDHF27byPjkdo7jweSYKg8zHuS45Bgo/50/w2b6Sj6Y93FyYit3JNYvtmN75aQ5\nFXYbxrAO9jiIojpTgSktxBaZKWk58Dzw2Yj4UaPKIzhpmtlotXOgcmppdeDr4E8ZM08A0yNiY36v\n81ZJx0bEi2UBTppm1n7VL8/Xw26DgKeTnTE2qjMtrzO2hdjdRMQ2yL4BEBH3S3oE6AHuL4sZ7nGa\nZrY32LJvaz97Wgb05E+1xwHnkI3vrrUEuABA0lxgU/717FZioeYsVdLE/AESko4kS5iPNjo0n2ma\nWftVeV4ARMQOSYuA24ExwNURsUrSwnz74oi4TdJ8Sb3Ay5DNbF0WCyDpLOByYCLwr5KWR8R7ycaS\nf0HSdmAnsLDZUEgnTTNrv4pJEyAilgJL68oW171f1GpsXn4LcEtB+U3ATSn9c9I0s/YbRNIc6Zw0\nzaz9qszqNUo4aZpZ+6VP/jRqOGmaWfv58tzMLEGV+WNHCSdNM2s/n2mamSVw0uyEsjXXDive9mz6\n+i70FU8E0dBd6SEAvLVCzN+UlD8OrCzetOV/TEhuZumO30+OOf49P02OAVjJ7OSY2ze8p7B854vf\n5c4NZxdum3V4+gwpmypM8lFlApJ3ck9yDJQvVraDfdlK8aS/X+T/JLbSngk7nDTNzFJ4yJGZWQIP\nOTIzS+DLczOzBB5yZGaWwGeaZmYJnDTNzBI4aZqZJfCQIzOzBF085MhrBJlZ+21p8aeApHmSVkta\nI+mSkjqX59tXSJrTLFbS2ZJ+KWkgX3Wydl+X5vVXSzqj2aE5aZpZ++1o8adOvsjZFcA8YDZwnqRj\n6urMB2ZFRA/wMeCqFmIfBM4C/qNuX7PJFmCbncddKalhXnTSNLP2297iz55OAnojoi8itgM3AAvq\n6pwJXAsQEfcB4yVNbhQbEasj4uGC9hYA10fE9ojoA3rz/ZQawfc015SUP1WybUZ6E6vTQypNvAFZ\nt1OdUFIu4PiSbenzVGTr8yVacdPcCg0BL1WIeUtJef8BDPQeWrhpVd+JheWNrFqdHjPh3PXJMQ+O\neVtyDMDAQPGEHVt33sJ/DJxVuO24MQ9WamvQqt/TnAqsrXm/Dji5hTpTgSktxNabAtTOPrNrX6VG\ncNI0s1Gr+pCjaLGemlcZmj44aZpZ+1VPmuuB6TXvp5Od/TWqMy2vM7aF2GbtTcvLSvmeppm1X/V7\nmsuAHkkzJI0je0izpK7OEuACAElzgU0R0d9iLOx+lroEOFfSOEkzgR7gZ40OzWeaZtZ+W6uFRcQO\nSYuA24ExwNURsUrSwnz74oi4TdJ8Sb3Ay8BFjWIBJJ0FXE52B/9fJS2PiPdGxEpJN5JN670DuDgi\nfHluZsNsEF+jjIilwNK6ssV17xe1GpuX3wLcUhJzGXBZq/1z0jSz9vPXKM3MEnTx1yidNM2s/TzL\nkZlZAidNM7MEvqdpZpag4pCj0cBJ08zaz5fnnVD2Wx8o2dZXoY0K1xC/mFahHZp/matIo1/B90q2\nnVuhnU0VYqp+cqrEjS8p30T5RCjLKrRTwXM/aji3Q7EqnwWA/UvKl03g5QOK+/HDLRX61w6+PDcz\nS+AhR2ZmCXx5bmaWwEnTzCyB72mamSXwkCMzswS+PDczS+DLczOzBB5yZGaWwJfnZmYJujhpemE1\nM2u/6gurIWmepNWS1ki6pKTO5fn2FZLmNIuVNEHSnZIelnSHpPF5+QxJmyUtz3+ubHZoTppm1n47\nWvypI2kMcAUwD5gNnCfpmLo684FZEdEDfAy4qoXYTwN3RsRRwN35+116I2JO/nNxs0Nz0jSzkeQk\nsiTWFxHbgRuABXV1zgSuBYiI+4DxkiY3iX01Jv/z96p2cATf03yupPzlkm2b29hGA6sPrdAOQIW4\nWSXlLwKHlGz75/RmeKlCzFsqxEC1e10PlJQ/T8G6g7kqk1GVzabUSNksS430VYgB2FJS/jTw85Jt\nv1mxrc6ZCqyteb8OOLmFOlOBKQ1iJ+VrowP0A5Nq6s2UtJzsE/XZiPhRow6O4KRpZnuhhmuO11CL\ndfbYX0SEpF3lTwDTI2KjpBOBWyUdGxEvlu10yC7PJX1LUr+kB2vKPi9pXc1N13lD1b6ZdVLlJ0Hr\ngek176ez5wyk9XWm5XWKytfnr/vzS3gkHUF2fk5EbIuIjfnr+4FHgJ5GRzaU9zSvIbshWyuAb9Tc\ndP3BELZvZh1T8UlQNn10T/5UexxwDrCkrs4S4AIASXOBTfmld6PYJcCH89cfBm7N4yfmD5CQdCRZ\nwny00ZEN2eV5RNwjaUbBplZOq81sVKv2PcqI2CFpEXA7MAa4OiJWSVqYb18cEbdJmi+pl+whx0WN\nYvNdfxWK7C8KAAAFCUlEQVS4UdJHye4qfzAvfyfwRUnbgZ3AwohouJZBJ+5pflzSBWT/K3yyWQfN\nbDSq8mA2ExFLqXvEFxGL694vajU2L38OOL2g/Gbg5pT+DXfSvAr4Yv76S8BfAR8trvrtmteTeO1h\n12Mlu67wJJyDK8S8vkIMwAHpIWW3ojffWx4zXBMlPF8xbmeFmLKbSI1+D1U+2S9UiHl2mGIAtpWU\nv9Dg9/DLZn1ZCRtWNalURffO2DGsSTMint71WtI3KV8eDLiwwZ5ObLGsmQkVYmZUiIFKQ47KhhUB\nHHJ+cfnL6c1UmvvwsAoxUG3IUaNP6WElv4fJFdqpMuSoSkzVf3VlQ44A3lDyezg2sY2vtuvuWfd+\nj3JYk6akIyLiyfztWcCDjeqb2WjlM81kkq4HTgUmSloLfA44TdIJZE/RHwMWDlX7ZtZJPtNMFhHn\nFRR/a6jaM7ORxGeaZmYJqj89H+mcNM1sCPjyvAPKxn9sLtl2f4U2TqkQs6ZCTEW9Zf9bPwT9ZXMK\nvK1CQxWGQ62uevlV5Qzk8PJNT5aUry4bmtbIzAoxr1SIqWj/A4vLB4DHS2J+NIyf19348tzMLIHP\nNM3MEvhM08wsgc80zcwS+EzTzCyBhxyZmSXwmaaZWQLf0zQzS+AzzRHkmU53YATo63QHRoiVne7A\nyLBzZTZP+YjiM80RxEnTSXOXoZg8dxSKkfh78JmmmVkCn2mamSXo3iFHimh1bfbhU7OQu5kNs4gY\n1JoXqf9+B9vecBuRSdPMbKQqW+fPzMwKOGmamSUYNUlT0jxJqyWtkXRJp/vTKZL6JP2XpOWSftbp\n/gwHSd+S1C/pwZqyCZLulPSwpDskVVlMd1Qp+T18XtK6/POwXNK8TvZxbzAqkqakMcAVwDxgNnCe\npGM626uOCeC0iJgTESd1ujPD5Bqyv/tanwbujIijgLvz992u6PcQwDfyz8OciPhBB/q1VxkVSRM4\nCeiNiL6I2A7cACzocJ86aVQ9bRysiLgH2FhXfCZwbf76WuD3hrVTHVDye4C97PPQaaMlaU4F1ta8\nX5eX7Y0CuEvSMkl/2OnOdNCkiOjPX/cDkzrZmQ77uKQVkq7eG25TdNpoSZoeF/WaUyJiDvBe4I8l\n/VanO9RpkY2b21s/I1eRrQh3Atkyc3/V2e50v9GSNNcD02veTyc729zrRMST+Z/PALeQ3brYG/VL\nmgwg6Qjg6Q73pyMi4unIAd9k7/08DJvRkjSXAT2SZkgaB5wDLOlwn4adpAMlHZK/Pgg4A3iwcVTX\nWgJ8OH/9YeDWDvalY/L/MHY5i7338zBsRsV3zyNih6RFwO1kk2BdHTEip3YZapOAWyRB9nf3jxFx\nR2e7NPQkXQ+cCkyUtBb4c+CrwI2SPko27dMHO9fD4VHwe/gccJqkE8huTzwGLOxgF/cK/hqlmVmC\n0XJ5bmY2IjhpmpklcNI0M0vgpGlmlsBJ08wsgZOmmVkCJ00zswROmmZmCZw0rS0k/Xo+085+kg6S\n9AtJszvdL7N28zeCrG0kfQnYHzgAWBsRX+twl8zazknT2kbSWLLJVTYDvxH+cFkX8uW5tdNE4CDg\nYLKzTbOu4zNNaxtJS4DrgCOBIyLi4x3uklnbjYqp4Wzkk3QBsDUibpC0D/BjSadFxL93uGtmbeUz\nTTOzBL6naWaWwEnTzCyBk6aZWQInTTOzBE6aZmYJnDTNzBI4aZqZJXDSNDNL8P8BcoGN33rh2osA\nAAAASUVORK5CYII=\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAU0AAAEZCAYAAAAT73clAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAIABJREFUeJzt3XuUXWWZ5/HvzyJB7hHTJiSpNsEUQvBCaDumRU2WtnSM\nShq7FZk1img3WWLsnmm1kaGnSbRBW1vsQRpWZkSbsRui0wgraiIgTpQBQSMXwSSaAIW5QCKXyEUg\nqfDMH3sXnJycy353napddfL7rLUXZ+/zPvt9d1F56t2391VEYGZmxbyo6gaYmY0lTppmZgmcNM3M\nEjhpmpklcNI0M0vgpGlmlsBJs8tIeqWkOyU9Luljki6T9HdD2N+5kv5XJ9toNpbJz2l2F0mXAzsj\n4uNVt6XTJPUDH4qIH1TdFtt/uafZfV4OrKu6Eakk9RQoFoCGuy1mrThpdhFJPwDmA5fkp+d9kv5V\n0mfy7ydK+o6kxyQ9IulHNbHnSNqSx22Q9JZ8+1JJX68pd4qkX+T7+L+Sjq35rl/SxyXdJWmnpBWS\nDmzS1g9KulnSRZIeBs6XdLSkH0h6WNJvJP2bpCPy8l8Hfh/4tqQnJH0i3z5X0i15e+6UNK/TP1ez\nWk6aXSQi3gLcBHw0Ig6PiI1kvbPBazAfBzYDE4GXAedCdh0U+Cjwuog4HDgZ6B/c7eD+JR0DXAn8\nVb6PVWRJ7ICasu8B/gSYAbwG+GCLJs8B7s3bciFZL/IC4CjgOKAXWJof2/uBXwPvjIjDIuKfJE0F\nvgN8OiJeAnwCuFrSxKI/M7NUTprdqdkp7C6yhDQ9IvZExM359j3AgcDxksZFxK8j4r4G+zoN+E5E\n3BgRe4B/Ag4C3lBT5uKIeCgiHgO+DZzQop3bIuJfIuK5iHgmIu7N9707Ih4GvgS06jn+Z2BVRHwP\nICK+D6wFFraIMRsSJ83uVH93bzDxfQHYBFwv6V5J5wBExCbgv5D16rZLukrSUQ32O4Wst0ceF2Q9\n16k1ZR6q+fw0cGiLdm7eq5HSpPyUfouk3wJfB17aIv7lwHvyU/PHJD0GnARMbhFjNiROmvuRiHgy\nIj4REa8ATgH+ZvDaZURcFRFvIktEAfxjg11szb8HQJLITqG3NquyXZPq1i8k6/W+KiKOAN7P3r+j\n9eV/DXw9Il5SsxwWEZ9vU69ZaU6a3UmNPkt6p6SZebJ7nCxB7ZF0jKS35DdtngWeyb+r93+Ad+Rl\nx5FdI30GuKVAO4o4FHgKeDy/XvnJuu+3A6+oWf834F2STpbUI+nFkubnsWbDwkmzO0Xd58H1mcAN\nwBNkie5fIuKHZNczPwv8BniQ7CbPufXxEfFLsuuIX87LvgN4V0QMtGhHs95mo++WAScCvyW7Hnp1\nXZnPAn+Xn4r/TURsARYB/w3YQdbz/Dj+vbZh5IfbzcwS+C+ymVkCJ00zswROmmZmCZw0zcwSHNC+\nyMiT5LtTZhWJiCENipL673eo9Y20UZk0M0812X4BcN6+m//84PQqPpEeMu31G9ODgGWcnxyzjlkN\nt9+y9Ae8YelbGn73X/lScj1TNz6aHMNX0kOA7I3yVNsab156Iyx9a5OYZg9BtXJ/esjqf02PWXBk\negyAmvxrXfokLG323tXLEuu4J618M/9QsFzpgV4rVMnpuaQF+Ug6Gwdf5TOz7jGu4NJIkfwg6eL8\n+7skzS4am4/C9ZykI2u2nZuX3yDp5HbHNuJJMx838RJgATALOF1Smf6HmY1SBxRc6hXJD5IWAjMj\nog84C7isSKykXuBtwAM122aRDUQzK4+7VFLLvFhFT3MOsCki+iNiN7CC7K2Ogt40TM0aO3rnz6i6\nCaOCfwyZ+eOrbsG+Diq4NFAkP5wCXAEQEbcBEyRNLhB7EfC3dftaBFyVj6zVTzagzZxWx1ZF0pzK\n3qPbbGHvUXLaeHOHmzP2OGlm5h9ddQtGh9GYNIdwel4kPzQrM6VZrKRFwJaI+Hndvqbk5VrVt5cq\nbgQVvLN2Qc3nN+FkadZ5a56ENc3uuQ7BEBJL0Tvvhe+4SzqIbHyCtxWMb9mGKpLmVrLhxAb1snem\nzzW4Q25mHTX/0GwZtOw3ndlvs5s864D1rUOL5If6MtPyMuOaxL4CmA7clQ3wxTTgZ5Je32RfzYY6\nBKo5PV8L9EmaLmk82UXYlRW0w8yGSbMbP68h+wc/uDRQJD+sBD4A2RxRZLOvbm8WGxH3RMSkiJgR\nETPIEumJecxK4H2SxkuaAfQBP2l3bCMqIgYkLQGuA3qAyyOizR8fMxtLmvU022mWHyQtzr9fHhGr\nJC2UtInsge4zW8U2qqamvnWSvknWCR4Azo42Q79V8nB7RKwGVldRt5kNv7JJExrnh4hYXre+pGhs\ngzJH161fSDZrQCGj+I0gMxurmjxO1BVGcdJM/Fv1quFpRb0J7CwVdz/Tk2N6Gs440doveWVyzNTN\nP06O2XtKtASvKxFT5u7unekh21elx/Snh6BDSgQBS0v8zKfuKFfXUI3ixDJk3XxsZlaRoZyej3ZO\nmmbWcd2cWLr52MysIu5pmpkl6ObE0s3HZmYVcU/TzCyBHzkyM0vgnqaZWYJuTizdfGxmVpFxRTNL\nmbmcKuakaWYdd4CTpplZceN6qm7B8HHSNLOOK9zTHING8aElNm1tiSrmp4c8wWElKoJHmJgccxrf\nSI6ZXmby7inpIfx1iRjI5gpM9SclYq5KD5lUYuqlBSV+3GUtPSk95hs3d74dRYw7sJp6R8IoTppm\nNmZ1cWbp4kMzs8p0cWbp4kMzs8p0cWbp4kMzs8p08d3zKmajNLNu12w6yvqlAUkLJG2QtFHSOU3K\nXJx/f5ek2e1iJX0mL3unpBsl9ebbp0t6WtId+XJpkUMzM+usknfPJfWQPWPxx2Tzj/9U0sraWSUl\nLQRmRkRfPnf5ZcDcNrGfj4j/nsd/DDgf+It8l5si4vnE2457mmbWeeV7mnPIklh/ROwGVgCL6sqc\nAlwBEBG3ARMkTW4VGxFP1MQfCjxc9tCcNM2s88onzansPW3flnxbkTJTWsVKukDSr4EzgM/VlJuR\nn5qvkfTGIodmZtZZTW4ErflttrQQBWtQWoMgIs4DzpP0KeBLwJnANqA3Ih6TdCJwraTj63qme3HS\nNLPOa5JZ5r80WwYt23da4q1Ab816L1mPsVWZaXmZcQViAa4EVgFExC5gV/75dkn3An3A7Y2PwKfn\nZjYcyp+erwX68rva44HTgJV1ZVYCHwCQNBfYGRHbW8VK6quJXwTckW+fmN9AQtLRZAnzvnaHZmbW\nWSUzS0QMSFoCXEd2kn95RKyXtDj/fnlErJK0UNIm4Cmy0+ymsfmuPyvplcAe4F7gI/n2NwOflrQb\neA5YHBE7h+HQzMxaGMKAHRGxGlhdt2153fqSorH59j9vUv5bwLdS2jeKk+ajieVf2r5IvQllQlr+\nEWqqp8Roq9/gtOSYv+fTyTGtT0aaSP3fM+j3S8Qk/UrnjkgPuf/O9JgZr0qPeXxjegzA4S9Ojzmu\nXFVDN4ozy1B18aGZWWW6+DVKJ00z67wuzixdfGhmVpkuzixdfGhmVhmfnpuZJejizNLFh2ZmlSlx\np3+scNI0s87z6bmZWYIuzixdfGhmVpkuzixdfGhmVhmfnpuZJejizNLFh2ZmlenizDKKDy1xAI5n\nSlTx/fSQ/mOnl6gIfvnMMckxXzjib5NjnmV8csx9Cycnxxy946HkGACOLRFTZtSJtekhMxaWqOeQ\n9JCDPl+iHoBT00Nec01iQMnBRPYxhFGORrtRnDTNbMzq4szSxYdmZpXp4szSxYdmZpXx3XMzswRd\nnFk8sZqZdV75idWQtEDSBkkbJZ3TpMzF+fd3SZrdLlbSZ/Kyd0q6UVJvzXfn5uU3SDq53aE5aZpZ\n5/UUXOrkM0NeAiwAZgGnSzqursxCYGZE9AFnAZcViP18RLw2Ik4ArgXOz2Nmkc1aOSuPu1RSy7zo\npGlmnffigsu+5gCbIqI/InYDK8im3K11CnAFQETcBkyQNLlVbEQ8URN/KPBw/nkRcFVE7I6IfmBT\nvp+muvjKg5lVpnxmmQpsrlnfAry+QJmpwJRWsZIuAN4PPM0LiXEKcGuDfTXlnqaZdV7J03MgCtag\n1CZFxHkR8fvA14B/blW01X7c0zSzzmuSWdbcnS0tbAV6a9Z7yXp/rcpMy8uMKxALcCWwqsW+trZq\noJOmmXVek8wyf3a2DFq2Yp8ia4E+SdOBbWQ3aU6vK7MSWAKskDQX2BkR2yU90ixWUl9EDL4kugi4\no2ZfV0q6iOy0vA/4SYlDMzMbgpIPt0fEgKQlwHX5Xi6PiPWSFuffL4+IVZIWStoEPAWc2So23/Vn\nJb0S2APcC3wkj1kn6ZvAOmAAODsiWp6eq833lZAUHJrYriUlKiozyMcJJWKAeWd8Lzlm4vM3+Ir7\nGF9OjpnFuuSY39vxZHIMAOvbF9nHbSNUT4lBPpg7QvUAPFIi5ui04vohRETy9cK99iFF/LBg2XlD\nr2+kuadpZp3n1yg7S1I/8DhZV3l3RLR8LsrMxpgu7o5VdWgBzI+IRyuq38yGk5PmsBhT1zHMLEEX\nJ82qHm4P4PuS1kr6y4raYGbDpfzD7aNeVX8PToqIByX9HnCDpA0RcVNFbTGzTuvinmYlhxYRD+b/\n/Y2ka8jeA907aT679IXPPfPhgPkj1Tyz/caandnScZ4jqHMkHQz0RMQTkg4BTgaW7VPwwKUj3DKz\n/c/8CdkyaNkDHdqxe5odNQm4RtJg/f8eEddX0A4zGy5Omp0TEfdT+r0aMxsTnDTNzIqLMXpnvAgn\nTTPruD1dnFlG76Gljgdxa/siHTG9XNhhPNG+UJ0nOCw5poeB5Jg1zE+Omf6y/uQYgBMOvCc5Zlzi\noBMAbGxfZB/HtS+yjx0lYsoMFAMwr0TMnSXrGiInTTOzBM8eOL5gyV3D2o7h4KRpZh23p6d7L2o6\naZpZx+0Zq+9IFuCkaWYdN+CkaWZW3J4uTi3de2RmVpluPj33vOdm1nF76Cm0NCJpgaQNkjZKOqdJ\nmYvz7++SNLtdrKQvSFqfl/+WpCPy7dMlPS3pjny5tN2xOWmaWcc9y/hCSz1JPcAlwAJgFnC6pOPq\nyiwEZkZEH3AWcFmB2OuB4yPitcCvgHNrdrkpImbny9ntjs1J08w6bg8HFFoamEOWxPojYjewgmye\n8lqnAFcARMRtwARJk1vFRsQNEfFcHn8bMK3ssTlpmlnHDeH0fCqwuWZ9S76tSJkpBWIBPgSsqlmf\nkZ+ar5H0xnbH5htBZtZxza5Xrl3zFGvX/K5VaBSsotQcY5LOA3ZFxJX5pm1Ab0Q8JulE4FpJx0dE\n0/eenTTNrOOaPad5wvzDOWH+4c+v/89lD9cX2Qr01qz3kvUYW5WZlpcZ1ypW0geBhcBbB7dFxC7y\ndzkj4nZJ9wJ9wO1NDm00J82fpRW/5w/Sq3hfesiL3vdUehBwN69Ojnkp+/xCtbWDSckxO5nQvlCd\nR3hpcgxA/xHpl5ImHbo9Oebw+3Ynx3BSeggr00N2P1iiHmBcmaG6T08snz6eSkNDeE5zLdAnaTpZ\nL/A09j2KlcASYIWkucDOiNgu6ZFmsZIWAJ8E5kXE80OmSJoIPBYReyQdTZYw72vVwFGcNM1srCr7\nnGZEDEhaAlxHNl/l5RGxXtLi/PvlEbFK0kJJm4CngDNbxea7/jIwnmwiR4Af53fK5wHLJO0GngMW\nR0TLWZOcNM2s43Y1eJyoqIhYDayu27a8bn1J0dh8e1+T8lcDV6e0z0nTzDrO756bmSXwu+dmZgm6\n+d1zJ00z6zgnTTOzBL6maWaWYBcHVt2EYeOkaWYd59NzM7MEPj03M0vgR47MzBL49LwS49KKP9O+\nyD7Sx8PguVsPKVERPDDh2PSYmekHdeXU/5Qc82ruTo6ZQMvXc5vq21g/YE0BR6SHbJj38uSYY7/4\nQHpFc9NDxpUb8wU+WCImdVyV/1GijgacNM3MEjhpmpkleNaPHJmZFeeepplZgm5Omm0nVpP0V5Je\nMhKNMbPuMEBPoWUsKtLTnAT8VNLtwFeB6yKi6ORHZrYf6ubnNNv2NCPiPOAYsoT5QWCjpAslvWKY\n22ZmY9QQpvAd9QrNe55Psv4QsB3YA7wE+A9JXxjGtpnZGDWUpClpgaQNkjZKOqdJmYvz7++SNLtd\nrKQvSFqfl/+WpCNqvjs3L79B0sntjq3INc2/lvQz4PPAzcCrIuIjwB8A724Xb2b7n2cZX2ipJ6kH\nuARYAMwCTpd0XF2ZhcDMfN6fs4DLCsReDxwfEa8FfgWcm8fMIpu1clYed6mklnmxyIWHI4F3R8Re\nr0tExHOS3lUg3sz2M0O4pjkH2BQR/QCSVgCLgPU1ZU4BrgCIiNskTZA0GZjRLDYibqiJvw34s/zz\nIuCqiNgN9OczXM4Bbm3WwCLXNM+vT5g1361rF29m+58hnJ5PBTbXrG/JtxUpM6VALMCHgFX55yl5\nuXYxz+veW1xmVpkh3OQp+mSOyuxc0nnAroi4smwbnDTNrOOaPYO5bc1Gtq3Z1Cp0K9Bbs97L3j3B\nRmWm5WXGtYqV9EFgIfDWNvva2qqBozhpTh/+KqaViPleybremR7yogP2JMesY1ZyzO84ODmmh/S2\nAWztuyU5ZuoPH02OOfbR9BGLfvDxP0qOOZjfJcf0nrq5faEGyvwcqvoX3uya5qT5xzFp/gv3dW5f\ndl19kbVAn6TpwDaymzSn15VZCSwBVkiaC+yMiO2SHmkWK2kB8ElgXkQ8U7evKyVdRHZa3gf8pNWx\njeKkaWZjVdnT84gYkLQEuA7oAS6PiPWSFuffL4+IVZIW5jdtngLObBWb7/rLwHjgBkkAP46IsyNi\nnaRvAuuAAeDsdi/vOGmaWcftavA4UVERsRpYXbdted36kqKx+fa+FvVdCFxYtH1OmmbWcWP1vfIi\nnDTNrOO6+d3z7j0yM6vMWH2vvAgnTTPrOCdNM7MEvqZpZpbA1zTNzBIM5ZGj0c5J08w6zqfnZmYJ\nfHpuZpbAd88r0Z9W/MnXpFexIT2EY0vEAPxHeshzEw5Jjjlq0rbkmFfQctSZhvpLDqjyff44OWb6\nvP7kmJt4U3JMmcE3jiL9530YTyTHAPxuXvrAKr1P1Q8QNDKcNM3MEjhpliDpq8A7gB0R8ep825HA\nN4CXk3Ul3xsRO4erDWZWjWc5sOomDJtCs1GW9DWyiYpqfQq4ISKOAW7M182sy+z3U/iWERE3AY/V\nbX5+QqT8v386XPWbWXW6OWmO9DXNSRGxPf+8HZg0wvWb2Qjwc5rDICJCUosRki+r+fw64A+Hu0lm\n+50f/Qh+dFPn9+vnNDtnu6TJEfGQpKOAHc2LfmTEGmW2v3rzm7Nl0AWf7cx+x+qpdxHDeSOokZXA\nGfnnM4BrR7h+MxsB3XxNc9iSpqSrgFuAV0raLOlM4HPA2yT9CnhLvm5mXebZXeMLLY1IWiBpg6SN\nks5pUubi/Pu7JM1uFyvpPZJ+IWmPpBNrtk+X9LSkO/Ll0nbHNmyn5xFRP+3moPRXQsxsTNkzUC61\nSOoBLiHLE1uBn0paWTOrJJIWAjMjok/S68lugMxtE3s3cCqwnH1tiojZDbY31L1Xa82sMnsGSp96\nzyFLYv0AklYAi4D1NWWef3QxIm6TNEHSZGBGs9iI2JBvK9uu5430NU0z2w/sGegptDQwFdhcs74l\n31akzJQCsY3MyE/N10h6Y7vCo7in+fPE8iUG7HgmPaT0T2xCiZgS7btzT+GzjOft7Elv3NOkDx4B\ncFCJQTF+x0ElYtLbNz11kBjgQaYkx+wq+YrhExyWHLPwkO8mRjyUXEcjA7sb9zTj5h8Rt7R8xqnF\nY4h7GXqXMbMN6I2Ix/JrnddKOj4imo6qMoqTppmNVc/taZJa5r4lWwZ9cZ9nnLYCvTXrvWQ9xlZl\npuVlxhWI3UtE7AJ25Z9vl3Qv0Afc3izGp+dm1nkDPcWWfa0F+vK72uOB08geVay1EvgAgKS5wM78\nTcMisVDTS5U0Mb+BhKSjyRLmfa0OzT1NM+u8Z8qllogYkLQEuA7oAS6PiPWSFuffL4+IVZIWStoE\nPAWc2SoWQNKpwMXAROC7ku6IiLcD84BlknYDzwGL24285qRpZp03UD40IlYDq+u2La9bX1I0Nt9+\nDXBNg+1XA1entM9J08w6bwhJc7Rz0jSzznPSNDNLsLvqBgwfJ00z67w9VTdg+Dhpmlnn+fTczCxB\nmbftxggnTTPrPPc0zcwSdHHSVETR9+NHTjZ30KrEqJnpFU3rS495VXpI6bgyM8KXmd/z0PSQo+f9\nokRFcHCJATvKDFQxocQPr3evAXKKKTOYyCzWJccAvIa7k2NWcFpS+R/oXUTEkAbDkBRcXTCv/JmG\nXN9Ic0/TzDrPjxyZmSXwI0dmZgm6+Jqmk6aZdZ4fOTIzS+CepplZAidNM7METppmZgn8yJGZWYIu\nfuTIE6uZWec9U3BpQNICSRskbZR0TpMyF+ff3yVpdrtYSe+R9AtJe/Kpemv3dW5efoOkk9sdmpOm\nmXXeQMGlTj4z5CXAAmAWcLqk4+rKLARmRkQfcBZwWYHYu4FTgR/V7WsW2ayVs/K4SyW1zItOmmbW\nebsLLvuaA2yKiP6I2A2sABbVlTkFuAIgIm4DJkia3Co2IjZExK8a1LcIuCoidkdEP7Ap309To/ia\nZn9i+ZenV7GlxNXq141Lj4Fyg2+UGIOELSViSrjvoeNHpiKAY9NDHnhxesxdd85NjnnxgkeTY+48\ndHb7Qg18vfE84S294cBbStU1ZOWvaU6FvUZO2QK8vkCZqcCUArH1pgC3NthXU6M4aZrZmFX+kaOi\nw64N58hILdvgpGlmndcsaW5dA9vWtIrcCvTWrPey7/lTfZlpeZlxBWLb1Tct39aUk6aZdV6zK18v\nm58tg9Yuqy+xFuiTNB3YRnaT5vS6MiuBJcAKSXOBnRGxXdIjBWJh717qSuBKSReRnZb3AT9pcWRO\nmmY2DJ4tFxYRA5KWANcBPcDlEbFe0uL8++URsUrSQkmbgKeAM1vFAkg6FbgYmAh8V9IdEfH2iFgn\n6ZvAOrL+8dnRZmR2J00z67whvEYZEauB1XXbltetLykam2+/BrimScyFwIVF2+ekaWad59cozcwS\ndPFrlE6aZtZ5HuXIzCyBk6aZWQJf0zQzS1DykaOxwEnTzDrPp+dVSO3fPzAsrdjH/5s1MvVAuRn9\n3lci5qESMZNLxMDI/WN6uETMk+khz9x6ZHpMmcFbACakh6ze+e6SlQ2RT8/NzBL4kSMzswQ+PTcz\nS+CkaWaWwNc0zcwS+JEjM7MEPj03M0vg03MzswR+5MjMLIFPz83MEjhpmpkl6OJrmi+qugFm1oUG\nCi4NSFogaYOkjZLOaVLm4vz7uyTNbhcr6UhJN0j6laTrJU3It0+X9LSkO/Ll0naH5qRpZqOGpB7g\nEmABMAs4XdJxdWUWAjMjog84C7isQOyngBsi4hjgxnx90KaImJ0vZ7dr4yg+PX86sfwIHcrDG0sG\nTk8POWBcesxX0kNKmTlC9QDcWSKmxIhApX6F7ikRU2I0pdJ1LShZV3XmkCWxfgBJK4BFwPqaMqcA\nVwBExG2SJkiaDMxoEXsKMC+PvwJYw96JszD3NM1sNJkKbK5Z35JvK1JmSovYSRGxPf+8HZhUU25G\nfmq+RtIb2zVw2Lpnkr4KvAPYERGvzrctBf4C+E1e7NyI+N5wtcHMqtLsTtAP86WpKFiBCpbZZ38R\nEZIGt28DeiPiMUknAtdKOj4inmi20+E8p/0a8GXgf9dsC+CiiLhoGOs1s8o1e+bopHwZ9A/1BbYC\nvTXrvWQ9xlZlpuVlxjXYvjX/vF3S5Ih4SNJRwA6AiNgF7Mo/3y7pXqAPuL3ZkQ3b6XlE3AQ81uCr\nIn8hzGxM211w2cdaoC+/qz0eOA1YWVdmJfABAElzgZ35qXer2JXAGfnnM4Br8/iJ+Q0kJB1NljDv\na3VkVdwI+pikD5Ad4Mcjouzg/2Y2aqXeyM1ExICkJcB1QA9weUSsl7Q4/355RKyStFDSJuAp4MxW\nsfmuPwd8U9KHgX7gvfn2NwOflrQbeA5Y3C4nKaLoJYR0kqYD3665pvkyXrie+RngqIj4cIO4gLfW\nbDkaeEWb2k4s0cL668tFlLijDYzY3fORehNjJO+eH1oiZqTunpeZK2k03T3fsga2rnlh/afLiIgh\nnQ1m/343ty8IQO+Q6xtpI9rTjIgdg58lfQX4dvPSbxuBFpnt56bNz5ZBP13WoR1373uUI5o0JR0V\nEQ/mq6cCd49k/WY2Urr3PcrhfOToKrKHSSdK2gycD8yXdALZXfT7gcXDVb+ZVck9zWQRcXqDzV8d\nrvrMbDRxT9PMLEG5u+djgZOmmQ0Dn55XIPUv1c0l6jipfZGO6U8PGSjz1/q49kX2cWR6yKYS1QDl\n/jFNal9kH2UGVukrEfN4iZiy/+wOTg+55Ocl6xoqn56bmSVwT9PMLIF7mmZmCdzTNDNL4J6mmVkC\nP3JkZpbAPU0zswS+pmlmlqB7e5pjcGK1/qobMAp4cKjMmqobMEqsqboBDQxh4vNRzklzTCozGm03\nWlN1A0aJNVU3oIHS012Mej49N7NhMDZ7kUU4aZrZMOjeR46GdY6gsmrmJDazEdaZOYJGrr6RNiqT\nppnZaDUGbwSZmVXHSdPMLMGYSZqSFkjaIGmjpHOqbk9VJPVL+rmkOyT9pOr2jARJX5W0XdLdNduO\nlHSDpF9Jul5SmZnOx5QmP4elkrbkvw93SGo307kN0ZhImpJ6gEuABcAs4HRJZYYo7wYBzI+I2REx\np+rGjJCvkf2/r/Up4IaIOAa4MV/vdo1+DgFclP8+zI6I71XQrv3KmEiawBxgU0T0R8RuYAWwqOI2\nVWlM3W0cqoi4CXisbvMpwBX55yuAPx3RRlWgyc8B9rPfh6qNlaQ5Fdhcs74l37Y/CuD7ktZK+suq\nG1OhSRGxPf+8nXITCXWLj0m6S9Ll+8NliqqNlaTp56JecFJEzAbeDnxU0puqblDVIntubn/9HbkM\nmAGcADxNbWCNAAABqElEQVQIfLHa5nS/sZI0twK9Neu9ZL3N/U5EPJj/9zfANWSXLvZH2yVNBpB0\nFLCj4vZUIiJ2RA74Cvvv78OIGStJcy3QJ2m6pPHAacDKits04iQdLOmw/PMhwMnsv0MerQTOyD+f\nAVxbYVsqk//BGHQq++/vw4gZE++eR8SApCXAdUAPcHlErK+4WVWYBFwjCbL/d/8eEddX26ThJ+kq\nYB4wUdJm4O+BzwHflPRhsqGv3ltdC0dGg5/D+cB8SSeQXZ64H1hcYRP3C36N0swswVg5PTczGxWc\nNM3MEjhpmpklcNI0M0vgpGlmlsBJ08wsgZOmmVkCJ00zswROmtYRkv4wH2nnQEmHSLpH0qyq22XW\naX4jyDpG0meAFwMHAZsj4h8rbpJZxzlpWsdIGkc2uMrTwB+Ff7msC/n03DppInAIcChZb9Os67in\naR0jaSVwJXA0cFREfKziJpl13JgYGs5GP0kfAJ6NiBWSXgTcIml+RKypuGlmHeWepplZAl/TNDNL\n4KRpZpbASdPMLIGTpplZAidNM7METppmZgmcNM3MEjhpmpkl+P+7zFuTqPArBgAAAABJRU5ErkJg\ngg==\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -1131,7 +1158,7 @@ "source": [ "# Extract thermal nu-fission rates from pandas\n", "fiss = df[df['score'] == 'nu-fission']\n", - "fiss = fiss[fiss['energy [MeV]'] == '(0.0e+00 - 6.3e-07)']\n", + "fiss = fiss[fiss['energy low [MeV]'] == 0.0]\n", "\n", "# Extract mean and reshape as 2D NumPy arrays\n", "mean = fiss['mean'].reshape((17,17))\n", @@ -1205,148 +1232,148 @@ " \n", " \n", " \n", - " 0\n", - " 10000\n", - " U-235\n", - " scatter-Y0,0\n", - " 0.038027\n", - " 0.001350\n", + " 0 \n", + " 10000\n", + " U-235\n", + " scatter-Y0,0\n", + " 0.037095\n", + " 0.001150\n", " \n", " \n", - " 1\n", - " 10000\n", - " U-235\n", - " scatter-Y1,-1\n", - " 0.000071\n", - " 0.000383\n", + " 1 \n", + " 10000\n", + " U-235\n", + " scatter-Y1,-1\n", + " 0.000266\n", + " 0.000323\n", " \n", " \n", - " 2\n", - " 10000\n", - " U-235\n", - " scatter-Y1,0\n", - " -0.000579\n", - " 0.000250\n", + " 2 \n", + " 10000\n", + " U-235\n", + " scatter-Y1,0\n", + " -0.000417\n", + " 0.000274\n", " \n", " \n", - " 3\n", - " 10000\n", - " U-235\n", - " scatter-Y1,1\n", - " -0.000176\n", - " 0.000282\n", + " 3 \n", + " 10000\n", + " U-235\n", + " scatter-Y1,1\n", + " -0.000228\n", + " 0.000237\n", " \n", " \n", - " 4\n", - " 10000\n", - " U-235\n", - " scatter-Y2,-2\n", - " 0.000105\n", - " 0.000224\n", + " 4 \n", + " 10000\n", + " U-235\n", + " scatter-Y2,-2\n", + " 0.000026\n", + " 0.000199\n", " \n", " \n", - " 5\n", - " 10000\n", - " U-235\n", - " scatter-Y2,-1\n", - " -0.000077\n", - " 0.000221\n", + " 5 \n", + " 10000\n", + " U-235\n", + " scatter-Y2,-1\n", + " -0.000115\n", + " 0.000185\n", " \n", " \n", - " 6\n", - " 10000\n", - " U-235\n", - " scatter-Y2,0\n", - " 0.000134\n", - " 0.000181\n", + " 6 \n", + " 10000\n", + " U-235\n", + " scatter-Y2,0\n", + " 0.000151\n", + " 0.000159\n", " \n", " \n", - " 7\n", - " 10000\n", - " U-235\n", - " scatter-Y2,1\n", - " -0.000117\n", - " 0.000308\n", + " 7 \n", + " 10000\n", + " U-235\n", + " scatter-Y2,1\n", + " -0.000122\n", + " 0.000280\n", " \n", " \n", - " 8\n", - " 10000\n", - " U-235\n", - " scatter-Y2,2\n", - " 0.000039\n", - " 0.000211\n", + " 8 \n", + " 10000\n", + " U-235\n", + " scatter-Y2,2\n", + " 0.000008\n", + " 0.000181\n", " \n", " \n", - " 9\n", - " 10000\n", - " U-238\n", - " scatter-Y0,0\n", - " 2.340987\n", - " 0.014310\n", + " 9 \n", + " 10000\n", + " U-238\n", + " scatter-Y0,0\n", + " 2.328632\n", + " 0.013107\n", " \n", " \n", " 10\n", - " 10000\n", - " U-238\n", - " scatter-Y1,-1\n", - " 0.022817\n", - " 0.002458\n", + " 10000\n", + " U-238\n", + " scatter-Y1,-1\n", + " 0.024530\n", + " 0.002272\n", " \n", " \n", " 11\n", - " 10000\n", - " U-238\n", - " scatter-Y1,0\n", - " 0.001589\n", - " 0.003051\n", + " 10000\n", + " U-238\n", + " scatter-Y1,0\n", + " -0.000059\n", + " 0.002804\n", " \n", " \n", " 12\n", - " 10000\n", - " U-238\n", - " scatter-Y1,1\n", - " -0.027146\n", - " 0.002511\n", + " 10000\n", + " U-238\n", + " scatter-Y1,1\n", + " -0.027990\n", + " 0.002536\n", " \n", " \n", " 13\n", - " 10000\n", - " U-238\n", - " scatter-Y2,-2\n", - " -0.004146\n", - " 0.001722\n", + " 10000\n", + " U-238\n", + " scatter-Y2,-2\n", + " -0.004861\n", + " 0.001575\n", " \n", " \n", " 14\n", - " 10000\n", - " U-238\n", - " scatter-Y2,-1\n", - " 0.001765\n", - " 0.002474\n", + " 10000\n", + " U-238\n", + " scatter-Y2,-1\n", + " 0.000557\n", + " 0.002018\n", " \n", " \n", " 15\n", - " 10000\n", - " U-238\n", - " scatter-Y2,0\n", - " 0.006038\n", - " 0.001917\n", + " 10000\n", + " U-238\n", + " scatter-Y2,0\n", + " 0.006236\n", + " 0.001627\n", " \n", " \n", " 16\n", - " 10000\n", - " U-238\n", - " scatter-Y2,1\n", - " 0.000167\n", - " 0.001438\n", + " 10000\n", + " U-238\n", + " scatter-Y2,1\n", + " -0.000648\n", + " 0.001551\n", " \n", " \n", " 17\n", - " 10000\n", - " U-238\n", - " scatter-Y2,2\n", - " -0.001684\n", - " 0.001535\n", + " 10000\n", + " U-238\n", + " scatter-Y2,2\n", + " -0.001031\n", + " 0.001310\n", " \n", " \n", "\n", @@ -1354,24 +1381,24 @@ ], "text/plain": [ " cell nuclide score mean std. dev.\n", - "0 10000 U-235 scatter-Y0,0 0.038027 0.001350\n", - "1 10000 U-235 scatter-Y1,-1 0.000071 0.000383\n", - "2 10000 U-235 scatter-Y1,0 -0.000579 0.000250\n", - "3 10000 U-235 scatter-Y1,1 -0.000176 0.000282\n", - "4 10000 U-235 scatter-Y2,-2 0.000105 0.000224\n", - "5 10000 U-235 scatter-Y2,-1 -0.000077 0.000221\n", - "6 10000 U-235 scatter-Y2,0 0.000134 0.000181\n", - "7 10000 U-235 scatter-Y2,1 -0.000117 0.000308\n", - "8 10000 U-235 scatter-Y2,2 0.000039 0.000211\n", - "9 10000 U-238 scatter-Y0,0 2.340987 0.014310\n", - "10 10000 U-238 scatter-Y1,-1 0.022817 0.002458\n", - "11 10000 U-238 scatter-Y1,0 0.001589 0.003051\n", - "12 10000 U-238 scatter-Y1,1 -0.027146 0.002511\n", - "13 10000 U-238 scatter-Y2,-2 -0.004146 0.001722\n", - "14 10000 U-238 scatter-Y2,-1 0.001765 0.002474\n", - "15 10000 U-238 scatter-Y2,0 0.006038 0.001917\n", - "16 10000 U-238 scatter-Y2,1 0.000167 0.001438\n", - "17 10000 U-238 scatter-Y2,2 -0.001684 0.001535" + "0 10000 U-235 scatter-Y0,0 0.037095 0.001150\n", + "1 10000 U-235 scatter-Y1,-1 0.000266 0.000323\n", + "2 10000 U-235 scatter-Y1,0 -0.000417 0.000274\n", + "3 10000 U-235 scatter-Y1,1 -0.000228 0.000237\n", + "4 10000 U-235 scatter-Y2,-2 0.000026 0.000199\n", + "5 10000 U-235 scatter-Y2,-1 -0.000115 0.000185\n", + "6 10000 U-235 scatter-Y2,0 0.000151 0.000159\n", + "7 10000 U-235 scatter-Y2,1 -0.000122 0.000280\n", + "8 10000 U-235 scatter-Y2,2 0.000008 0.000181\n", + "9 10000 U-238 scatter-Y0,0 2.328632 0.013107\n", + "10 10000 U-238 scatter-Y1,-1 0.024530 0.002272\n", + "11 10000 U-238 scatter-Y1,0 -0.000059 0.002804\n", + "12 10000 U-238 scatter-Y1,1 -0.027990 0.002536\n", + "13 10000 U-238 scatter-Y2,-2 -0.004861 0.001575\n", + "14 10000 U-238 scatter-Y2,-1 0.000557 0.002018\n", + "15 10000 U-238 scatter-Y2,0 0.006236 0.001627\n", + "16 10000 U-238 scatter-Y2,1 -0.000648 0.001551\n", + "17 10000 U-238 scatter-Y2,2 -0.001031 0.001310" ] }, "execution_count": 29, @@ -1405,8 +1432,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "[[[ 0.00153535 0.0143096 ]\n", - " [ 0.00021107 0.00135025]]]\n" + "[[[ 0.00131009 0.01310707]\n", + " [ 0.00018089 0.00114976]]]\n" ] } ], @@ -1474,7 +1501,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "[[[ 0.04318886]]]\n" + "[[[ 0.04537029]]]\n" ] } ], @@ -1517,143 +1544,143 @@ " \n", " \n", " 558\n", - " 279\n", - " absorption\n", - " 0.000102\n", - " 0.000016\n", + " 279\n", + " absorption\n", + " 0.000093\n", + " 0.000013\n", " \n", " \n", " 559\n", - " 279\n", - " scatter\n", - " 0.013889\n", - " 0.000964\n", + " 279\n", + " scatter\n", + " 0.013504\n", + " 0.000805\n", " \n", " \n", " 560\n", - " 280\n", - " absorption\n", - " 0.000087\n", - " 0.000012\n", + " 280\n", + " absorption\n", + " 0.000084\n", + " 0.000010\n", " \n", " \n", " 561\n", - " 280\n", - " scatter\n", - " 0.014347\n", - " 0.000652\n", + " 280\n", + " scatter\n", + " 0.014215\n", + " 0.000612\n", " \n", " \n", " 562\n", - " 281\n", - " absorption\n", - " 0.000087\n", - " 0.000010\n", + " 281\n", + " absorption\n", + " 0.000091\n", + " 0.000008\n", " \n", " \n", " 563\n", - " 281\n", - " scatter\n", - " 0.014283\n", - " 0.000715\n", + " 281\n", + " scatter\n", + " 0.014545\n", + " 0.000590\n", " \n", " \n", " 564\n", - " 282\n", - " absorption\n", - " 0.000111\n", - " 0.000012\n", + " 282\n", + " absorption\n", + " 0.000112\n", + " 0.000012\n", " \n", " \n", " 565\n", - " 282\n", - " scatter\n", - " 0.016374\n", - " 0.000865\n", + " 282\n", + " scatter\n", + " 0.016321\n", + " 0.000729\n", " \n", " \n", " 566\n", - " 283\n", - " absorption\n", - " 0.000090\n", - " 0.000008\n", + " 283\n", + " absorption\n", + " 0.000092\n", + " 0.000007\n", " \n", " \n", " 567\n", - " 283\n", - " scatter\n", - " 0.015839\n", - " 0.000795\n", + " 283\n", + " scatter\n", + " 0.016163\n", + " 0.000661\n", " \n", " \n", " 568\n", - " 284\n", - " absorption\n", - " 0.000103\n", - " 0.000012\n", + " 284\n", + " absorption\n", + " 0.000104\n", + " 0.000011\n", " \n", " \n", " 569\n", - " 284\n", - " scatter\n", - " 0.017182\n", - " 0.000660\n", + " 284\n", + " scatter\n", + " 0.017384\n", + " 0.000599\n", " \n", " \n", " 570\n", - " 285\n", - " absorption\n", - " 0.000111\n", - " 0.000014\n", + " 285\n", + " absorption\n", + " 0.000111\n", + " 0.000011\n", " \n", " \n", " 571\n", - " 285\n", - " scatter\n", - " 0.017565\n", - " 0.000862\n", + " 285\n", + " scatter\n", + " 0.018015\n", + " 0.000774\n", " \n", " \n", " 572\n", - " 286\n", - " absorption\n", - " 0.000125\n", - " 0.000014\n", + " 286\n", + " absorption\n", + " 0.000125\n", + " 0.000012\n", " \n", " \n", " 573\n", - " 286\n", - " scatter\n", - " 0.018128\n", - " 0.000931\n", + " 286\n", + " scatter\n", + " 0.018294\n", + " 0.000828\n", " \n", " \n", " 574\n", - " 287\n", - " absorption\n", - " 0.000124\n", - " 0.000016\n", + " 287\n", + " absorption\n", + " 0.000119\n", + " 0.000013\n", " \n", " \n", " 575\n", - " 287\n", - " scatter\n", - " 0.017253\n", - " 0.000902\n", + " 287\n", + " scatter\n", + " 0.017483\n", + " 0.000757\n", " \n", " \n", " 576\n", - " 288\n", - " absorption\n", - " 0.000119\n", - " 0.000016\n", + " 288\n", + " absorption\n", + " 0.000113\n", + " 0.000014\n", " \n", " \n", " 577\n", - " 288\n", - " scatter\n", - " 0.018482\n", - " 0.000861\n", + " 288\n", + " scatter\n", + " 0.018248\n", + " 0.000782\n", " \n", " \n", "\n", @@ -1661,26 +1688,26 @@ ], "text/plain": [ " distribcell score mean std. dev.\n", - "558 279 absorption 0.000102 0.000016\n", - "559 279 scatter 0.013889 0.000964\n", - "560 280 absorption 0.000087 0.000012\n", - "561 280 scatter 0.014347 0.000652\n", - "562 281 absorption 0.000087 0.000010\n", - "563 281 scatter 0.014283 0.000715\n", - "564 282 absorption 0.000111 0.000012\n", - "565 282 scatter 0.016374 0.000865\n", - "566 283 absorption 0.000090 0.000008\n", - "567 283 scatter 0.015839 0.000795\n", - "568 284 absorption 0.000103 0.000012\n", - "569 284 scatter 0.017182 0.000660\n", - "570 285 absorption 0.000111 0.000014\n", - "571 285 scatter 0.017565 0.000862\n", - "572 286 absorption 0.000125 0.000014\n", - "573 286 scatter 0.018128 0.000931\n", - "574 287 absorption 0.000124 0.000016\n", - "575 287 scatter 0.017253 0.000902\n", - "576 288 absorption 0.000119 0.000016\n", - "577 288 scatter 0.018482 0.000861" + "558 279 absorption 0.000093 0.000013\n", + "559 279 scatter 0.013504 0.000805\n", + "560 280 absorption 0.000084 0.000010\n", + "561 280 scatter 0.014215 0.000612\n", + "562 281 absorption 0.000091 0.000008\n", + "563 281 scatter 0.014545 0.000590\n", + "564 282 absorption 0.000112 0.000012\n", + "565 282 scatter 0.016321 0.000729\n", + "566 283 absorption 0.000092 0.000007\n", + "567 283 scatter 0.016163 0.000661\n", + "568 284 absorption 0.000104 0.000011\n", + "569 284 scatter 0.017384 0.000599\n", + "570 285 absorption 0.000111 0.000011\n", + "571 285 scatter 0.018015 0.000774\n", + "572 286 absorption 0.000125 0.000012\n", + "573 286 scatter 0.018294 0.000828\n", + "574 287 absorption 0.000119 0.000013\n", + "575 287 scatter 0.017483 0.000757\n", + "576 288 absorption 0.000113 0.000014\n", + "577 288 scatter 0.018248 0.000782" ] }, "execution_count": 33, @@ -1716,397 +1743,415 @@ "
\n", "\n", " \n", - " \n", + " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", "
level 1level 2level 3(level 1, cell, id)(level 1, univ, id)(level 2, lat, id)(level 2, lat, x)(level 2, lat, y)(level 2, lat, z)(level 3, cell, id)(level 3, univ, id)distribcellscoremeanstd. dev.
cellunivlatcelluniv
idididxyzidid
01000301000100010002100000absorption0.0001130.0000130 10003 0 10001 0 0 0 10002 10000 0 absorption 0.000123 0.000012
11000301000100010002100000scatter0.0173370.0007491 10003 0 10001 0 0 0 10002 10000 0 scatter 0.017805 0.000808
21000301000101010002100001absorption0.0002040.0000212 10003 0 10001 0 1 0 10002 10000 1 absorption 0.000217 0.000020
31000301000101010002100001scatter0.0276310.0013483 10003 0 10001 0 1 0 10002 10000 1 scatter 0.028867 0.001263
41000301000102010002100002absorption0.0003190.0000254 10003 0 10001 0 2 0 10002 10000 2 absorption 0.000318 0.000020
51000301000102010002100002scatter0.0400520.0014275 10003 0 10001 0 2 0 10002 10000 2 scatter 0.040493 0.001269
61000301000103010002100003absorption0.0003880.0000226 10003 0 10001 0 3 0 10002 10000 3 absorption 0.000386 0.000018
71000301000103010002100003scatter0.0485780.0015617 10003 0 10001 0 3 0 10002 10000 3 scatter 0.048576 0.001337
81000301000104010002100004absorption0.0005110.0000308 10003 0 10001 0 4 0 10002 10000 4 absorption 0.000501 0.000026
91000301000104010002100004scatter0.0579030.0019889 10003 0 10001 0 4 0 10002 10000 4 scatter 0.057063 0.001715
101000301000105010002100005absorption0.0004810.000033 10003 0 10001 0 5 0 10002 10000 5 absorption 0.000484 0.000026
111000301000105010002100005scatter0.0612110.001989 10003 0 10001 0 5 0 10002 10000 5 scatter 0.060822 0.001581
121000301000106010002100006absorption0.0005420.000045 10003 0 10001 0 6 0 10002 10000 6 absorption 0.000532 0.000039
131000301000106010002100006scatter0.0708880.002497 10003 0 10001 0 6 0 10002 10000 6 scatter 0.069101 0.002249
141000301000107010002100007absorption0.0005870.000047 10003 0 10001 0 7 0 10002 10000 7 absorption 0.000577 0.000039
151000301000107010002100007scatter0.0781070.002794 10003 0 10001 0 7 0 10002 10000 7 scatter 0.076722 0.002335
161000301000108010002100008absorption0.0006270.000033 10003 0 10001 0 8 0 10002 10000 8 absorption 0.000649 0.000039
171000301000108010002100008scatter0.0820310.001740 10003 0 10001 0 8 0 10002 10000 8 scatter 0.081564 0.001610
181000301000109010002100009absorption0.0006670.000028 10003 0 10001 0 9 0 10002 10000 9 absorption 0.000680 0.000032
191000301000109010002100009scatter0.0885160.002037 10003 0 10001 0 9 0 10002 10000 9 scatter 0.087715 0.001959
\n", "
" ], "text/plain": [ - " level 1 level 2 level 3 distribcell score \\\n", - " cell univ lat cell univ \n", - " id id id x y z id id \n", - "0 10003 0 10001 0 0 0 10002 10000 0 absorption \n", - "1 10003 0 10001 0 0 0 10002 10000 0 scatter \n", - "2 10003 0 10001 0 1 0 10002 10000 1 absorption \n", - "3 10003 0 10001 0 1 0 10002 10000 1 scatter \n", - "4 10003 0 10001 0 2 0 10002 10000 2 absorption \n", - "5 10003 0 10001 0 2 0 10002 10000 2 scatter \n", - "6 10003 0 10001 0 3 0 10002 10000 3 absorption \n", - "7 10003 0 10001 0 3 0 10002 10000 3 scatter \n", - "8 10003 0 10001 0 4 0 10002 10000 4 absorption \n", - "9 10003 0 10001 0 4 0 10002 10000 4 scatter \n", - "10 10003 0 10001 0 5 0 10002 10000 5 absorption \n", - "11 10003 0 10001 0 5 0 10002 10000 5 scatter \n", - "12 10003 0 10001 0 6 0 10002 10000 6 absorption \n", - "13 10003 0 10001 0 6 0 10002 10000 6 scatter \n", - "14 10003 0 10001 0 7 0 10002 10000 7 absorption \n", - "15 10003 0 10001 0 7 0 10002 10000 7 scatter \n", - "16 10003 0 10001 0 8 0 10002 10000 8 absorption \n", - "17 10003 0 10001 0 8 0 10002 10000 8 scatter \n", - "18 10003 0 10001 0 9 0 10002 10000 9 absorption \n", - "19 10003 0 10001 0 9 0 10002 10000 9 scatter \n", + " (level 1, cell, id) (level 1, univ, id) (level 2, lat, id) \\\n", + "0 10003 0 10001 \n", + "1 10003 0 10001 \n", + "2 10003 0 10001 \n", + "3 10003 0 10001 \n", + "4 10003 0 10001 \n", + "5 10003 0 10001 \n", + "6 10003 0 10001 \n", + "7 10003 0 10001 \n", + "8 10003 0 10001 \n", + "9 10003 0 10001 \n", + "10 10003 0 10001 \n", + "11 10003 0 10001 \n", + "12 10003 0 10001 \n", + "13 10003 0 10001 \n", + "14 10003 0 10001 \n", + "15 10003 0 10001 \n", + "16 10003 0 10001 \n", + "17 10003 0 10001 \n", + "18 10003 0 10001 \n", + "19 10003 0 10001 \n", "\n", - " mean std. dev. \n", - " \n", - " \n", - "0 0.000113 0.000013 \n", - "1 0.017337 0.000749 \n", - "2 0.000204 0.000021 \n", - "3 0.027631 0.001348 \n", - "4 0.000319 0.000025 \n", - "5 0.040052 0.001427 \n", - "6 0.000388 0.000022 \n", - "7 0.048578 0.001561 \n", - "8 0.000511 0.000030 \n", - "9 0.057903 0.001988 \n", - "10 0.000481 0.000033 \n", - "11 0.061211 0.001989 \n", - "12 0.000542 0.000045 \n", - "13 0.070888 0.002497 \n", - "14 0.000587 0.000047 \n", - "15 0.078107 0.002794 \n", - "16 0.000627 0.000033 \n", - "17 0.082031 0.001740 \n", - "18 0.000667 0.000028 \n", - "19 0.088516 0.002037 " + " (level 2, lat, x) (level 2, lat, y) (level 2, lat, z) \\\n", + "0 0 0 0 \n", + "1 0 0 0 \n", + "2 0 1 0 \n", + "3 0 1 0 \n", + "4 0 2 0 \n", + "5 0 2 0 \n", + "6 0 3 0 \n", + "7 0 3 0 \n", + "8 0 4 0 \n", + "9 0 4 0 \n", + "10 0 5 0 \n", + "11 0 5 0 \n", + "12 0 6 0 \n", + "13 0 6 0 \n", + "14 0 7 0 \n", + "15 0 7 0 \n", + "16 0 8 0 \n", + "17 0 8 0 \n", + "18 0 9 0 \n", + "19 0 9 0 \n", + "\n", + " (level 3, cell, id) (level 3, univ, id) distribcell score \\\n", + "0 10002 10000 0 absorption \n", + "1 10002 10000 0 scatter \n", + "2 10002 10000 1 absorption \n", + "3 10002 10000 1 scatter \n", + "4 10002 10000 2 absorption \n", + "5 10002 10000 2 scatter \n", + "6 10002 10000 3 absorption \n", + "7 10002 10000 3 scatter \n", + "8 10002 10000 4 absorption \n", + "9 10002 10000 4 scatter \n", + "10 10002 10000 5 absorption \n", + "11 10002 10000 5 scatter \n", + "12 10002 10000 6 absorption \n", + "13 10002 10000 6 scatter \n", + "14 10002 10000 7 absorption \n", + "15 10002 10000 7 scatter \n", + "16 10002 10000 8 absorption \n", + "17 10002 10000 8 scatter \n", + "18 10002 10000 9 absorption \n", + "19 10002 10000 9 scatter \n", + "\n", + " mean std. dev. \n", + "0 0.000123 0.000012 \n", + "1 0.017805 0.000808 \n", + "2 0.000217 0.000020 \n", + "3 0.028867 0.001263 \n", + "4 0.000318 0.000020 \n", + "5 0.040493 0.001269 \n", + "6 0.000386 0.000018 \n", + "7 0.048576 0.001337 \n", + "8 0.000501 0.000026 \n", + "9 0.057063 0.001715 \n", + "10 0.000484 0.000026 \n", + "11 0.060822 0.001581 \n", + "12 0.000532 0.000039 \n", + "13 0.069101 0.002249 \n", + "14 0.000577 0.000039 \n", + "15 0.076722 0.002335 \n", + "16 0.000649 0.000039 \n", + "17 0.081564 0.001610 \n", + "18 0.000680 0.000032 \n", + "19 0.087715 0.001959 " ] }, "execution_count": 34, @@ -2135,62 +2180,52 @@ "
\n", "\n", " \n", - " \n", + " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", "
meanstd. dev.
count289.000000289.000000 289.000000 289.000000
mean0.0004190.000024 0.000418 0.000022
std0.0002370.000010 0.000239 0.000009
min0.0000150.000003 0.000018 0.000004
25%0.0002070.000017 0.000202 0.000015
50%0.0004150.000023 0.000402 0.000021
75%0.0006150.000030 0.000615 0.000027
max0.0009010.000055 0.000892 0.000044
\n", @@ -2198,16 +2233,14 @@ ], "text/plain": [ " mean std. dev.\n", - " \n", - " \n", "count 289.000000 289.000000\n", - "mean 0.000419 0.000024\n", - "std 0.000237 0.000010\n", - "min 0.000015 0.000003\n", - "25% 0.000207 0.000017\n", - "50% 0.000415 0.000023\n", - "75% 0.000615 0.000030\n", - "max 0.000901 0.000055" + "mean 0.000418 0.000022\n", + "std 0.000239 0.000009\n", + "min 0.000018 0.000004\n", + "25% 0.000202 0.000015\n", + "50% 0.000402 0.000021\n", + "75% 0.000615 0.000027\n", + "max 0.000892 0.000044" ] }, "execution_count": 35, @@ -2242,7 +2275,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Mann-Whitney Test p-value: 0.456115837774\n" + "Mann-Whitney Test p-value: 0.414863173548\n" ] } ], @@ -2280,7 +2313,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Mann-Whitney Test p-value: 4.59783355073e-42\n" + "Mann-Whitney Test p-value: 3.28554363741e-42\n" ] } ], @@ -2316,7 +2349,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "/usr/local/lib/python2.7/dist-packages/ipykernel/__main__.py:4: SettingWithCopyWarning: \n", + "/home/smharper/.local/lib/python2.7/site-packages/ipykernel/__main__.py:4: SettingWithCopyWarning: \n", "A value is trying to be set on a copy of a slice from a DataFrame.\n", "Try using .loc[row_indexer,col_indexer] = value instead\n", "\n", @@ -2326,7 +2359,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 38, @@ -2335,9 +2368,9 @@ }, { "data": { - "image/png": "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\nTkSuQmCC\n", + "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -2364,7 +2397,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 39, @@ -2373,9 +2406,9 @@ }, { "data": { - "image/png": "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\nwXh7GWfQoEFRh1AjaurCcmlKCiJSrrC+eKR6wkzYaj4SEZE4JQUREYlTUhARkTglBRERiVNSEJFa\nJTc3l8mTJ8dfjx07ln322Yf333+frKwscnJyyMnJoW3btvTt25dJkyZ9r3yjRo3i2+Xk5HDNNdek\nuhppS0lBRGoVM4v3vhk1ahRXXXUVr732Gp07dwZg48aNFBUVMWfOHE4++WTOOussRo0aVaL8K6+8\nQlFRUXwaPnx4JHVJR0oKIlLruDuPPfYYN9xwAxMnTuSYY4753jatW7fmmmuuYdiwYdx0000RRFk7\nKSmISK3z8MMPc/vtt/P222/Ts2fPCrc966yzWLt2LZ9++ml8me6/KJ9uXhORKrHf18wNVH575b6g\n3Z1JkybRp08funfvvsft27dvD8A333wTL3/mmWdSr95/v/7uueceLr300krFkamUFESkSir7ZV5T\nzIxHH32UO++8k1/+8peMHDmywu2//PJLAPbZZ594+Zdffpk+ffqEHmttpOYjEal12rRpw+TJk5ky\nZQq/+tWvKtz2xRdfpE2bNnTr1i1F0dVuSgoiUiu1a9eOyZMn88Ybb3D99dfHlxdfL1izZg0PPfQQ\nd9xxB3fffXeJsrqmUD41H4lIrdWpUyfefvttevfuzerVqwFo3rw57k7jxo056qijGDduHKecckqJ\ncn379iU7Ozv++pRTTuH5559PaezpSklBRGqVpUuXlnidm5vL8uXLASgoKKh0eSlJzUciIhKnpCAi\nInFKCiIiEqekICIicUoKIiISp6QgIiJxSgoiIhKnpCAiInFKCiKSUbp37877778fdRi1lpKCiCSl\n+IlnYU7JKP04ToAnn3ySE088EYC5c+fSu3fvCvexbNkysrKy2L17d9X+GBlMw1yISCWEOZBcckmh\nMglkT8IaGG/Xrl0lxlaqTXSmICIZJTc3l7fffhuAGTNmcOSRR9KsWTPatm3LDTfcABA/k2jevDk5\nOTl8+OGHuDt/+MMfyM3NpU2bNlx88cV8++238f0+9dRTdOnShZYtW8a3Kz7OsGHDOOecc7jwwgtp\n1qwZo0aN4t///jfHHnssLVq0oH379lx99dXs2LEjvr+srCweeeQRDjzwQJo2bcptt93G4sWLOfbY\nY2nevDkDBgwosX2qKCmISK1T0S/8xLOIa6+9luuuu46NGzeyZMkSzj33XACmTJkCwMaNGykqKqJX\nr1488cQTjBo1infffZclS5awadMmrrrqKgDmzZvHlVdeyZgxY1i1ahUbN25k5cqVJY47fvx4zj33\nXDZu3MjAgQPJzs7mgQce4Ouvv2batGlMnjyZhx9+uESZiRMnMmvWLKZPn86f/vQnhgwZwpgxY1i+\nfDmFhYWMGTOmRv5elaGkIGmrOu3OkrmKH6fZokWL+HTllVeW+dlo0KABn332GV999RWNGjWiV69e\n8X2UNnr0aH7961+Tm5tL48aNufvuuxk7diy7du1i3Lhx9OvXj+OOO4769etzxx13fO94xx13HP36\n9QNgr732omfPnhx99NFkZWXRpUsXhg4dynvvvVeizI033kiTJk3Iz8/n0EMP5bTTTiM3N5emTZty\n2mmnMWvWrJr6syVNSUHSnJeapK4rfpzm+vXr49PDDz9c5hf9yJEjWbhwIXl5eRx99NG8+uqr5e53\n1apVdOnSJf66c+fO7Ny5kzVr1rBq1So6duwYX7f33nuz7777liifuB5g4cKFnH766bRr145mzZpx\n66238vXXX5fYpk2bNiX2Wfr1pk2b9vDXqHlKCiJS65XXnHTAAQdQUFDAunXruOmmmzjnnHPYsmVL\nmWcV7du3Z9myZfHXy5cvp169erRt25Z27dqxYsWK+LotW7Z87wu+9D6vuOIK8vPzWbRoERs3buSu\nu+6qFb2dlBREJGM9/fTTrFu3DoBmzZphZmRlZdGqVSuysrJYvHhxfNvzzz+f+++/n2XLlrFp0yZu\nueUWBgwYQFZWFv3792fChAlMmzaN7du3M2zYsD32XNq0aRM5OTk0atSIBQsW8Mgjj+wx3sR9RvXI\nUCUFEakEC3GqRlTlXG9688036d69Ozk5OVx33XWMHTuWhg0b0qhRI2699VaOP/54WrRowYwZM/jF\nL37BhRdeSO/evdlvv/1o1KgRDz74IACHHHIIDz74IAMGDKB9+/bk5OTQunVrGjZsWO7x77nnHgoK\nCmjatClDhw5lwIABJbYpK97S66O4hmZhZSMz6wQ8BbQm1hj8uLsPN7N9gGeALsAy4OfuvqFUWc/k\nB2sXFBQwcODAqMMITU3VL/YfovTnwCJ/6Hpdef/Mov9bp6tNmzbRokULFi1aVOI6RKqU994Ey6uV\nScI8U9gBXOfuhwDHAFeaWR5wM/CWux8ETA5ei4iktQkTJrB582a+++47brjhBg477LBIEkLYQksK\n7r7a3T8J5jcB84EOQD9gVLDZKODMsGIQEakp48ePp0OHDnTo0IHFixczduzYqEMKRUqGuTCzXOBw\n4EOgjbuvCVatAdqUU0xEJG2MGDGCESNGRB1G6EJPCmbWBHgeuNbdixIvnLi7m1mZjZb9+/ePz+fl\n5ZGfnx92qCkzderUqEMIVdj1KygoCHX/e6L3T9JBQUEB8+bNY/78+TW639AuNAOYWX3gFeB1d/9r\nsGwBcJK7rzazdsA77n5wqXK60FyL6UJz7aYLzemvVl5ottj/6JHAvOKEEBgPXBzMXwy8FFYMIiJS\nOWE2Hx0PXADMMbPiATx+A/wReNbMLiXokhpiDCJSDRprqu4JLSm4+78o/0zkJ2EdV0RqRiY2HWV6\n019N0B3NIiISp6QgIiJxSgoiIhKnpCAiInFKCiIiEqekICIicUoKIiISp6QgIiJxSgoiIhKnpCAi\nInFKCiIiEqekICIicUoKIiISl5LHcYqEqazhnTNxhE+RVFBSkAyRmAT0DACRqlLzkYiIxCkpiIhI\nnJKCiIjEKSmIiEickoKIiMQpKYiISJySgoiIxCkpiIhInJKCiIjEKSmIiEickoKIiMQpKYiISJyS\ngoiIxCkpiIhInJKCiIjEKSmIiEicHrIjEqGynhoH4T45LopjSu2hpCASudJfxql4clwUx5TaQM1H\nIiISp6QgIiJxoSYFM/uHma0xs8KEZcPMbIWZzQqmU8OMQUREkhf2mcITQOkvfQfuc/fDg+mNkGMQ\nEZEkhZoU3H0KsL6MVbqqJSKShqK6pnC1mc02s5Fm1jyiGEREpJQoksIjQFegB7AKuDeCGEREpAwp\nv0/B3dcWz5vZ34EJZW3Xv3//+HxeXh75+fnhB5ciU6dOjTqEUIVdv4KCghrZZtCgQWUuHz16dIXl\nUvH+JRN/WMfM5M9nptVt3rx5zJ8/v2Z36u6hTkAuUJjwul3C/HVAQRllPJONHj066hBCVVP1Axy8\n1PT9z8b3t0vu85Ps/kuryfevqjGEecxM/nxmct3c4+9jtb6zQz1TMLMxwA+Blmb2BXA7cJKZ9Yh9\nMFkKXBZmDCIikrxQk4K7n1/G4n+EeUwREak63dEsIiJxe0wKZvaCmf3MzJRAREQyXDJf9I8Ag4BF\nZvZHM+sWckwiIhKRPSYFd3/L3QcCPYFlwGQz+8DMBptZ/bADFBGR1EmqScjM9gUuAX4JfAwMB44A\n3gotMhERSbk99j4ysxeBg4F/An3dfVWwaqyZzQwzOJHaQk8zk0yRTJfUEe7+WuICM2vo7tvc/YiQ\n4hKphfQ0M6n9kmk+uquMZdNqOhAREYleuWcKZtYOaA/sbWY9if3scaAp0Cg14YmISCpV1Hz0P8DF\nQAdKjmRaBNwSZlAiIhKNcpOCuz8JPGlm/d39+dSFJCIiUamo+ehCd/8nkGtm1yeuIjYS332hRyci\nIilVUfNR8XWDHEp2qzC+381CREQyQEXNR48F/w5LWTQiIhKpZAbE+7OZNTWz+mY22cy+MrMLUxGc\n1B1m9r2pNu0/bGXFX9vqILVDMvcp/I+7fwucTmzso/2B/xdmUFJXeamptu0/bLU9fqkNkkkKxU1M\npwPj3H0j+kSKiGSkZIa5mGBmC4CtwBVm1jqYFxGRDJPM0Nk3A8cDR7j7duA74IywAxMRkdRL9hnN\nBwNdEp6f4MBT4YQkIiJRSWbo7KeB/YBPgF0Jq5QUREQyTDJnCkcA+a6B4UVEMl4yvY/mAu3CDkRE\nRKKXzJlCK2Cemc0AtgXL3N37hReWSPlSedNWeccaNGhQlcvrpFvSWTJJYVjwr/PfR0npUy0RSvUT\nzso6XrIx6GlsUrvsMSm4+7tmlgsc4O6TzKxRMuVERKT2SWbso6HAc8BjwaKOwIthBiUiItFI5kLz\nlcAJwLcA7r4QaB1mUCIiEo1kksI2dy++wIyZ1UPXFCRdZG+DfYDmSyFrZ9TRiNR6yVwbeM/MbgUa\nmdnJwK+ACeGGJbIH+70Fx90DXd6HTUDWD6HRV7DiGJgLm3dsplH9RnvcjYiUlExSuBm4FCgELgNe\nA/4eZlAi5coGTh8Mue/BO3fAMy/CjsbAcmiwCfabBD3eoesDXbm217Vcd8x17F1/76ijFqk1kul9\ntMvMXgJecve1KYhJpGz1tsJAYGsRPDwXdpQ6E9jeBBacCQvg3eHvctu7t5H3tzzuPeXeSMIVqY3K\nTQoWu+vmduAqYr/PMLNdwIPAHRr2QlLLod+lsAUY9wx4doVb57fOj83kwjkLz4ELgFcXw/r9ww40\nrejpbFJZFV1ovo7YkNlHuXsLd28BHB0suy4VwYnEHfE4tFwQ6wy9h4QQEzydbJnDY9thCTCkF/T+\nQ+zidJ2iJ7ZJ8ipKChcBA919afECd18CDArWiaRGs8+hz2/hxX9CVToY7a4PHwCPzYQOM+DyHpD7\nbg0HKZIZKrqmUM/d15Ve6O7rgm6pIqnxk5thxlWwLr96+9nYBcaMh4NfgrMugqXAxHWwuVWNhCmS\nCSo6U9hRxXVxZvYPM1tjZoUJy/Yxs7fMbKGZTTSz5skGK3VQ+49i3U4/uKHm9rngTPjbPNgM/Ko7\nHD4SbHfN7V+kFqsoKRxmZkVlTcChSe7/CeDUUstuBt5y94OAycFrkbL9+BZ47/ag22kN2t4EJgJP\nvwlHjIDBvWPdWUXquHKTgrtnu3tOOVNSzUfuPgVYX2pxP2BUMD8KOLNKkUvmawu0mgefXBLeMVb3\ngJFTYeYQOPV/4XJ4YPoDfPntl+EdUySNRXFtoI27rwnm1wBtIohBaoNjgQ+vhl0Nwj2OZ8Psi2H2\nRbBfFp+c+gm/f+/3dGzaEU4H1vwNNnaG71rDroaxh9Lu/rSMHSUs210fNgJqlZJaJtILxu7uZqY+\ncvJ9OSvhIOD1oSk8qMESeOKMJ9h++nZmr57N0aOOhtZz4cDXoPE6yN4eu2vHynrGVMKyetugCbDx\nIPjiOFh2Eiz8Wew6hkgaiyIprDGztu6+2szaAWXeJd2/f//4fF5eHvn51ex5kkamTp0adQihqpH6\n/WAU/AfY2qL6+6qk79/w9UjpLShxVlDesmyDfV+Azv+CA1+FU6+FL8DyLLZpBT+HCgoKqhTr6NGj\nkypX0TEz+fOZaXWbN28e8+fPr9mdunuoE5ALFCa8/jNwUzB/M/DHMsp4Jhs9enTUIYSqKvUDHDyY\ndjtXHeR0TFxWPCWzrKrlQt5XgyLnMJwhRzlXH+j0fNzJKrtcxX+f8mOtWrmSZTP585nJdXOPv4/V\n+s5OZujsKjOzMcRuG+pmZl+Y2WDgj8DJZrYQ6BO8FvmvTtMAgxVRB1LDtjeBOcCID2H8CDh0TGzM\n4YNfQncaS7oItfnI3c8vZ9VPwjyu1HI9noBZg8nc3soGn/8QRk2GA7Lg5N/BsffCm/fDyiOjDk7q\nuFDPFEQqLXsb5D8Pcy6IOpIUMFgEPPpJrNvt+X3hzIshJ+q4pC5TUpD0st9kWHsIFHWIOpLU8WyY\ndSk89CkUtYcr4M737mTzDnVVktRTUpD0kj8O5vff83aZaFtTmHw3PA6Faws5+KGDKSgsKO58IZIS\nSgqSPrJ2QLfxMP/sqCOJ1gZ49txnGX32aO6ddi/H/eO4WB8+XYyWFFBSkJQzs+9NQGw462/2j909\nLJzY5UT+PeTfXH7E5bE7qy/rGRu8b68NoRyv+L0YNGhQyfdF6hQlBYlIGQ9+yXtRZwmlZFkWF/e4\nGP4GTPojdJsA13WGgafDUcTutq6xEV71MB6JeJgLkRIOfA1Gvxp1FOnJgcX/E5safgsHvQL7vQrH\nnhk7c1h+AnwOM76cweFtD6d+dv2oI5ZaSklB0kNLAK/+g3Tqgm1NoXAgFA4CFkHOl9BlCnR+mSET\nhrBk/RL6dO3DRYddFGsL0KB8UglqPpL0cCCw6DRiYwhJpRR1gLkD4DWYfflslv/vcs46+Czun34/\nXEmsR5dIkpQUJD0cCHz206ijyAgt9m7BJT0u4V+/+Be8Avzod3DOedCgKOrQpBZQUpDoNSiCDsDS\nPlFHknmWAo99HGtyGtwbmqyKOiJJc0oKEr39JscGv9veJOpIMtPOvWHC47DgLLjoJ7BX1AFJOlNS\nkOgd8HpsDCAJkcF7t8GiU+F8YjcKipRBSUGit98kWBx1EOmlzJv7aqLcW3+BbUCf39VcsJJRlBQk\nWs2WQ8Oicp6/V5dV9UayPZTzLHgJOOxp6Dq5+mFKxlFSkGjlvhN7frGkzmZi1xj6Xgb1tkQdjaQZ\nJQWJVtd3YOmPoo6i7vnsp7D6B3CCHnwoJSkpSIQ8OFNQUojEG3+Fox+CnJVRRyJpRElBotNiKWRv\nh6+6RR1J3fRtJ5j1C+j9h6gjkTSipCDRiZ8laGiLyEy9CQ55FlpEHYikCyUFiY6uJ0Rvc0uYcSWc\nGHUgki6UFCQirp5H6WLG1ZAHNFkddSSSBpQUJBr7fgYYfHNA1JHI5pZQCBz94PdWVfUmOqm9lBQk\nGrnFTUf6okkL04EjH4MGm0qt0JPY6holBYlGV3VFTSvfEHt6W/cxUUciEVNSkGjkvquLzOnmo8vh\nyEejjkIipqQgqdcK2LkXbOgadSSSaPEpsPc30P6jqCORCCkpSOrlorOEdORZMPMynS3UcUoKknpd\n0fWEdDVrMOQ9Dw03Rh2JRERJQVJqt+/WmUI6+65NLGHnj4s6EomIkoKk1Ny1c2ErsXF3JD3Nvgh+\n8FTUUUhElBQkpd5Z+k7sYfKSvj77KbSaB82jDkSioKQgKfXOsndgWdRRSIV2NYD/nAeHRR2IREFJ\nQVJm1+5dvP/5+zpTqA1mXwQ/AN3JXPcoKUjKzF4zm9aNW0PpkRQk/Xx5FOwGOk2LOhJJMSUFSZl3\nlr7Dj3LV66h2MJgDHPbPqAORFIssKZjZMjObY2azzGxGVHFI6ryz7B36dO0TdRiSrELgkOdiT8eT\nOiPKMwUHTnL3w9396AjjkBTYuXsnU5ZP4aTck6IORZK1AViXBwe8EXUkkkJRNx9p3OQ6YubKmXRp\n1oVWjVtFHYpURuEgOHR01FFICtWL8NgOTDKzXcBj7j4iwlgkJK+++iqbNm3i5a9fpsPODjzzzDNR\nhySV8Z9z4Sc3QcNvYVvUwUgqRJkUjnf3VWbWCnjLzBa4+5Tilf37949vmJeXR35+fhQxhmLq1KlR\nhxCqxPpdeeWNbNmSz44Bs8n+uCvvfqY7ZWuVLfvGHpma9wJ8AgUFBVFHVC2Z9n9v3rx5zJ8/v0b3\nGVlScPdVwb/rzOxF4GggnhSef/75qEJLiYEDB0YdQqiK63f99bezoeh+aH8Mu595nR1bdwMtow1O\nKqdwEPQcAZ9kxuc2E+pQnpp4ZGok1xTMrJGZ5QTzjYFTiPV1kEzUYQ58fRBsbRF1JFIVn/aNPWOh\nSdSBSCpEdaG5DTDFzD4BPgRecfeJEcUiYes6HZaqK2qttXNvWHAmdI86EEmFSJqP3H0p0COKY0sE\ncj+ED26LOgqpjsJB8JMno45CUiDqLqmS4Tx7N3QohM9PjDoUqY6lP4IcWPDVgqgjkZApKUiotrfb\nCqsPhu05UYci1eHZUAij5+iehUynpCCh2t5pMyzSWUJGKITRhaNx18ipmUxJQUK1rfNmWHxC1GFI\nTVgFe9Xbi2krNHJqJlNSkNB8sfELdu+9E1aq20qmmP/MfI6//HjMLD5JZlFSkNBMXDyRBisaxdqj\nJTMULoFDWkLWdvQAnsykpCCheXPxmzT8olHUYUhN2tA1diPiAW9GHYmERElBQrFr9y4mLZkUO1OQ\nzDLnAo2cmsGUFCQUM76cQYemHcj+LsoxFyUU886FA1+HBkVRRyIhUFKQUIz/dDx9D+obdRgShs0t\nYzcj5r0YdSQSAiUFCcXLn77MGd3OiDoMCYuakDKWkoLUuNXbV7Nh6waO6nBU1KFIWBb2hQ4zNHJq\nBlJSkBo387uZ9OvWjyzTxytj7WgEn/bTyKkZSP9rpcZ9tOkjNR3VBXMugEOjDkJqmpKC1Ki1361l\nxfYV9Omq5ydkvKV9oCl8+tWnUUciNUhJQWrUuHnj6NG4Bw3rNYw6FAmbZ8Pc2CB5kjmUFKRGFRQW\ncFzOcVGHIakyB56a/RS7du+KOhKpIUoKUmM+3/A5C75awKGN1NBcZ6yCdjntmLBwQtSRSA1RUpAa\nM3buWM6mJdosAAAJv0lEQVTJP4d6pruY65Jrjr6G4R8OjzoMqSFKClIj3J2nC59m4KEDow5FUqx/\nfn8WfLWAwjWFUYciNUBJQWrE9BXT2bZzGyd21lPW6poG2Q244sgreHDGg1GHIjVASUFqxGMzH2Po\nEUP10JU6augRQ3lu3nOs3rQ66lCkmpQUpNrWb1nPy5++zCU9Lok6FIlImyZtuODQC7j3g3ujDkWq\nSUlBqm3U7FGcdsBptGzUMupQJEI3nXATI2eNZN1366IORapBSUGqZceuHdw//X6u7XVt1KFIxDo2\n7ch5h5zHfdPuizoUqQYlBamWsXPHsn+L/enVsVfUoUgauPmEm3n848dZWbQy6lCkipQUpMp27d7F\nn6b+iZtPuDnqUCRNdGnehSE9h3Dr27dGHYpUkZKCVNnowtE026sZJ+93ctShSBq55cRbeGPRG8xc\nOTPqUKQKlBSkSrbs2MJv3/4tfzn5L+qGKiU0bdiUu/rcxeWvXs7O3TujDkcqSUlBquQvH/yFI9sf\nyXGdNPidfN/gHoPZZ+99+PPUP0cdilSSkoJU2ty1c3lwxoMMP03j3UjZzIwRfUdw//T7+XjVx1GH\nI5WgpCCVsm3nNga/PJi7+txFx6Ydow5H0ljnZp15+KcP0//Z/ny1+auow5EkKSlIpVzz+jV0btaZ\nIT2HRB2K1ALnHnIu5x1yHj9/7uds3bk16nAkCUoKkrT7pt3H+8vf54kzntDFZUnaXX3uYt9G+3LO\ns+ewfdf2qMORPVBSkKQM/3A4D854kIkXTKRpw6ZRhyO1SHZWNgVnF9AguwF9x/Rl/Zb1UYckFYgk\nKZjZqWa2wMw+M7OboohBkrNt5zaufu1qHvnoEd6+6G06NesUdUhSC9XPrs+z5z5LXss8ev29ly4+\np7GUJwUzywYeAk4F8oHzzSwv1XFEad68eVGHkJQpn0/hiMePYEXRCqZfOp2uLbomVa621E9Sq15W\nPf566l8ZdtIwTht9Gte/eX3KB8/TZ3PPojhTOBpY5O7L3H0HMBY4I4I4IjN//vyoQyjXlh1bGDdv\nHH1G9eHily7mt71/yws/f4FmezVLeh/pXD+J3sBDB1J4RSGbd2ym20PduPLVK5n2xTTcPfRj67O5\nZ1E8TLcD8EXC6xWARlNLMXenaHsRyzYsY8n6JcxdO5epX0xl+orpHNHuCC7pcQnndz+f+tn1ow5V\nMlDrxq159PRH+W3v3/LErCcY/PJg1m9dT+8uvenVoRcH7XsQB+5zIO1y2tGsYTN1bEihKJJC+D8H\n0tjwD4czNXcqPx39UxyP/zoqni/9b0XrPPhTJrtut+/m223fsmHrBr7d9i171duLLs27sH+L/em2\nbzeG9hzKU2c+RavGrWqsvtnZ0KTJULKymgTxbKeoqMZ2L7Vcx6Yd+d0Pf8fvfvg7Pt/wOVOWT+Gj\nlR/xzrJ3+Ozrz1i9aTVbdm6hxV4taNqwKQ3rNaRBdgMaZsf+bZDdIJ4wDCsxD3xv3czcmZxecHqJ\ndZVx+RGX87ODflYTVU9blopTthIHNDsGGObupwavfwPsdvc/JWxTpxOHiEhVuXu1TquiSAr1gE+B\nHwMrgRnA+e6uxj4RkYilvPnI3Xea2VXAm0A2MFIJQUQkPaT8TEFERNJXZHc0m9k+ZvaWmS00s4lm\n1ryc7f5hZmvMrLAq5aNSifqVeSOfmQ0zsxVmNiuYTk1d9OVL5sZDMxserJ9tZodXpmyUqlm3ZWY2\nJ3ivZqQu6uTtqX5mdrCZTTOzrWb268qUTQfVrF8mvH+Dgs/lHDObamaHJVu2BHePZAL+DNwYzN8E\n/LGc7U4EDgcKq1I+netHrPlsEZAL1Ac+AfKCdbcD10ddj2TjTdjmp8BrwXwvYHqyZWtr3YLXS4F9\noq5HNevXCjgS+APw68qUjXqqTv0y6P07FmgWzJ9a1f97UY591A8YFcyPAs4sayN3nwKUNVhKUuUj\nlEx8e7qRL906Zydz42G83u7+IdDczNomWTZKVa1bm4T16fZ+Jdpj/dx9nbt/BOyobNk0UJ36Favt\n7980d98YvPwQ6Jhs2URRJoU27r4mmF8DtKlo4xDKhy2Z+Mq6ka9Dwuurg9PBkWnSPLaneCvapn0S\nZaNUnbpB7P6bSWb2kZml47jiydQvjLKpUt0YM+39uxR4rSplQ+19ZGZvAW3LWHVr4gt39+rcm1Dd\n8lVVA/WrKOZHgDuC+TuBe4m90VFK9m+czr+4ylPdup3g7ivNrBXwlpktCM5y00V1/n/Uht4o1Y3x\neHdflQnvn5n9CPgFcHxly0LIScHdTy5vXXDxuK27rzazdsDaSu6+uuWrrQbq9yWQOOxoJ2JZHHeP\nb29mfwcm1EzU1VJuvBVs0zHYpn4SZaNU1bp9CeDuK4N/15nZi8RO2dPpSyWZ+oVRNlWqFaO7rwr+\nrdXvX3BxeQRwqruvr0zZYlE2H40HLg7mLwZeSnH5sCUT30fAgWaWa2YNgPOCcgSJpNhZQGEZ5VOt\n3HgTjAcugvjd6xuCZrRkykapynUzs0ZmlhMsbwycQnq8X4kq8/cvfTaU7u8dVKN+mfL+mVln4AXg\nAndfVJmyJUR4NX0fYBKwEJgINA+WtwdeTdhuDLE7n7cRaxcbXFH5dJkqUb/TiN3hvQj4TcLyp4A5\nwGxiCaVN1HUqL17gMuCyhG0eCtbPBnruqa7pMlW1bsB+xHp0fALMTce6JVM/Yk2hXwAbiXXuWA40\nqQ3vXXXql0Hv39+Br4FZwTSjorLlTbp5TURE4vQ4ThERiVNSEBGROCUFERGJU1IQEZE4JQUREYlT\nUhARkTglBanTzGy3mf0z4XU9M1tnZulwB7lIyikpSF33HXCIme0VvD6Z2BAAuoFH6iQlBZHYaJI/\nC+bPJ3YXvUFs2AOLPejpQzP72Mz6Bctzzex9M5sZTMcGy08ys3fN7Dkzm29mT0dRIZGqUlIQgWeA\nAWbWEDiU2Fj0xW4FJrt7L6AP8Bcza0RsOPST3f0IYAAwPKFMD+BaIB/Yz8yOR6SWCHWUVJHawN0L\nzSyX2FnCq6VWnwL0NbMbgtcNiY0yuRp4yMx+AOwCDkwoM8ODUVPN7BNiT7yaGlb8IjVJSUEkZjxw\nD/BDYo9tTHS2u3+WuMDMhgGr3P1CM8sGtias3pYwvwv9P5NaRM1HIjH/AIa5+39KLX8TuKb4hZkd\nHsw2JXa2ALHhtLNDj1AkBZQUpK5zAHf/0t0fSlhW3PvoTqC+mc0xs7nA74PlDwMXB81D3YBNpfdZ\nwWuRtKWhs0VEJE5nCiIiEqekICIicUoKIiISp6QgIiJxSgoiIhKnpCAiInFKCiIiEqekICIicf8f\nReuGFnegfMcAAAAASUVORK5CYII=\n", + "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -2390,6 +2423,15 @@ "pylab.xlabel('Mean')\n", "pylab.legend(['KDE', 'Histogram'])" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/docs/source/pythonapi/examples/tally-arithmetic.ipynb b/docs/source/pythonapi/examples/tally-arithmetic.ipynb index 87cdc9b663..91514719db 100644 --- a/docs/source/pythonapi/examples/tally-arithmetic.ipynb +++ b/docs/source/pythonapi/examples/tally-arithmetic.ipynb @@ -366,7 +366,7 @@ "outputs": [ { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ABDg0ADuhPUfUAAALKSURBVGje7dpLcqQwDAbgHHE2\nYeEj+D4cwQucBUfo+3CEXoSp8OhuhF70T4qpKXmdr21LogK2Pj7A8QmNP+HDhw8fPnz48Kf6VH9G\n+66vy+je8k19jnf8C5dXIPv86ms56lPdjvaYbyodx3ze+XLE76cXFiD4zPji99z0/AJ4n1lfvJ6f\nnl0A6x+578efMSg1wPr172/jPO5yFXM+Ef78gdblM+WPHyguP//t1/g6pA0wfln+ho/fwgYYn19C\n/xwDvwHGc9OvC+hs37DTrwuwfWanXxdQTC9Mvyygs3wjTL8uwPJpn/tNDbSGz7T0SBEWw4vLXzbQ\n6b6RoveIoO6TvPxlA63qs7z8ZQPF9F+SH22vbX8OQKf5Rtv+EgDNJ3X58wZaxWd1+fMGiuFvir8b\nvjp8J/tGy/6jAmRvhW8fwL3vVT+o3grfPoB7r/IpALI3tz8FoJN84/NV873hB8UnM3xzANtf8nb4\ndwmg3grfFEDJO8JPE0i9Ff4pAYL3pI8mkHor/HMCeO9JH00g9SafEsh7T/ppARBvp48UwJnelT5S\nACd7O31TAlnvKx9SQCd7B58KgPO+8iMFuPWe9E8F8BveWX7bAjzX9y4//Jve+fhsH6Ctv7n8PTzj\nvY/v9gEOHz58+PBX+6v/f/wPvnd54f3j6venE/yl769Xv7+j3x/o98/V32/o9+fl389Xnx+g5x/o\n+Qt6/oOeP6HnX+j5G3z+h54/ouefV5/foufP6Pk3ev4On/+j9w/o/Qd6/4Le/6D3T/D9V67Y/ZsV\nQBq+s+8f0ftP+P41axXguP9NWgDuu/Cdfv+N3r/D9/9TAID+A7T/Ae2/gPs/0P4TtP8F7r9J3AIO\n9P+g/Udw/9Oygbf7r9D+L7j/DO1/Q/vv4P4/tP8Q7n9E+y/h/k+0/xTuf4X7b+H+X7T/+BPuf3aM\n8OHDhw8fPnz4w/4vzcvgeY10sY0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDEtMTRUMDc6MDA6\nMTQtMDY6MDA6WZzHAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAxLTE0VDA3OjAwOjE0LTA2OjAw\nSwQkewAAAABJRU5ErkJggg==\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBhQ1GVhO3EQAAALKSURBVGje7dpLcqQwDAbgHHE2\nYeEj+D4cwQucBUfo+3CEXoSp8OhuhF70T4qpKXmdr21LogK2Pj7A8QmNP+HDhw8fPnz48Kf6VH9G\n+66vy+je8k19jnf8C5dXIPv86ms56lPdjvaYbyodx3ze+XLE76cXFiD4zPji99z0/AJ4n1lfvJ6f\nnl0A6x+578efMSg1wPr172/jPO5yFXM+Ef78gdblM+WPHyguP//t1/g6pA0wfln+ho/fwgYYn19C\n/xwDvwHGc9OvC+hs37DTrwuwfWanXxdQTC9Mvyygs3wjTL8uwPJpn/tNDbSGz7T0SBEWw4vLXzbQ\n6b6RoveIoO6TvPxlA63qs7z8ZQPF9F+SH22vbX8OQKf5Rtv+EgDNJ3X58wZaxWd1+fMGiuFvir8b\nvjp8J/tGy/6jAmRvhW8fwL3vVT+o3grfPoB7r/IpALI3tz8FoJN84/NV873hB8UnM3xzANtf8nb4\ndwmg3grfFEDJO8JPE0i9Ff4pAYL3pI8mkHor/HMCeO9JH00g9SafEsh7T/ppARBvp48UwJnelT5S\nACd7O31TAlnvKx9SQCd7B58KgPO+8iMFuPWe9E8F8BveWX7bAjzX9y4//Jve+fhsH6Ctv7n8PTzj\nvY/v9gEOHz58+PBX+6v/f/wPvnd54f3j6venE/yl769Xv7+j3x/o98/V32/o9+fl389Xnx+g5x/o\n+Qt6/oOeP6HnX+j5G3z+h54/ouefV5/foufP6Pk3ev4On/+j9w/o/Qd6/4Le/6D3T/D9V67Y/ZsV\nQBq+s+8f0ftP+P41axXguP9NWgDuu/Cdfv+N3r/D9/9TAID+A7T/Ae2/gPs/0P4TtP8F7r9J3AIO\n9P+g/Udw/9Oygbf7r9D+L7j/DO1/Q/vv4P4/tP8Q7n9E+y/h/k+0/xTuf4X7b+H+X7T/+BPuf3aM\n8OHDhw8fPnz4w/4vzcvgeY10sY0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDItMDZUMTU6NTM6\nMjQtMDU6MDBiAB8/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAyLTA2VDE1OjUzOjI0LTA1OjAw\nE12ngwAAAABJRU5ErkJggg==\n", "text/plain": [ "" ] @@ -472,7 +472,7 @@ "# Resonance Escape Probability tallies\n", "therm_abs_rate = openmc.Tally(name='therm. abs. rate')\n", "therm_abs_rate.add_score('absorption')\n", - "therm_abs_rate.add_filter(openmc.Filter(type='energy', bins=[0., 0.625]))\n", + "therm_abs_rate.add_filter(openmc.Filter(type='energy', bins=[0., 0.625e-6]))\n", "tallies_file.add_tally(therm_abs_rate)" ] }, @@ -487,7 +487,7 @@ "# Thermal Flux Utilization tallies\n", "fuel_therm_abs_rate = openmc.Tally(name='fuel therm. abs. rate')\n", "fuel_therm_abs_rate.add_score('absorption')\n", - "fuel_therm_abs_rate.add_filter(openmc.Filter(type='energy', bins=[0., 0.625]))\n", + "fuel_therm_abs_rate.add_filter(openmc.Filter(type='energy', bins=[0., 0.625e-6]))\n", "fuel_therm_abs_rate.add_filter(openmc.Filter(type='cell', bins=[fuel_cell.id]))\n", "tallies_file.add_tally(fuel_therm_abs_rate)" ] @@ -503,7 +503,7 @@ "# Fast Fission Factor tallies\n", "therm_fiss_rate = openmc.Tally(name='therm. fiss. rate')\n", "therm_fiss_rate.add_score('nu-fission')\n", - "therm_fiss_rate.add_filter(openmc.Filter(type='energy', bins=[0., 0.625]))\n", + "therm_fiss_rate.add_filter(openmc.Filter(type='energy', bins=[0., 0.625e-6]))\n", "tallies_file.add_tally(therm_fiss_rate)" ] }, @@ -576,8 +576,9 @@ " Copyright: 2011-2015 Massachusetts Institute of Technology\n", " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", - " Git SHA1: ea9fb637f63f9374c7436456141afa850b84acf9\n", - " Date/Time: 2016-01-14 07:00:14\n", + " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", + " Date/Time: 2016-02-06 15:53:27\n", + " MPI Processes: 1\n", "\n", " ===========================================================================\n", " ========================> INITIALIZATION <=========================\n", @@ -633,20 +634,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 1.2510E+00 seconds\n", - " Reading cross sections = 9.7600E-01 seconds\n", - " Total time in simulation = 1.5844E+01 seconds\n", - " Time in transport only = 1.5834E+01 seconds\n", - " Time in inactive batches = 2.2840E+00 seconds\n", - " Time in active batches = 1.3560E+01 seconds\n", + " Total time for initialization = 3.8900E-01 seconds\n", + " Reading cross sections = 8.8000E-02 seconds\n", + " Total time in simulation = 8.0560E+00 seconds\n", + " Time in transport only = 8.0400E+00 seconds\n", + " Time in inactive batches = 1.1570E+00 seconds\n", + " Time in active batches = 6.8990E+00 seconds\n", " Time synchronizing fission bank = 3.0000E-03 seconds\n", - " Sampling source sites = 2.0000E-03 seconds\n", - " SEND/RECV source sites = 1.0000E-03 seconds\n", + " Sampling source sites = 3.0000E-03 seconds\n", + " SEND/RECV source sites = 0.0000E+00 seconds\n", " Time accumulating tallies = 0.0000E+00 seconds\n", - " Total time for finalization = 1.0000E-03 seconds\n", - " Total time elapsed = 1.7110E+01 seconds\n", - " Calculation Rate (inactive) = 5472.85 neutrons/second\n", - " Calculation Rate (active) = 2765.49 neutrons/second\n", + " Total time for finalization = 2.0000E-03 seconds\n", + " Total time elapsed = 8.4560E+00 seconds\n", + " Calculation Rate (inactive) = 10803.8 neutrons/second\n", + " Calculation Rate (active) = 5435.57 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -758,10 +759,10 @@ " \n", " \n", " 0\n", - " total\n", - " (nu-fission / absorption)\n", - " 1.040166\n", - " 0.009069\n", + " total\n", + " (nu-fission / absorption)\n", + " 1.040166\n", + " 0.009069\n", " \n", " \n", "\n", @@ -809,7 +810,8 @@ " \n", " \n", " \n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -819,19 +821,23 @@ " \n", " \n", " 0\n", - " (0.0e+00 - 6.2e-01)\n", - " total\n", - " absorption\n", - " 0.95938\n", - " 0.008187\n", + " 0\n", + " 0.000001\n", + " total\n", + " absorption\n", + " 0.694707\n", + " 0.006699\n", " \n", " \n", "\n", "
" ], "text/plain": [ - " energy [MeV] nuclide score mean std. dev.\n", - "0 (0.0e+00 - 6.2e-01) total absorption 0.95938 0.008187" + " energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 0 0.000001 total absorption 0.694707 \n", + "\n", + " std. dev. \n", + "0 0.006699 " ] }, "execution_count": 27, @@ -869,7 +875,8 @@ " \n", " \n", " \n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -879,19 +886,23 @@ " \n", " \n", " 0\n", - " (0.0e+00 - 6.2e-01)\n", - " total\n", - " nu-fission\n", - " 1.090899\n", - " 0.010602\n", + " 0\n", + " 0.000001\n", + " total\n", + " nu-fission\n", + " 1.201216\n", + " 0.012288\n", " \n", " \n", "\n", "" ], "text/plain": [ - " energy [MeV] nuclide score mean std. dev.\n", - "0 (0.0e+00 - 6.2e-01) total nu-fission 1.090899 0.010602" + " energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 0 0.000001 total nu-fission 1.201216 \n", + "\n", + " std. dev. \n", + "0 0.012288 " ] }, "execution_count": 28, @@ -930,7 +941,8 @@ " \n", " \n", " \n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " cell\n", " nuclide\n", " score\n", @@ -941,20 +953,24 @@ " \n", " \n", " 0\n", - " (0.0e+00 - 6.2e-01)\n", - " 10000\n", - " total\n", - " absorption\n", - " 0.803413\n", - " 0.007031\n", + " 0\n", + " 0.000001\n", + " 10000\n", + " total\n", + " absorption\n", + " 0.74925\n", + " 0.008257\n", " \n", " \n", "\n", "" ], "text/plain": [ - " energy [MeV] cell nuclide score mean std. dev.\n", - "0 (0.0e+00 - 6.2e-01) 10000 total absorption 0.803413 0.007031" + " energy low [MeV] energy high [MeV] cell nuclide score mean \\\n", + "0 0 0.000001 10000 total absorption 0.74925 \n", + "\n", + " std. dev. \n", + "0 0.008257 " ] }, "execution_count": 29, @@ -991,7 +1007,8 @@ " \n", " \n", " \n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " cell\n", " nuclide\n", " score\n", @@ -1002,23 +1019,24 @@ " \n", " \n", " 0\n", - " (0.0e+00 - 6.2e-01)\n", - " 10000\n", - " total\n", - " (nu-fission / absorption)\n", - " 1.237053\n", - " 0.011765\n", + " 0\n", + " 0.000001\n", + " 10000\n", + " total\n", + " (nu-fission / absorption)\n", + " 1.663616\n", + " 0.018624\n", " \n", " \n", "\n", "" ], "text/plain": [ - " energy [MeV] cell nuclide score mean \\\n", - "0 (0.0e+00 - 6.2e-01) 10000 total (nu-fission / absorption) 1.237053 \n", + " energy low [MeV] energy high [MeV] cell nuclide \\\n", + "0 0 0.000001 10000 total \n", "\n", - " std. dev. \n", - "0 0.011765 " + " score mean std. dev. \n", + "0 (nu-fission / absorption) 1.663616 0.018624 " ] }, "execution_count": 30, @@ -1054,7 +1072,8 @@ " \n", " \n", " \n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " cell\n", " nuclide\n", " score\n", @@ -1065,23 +1084,24 @@ " \n", " \n", " 0\n", - " (0.0e+00 - 6.2e-01)\n", - " 10000\n", - " total\n", - " (((absorption * nu-fission) * absorption) * (n...\n", - " 1.040166\n", - " 0.019018\n", + " 0\n", + " 0.000001\n", + " 10000\n", + " total\n", + " (((absorption * nu-fission) * absorption) * (n...\n", + " 1.040166\n", + " 0.021928\n", " \n", " \n", "\n", "" ], "text/plain": [ - " energy [MeV] cell nuclide \\\n", - "0 (0.0e+00 - 6.2e-01) 10000 total \n", + " energy low [MeV] energy high [MeV] cell nuclide \\\n", + "0 0 0.000001 10000 total \n", "\n", " score mean std. dev. \n", - "0 (((absorption * nu-fission) * absorption) * (n... 1.040166 0.019018 " + "0 (((absorption * nu-fission) * absorption) * (n... 1.040166 0.021928 " ] }, "execution_count": 31, @@ -1135,7 +1155,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -1145,100 +1166,108 @@ " \n", " \n", " 0\n", - " 10000\n", - " (0.0e+00 - 6.3e-07)\n", - " (U-238 / total)\n", - " (nu-fission / flux)\n", - " 0.000001\n", - " 7.377419e-09\n", + " 10000\n", + " 0.000000\n", + " 0.000001\n", + " (U-238 / total)\n", + " (nu-fission / flux)\n", + " 0.000001\n", + " 7.377419e-09\n", " \n", " \n", " 1\n", - " 10000\n", - " (0.0e+00 - 6.3e-07)\n", - " (U-238 / total)\n", - " (scatter / flux)\n", - " 0.209989\n", - " 2.303838e-03\n", + " 10000\n", + " 0.000000\n", + " 0.000001\n", + " (U-238 / total)\n", + " (scatter / flux)\n", + " 0.209989\n", + " 2.303838e-03\n", " \n", " \n", " 2\n", - " 10000\n", - " (0.0e+00 - 6.3e-07)\n", - " (U-235 / total)\n", - " (nu-fission / flux)\n", - " 0.356420\n", - " 3.951669e-03\n", + " 10000\n", + " 0.000000\n", + " 0.000001\n", + " (U-235 / total)\n", + " (nu-fission / flux)\n", + " 0.356420\n", + " 3.951669e-03\n", " \n", " \n", " 3\n", - " 10000\n", - " (0.0e+00 - 6.3e-07)\n", - " (U-235 / total)\n", - " (scatter / flux)\n", - " 0.005555\n", - " 6.101004e-05\n", + " 10000\n", + " 0.000000\n", + " 0.000001\n", + " (U-235 / total)\n", + " (scatter / flux)\n", + " 0.005555\n", + " 6.101004e-05\n", " \n", " \n", " 4\n", - " 10000\n", - " (6.3e-07 - 2.0e+01)\n", - " (U-238 / total)\n", - " (nu-fission / flux)\n", - " 0.007155\n", - " 8.053460e-05\n", + " 10000\n", + " 0.000001\n", + " 20.000000\n", + " (U-238 / total)\n", + " (nu-fission / flux)\n", + " 0.007155\n", + " 8.053460e-05\n", " \n", " \n", " 5\n", - " 10000\n", - " (6.3e-07 - 2.0e+01)\n", - " (U-238 / total)\n", - " (scatter / flux)\n", - " 0.227770\n", - " 1.079289e-03\n", + " 10000\n", + " 0.000001\n", + " 20.000000\n", + " (U-238 / total)\n", + " (scatter / flux)\n", + " 0.227770\n", + " 1.079289e-03\n", " \n", " \n", " 6\n", - " 10000\n", - " (6.3e-07 - 2.0e+01)\n", - " (U-235 / total)\n", - " (nu-fission / flux)\n", - " 0.008067\n", - " 5.254797e-05\n", + " 10000\n", + " 0.000001\n", + " 20.000000\n", + " (U-235 / total)\n", + " (nu-fission / flux)\n", + " 0.008067\n", + " 5.254797e-05\n", " \n", " \n", " 7\n", - " 10000\n", - " (6.3e-07 - 2.0e+01)\n", - " (U-235 / total)\n", - " (scatter / flux)\n", - " 0.003367\n", - " 1.647058e-05\n", + " 10000\n", + " 0.000001\n", + " 20.000000\n", + " (U-235 / total)\n", + " (scatter / flux)\n", + " 0.003367\n", + " 1.647058e-05\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide score mean \\\n", - "0 10000 (0.0e+00 - 6.3e-07) (U-238 / total) (nu-fission / flux) 0.000001 \n", - "1 10000 (0.0e+00 - 6.3e-07) (U-238 / total) (scatter / flux) 0.209989 \n", - "2 10000 (0.0e+00 - 6.3e-07) (U-235 / total) (nu-fission / flux) 0.356420 \n", - "3 10000 (0.0e+00 - 6.3e-07) (U-235 / total) (scatter / flux) 0.005555 \n", - "4 10000 (6.3e-07 - 2.0e+01) (U-238 / total) (nu-fission / flux) 0.007155 \n", - "5 10000 (6.3e-07 - 2.0e+01) (U-238 / total) (scatter / flux) 0.227770 \n", - "6 10000 (6.3e-07 - 2.0e+01) (U-235 / total) (nu-fission / flux) 0.008067 \n", - "7 10000 (6.3e-07 - 2.0e+01) (U-235 / total) (scatter / flux) 0.003367 \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 10000 0.000000 0.000001 (U-238 / total) \n", + "1 10000 0.000000 0.000001 (U-238 / total) \n", + "2 10000 0.000000 0.000001 (U-235 / total) \n", + "3 10000 0.000000 0.000001 (U-235 / total) \n", + "4 10000 0.000001 20.000000 (U-238 / total) \n", + "5 10000 0.000001 20.000000 (U-238 / total) \n", + "6 10000 0.000001 20.000000 (U-235 / total) \n", + "7 10000 0.000001 20.000000 (U-235 / total) \n", "\n", - " std. dev. \n", - "0 7.377419e-09 \n", - "1 2.303838e-03 \n", - "2 3.951669e-03 \n", - "3 6.101004e-05 \n", - "4 8.053460e-05 \n", - "5 1.079289e-03 \n", - "6 5.254797e-05 \n", - "7 1.647058e-05 " + " score mean std. dev. \n", + "0 (nu-fission / flux) 0.000001 7.377419e-09 \n", + "1 (scatter / flux) 0.209989 2.303838e-03 \n", + "2 (nu-fission / flux) 0.356420 3.951669e-03 \n", + "3 (scatter / flux) 0.005555 6.101004e-05 \n", + "4 (nu-fission / flux) 0.007155 8.053460e-05 \n", + "5 (scatter / flux) 0.227770 1.079289e-03 \n", + "6 (nu-fission / flux) 0.008067 5.254797e-05 \n", + "7 (scatter / flux) 0.003367 1.647058e-05 " ] }, "execution_count": 33, @@ -1361,7 +1390,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -1371,50 +1401,60 @@ " \n", " \n", " 0\n", - " 10000\n", - " (0.0e+00 - 6.3e-07)\n", - " U-238\n", - " nu-fission\n", - " 0.000002\n", - " 1.283958e-08\n", + " 10000\n", + " 0.000000\n", + " 0.000001\n", + " U-238\n", + " nu-fission\n", + " 0.000002\n", + " 1.283958e-08\n", " \n", " \n", " 1\n", - " 10000\n", - " (0.0e+00 - 6.3e-07)\n", - " U-235\n", - " nu-fission\n", - " 0.868553\n", - " 6.880390e-03\n", + " 10000\n", + " 0.000000\n", + " 0.000001\n", + " U-235\n", + " nu-fission\n", + " 0.868553\n", + " 6.880390e-03\n", " \n", " \n", " 2\n", - " 10000\n", - " (6.3e-07 - 2.0e+01)\n", - " U-238\n", - " nu-fission\n", - " 0.082149\n", - " 8.837250e-04\n", + " 10000\n", + " 0.000001\n", + " 20.000000\n", + " U-238\n", + " nu-fission\n", + " 0.082149\n", + " 8.837250e-04\n", " \n", " \n", " 3\n", - " 10000\n", - " (6.3e-07 - 2.0e+01)\n", - " U-235\n", - " nu-fission\n", - " 0.092618\n", - " 5.195308e-04\n", + " 10000\n", + " 0.000001\n", + " 20.000000\n", + " U-235\n", + " nu-fission\n", + " 0.092618\n", + " 5.195308e-04\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide score mean std. dev.\n", - "0 10000 (0.0e+00 - 6.3e-07) U-238 nu-fission 0.000002 1.283958e-08\n", - "1 10000 (0.0e+00 - 6.3e-07) U-235 nu-fission 0.868553 6.880390e-03\n", - "2 10000 (6.3e-07 - 2.0e+01) U-238 nu-fission 0.082149 8.837250e-04\n", - "3 10000 (6.3e-07 - 2.0e+01) U-235 nu-fission 0.092618 5.195308e-04" + " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 10000 0.000000 0.000001 U-238 nu-fission 0.000002 \n", + "1 10000 0.000000 0.000001 U-235 nu-fission 0.868553 \n", + "2 10000 0.000001 20.000000 U-238 nu-fission 0.082149 \n", + "3 10000 0.000001 20.000000 U-235 nu-fission 0.092618 \n", + "\n", + " std. dev. \n", + "0 1.283958e-08 \n", + "1 6.880390e-03 \n", + "2 8.837250e-04 \n", + "3 5.195308e-04 " ] }, "execution_count": 37, @@ -1444,7 +1484,8 @@ " \n", " \n", " cell\n", - " energy [MeV]\n", + " energy low [MeV]\n", + " energy high [MeV]\n", " nuclide\n", " score\n", " mean\n", @@ -1454,100 +1495,120 @@ " \n", " \n", " 0\n", - " 10002\n", - " (1.0e-08 - 1.1e-07)\n", - " H-1\n", - " scatter\n", - " 4.619398\n", - " 0.040124\n", + " 10002\n", + " 1.000000e-08\n", + " 0.000000\n", + " H-1\n", + " scatter\n", + " 4.619398\n", + " 0.040124\n", " \n", " \n", " 1\n", - " 10002\n", - " (1.1e-07 - 1.2e-06)\n", - " H-1\n", - " scatter\n", - " 2.030757\n", - " 0.011239\n", + " 10002\n", + " 1.080060e-07\n", + " 0.000001\n", + " H-1\n", + " scatter\n", + " 2.030757\n", + " 0.011239\n", " \n", " \n", " 2\n", - " 10002\n", - " (1.2e-06 - 1.3e-05)\n", - " H-1\n", - " scatter\n", - " 1.658488\n", - " 0.009777\n", + " 10002\n", + " 1.166529e-06\n", + " 0.000013\n", + " H-1\n", + " scatter\n", + " 1.658488\n", + " 0.009777\n", " \n", " \n", " 3\n", - " 10002\n", - " (1.3e-05 - 1.4e-04)\n", - " H-1\n", - " scatter\n", - " 1.853002\n", - " 0.007378\n", + " 10002\n", + " 1.259921e-05\n", + " 0.000136\n", + " H-1\n", + " scatter\n", + " 1.853002\n", + " 0.007378\n", " \n", " \n", " 4\n", - " 10002\n", - " (1.4e-04 - 1.5e-03)\n", - " H-1\n", - " scatter\n", - " 2.050773\n", - " 0.012484\n", + " 10002\n", + " 1.360790e-04\n", + " 0.001470\n", + " H-1\n", + " scatter\n", + " 2.050773\n", + " 0.012484\n", " \n", " \n", " 5\n", - " 10002\n", - " (1.5e-03 - 1.6e-02)\n", - " H-1\n", - " scatter\n", - " 2.131759\n", - " 0.007821\n", + " 10002\n", + " 1.469734e-03\n", + " 0.015874\n", + " H-1\n", + " scatter\n", + " 2.131759\n", + " 0.007821\n", " \n", " \n", " 6\n", - " 10002\n", - " (1.6e-02 - 1.7e-01)\n", - " H-1\n", - " scatter\n", - " 2.213710\n", - " 0.015159\n", + " 10002\n", + " 1.587401e-02\n", + " 0.171449\n", + " H-1\n", + " scatter\n", + " 2.213710\n", + " 0.015159\n", " \n", " \n", " 7\n", - " 10002\n", - " (1.7e-01 - 1.9e+00)\n", - " H-1\n", - " scatter\n", - " 2.011925\n", - " 0.009406\n", + " 10002\n", + " 1.714488e-01\n", + " 1.851749\n", + " H-1\n", + " scatter\n", + " 2.011925\n", + " 0.009406\n", " \n", " \n", " 8\n", - " 10002\n", - " (1.9e+00 - 2.0e+01)\n", - " H-1\n", - " scatter\n", - " 0.371280\n", - " 0.003949\n", + " 10002\n", + " 1.851749e+00\n", + " 20.000000\n", + " H-1\n", + " scatter\n", + " 0.371280\n", + " 0.003949\n", " \n", " \n", "\n", "" ], "text/plain": [ - " cell energy [MeV] nuclide score mean std. dev.\n", - "0 10002 (1.0e-08 - 1.1e-07) H-1 scatter 4.619398 0.040124\n", - "1 10002 (1.1e-07 - 1.2e-06) H-1 scatter 2.030757 0.011239\n", - "2 10002 (1.2e-06 - 1.3e-05) H-1 scatter 1.658488 0.009777\n", - "3 10002 (1.3e-05 - 1.4e-04) H-1 scatter 1.853002 0.007378\n", - "4 10002 (1.4e-04 - 1.5e-03) H-1 scatter 2.050773 0.012484\n", - "5 10002 (1.5e-03 - 1.6e-02) H-1 scatter 2.131759 0.007821\n", - "6 10002 (1.6e-02 - 1.7e-01) H-1 scatter 2.213710 0.015159\n", - "7 10002 (1.7e-01 - 1.9e+00) H-1 scatter 2.011925 0.009406\n", - "8 10002 (1.9e+00 - 2.0e+01) H-1 scatter 0.371280 0.003949" + " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 10002 1.000000e-08 0.000000 H-1 scatter 4.619398 \n", + "1 10002 1.080060e-07 0.000001 H-1 scatter 2.030757 \n", + "2 10002 1.166529e-06 0.000013 H-1 scatter 1.658488 \n", + "3 10002 1.259921e-05 0.000136 H-1 scatter 1.853002 \n", + "4 10002 1.360790e-04 0.001470 H-1 scatter 2.050773 \n", + "5 10002 1.469734e-03 0.015874 H-1 scatter 2.131759 \n", + "6 10002 1.587401e-02 0.171449 H-1 scatter 2.213710 \n", + "7 10002 1.714488e-01 1.851749 H-1 scatter 2.011925 \n", + "8 10002 1.851749e+00 20.000000 H-1 scatter 0.371280 \n", + "\n", + " std. dev. \n", + "0 0.040124 \n", + "1 0.011239 \n", + "2 0.009777 \n", + "3 0.007378 \n", + "4 0.012484 \n", + "5 0.007821 \n", + "6 0.015159 \n", + "7 0.009406 \n", + "8 0.003949 " ] }, "execution_count": 38, diff --git a/openmc/filter.py b/openmc/filter.py index 54814a6b6f..ace98dc424 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -502,9 +502,9 @@ class Filter(object): 2. separate columns for the cell IDs, universe IDs, and lattice IDs and x,y,z cell indices corresponding to each (with summary info). - For 'energy' and 'energyout' filters, the DataFrame include a single - column with each element comprising a string with the lower, upper - energy bounds for each filter bin. + For 'energy' and 'energyout' filters, the DataFrame includes one + column for the lower energy bound and one column for the upper + energy bound for each filter bin. For 'mesh' filters, the DataFrame includes three columns for the x,y,z mesh cell indices corresponding to each filter bin. @@ -719,21 +719,20 @@ class Filter(object): # energy, energyout filters elif 'energy' in self.type: - bins = self.bins - num_bins = self.num_bins + # Extract the lower and upper energy bounds for each result. + lo_bins = self.bins[:-1] + hi_bins = self.bins[1:] - # Create strings for - template = '({0:.1e} - {1:.1e})' - filter_bins = [] - for i in range(num_bins): - filter_bins.append(template.format(bins[i], bins[i+1])) + # Repeat and tile them as necessary to account for other filters. + lo_bins = np.repeat(lo_bins, self.stride) + hi_bins = np.repeat(hi_bins, self.stride) + tile_factor = data_size / len(lo_bins) + lo_bins = np.tile(lo_bins, tile_factor) + hi_bins = np.tile(hi_bins, tile_factor) - # Tile the energy bins into a DataFrame column - filter_bins = np.repeat(filter_bins, self.stride) - tile_factor = data_size / len(filter_bins) - filter_bins = np.tile(filter_bins, tile_factor) - filter_bins = filter_bins - df = pd.concat([df, pd.DataFrame({self.type + ' [MeV]' : filter_bins})]) + # Now stick 'em in the DataFrame. + df.loc[:, self.type + ' low [MeV]'] = lo_bins + df.loc[:, self.type + ' high [MeV]'] = hi_bins # universe, material, surface, cell, and cellborn filters else: diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index f241274581..875a82c468 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -1232,28 +1232,35 @@ class MGXS(object): # Override energy groups bounds with indices all_groups = np.arange(self.num_groups, 0, -1, dtype=np.int) all_groups = np.repeat(all_groups, self.num_nuclides) - if 'energy [MeV]' in df and 'energyout [MeV]' in df: - df.rename(columns={'energy [MeV]': 'group in'}, inplace=True) + if 'energy low [MeV]' in df and 'energyout low [MeV]' in df: + df.rename(columns={'energy low [MeV]': 'group in'}, + inplace=True) in_groups = np.tile(all_groups, self.num_subdomains) in_groups = np.repeat(in_groups, self.num_groups) df['group in'] = in_groups + del df['energy high [MeV]'] - df.rename(columns={'energyout [MeV]': 'group out'}, inplace=True) + df.rename(columns={'energyout low [MeV]': 'group out'}, + inplace=True) out_groups = \ np.tile(all_groups, self.num_subdomains * self.num_groups) df['group out'] = out_groups + del df['energyout high [MeV]'] columns = ['group in', 'group out'] - elif 'energyout [MeV]' in df: - df.rename(columns={'energyout [MeV]': 'group out'}, inplace=True) + elif 'energyout low [MeV]' in df: + df.rename(columns={'energyout low [MeV]': 'group out'}, + inplace=True) in_groups = np.tile(all_groups, self.num_subdomains) df['group out'] = in_groups + del df['energyout high [MeV]'] columns = ['group out'] - elif 'energy [MeV]' in df: - df.rename(columns={'energy [MeV]': 'group in'}, inplace=True) + elif 'energy low [MeV]' in df: + df.rename(columns={'energy low [MeV]': 'group in'}, inplace=True) in_groups = np.tile(all_groups, self.num_subdomains) df['group in'] = in_groups + del df['energy high [MeV]'] columns = ['group in'] # Select out those groups the user requested From a2ac93a84389d400b39ad6eccf9bfc3ee4c788a6 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 6 Feb 2016 20:53:52 -0500 Subject: [PATCH 092/149] Fixed bugs in tally merge method --- openmc/mgxs/mgxs.py | 4 ++ openmc/tallies.py | 124 ++++++++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 57 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 272d5e0402..a382c629b1 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -953,6 +953,10 @@ class MGXS(object): slice_xs.sparse = self.sparse return slice_xs + # FIXME + def merge(self, other): + raise NotImplementedError('not yet implemented') + def print_xs(self, subdomains='all', nuclides='all', xs_type='macro'): """Print a string representation for the multi-group cross section. diff --git a/openmc/tallies.py b/openmc/tallies.py index 51633186e7..c966fbcf88 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -695,10 +695,11 @@ class Tally(object): # Return False if only one tally has a delayed group filter tally1_dg = self.contains_filter('delayedgroup') tally2_dg = other.contains_filter('delayedgroup') - if sum(tally1_dg, tally2_dg) == 1: + if sum([tally1_dg, tally2_dg]) == 1: return False # Look to see if all filters are the same, or one or more can be merged + merge_filters = False for filter1 in self.filters: mergeable_filter = False @@ -758,9 +759,9 @@ class Tally(object): no_nuclides_match = False # Either all nuclides should match, or none should - if no_nuclides_match: + if no_nuclides_match or all_nuclides_match: return True - if not no_nuclides_match and not all_nuclides_match: + else: return False def _can_merge_scores(self, other): @@ -794,15 +795,23 @@ class Tally(object): else: no_scores_match = False + # Nuclides cannot be specified on 'flux' scores + if 'flux' in self.scores or 'flux' in other.scores: + if self.nuclides != other.nuclides: + return False + # Either all scores should match, or none should - if no_scores_match: + if no_scores_match or all_scores_match: return True - elif not no_scores_match and not all_scores_match: + else: return False def can_merge(self, other): """Determine if another tally can be merged with this one + If results have been loaded from a statepoint, then tallies are only + mergeable along one and only one of filter bins, nuclides or scores. + Parameters ---------- other : Tally @@ -821,39 +830,43 @@ class Tally(object): merge_filters = self._can_merge_filters(other) merge_nuclides = self._can_merge_nuclides(other) merge_scores = self._can_merge_scores(other) + mergeability = [merge_filters, merge_nuclides, merge_scores] - # Tallies are mergeable if only one of filters, nuclides and - # scores is mergeable - if sum(merge_filters, merge_nuclides, merge_scores) == 1: - return True - else: + # If the tally results have been read from the statepoint, we can only + # merge along one of filter bins, scores or nuclides + if self._results_read and sum(mergeability) > 1: return False + else: + return all([merge_filters, merge_nuclides, merge_scores]) def merge(self, other): - """Join another tally with this one + """Merge another tally with this one + + If results have been loaded from a statepoint, then tallies are only + mergeable along one and only one of filter bins, nuclides or scores. Parameters ---------- tally : Tally - Tally to join with this one + Tally to merge with this one Returns ------- - joined_tally : Tally - Joined tallies + merged_tally : Tally + Merged tallies """ if not self.can_merge(other): - msg = 'Unable to join tally ID="{0}" with ' + \ + msg = 'Unable to merge tally ID="{0}" with ' \ '"{1}"'.format(other.id, self.id) raise ValueError(msg) # Create deep copy of tally to return as merged tally - joined_tally = copy.deepcopy(self) + merged_tally = copy.deepcopy(self) # Differentiate Tally with a new auto-generated Tally ID - joined_tally.id = None + merged_tally.id = None # Create deep copy of other tally to use for array concatenation other_copy = copy.deepcopy(other) @@ -865,79 +878,76 @@ class Tally(object): for i, filter1 in enumerate(self.filters): for j, filter2 in enumerate(other.filters): if filter1 != filter2 and filter1.can_merge(filter2): - other_copy._swap_filters(other_copy.filters[i], filter1) - joined_tally.filters[i] = filter1.merge(filter2) - join_axis = i + other_copy._swap_filters(other_copy.filters[i], filter2) + merged_tally.filters[i] = filter1.merge(filter2) + merge_axis = i break # If two tallies can be merged along nuclide bins - elif self._can_merge_nuclides(other): - join_axis = self.num_filters + if self._can_merge_nuclides(other): + merge_axis = self.num_filters # Add unique nuclides from other tally to merged tally for nuclide in other.nuclides: - if nuclide not in joined_tally.nuclides: - joined_tally.add_score(nuclide) + if nuclide not in merged_tally.nuclides: + merged_tally.add_nuclide(nuclide) # If two tallies can be merged along score bins - elif self._can_merge_scores(other): - join_axis = self.num_filters + 1 + if self._can_merge_scores(other): + merge_axis = self.num_filters + 1 # Add unique scores from other tally to merged tally for score in other.scores: - if score not in joined_tally.scores: - joined_tally.add_score(score) + if score not in merged_tally.scores: + merged_tally.add_score(score) - else: - raise ValueError('Unable to merge tallies') - - # Update filter strides in joined tally - joined_tally._update_filter_strides() + # Update filter strides in merged tally + merged_tally._update_filter_strides() # Concatenate sum arrays if present in both tallies if self.sum is not None and other_copy.sum is not None: self_sum = self.get_reshaped_data(value='sum') other_sum = other_copy.get_reshaped_data(value='sum') - joined_tally._sum = \ - np.concatenate((self_sum, other_sum), axis=join_axis) - joined_tally._sum = \ - np.reshape(joined_tally._sum, joined_tally.shape) + merged_tally._sum = \ + np.concatenate((self_sum, other_sum), axis=merge_axis) + merged_tally._sum = \ + np.reshape(merged_tally._sum, merged_tally.shape) # Concatenate sum_sq arrays if present in both tallies if self.sum_sq is not None and other.sum_sq is not None: self_sum_sq = self.get_reshaped_data(value='sum_sq') other_sum_sq = other_copy.get_reshaped_data(value='sum_sq') - joined_tally._sum_sq = \ - np.concatenate((self_sum_sq, other_sum_sq), axis=join_axis) - joined_tally._sum_sq = \ - np.reshape(joined_tally._sum_sq, joined_tally.shape) + merged_tally._sum_sq = \ + np.concatenate((self_sum_sq, other_sum_sq), axis=merge_axis) + merged_tally._sum_sq = \ + np.reshape(merged_tally._sum_sq, merged_tally.shape) # Concatenate mean arrays if present in both tallies if self.mean is not None and other.mean is not None: self_mean = self.get_reshaped_data(value='mean') other_mean = other_copy.get_reshaped_data(value='mean') - joined_tally._mean = \ - np.concatenate((self_mean, other_mean), axis=join_axis) - joined_tally._mean = \ - np.reshape(joined_tally._mean, joined_tally.shape) + merged_tally._mean = \ + np.concatenate((self_mean, other_mean), axis=merge_axis) + merged_tally._mean = \ + np.reshape(merged_tally._mean, merged_tally.shape) # Concatenate std. dev. arrays if present in both tallies if self.std_dev is not None and other.std_dev is not None: self_std_dev = self.get_reshaped_data(value='std_dev') other_std_dev = other_copy.get_reshaped_data(value='std_dev') - joined_tally._std_dev = \ - np.concatenate((self_std_dev, other_std_dev), axis=join_axis) - joined_tally._std_dev = \ - np.reshape(joined_tally._std_dev, joined_tally.shape) + merged_tally._std_dev = \ + np.concatenate((self_std_dev, other_std_dev), axis=merge_axis) + merged_tally._std_dev = \ + np.reshape(merged_tally._std_dev, merged_tally.shape) - # Sparsify joined tally if both tallies are sparse - joined_tally.sparse = self.sparse and other.sparse + # Sparsify merged tally if both tallies are sparse + merged_tally.sparse = self.sparse and other.sparse # Add triggers from other tally to merged tally for trigger in other.triggers: - joined_tally.add_trigger(trigger) + merged_tally.add_trigger(trigger) - return joined_tally + return merged_tally def get_tally_xml(self): """Return XML representation of the tally @@ -2131,10 +2141,10 @@ class Tally(object): """ # Check that results have been read - if not self.derived and self.sum is None: - msg = 'Unable to use tally arithmetic with Tally ID="{0}" ' \ - 'since it does not contain any results.'.format(self.id) - raise ValueError(msg) +# if not self.derived and self.sum is None: +# msg = 'Unable to use tally arithmetic with Tally ID="{0}" ' \ +# 'since it does not contain any results.'.format(self.id) +# raise ValueError(msg) cv.check_type('filter1', filter1, Filter) cv.check_type('filter2', filter2, Filter) From 2098487bcbb13e7d43cd06d7f3df4fbb1756caf0 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 7 Feb 2016 05:37:07 -0500 Subject: [PATCH 093/149] Correcting some more EnergyGroups.num_group issues --- openmc/mgxs/groups.py | 2 +- openmc/mgxs_library.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openmc/mgxs/groups.py b/openmc/mgxs/groups.py index e6838b36ba..253df520ee 100644 --- a/openmc/mgxs/groups.py +++ b/openmc/mgxs/groups.py @@ -24,7 +24,7 @@ class EnergyGroups(object): ---------- group_edges : Iterable of Real The energy group boundaries [MeV] - num_group : Integral + num_groups : Integral The number of energy groups """ diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index 3b6b7753ea..f3e7b92184 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -418,12 +418,12 @@ class XSdata(object): @multiplicity.setter def multiplicity(self, multiplicity): if self._representation is 'isotropic': - shape = (self._energy_groups.num_group, + shape = (self._energy_groups.num_groups, self._energy_groups.num_groups) max_depth = 2 elif self._representation is 'angle': shape = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group, + self._energy_groups.num_groups, self._energy_groups.num_groups) max_depth = 4 # check we have a numpy list @@ -455,7 +455,7 @@ class XSdata(object): shape_vec = (self._num_polar, self._num_azimuthal, self._energy_groups.num_groups) shape_mat = (self._num_polar, self._num_azimuthal, - self._energy_groups.num_group, + self._energy_groups.num_groups, self._energy_groups.num_groups) # Begin by checking the case when chi has already been given and thus From a5be5cf7f87a0ed70d650d093d8c2d787b1aeb31 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sun, 7 Feb 2016 13:01:56 -0500 Subject: [PATCH 094/149] Address #582 review comments --- openmc/filter.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/openmc/filter.py b/openmc/filter.py index ace98dc424..a27e17cd96 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -719,18 +719,15 @@ class Filter(object): # energy, energyout filters elif 'energy' in self.type: - # Extract the lower and upper energy bounds for each result. - lo_bins = self.bins[:-1] - hi_bins = self.bins[1:] - - # Repeat and tile them as necessary to account for other filters. - lo_bins = np.repeat(lo_bins, self.stride) - hi_bins = np.repeat(hi_bins, self.stride) + # Extract the lower and upper energy bounds, then repeat and tile + # them as necessary to account for other filters. + lo_bins = np.repeat(self.bins[:-1], self.stride) + hi_bins = np.repeat(self.bins[1:], self.stride) tile_factor = data_size / len(lo_bins) lo_bins = np.tile(lo_bins, tile_factor) hi_bins = np.tile(hi_bins, tile_factor) - # Now stick 'em in the DataFrame. + # Add the new energy columns to the DataFrame. df.loc[:, self.type + ' low [MeV]'] = lo_bins df.loc[:, self.type + ' high [MeV]'] = hi_bins From 077eff7f19bbab9a411d5c3356a93b9b7c9279b2 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sun, 7 Feb 2016 13:24:14 -0500 Subject: [PATCH 095/149] Fixed some bugs in tally merging with introduction of comparison operators for filers and nuclides --- openmc/element.py | 6 ++++ openmc/filter.py | 25 ++++++++++++- openmc/nuclide.py | 6 ++++ openmc/tallies.py | 92 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 106 insertions(+), 23 deletions(-) diff --git a/openmc/element.py b/openmc/element.py index 9f04abfdab..4880dfaf23 100644 --- a/openmc/element.py +++ b/openmc/element.py @@ -57,6 +57,12 @@ class Element(object): def __ne__(self, other): return not self == other + def __lt__(self, other): + return not self > other + + def __hash__(self): + return hash(repr(self)) + def __hash__(self): return hash(repr(self)) diff --git a/openmc/filter.py b/openmc/filter.py index 430b2415f0..21797264b3 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -77,6 +77,23 @@ class Filter(object): def __ne__(self, other): return not self == other + def __gt__(self, other): + if self.type != other.type: + if self.type in _FILTER_TYPES and other.type in _FILTER_TYPES: + delta = _FILTER_TYPES.index(self.type) - \ + _FILTER_TYPES.index(other.type) + return True if delta > 0 else False + else: + return False + else: + if 'energy' in self.type and 'energy' in other.type: + return self.bins[0] >= other.bins[-1] + else: + return max(self.bins) > max(other.bins) + + def __lt__(self, other): + return not self > other + def __hash__(self): return hash(repr(self)) @@ -297,7 +314,13 @@ class Filter(object): # Merge unique filter bins merged_bins = set(np.concatenate((self.bins, other.bins))) - merged_filter.bins = list(sorted(merged_bins)) + + # Sort energy bin edges + if 'energy' in self.type: + merged_bins = sorted(merged_bins) + + # Assign merged bins to merged filter + merged_filter.bins = list(merged_bins) # Count bins in the merged filter if 'energy' in merged_filter.type: diff --git a/openmc/nuclide.py b/openmc/nuclide.py index 01fb2aa459..8e97f1a1c6 100644 --- a/openmc/nuclide.py +++ b/openmc/nuclide.py @@ -60,6 +60,12 @@ class Nuclide(object): def __ne__(self, other): return not self == other + def __gt__(self, other): + return repr(self) > repr(other) + + def __lt__(self, other): + return not self > other + def __hash__(self): return hash(repr(self)) diff --git a/openmc/tallies.py b/openmc/tallies.py index c966fbcf88..d88519ba3b 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -826,18 +826,30 @@ class Tally(object): if self.estimator != other.estimator: return False + equal_filters = sorted(self.filters) == sorted(other.filters) + equal_nuclides = sorted(self.nuclides) == sorted(other.nuclides) + equal_scores = sorted(self.scores) == sorted(other.scores) + equality = [equal_filters, equal_nuclides, equal_scores] + + # If all filters, nuclides and scores match then tallies are mergeable + if equal_filters and equal_nuclides and equal_scores: + return True + # Variables to indicate matching filter bins, nuclides and scores merge_filters = self._can_merge_filters(other) merge_nuclides = self._can_merge_nuclides(other) merge_scores = self._can_merge_scores(other) mergeability = [merge_filters, merge_nuclides, merge_scores] + if not all(mergeability): + return False + # If the tally results have been read from the statepoint, we can only - # merge along one of filter bins, scores or nuclides - if self._results_read and sum(mergeability) > 1: + # at least two of filters, nuclides and scores must match + elif self._results_read and sum(equality) < 2: return False else: - return all([merge_filters, merge_nuclides, merge_scores]) + return True def merge(self, other): """Merge another tally with this one @@ -871,8 +883,16 @@ class Tally(object): # Create deep copy of other tally to use for array concatenation other_copy = copy.deepcopy(other) + # FIXME: document and create vars for merge_filters, etc. + merge_filters = self._can_merge_filters(other) + merge_nuclides = self._can_merge_nuclides(other) + merge_scores = self._can_merge_scores(other) + equal_filters = sorted(self.filters) == sorted(other.filters) + equal_nuclides = sorted(self.nuclides) == sorted(other.nuclides) + equal_scores = sorted(self.scores) == sorted(other.scores) + # If two tallies can be merged along a filter's bins - if self._can_merge_filters(other): + if merge_filters and not equal_filters: # Search for mergeable filters for i, filter1 in enumerate(self.filters): @@ -880,12 +900,14 @@ class Tally(object): if filter1 != filter2 and filter1.can_merge(filter2): other_copy._swap_filters(other_copy.filters[i], filter2) merged_tally.filters[i] = filter1.merge(filter2) + join_right = filter1 < filter2 merge_axis = i break # If two tallies can be merged along nuclide bins - if self._can_merge_nuclides(other): + if merge_nuclides and not equal_nuclides: merge_axis = self.num_filters + join_right = True # Add unique nuclides from other tally to merged tally for nuclide in other.nuclides: @@ -893,8 +915,9 @@ class Tally(object): merged_tally.add_nuclide(nuclide) # If two tallies can be merged along score bins - if self._can_merge_scores(other): + if merge_scores and not equal_scores: merge_axis = self.num_filters + 1 + join_right = True # Add unique scores from other tally to merged tally for score in other.scores: @@ -908,37 +931,57 @@ class Tally(object): if self.sum is not None and other_copy.sum is not None: self_sum = self.get_reshaped_data(value='sum') other_sum = other_copy.get_reshaped_data(value='sum') - merged_tally._sum = \ - np.concatenate((self_sum, other_sum), axis=merge_axis) - merged_tally._sum = \ - np.reshape(merged_tally._sum, merged_tally.shape) + + if join_right: + merged_sum = \ + np.concatenate((self_sum, other_sum), axis=merge_axis) + else: + merged_sum = \ + np.concatenate((other_sum, self_sum), axis=merge_axis) + + merged_tally._sum = np.reshape(merged_sum, merged_tally.shape) # Concatenate sum_sq arrays if present in both tallies if self.sum_sq is not None and other.sum_sq is not None: self_sum_sq = self.get_reshaped_data(value='sum_sq') other_sum_sq = other_copy.get_reshaped_data(value='sum_sq') - merged_tally._sum_sq = \ - np.concatenate((self_sum_sq, other_sum_sq), axis=merge_axis) - merged_tally._sum_sq = \ - np.reshape(merged_tally._sum_sq, merged_tally.shape) + + if join_right: + merged_sum_sq = \ + np.concatenate((self_sum_sq, other_sum_sq), axis=merge_axis) + else: + merged_sum_sq = \ + np.concatenate((other_sum_sq, self_sum_sq), axis=merge_axis) + + merged_tally._sum_sq = np.reshape(merged_sum_sq, merged_tally.shape) # Concatenate mean arrays if present in both tallies if self.mean is not None and other.mean is not None: self_mean = self.get_reshaped_data(value='mean') other_mean = other_copy.get_reshaped_data(value='mean') - merged_tally._mean = \ - np.concatenate((self_mean, other_mean), axis=merge_axis) - merged_tally._mean = \ - np.reshape(merged_tally._mean, merged_tally.shape) + + if join_right: + merged_mean = \ + np.concatenate((self_mean, other_mean), axis=merge_axis) + else: + merged_mean = \ + np.concatenate((other_mean, self_mean), axis=merge_axis) + + merged_tally._mean = np.reshape(merged_mean, merged_tally.shape) # Concatenate std. dev. arrays if present in both tallies if self.std_dev is not None and other.std_dev is not None: self_std_dev = self.get_reshaped_data(value='std_dev') other_std_dev = other_copy.get_reshaped_data(value='std_dev') - merged_tally._std_dev = \ - np.concatenate((self_std_dev, other_std_dev), axis=merge_axis) - merged_tally._std_dev = \ - np.reshape(merged_tally._std_dev, merged_tally.shape) + + if join_right: + merged_std_dev = \ + np.concatenate((self_std_dev, other_std_dev), axis=merge_axis) + else: + merged_std_dev = \ + np.concatenate((other_std_dev, self_std_dev), axis=merge_axis) + + merged_tally._std_dev = np.reshape(merged_std_dev, merged_tally.shape) # Sparsify merged tally if both tallies are sparse merged_tally.sparse = self.sparse and other.sparse @@ -2878,7 +2921,12 @@ class Tally(object): 'since it does not contain any results.'.format(self.id) raise ValueError(msg) + # Create deep copy of tally to return as sliced tally new_tally = copy.deepcopy(self) + + # Differentiate Tally with a new auto-generated Tally ID + new_tally.id = None + new_tally.sparse = False if not self.derived and self.sum is not None: From 5501d1b42a93bff148df2f25a0623d109228d16a Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sun, 7 Feb 2016 14:18:17 -0500 Subject: [PATCH 096/149] Prefer string formatting for Pandas DataFrames --- .../pythonapi/examples/mgxs-part-i.ipynb | 93 ++++---- .../examples/pandas-dataframes.ipynb | 208 +++++++++--------- .../pythonapi/examples/tally-arithmetic.ipynb | 208 +++++++++--------- openmc/arithmetic.py | 21 +- openmc/filter.py | 16 +- openmc/tallies.py | 13 +- 6 files changed, 298 insertions(+), 261 deletions(-) diff --git a/docs/source/pythonapi/examples/mgxs-part-i.ipynb b/docs/source/pythonapi/examples/mgxs-part-i.ipynb index 319c6d1dfd..211829be64 100644 --- a/docs/source/pythonapi/examples/mgxs-part-i.ipynb +++ b/docs/source/pythonapi/examples/mgxs-part-i.ipynb @@ -519,7 +519,7 @@ " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", - " Date/Time: 2016-02-06 15:29:23\n", + " Date/Time: 2016-02-07 14:10:52\n", " MPI Processes: 1\n", "\n", " ===========================================================================\n", @@ -605,20 +605,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 3.7300E-01 seconds\n", - " Reading cross sections = 9.8000E-02 seconds\n", - " Total time in simulation = 8.5810E+00 seconds\n", - " Time in transport only = 8.5650E+00 seconds\n", - " Time in inactive batches = 1.2990E+00 seconds\n", - " Time in active batches = 7.2820E+00 seconds\n", - " Time synchronizing fission bank = 4.0000E-03 seconds\n", + " Total time for initialization = 8.7800E-01 seconds\n", + " Reading cross sections = 1.9200E-01 seconds\n", + " Total time in simulation = 1.3677E+01 seconds\n", + " Time in transport only = 1.3579E+01 seconds\n", + " Time in inactive batches = 1.7900E+00 seconds\n", + " Time in active batches = 1.1887E+01 seconds\n", + " Time synchronizing fission bank = 6.0000E-03 seconds\n", " Sampling source sites = 2.0000E-03 seconds\n", - " SEND/RECV source sites = 2.0000E-03 seconds\n", - " Time accumulating tallies = 0.0000E+00 seconds\n", - " Total time for finalization = 0.0000E+00 seconds\n", - " Total time elapsed = 8.9680E+00 seconds\n", - " Calculation Rate (inactive) = 19245.6 neutrons/second\n", - " Calculation Rate (active) = 13732.5 neutrons/second\n", + " SEND/RECV source sites = 3.0000E-03 seconds\n", + " Time accumulating tallies = 1.0000E-03 seconds\n", + " Total time for finalization = 1.0000E-03 seconds\n", + " Total time elapsed = 1.4578E+01 seconds\n", + " Calculation Rate (inactive) = 13966.5 neutrons/second\n", + " Calculation Rate (active) = 8412.55 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -909,8 +909,8 @@ " \n", " 0\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " total\n", " (((total / flux) - (absorption / flux)) - (sca...\n", " 4.884981e-15\n", @@ -919,8 +919,8 @@ " \n", " 1\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " total\n", " (((total / flux) - (absorption / flux)) - (sca...\n", " 1.221245e-15\n", @@ -931,9 +931,9 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.000000 0.000001 total \n", - "1 1 0.000001 20.000000 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", " score mean std. dev. \n", "0 (((total / flux) - (absorption / flux)) - (sca... 4.884981e-15 0.011274 \n", @@ -988,8 +988,8 @@ " \n", " 0\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " total\n", " ((absorption / flux) / (total / flux))\n", " 0.076219\n", @@ -998,8 +998,8 @@ " \n", " 1\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " total\n", " ((absorption / flux) / (total / flux))\n", " 0.019319\n", @@ -1010,9 +1010,9 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.000000 0.000001 total \n", - "1 1 0.000001 20.000000 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", " score mean std. dev. \n", "0 ((absorption / flux) / (total / flux)) 0.076219 0.000651 \n", @@ -1060,8 +1060,8 @@ " \n", " 0\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " total\n", " ((scatter / flux) / (total / flux))\n", " 0.923781\n", @@ -1070,8 +1070,8 @@ " \n", " 1\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " total\n", " ((scatter / flux) / (total / flux))\n", " 0.980681\n", @@ -1082,9 +1082,9 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.000000 0.000001 total \n", - "1 1 0.000001 20.000000 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", " score mean std. dev. \n", "0 ((scatter / flux) / (total / flux)) 0.923781 0.007714 \n", @@ -1139,8 +1139,8 @@ " \n", " 0\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " total\n", " (((absorption / flux) / (total / flux)) + ((sc...\n", " 1\n", @@ -1149,8 +1149,8 @@ " \n", " 1\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " total\n", " (((absorption / flux) / (total / flux)) + ((sc...\n", " 1\n", @@ -1161,9 +1161,9 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.000000 0.000001 total \n", - "1 1 0.000001 20.000000 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", " score mean std. dev. \n", "0 (((absorption / flux) / (total / flux)) + ((sc... 1 0.007741 \n", @@ -1182,6 +1182,15 @@ "# The scattering-to-total ratio is a derived tally which can generate Pandas DataFrames for inspection\n", "sum_ratio.get_pandas_dataframe()" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/docs/source/pythonapi/examples/pandas-dataframes.ipynb b/docs/source/pythonapi/examples/pandas-dataframes.ipynb index 16fa16f21b..45868ab769 100644 --- a/docs/source/pythonapi/examples/pandas-dataframes.ipynb +++ b/docs/source/pythonapi/examples/pandas-dataframes.ipynb @@ -382,7 +382,7 @@ "outputs": [ { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBhQuBnxwGisAAAPZSURBVGje7Zs7buMwEIZ9iey5\n0gyNjQpXKTYudIScgkdQYTfut1idwkdQkQNsYQO2Qj0sPiVK+mlQDmwgwIcgg8Cc4fCTSK5W4OeF\nkM8rHv+2I/rgxPZEPZgR7XtQxKdXYuUXJSUnBQ/9WCgo4vOSJ+WFUvF7E08mlia+rn7VcKXP8sRs\nzFX8b2MdX2y6v1Tw6MZUw4H4ojfIjD8mvn/qRL5p4+vvlMqvp2EhR8WBzfiz20hXORmP9fi/bM9E\neUFvV5H/0yRkeSbiGRfFJErxD9ENdz7Mbhig/h89fvtFdMiI/ePUIXV4lXju8K3DKv9NThOZ3q2K\nmUy6grxFES8rjeyic+FFQav+ncg3fXjH+Ts+/iibztFqOiZuZP/Z3OafPX40NGgST2r+uvQkXXp6\ncKvmr+r0e1Eef5um3+JHP3IFF1D/seNZJgaDmvY0Gav1s+2f1fqpIcublfKGt6apotG/NVx3SInW\ntLX+7Vg/Pv1YqOsnun6JSVdOXT/X7vk75f938QP+8OmSBs0fXtymMhJbf8qlPynYmpKCh7OB1fzN\nalOj1sl0ZAruHLiA+RM73pDe/VjMVP89+aTXwjyc/x5n+u991895/utrJTy8/06TXh0r/5JOa2Jm\nYmqi4r/vUm/H4wLmT+z4anhr05X+q6KUXhtzr/9qSff5L5uMT//V/NdU4YuBTPa/8P67l/6r44ds\n+hYuoP5jx9ciy6XTWlibBrmx8V/TdMfjkP+6pOsu/lvM9N90sf7r+f6m/65n+S8p/itN15v0UkW3\n/+48+PRfJX6S9Joo4g+G/1qYG9KroqP/WypcuvyXPf13wH89/hHef7MB6R3Cqn55U4rv4kfH3zaS\ngQuYP7HjVf89tXrbO+hfLdr+Ozv/SP1dgtQ/Ov8C+i/3+q/Zf2D/HWi6bjT6rym9I/v/03/b+LHS\n4cTg/utTsV7/net/Afzz4f0XGX84/2j9xZ4/sePR/of2X7D/o+vPo/sv6h9B/Bfxr9j1Hz2eN/hO\n8/wfff4A848+f/1A/530/I0+/8PvH9D3H9HnT+R49P0b+v4PfP/4E/wXfP8Mvf9G37/D/ovuP8Se\nP7Hj0f0vdP8tqP9O339cyv7p3P1fdP8Z3v9G999j13/seMax8x/o+ZN7+O+E8zdP/8XOf8Hnz9Dz\nb7HnT+x49PxlCp7/BM+fOv13wvnXBfivt2lMvD8TyH/Hnb+Gz3+j589jz5/Y8ej9h4D+W7qQmf57\nefqv239n3T+C7z+h969i13/seMax+3/o/cMcu/8Y2H9n3p+J6r98pv8m4fwXuH+M3n+OO3++AX9c\nlR+4PhbRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTAyLTA2VDE1OjQ2OjA2LTA1OjAwkB0d7wAA\nACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMi0wNlQxNTo0NjowNi0wNTowMOFApVMAAAAASUVORK5C\nYII=\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBxMOKxHYExwAAAPZSURBVGje7Zs7buMwEIZ9iey5\n0gyNjQpXKTYudIScgkdQYTfut1idwkdQkQNsYQO2Qj0sPiVK+mlQDmwgwIcgg8Cc4fCTSK5W4OeF\nkM8rHv+2I/rgxPZEPZgR7XtQxKdXYuUXJSUnBQ/9WCgo4vOSJ+WFUvF7E08mlia+rn7VcKXP8sRs\nzFX8b2MdX2y6v1Tw6MZUw4H4ojfIjD8mvn/qRL5p4+vvlMqvp2EhR8WBzfiz20hXORmP9fi/bM9E\neUFvV5H/0yRkeSbiGRfFJErxD9ENdz7Mbhig/h89fvtFdMiI/ePUIXV4lXju8K3DKv9NThOZ3q2K\nmUy6grxFES8rjeyic+FFQav+ncg3fXjH+Ts+/iibztFqOiZuZP/Z3OafPX40NGgST2r+uvQkXXp6\ncKvmr+r0e1Eef5um3+JHP3IFF1D/seNZJgaDmvY0Gav1s+2f1fqpIcublfKGt6apotG/NVx3SInW\ntLX+7Vg/Pv1YqOsnun6JSVdOXT/X7vk75f938QP+8OmSBs0fXtymMhJbf8qlPynYmpKCh7OB1fzN\nalOj1sl0ZAruHLiA+RM73pDe/VjMVP89+aTXwjyc/x5n+u991895/utrJTy8/06TXh0r/5JOa2Jm\nYmqi4r/vUm/H4wLmT+z4anhr05X+q6KUXhtzr/9qSff5L5uMT//V/NdU4YuBTPa/8P67l/6r44ds\n+hYuoP5jx9ciy6XTWlibBrmx8V/TdMfjkP+6pOsu/lvM9N90sf7r+f6m/65n+S8p/itN15v0UkW3\n/+48+PRfJX6S9Joo4g+G/1qYG9KroqP/WypcuvyXPf13wH89/hHef7MB6R3Cqn55U4rv4kfH3zaS\ngQuYP7HjVf89tXrbO+hfLdr+Ozv/SP1dgtQ/Ov8C+i/3+q/Zf2D/HWi6bjT6rym9I/v/03/b+LHS\n4cTg/utTsV7/net/Afzz4f0XGX84/2j9xZ4/sePR/of2X7D/o+vPo/sv6h9B/Bfxr9j1Hz2eN/hO\n8/wfff4A848+f/1A/530/I0+/8PvH9D3H9HnT+R49P0b+v4PfP/4E/wXfP8Mvf9G37/D/ovuP8Se\nP7Hj0f0vdP8tqP9O339cyv7p3P1fdP8Z3v9G999j13/seMax8x/o+ZN7+O+E8zdP/8XOf8Hnz9Dz\nb7HnT+x49PxlCp7/BM+fOv13wvnXBfivt2lMvD8TyH/Hnb+Gz3+j589jz5/Y8ej9h4D+W7qQmf57\nefqv239n3T+C7z+h969i13/seMax+3/o/cMcu/8Y2H9n3p+J6r98pv8m4fwXuH+M3n+OO3++AX9c\nlR+4PhbRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTAyLTA3VDE0OjE0OjQzLTA1OjAwQDMI2QAA\nACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMi0wN1QxNDoxNDo0My0wNTowMDFusGUAAAAASUVORK5C\nYII=\n", "text/plain": [ "" ] @@ -572,7 +572,7 @@ " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", - " Date/Time: 2016-02-06 15:46:08\n", + " Date/Time: 2016-02-07 14:14:45\n", " MPI Processes: 1\n", "\n", " ===========================================================================\n", @@ -637,20 +637,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 3.1900E-01 seconds\n", - " Reading cross sections = 8.7000E-02 seconds\n", - " Total time in simulation = 4.8710E+00 seconds\n", - " Time in transport only = 4.8580E+00 seconds\n", - " Time in inactive batches = 7.1900E-01 seconds\n", - " Time in active batches = 4.1520E+00 seconds\n", + " Total time for initialization = 3.1700E-01 seconds\n", + " Reading cross sections = 8.0000E-02 seconds\n", + " Total time in simulation = 4.7680E+00 seconds\n", + " Time in transport only = 4.7530E+00 seconds\n", + " Time in inactive batches = 7.0700E-01 seconds\n", + " Time in active batches = 4.0610E+00 seconds\n", " Time synchronizing fission bank = 3.0000E-03 seconds\n", - " Sampling source sites = 3.0000E-03 seconds\n", - " SEND/RECV source sites = 0.0000E+00 seconds\n", - " Time accumulating tallies = 1.0000E-03 seconds\n", + " Sampling source sites = 2.0000E-03 seconds\n", + " SEND/RECV source sites = 1.0000E-03 seconds\n", + " Time accumulating tallies = 0.0000E+00 seconds\n", " Total time for finalization = 0.0000E+00 seconds\n", - " Total time elapsed = 5.1990E+00 seconds\n", - " Calculation Rate (inactive) = 17385.3 neutrons/second\n", - " Calculation Rate (active) = 9031.79 neutrons/second\n", + " Total time elapsed = 5.0960E+00 seconds\n", + " Calculation Rate (inactive) = 17680.3 neutrons/second\n", + " Calculation Rate (active) = 9234.18 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -825,8 +825,8 @@ " 1\n", " 1\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", " 0.000202\n", " 0.000037\n", @@ -836,8 +836,8 @@ " 1\n", " 1\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", " 0.000492\n", " 0.000090\n", @@ -847,8 +847,8 @@ " 1\n", " 1\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", " 0.000076\n", " 0.000004\n", @@ -858,8 +858,8 @@ " 1\n", " 1\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", " 0.000204\n", " 0.000010\n", @@ -869,8 +869,8 @@ " 1\n", " 2\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", " 0.000375\n", " 0.000039\n", @@ -880,8 +880,8 @@ " 1\n", " 2\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", " 0.000914\n", " 0.000094\n", @@ -891,8 +891,8 @@ " 1\n", " 2\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", " 0.000107\n", " 0.000013\n", @@ -902,8 +902,8 @@ " 1\n", " 2\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", " 0.000278\n", " 0.000032\n", @@ -913,8 +913,8 @@ " 1\n", " 3\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", " 0.000564\n", " 0.000056\n", @@ -924,8 +924,8 @@ " 1\n", " 3\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", " 0.001374\n", " 0.000137\n", @@ -935,8 +935,8 @@ " 1\n", " 3\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", " 0.000149\n", " 0.000007\n", @@ -946,8 +946,8 @@ " 1\n", " 3\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", " 0.000388\n", " 0.000018\n", @@ -957,8 +957,8 @@ " 1\n", " 4\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", " 0.000669\n", " 0.000044\n", @@ -968,8 +968,8 @@ " 1\n", " 4\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", " 0.001631\n", " 0.000108\n", @@ -979,8 +979,8 @@ " 1\n", " 4\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", " 0.000165\n", " 0.000011\n", @@ -990,8 +990,8 @@ " 1\n", " 4\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", " 0.000433\n", " 0.000029\n", @@ -1001,8 +1001,8 @@ " 1\n", " 5\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", " 0.000932\n", " 0.000069\n", @@ -1012,8 +1012,8 @@ " 1\n", " 5\n", " 1\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", " 0.002270\n", " 0.000168\n", @@ -1023,8 +1023,8 @@ " 1\n", " 5\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", " 0.000183\n", " 0.000011\n", @@ -1034,8 +1034,8 @@ " 1\n", " 5\n", " 1\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", " 0.000477\n", " 0.000028\n", @@ -1045,49 +1045,49 @@ "" ], "text/plain": [ - " (mesh 1, x) (mesh 1, y) (mesh 1, z) energy low [MeV] \\\n", - "0 1 1 1 0.000000 \n", - "1 1 1 1 0.000000 \n", - "2 1 1 1 0.000001 \n", - "3 1 1 1 0.000001 \n", - "4 1 2 1 0.000000 \n", - "5 1 2 1 0.000000 \n", - "6 1 2 1 0.000001 \n", - "7 1 2 1 0.000001 \n", - "8 1 3 1 0.000000 \n", - "9 1 3 1 0.000000 \n", - "10 1 3 1 0.000001 \n", - "11 1 3 1 0.000001 \n", - "12 1 4 1 0.000000 \n", - "13 1 4 1 0.000000 \n", - "14 1 4 1 0.000001 \n", - "15 1 4 1 0.000001 \n", - "16 1 5 1 0.000000 \n", - "17 1 5 1 0.000000 \n", - "18 1 5 1 0.000001 \n", - "19 1 5 1 0.000001 \n", + " (mesh 1, x) (mesh 1, y) (mesh 1, z) energy low [MeV] energy high [MeV] \\\n", + "0 1 1 1 0.00e+00 6.25e-07 \n", + "1 1 1 1 0.00e+00 6.25e-07 \n", + "2 1 1 1 6.25e-07 2.00e+01 \n", + "3 1 1 1 6.25e-07 2.00e+01 \n", + "4 1 2 1 0.00e+00 6.25e-07 \n", + "5 1 2 1 0.00e+00 6.25e-07 \n", + "6 1 2 1 6.25e-07 2.00e+01 \n", + "7 1 2 1 6.25e-07 2.00e+01 \n", + "8 1 3 1 0.00e+00 6.25e-07 \n", + "9 1 3 1 0.00e+00 6.25e-07 \n", + "10 1 3 1 6.25e-07 2.00e+01 \n", + "11 1 3 1 6.25e-07 2.00e+01 \n", + "12 1 4 1 0.00e+00 6.25e-07 \n", + "13 1 4 1 0.00e+00 6.25e-07 \n", + "14 1 4 1 6.25e-07 2.00e+01 \n", + "15 1 4 1 6.25e-07 2.00e+01 \n", + "16 1 5 1 0.00e+00 6.25e-07 \n", + "17 1 5 1 0.00e+00 6.25e-07 \n", + "18 1 5 1 6.25e-07 2.00e+01 \n", + "19 1 5 1 6.25e-07 2.00e+01 \n", "\n", - " energy high [MeV] score mean std. dev. \n", - "0 0.000001 fission 0.000202 0.000037 \n", - "1 0.000001 nu-fission 0.000492 0.000090 \n", - "2 20.000000 fission 0.000076 0.000004 \n", - "3 20.000000 nu-fission 0.000204 0.000010 \n", - "4 0.000001 fission 0.000375 0.000039 \n", - "5 0.000001 nu-fission 0.000914 0.000094 \n", - "6 20.000000 fission 0.000107 0.000013 \n", - "7 20.000000 nu-fission 0.000278 0.000032 \n", - "8 0.000001 fission 0.000564 0.000056 \n", - "9 0.000001 nu-fission 0.001374 0.000137 \n", - "10 20.000000 fission 0.000149 0.000007 \n", - "11 20.000000 nu-fission 0.000388 0.000018 \n", - "12 0.000001 fission 0.000669 0.000044 \n", - "13 0.000001 nu-fission 0.001631 0.000108 \n", - "14 20.000000 fission 0.000165 0.000011 \n", - "15 20.000000 nu-fission 0.000433 0.000029 \n", - "16 0.000001 fission 0.000932 0.000069 \n", - "17 0.000001 nu-fission 0.002270 0.000168 \n", - "18 20.000000 fission 0.000183 0.000011 \n", - "19 20.000000 nu-fission 0.000477 0.000028 " + " score mean std. dev. \n", + "0 fission 0.000202 0.000037 \n", + "1 nu-fission 0.000492 0.000090 \n", + "2 fission 0.000076 0.000004 \n", + "3 nu-fission 0.000204 0.000010 \n", + "4 fission 0.000375 0.000039 \n", + "5 nu-fission 0.000914 0.000094 \n", + "6 fission 0.000107 0.000013 \n", + "7 nu-fission 0.000278 0.000032 \n", + "8 fission 0.000564 0.000056 \n", + "9 nu-fission 0.001374 0.000137 \n", + "10 fission 0.000149 0.000007 \n", + "11 nu-fission 0.000388 0.000018 \n", + "12 fission 0.000669 0.000044 \n", + "13 nu-fission 0.001631 0.000108 \n", + "14 fission 0.000165 0.000011 \n", + "15 nu-fission 0.000433 0.000029 \n", + "16 fission 0.000932 0.000069 \n", + "17 nu-fission 0.002270 0.000168 \n", + "18 fission 0.000183 0.000011 \n", + "19 nu-fission 0.000477 0.000028 " ] }, "execution_count": 25, @@ -1114,7 +1114,7 @@ "data": { "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -1137,7 +1137,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 27, @@ -1148,7 +1148,7 @@ "data": { "image/png": "iVBORw0KGgoAAAANSUhEUgAAAU0AAAEZCAYAAAAT73clAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAIABJREFUeJzt3XuUXWWZ5/HvzyJB7hHTJiSpNsEUQvBCaDumRU2WtnSM\nShq7FZk1img3WWLsnmm1kaGnSbRBW1vsQRpWZkSbsRui0wgraiIgTpQBQSMXwSSaAIW5QCKXyEUg\nqfDMH3sXnJycy353napddfL7rLUXZ+/zPvt9d1F56t2391VEYGZmxbyo6gaYmY0lTppmZgmcNM3M\nEjhpmpklcNI0M0vgpGlmlsBJs8tIeqWkOyU9Luljki6T9HdD2N+5kv5XJ9toNpbJz2l2F0mXAzsj\n4uNVt6XTJPUDH4qIH1TdFtt/uafZfV4OrKu6Eakk9RQoFoCGuy1mrThpdhFJPwDmA5fkp+d9kv5V\n0mfy7ydK+o6kxyQ9IulHNbHnSNqSx22Q9JZ8+1JJX68pd4qkX+T7+L+Sjq35rl/SxyXdJWmnpBWS\nDmzS1g9KulnSRZIeBs6XdLSkH0h6WNJvJP2bpCPy8l8Hfh/4tqQnJH0i3z5X0i15e+6UNK/TP1ez\nWk6aXSQi3gLcBHw0Ig6PiI1kvbPBazAfBzYDE4GXAedCdh0U+Cjwuog4HDgZ6B/c7eD+JR0DXAn8\nVb6PVWRJ7ICasu8B/gSYAbwG+GCLJs8B7s3bciFZL/IC4CjgOKAXWJof2/uBXwPvjIjDIuKfJE0F\nvgN8OiJeAnwCuFrSxKI/M7NUTprdqdkp7C6yhDQ9IvZExM359j3AgcDxksZFxK8j4r4G+zoN+E5E\n3BgRe4B/Ag4C3lBT5uKIeCgiHgO+DZzQop3bIuJfIuK5iHgmIu7N9707Ih4GvgS06jn+Z2BVRHwP\nICK+D6wFFraIMRsSJ83uVH93bzDxfQHYBFwv6V5J5wBExCbgv5D16rZLukrSUQ32O4Wst0ceF2Q9\n16k1ZR6q+fw0cGiLdm7eq5HSpPyUfouk3wJfB17aIv7lwHvyU/PHJD0GnARMbhFjNiROmvuRiHgy\nIj4REa8ATgH+ZvDaZURcFRFvIktEAfxjg11szb8HQJLITqG3NquyXZPq1i8k6/W+KiKOAN7P3r+j\n9eV/DXw9Il5SsxwWEZ9vU69ZaU6a3UmNPkt6p6SZebJ7nCxB7ZF0jKS35DdtngWeyb+r93+Ad+Rl\nx5FdI30GuKVAO4o4FHgKeDy/XvnJuu+3A6+oWf834F2STpbUI+nFkubnsWbDwkmzO0Xd58H1mcAN\nwBNkie5fIuKHZNczPwv8BniQ7CbPufXxEfFLsuuIX87LvgN4V0QMtGhHs95mo++WAScCvyW7Hnp1\nXZnPAn+Xn4r/TURsARYB/w3YQdbz/Dj+vbZh5IfbzcwS+C+ymVkCJ00zswROmmZmCZw0zcwSHNC+\nyMiT5LtTZhWJiCENipL673eo9Y20UZk0M0812X4BcN6+m//84PQqPpEeMu31G9ODgGWcnxyzjlkN\nt9+y9Ae8YelbGn73X/lScj1TNz6aHMNX0kOA7I3yVNsab156Iyx9a5OYZg9BtXJ/esjqf02PWXBk\negyAmvxrXfokLG323tXLEuu4J618M/9QsFzpgV4rVMnpuaQF+Ug6Gwdf5TOz7jGu4NJIkfwg6eL8\n+7skzS4am4/C9ZykI2u2nZuX3yDp5HbHNuJJMx838RJgATALOF1Smf6HmY1SBxRc6hXJD5IWAjMj\nog84C7isSKykXuBtwAM122aRDUQzK4+7VFLLvFhFT3MOsCki+iNiN7CC7K2Ogt40TM0aO3rnz6i6\nCaOCfwyZ+eOrbsG+Diq4NFAkP5wCXAEQEbcBEyRNLhB7EfC3dftaBFyVj6zVTzagzZxWx1ZF0pzK\n3qPbbGHvUXLaeHOHmzP2OGlm5h9ddQtGh9GYNIdwel4kPzQrM6VZrKRFwJaI+Hndvqbk5VrVt5cq\nbgQVvLN2Qc3nN+FkadZ5a56ENc3uuQ7BEBJL0Tvvhe+4SzqIbHyCtxWMb9mGKpLmVrLhxAb1snem\nzzW4Q25mHTX/0GwZtOw3ndlvs5s864D1rUOL5If6MtPyMuOaxL4CmA7clQ3wxTTgZ5Je32RfzYY6\nBKo5PV8L9EmaLmk82UXYlRW0w8yGSbMbP68h+wc/uDRQJD+sBD4A2RxRZLOvbm8WGxH3RMSkiJgR\nETPIEumJecxK4H2SxkuaAfQBP2l3bCMqIgYkLQGuA3qAyyOizR8fMxtLmvU022mWHyQtzr9fHhGr\nJC2UtInsge4zW8U2qqamvnWSvknWCR4Azo42Q79V8nB7RKwGVldRt5kNv7JJExrnh4hYXre+pGhs\ngzJH161fSDZrQCGj+I0gMxurmjxO1BVGcdJM/Fv1quFpRb0J7CwVdz/Tk2N6Gs440doveWVyzNTN\nP06O2XtKtASvKxFT5u7unekh21elx/Snh6BDSgQBS0v8zKfuKFfXUI3ixDJk3XxsZlaRoZyej3ZO\nmmbWcd2cWLr52MysIu5pmpkl6ObE0s3HZmYVcU/TzCyBHzkyM0vgnqaZWYJuTizdfGxmVpFxRTNL\nmbmcKuakaWYdd4CTpplZceN6qm7B8HHSNLOOK9zTHING8aElNm1tiSrmp4c8wWElKoJHmJgccxrf\nSI6ZXmby7inpIfx1iRjI5gpM9SclYq5KD5lUYuqlBSV+3GUtPSk95hs3d74dRYw7sJp6R8IoTppm\nNmZ1cWbp4kMzs8p0cWbp4kMzs8p0cWbp4kMzs8p08d3zKmajNLNu12w6yvqlAUkLJG2QtFHSOU3K\nXJx/f5ek2e1iJX0mL3unpBsl9ebbp0t6WtId+XJpkUMzM+usknfPJfWQPWPxx2Tzj/9U0sraWSUl\nLQRmRkRfPnf5ZcDcNrGfj4j/nsd/DDgf+It8l5si4vnE2457mmbWeeV7mnPIklh/ROwGVgCL6sqc\nAlwBEBG3ARMkTW4VGxFP1MQfCjxc9tCcNM2s88onzansPW3flnxbkTJTWsVKukDSr4EzgM/VlJuR\nn5qvkfTGIodmZtZZTW4ErflttrQQBWtQWoMgIs4DzpP0KeBLwJnANqA3Ih6TdCJwraTj63qme3HS\nNLPOa5JZ5r80WwYt23da4q1Ab816L1mPsVWZaXmZcQViAa4EVgFExC5gV/75dkn3An3A7Y2PwKfn\nZjYcyp+erwX68rva44HTgJV1ZVYCHwCQNBfYGRHbW8VK6quJXwTckW+fmN9AQtLRZAnzvnaHZmbW\nWSUzS0QMSFoCXEd2kn95RKyXtDj/fnlErJK0UNIm4Cmy0+ymsfmuPyvplcAe4F7gI/n2NwOflrQb\neA5YHBE7h+HQzMxaGMKAHRGxGlhdt2153fqSorH59j9vUv5bwLdS2jeKk+ajieVf2r5IvQllQlr+\nEWqqp8Roq9/gtOSYv+fTyTGtT0aaSP3fM+j3S8Qk/UrnjkgPuf/O9JgZr0qPeXxjegzA4S9Ojzmu\nXFVDN4ozy1B18aGZWWW6+DVKJ00z67wuzixdfGhmVpkuzixdfGhmVhmfnpuZJejizNLFh2ZmlSlx\np3+scNI0s87z6bmZWYIuzixdfGhmVpkuzixdfGhmVhmfnpuZJejizNLFh2ZmlenizDKKDy1xAI5n\nSlTx/fSQ/mOnl6gIfvnMMckxXzjib5NjnmV8csx9Cycnxxy946HkGACOLRFTZtSJtekhMxaWqOeQ\n9JCDPl+iHoBT00Nec01iQMnBRPYxhFGORrtRnDTNbMzq4szSxYdmZpXp4szSxYdmZpXx3XMzswRd\nnFk8sZqZdV75idWQtEDSBkkbJZ3TpMzF+fd3SZrdLlbSZ/Kyd0q6UVJvzXfn5uU3SDq53aE5aZpZ\n5/UUXOrkM0NeAiwAZgGnSzqursxCYGZE9AFnAZcViP18RLw2Ik4ArgXOz2Nmkc1aOSuPu1RSy7zo\npGlmnffigsu+5gCbIqI/InYDK8im3K11CnAFQETcBkyQNLlVbEQ8URN/KPBw/nkRcFVE7I6IfmBT\nvp+muvjKg5lVpnxmmQpsrlnfAry+QJmpwJRWsZIuAN4PPM0LiXEKcGuDfTXlnqaZdV7J03MgCtag\n1CZFxHkR8fvA14B/blW01X7c0zSzzmuSWdbcnS0tbAV6a9Z7yXp/rcpMy8uMKxALcCWwqsW+trZq\noJOmmXVek8wyf3a2DFq2Yp8ia4E+SdOBbWQ3aU6vK7MSWAKskDQX2BkR2yU90ixWUl9EDL4kugi4\no2ZfV0q6iOy0vA/4SYlDMzMbgpIPt0fEgKQlwHX5Xi6PiPWSFuffL4+IVZIWStoEPAWc2So23/Vn\nJb0S2APcC3wkj1kn6ZvAOmAAODsiWp6eq833lZAUHJrYriUlKiozyMcJJWKAeWd8Lzlm4vM3+Ir7\nGF9OjpnFuuSY39vxZHIMAOvbF9nHbSNUT4lBPpg7QvUAPFIi5ui04vohRETy9cK99iFF/LBg2XlD\nr2+kuadpZp3n1yg7S1I/8DhZV3l3RLR8LsrMxpgu7o5VdWgBzI+IRyuq38yGk5PmsBhT1zHMLEEX\nJ82qHm4P4PuS1kr6y4raYGbDpfzD7aNeVX8PToqIByX9HnCDpA0RcVNFbTGzTuvinmYlhxYRD+b/\n/Y2ka8jeA907aT679IXPPfPhgPkj1Tyz/caandnScZ4jqHMkHQz0RMQTkg4BTgaW7VPwwKUj3DKz\n/c/8CdkyaNkDHdqxe5odNQm4RtJg/f8eEddX0A4zGy5Omp0TEfdT+r0aMxsTnDTNzIqLMXpnvAgn\nTTPruD1dnFlG76Gljgdxa/siHTG9XNhhPNG+UJ0nOCw5poeB5Jg1zE+Omf6y/uQYgBMOvCc5Zlzi\noBMAbGxfZB/HtS+yjx0lYsoMFAMwr0TMnSXrGiInTTOzBM8eOL5gyV3D2o7h4KRpZh23p6d7L2o6\naZpZx+0Zq+9IFuCkaWYdN+CkaWZW3J4uTi3de2RmVpluPj33vOdm1nF76Cm0NCJpgaQNkjZKOqdJ\nmYvz7++SNLtdrKQvSFqfl/+WpCPy7dMlPS3pjny5tN2xOWmaWcc9y/hCSz1JPcAlwAJgFnC6pOPq\nyiwEZkZEH3AWcFmB2OuB4yPitcCvgHNrdrkpImbny9ntjs1J08w6bg8HFFoamEOWxPojYjewgmye\n8lqnAFcARMRtwARJk1vFRsQNEfFcHn8bMK3ssTlpmlnHDeH0fCqwuWZ9S76tSJkpBWIBPgSsqlmf\nkZ+ar5H0xnbH5htBZtZxza5Xrl3zFGvX/K5VaBSsotQcY5LOA3ZFxJX5pm1Ab0Q8JulE4FpJx0dE\n0/eenTTNrOOaPad5wvzDOWH+4c+v/89lD9cX2Qr01qz3kvUYW5WZlpcZ1ypW0geBhcBbB7dFxC7y\ndzkj4nZJ9wJ9wO1NDm00J82fpRW/5w/Sq3hfesiL3vdUehBwN69Ojnkp+/xCtbWDSckxO5nQvlCd\nR3hpcgxA/xHpl5ImHbo9Oebw+3Ynx3BSeggr00N2P1iiHmBcmaG6T08snz6eSkNDeE5zLdAnaTpZ\nL/A09j2KlcASYIWkucDOiNgu6ZFmsZIWAJ8E5kXE80OmSJoIPBYReyQdTZYw72vVwFGcNM1srCr7\nnGZEDEhaAlxHNl/l5RGxXtLi/PvlEbFK0kJJm4CngDNbxea7/jIwnmwiR4Af53fK5wHLJO0GngMW\nR0TLWZOcNM2s43Y1eJyoqIhYDayu27a8bn1J0dh8e1+T8lcDV6e0z0nTzDrO756bmSXwu+dmZgm6\n+d1zJ00z6zgnTTOzBL6maWaWYBcHVt2EYeOkaWYd59NzM7MEPj03M0vgR47MzBL49LwS49KKP9O+\nyD7Sx8PguVsPKVERPDDh2PSYmekHdeXU/5Qc82ruTo6ZQMvXc5vq21g/YE0BR6SHbJj38uSYY7/4\nQHpFc9NDxpUb8wU+WCImdVyV/1GijgacNM3MEjhpmpkleNaPHJmZFeeepplZgm5Omm0nVpP0V5Je\nMhKNMbPuMEBPoWUsKtLTnAT8VNLtwFeB6yKi6ORHZrYf6ubnNNv2NCPiPOAYsoT5QWCjpAslvWKY\n22ZmY9QQpvAd9QrNe55Psv4QsB3YA7wE+A9JXxjGtpnZGDWUpClpgaQNkjZKOqdJmYvz7++SNLtd\nrKQvSFqfl/+WpCNqvjs3L79B0sntjq3INc2/lvQz4PPAzcCrIuIjwB8A724Xb2b7n2cZX2ipJ6kH\nuARYAMwCTpd0XF2ZhcDMfN6fs4DLCsReDxwfEa8FfgWcm8fMIpu1clYed6mklnmxyIWHI4F3R8Re\nr0tExHOS3lUg3sz2M0O4pjkH2BQR/QCSVgCLgPU1ZU4BrgCIiNskTZA0GZjRLDYibqiJvw34s/zz\nIuCqiNgN9OczXM4Bbm3WwCLXNM+vT5g1361rF29m+58hnJ5PBTbXrG/JtxUpM6VALMCHgFX55yl5\nuXYxz+veW1xmVpkh3OQp+mSOyuxc0nnAroi4smwbnDTNrOOaPYO5bc1Gtq3Z1Cp0K9Bbs97L3j3B\nRmWm5WXGtYqV9EFgIfDWNvva2qqBozhpTh/+KqaViPleybremR7yogP2JMesY1ZyzO84ODmmh/S2\nAWztuyU5ZuoPH02OOfbR9BGLfvDxP0qOOZjfJcf0nrq5faEGyvwcqvoX3uya5qT5xzFp/gv3dW5f\ndl19kbVAn6TpwDaymzSn15VZCSwBVkiaC+yMiO2SHmkWK2kB8ElgXkQ8U7evKyVdRHZa3gf8pNWx\njeKkaWZjVdnT84gYkLQEuA7oAS6PiPWSFuffL4+IVZIW5jdtngLObBWb7/rLwHjgBkkAP46IsyNi\nnaRvAuuAAeDsdi/vOGmaWcftavA4UVERsRpYXbdted36kqKx+fa+FvVdCFxYtH1OmmbWcWP1vfIi\nnDTNrOO6+d3z7j0yM6vMWH2vvAgnTTPrOCdNM7MEvqZpZpbA1zTNzBIM5ZGj0c5J08w6zqfnZmYJ\nfHpuZpbAd88r0Z9W/MnXpFexIT2EY0vEAPxHeshzEw5Jjjlq0rbkmFfQctSZhvpLDqjyff44OWb6\nvP7kmJt4U3JMmcE3jiL9530YTyTHAPxuXvrAKr1P1Q8QNDKcNM3MEjhpliDpq8A7gB0R8ep825HA\nN4CXk3Ul3xsRO4erDWZWjWc5sOomDJtCs1GW9DWyiYpqfQq4ISKOAW7M182sy+z3U/iWERE3AY/V\nbX5+QqT8v386XPWbWXW6OWmO9DXNSRGxPf+8HZg0wvWb2Qjwc5rDICJCUosRki+r+fw64A+Hu0lm\n+50f/Qh+dFPn9+vnNDtnu6TJEfGQpKOAHc2LfmTEGmW2v3rzm7Nl0AWf7cx+x+qpdxHDeSOokZXA\nGfnnM4BrR7h+MxsB3XxNc9iSpqSrgFuAV0raLOlM4HPA2yT9CnhLvm5mXebZXeMLLY1IWiBpg6SN\nks5pUubi/Pu7JM1uFyvpPZJ+IWmPpBNrtk+X9LSkO/Ll0nbHNmyn5xFRP+3moPRXQsxsTNkzUC61\nSOoBLiHLE1uBn0paWTOrJJIWAjMjok/S68lugMxtE3s3cCqwnH1tiojZDbY31L1Xa82sMnsGSp96\nzyFLYv0AklYAi4D1NWWef3QxIm6TNEHSZGBGs9iI2JBvK9uu5430NU0z2w/sGegptDQwFdhcs74l\n31akzJQCsY3MyE/N10h6Y7vCo7in+fPE8iUG7HgmPaT0T2xCiZgS7btzT+GzjOft7Elv3NOkDx4B\ncFCJQTF+x0ElYtLbNz11kBjgQaYkx+wq+YrhExyWHLPwkO8mRjyUXEcjA7sb9zTj5h8Rt7R8xqnF\nY4h7GXqXMbMN6I2Ix/JrnddKOj4imo6qMoqTppmNVc/taZJa5r4lWwZ9cZ9nnLYCvTXrvWQ9xlZl\npuVlxhWI3UtE7AJ25Z9vl3Qv0Afc3izGp+dm1nkDPcWWfa0F+vK72uOB08geVay1EvgAgKS5wM78\nTcMisVDTS5U0Mb+BhKSjyRLmfa0OzT1NM+u8Z8qllogYkLQEuA7oAS6PiPWSFuffL4+IVZIWStoE\nPAWc2SoWQNKpwMXAROC7ku6IiLcD84BlknYDzwGL24285qRpZp03UD40IlYDq+u2La9bX1I0Nt9+\nDXBNg+1XA1entM9J08w6bwhJc7Rz0jSzznPSNDNLsLvqBgwfJ00z67w9VTdg+Dhpmlnn+fTczCxB\nmbftxggnTTPrPPc0zcwSdHHSVETR9+NHTjZ30KrEqJnpFU3rS495VXpI6bgyM8KXmd/z0PSQo+f9\nokRFcHCJATvKDFQxocQPr3evAXKKKTOYyCzWJccAvIa7k2NWcFpS+R/oXUTEkAbDkBRcXTCv/JmG\nXN9Ic0/TzDrPjxyZmSXwI0dmZgm6+Jqmk6aZdZ4fOTIzS+CepplZAidNM7METppmZgn8yJGZWYIu\nfuTIE6uZWec9U3BpQNICSRskbZR0TpMyF+ff3yVpdrtYSe+R9AtJe/Kpemv3dW5efoOkk9sdmpOm\nmXXeQMGlTj4z5CXAAmAWcLqk4+rKLARmRkQfcBZwWYHYu4FTgR/V7WsW2ayVs/K4SyW1zItOmmbW\nebsLLvuaA2yKiP6I2A2sABbVlTkFuAIgIm4DJkia3Co2IjZExK8a1LcIuCoidkdEP7Ap309To/ia\nZn9i+ZenV7GlxNXq141Lj4Fyg2+UGIOELSViSrjvoeNHpiKAY9NDHnhxesxdd85NjnnxgkeTY+48\ndHb7Qg18vfE84S294cBbStU1ZOWvaU6FvUZO2QK8vkCZqcCUArH1pgC3NthXU6M4aZrZmFX+kaOi\nw64N58hILdvgpGlmndcsaW5dA9vWtIrcCvTWrPey7/lTfZlpeZlxBWLb1Tct39aUk6aZdV6zK18v\nm58tg9Yuqy+xFuiTNB3YRnaT5vS6MiuBJcAKSXOBnRGxXdIjBWJh717qSuBKSReRnZb3AT9pcWRO\nmmY2DJ4tFxYRA5KWANcBPcDlEbFe0uL8++URsUrSQkmbgKeAM1vFAkg6FbgYmAh8V9IdEfH2iFgn\n6ZvAOrL+8dnRZmR2J00z67whvEYZEauB1XXbltetLykam2+/BrimScyFwIVF2+ekaWad59cozcwS\ndPFrlE6aZtZ5HuXIzCyBk6aZWQJf0zQzS1DykaOxwEnTzDrPp+dVSO3fPzAsrdjH/5s1MvVAuRn9\n3lci5qESMZNLxMDI/WN6uETMk+khz9x6ZHpMmcFbACakh6ze+e6SlQ2RT8/NzBL4kSMzswQ+PTcz\nS+CkaWaWwNc0zcwS+JEjM7MEPj03M0vg03MzswR+5MjMLIFPz83MEjhpmpkl6OJrmi+qugFm1oUG\nCi4NSFogaYOkjZLOaVLm4vz7uyTNbhcr6UhJN0j6laTrJU3It0+X9LSkO/Ll0naH5qRpZqOGpB7g\nEmABMAs4XdJxdWUWAjMjog84C7isQOyngBsi4hjgxnx90KaImJ0vZ7dr4yg+PX86sfwIHcrDG0sG\nTk8POWBcesxX0kNKmTlC9QDcWSKmxIhApX6F7ikRU2I0pdJ1LShZV3XmkCWxfgBJK4BFwPqaMqcA\nVwBExG2SJkiaDMxoEXsKMC+PvwJYw96JszD3NM1sNJkKbK5Z35JvK1JmSovYSRGxPf+8HZhUU25G\nfmq+RtIb2zVw2Lpnkr4KvAPYERGvzrctBf4C+E1e7NyI+N5wtcHMqtLsTtAP86WpKFiBCpbZZ38R\nEZIGt28DeiPiMUknAtdKOj4inmi20+E8p/0a8GXgf9dsC+CiiLhoGOs1s8o1e+bopHwZ9A/1BbYC\nvTXrvWQ9xlZlpuVlxjXYvjX/vF3S5Ih4SNJRwA6AiNgF7Mo/3y7pXqAPuL3ZkQ3b6XlE3AQ81uCr\nIn8hzGxM211w2cdaoC+/qz0eOA1YWVdmJfABAElzgZ35qXer2JXAGfnnM4Br8/iJ+Q0kJB1NljDv\na3VkVdwI+pikD5Ad4Mcjouzg/2Y2aqXeyM1ExICkJcB1QA9weUSsl7Q4/355RKyStFDSJuAp4MxW\nsfmuPwd8U9KHgX7gvfn2NwOflrQbeA5Y3C4nKaLoJYR0kqYD3665pvkyXrie+RngqIj4cIO4gLfW\nbDkaeEWb2k4s0cL668tFlLijDYzY3fORehNjJO+eH1oiZqTunpeZK2k03T3fsga2rnlh/afLiIgh\nnQ1m/343ty8IQO+Q6xtpI9rTjIgdg58lfQX4dvPSbxuBFpnt56bNz5ZBP13WoR1373uUI5o0JR0V\nEQ/mq6cCd49k/WY2Urr3PcrhfOToKrKHSSdK2gycD8yXdALZXfT7gcXDVb+ZVck9zWQRcXqDzV8d\nrvrMbDRxT9PMLEG5u+djgZOmmQ0Dn55XIPUv1c0l6jipfZGO6U8PGSjz1/q49kX2cWR6yKYS1QDl\n/jFNal9kH2UGVukrEfN4iZiy/+wOTg+55Ocl6xoqn56bmSVwT9PMLIF7mmZmCdzTNDNL4J6mmVkC\nP3JkZpbAPU0zswS+pmlmlqB7e5pjcGK1/qobMAp4cKjMmqobMEqsqboBDQxh4vNRzklzTCozGm03\nWlN1A0aJNVU3oIHS012Mej49N7NhMDZ7kUU4aZrZMOjeR46GdY6gsmrmJDazEdaZOYJGrr6RNiqT\nppnZaDUGbwSZmVXHSdPMLMGYSZqSFkjaIGmjpHOqbk9VJPVL+rmkOyT9pOr2jARJX5W0XdLdNduO\nlHSDpF9Jul5SmZnOx5QmP4elkrbkvw93SGo307kN0ZhImpJ6gEuABcAs4HRJZYYo7wYBzI+I2REx\np+rGjJCvkf2/r/Up4IaIOAa4MV/vdo1+DgFclP8+zI6I71XQrv3KmEiawBxgU0T0R8RuYAWwqOI2\nVWlM3W0cqoi4CXisbvMpwBX55yuAPx3RRlWgyc8B9rPfh6qNlaQ5Fdhcs74l37Y/CuD7ktZK+suq\nG1OhSRGxPf+8nXITCXWLj0m6S9Ll+8NliqqNlaTp56JecFJEzAbeDnxU0puqblDVIntubn/9HbkM\nmAGcADxNbWCNAAABqElEQVQIfLHa5nS/sZI0twK9Neu9ZL3N/U5EPJj/9zfANWSXLvZH2yVNBpB0\nFLCj4vZUIiJ2RA74Cvvv78OIGStJcy3QJ2m6pPHAacDKits04iQdLOmw/PMhwMnsv0MerQTOyD+f\nAVxbYVsqk//BGHQq++/vw4gZE++eR8SApCXAdUAPcHlErK+4WVWYBFwjCbL/d/8eEddX26ThJ+kq\nYB4wUdJm4O+BzwHflPRhsqGv3ltdC0dGg5/D+cB8SSeQXZ64H1hcYRP3C36N0swswVg5PTczGxWc\nNM3MEjhpmpklcNI0M0vgpGlmlsBJ08wsgZOmmVkCJ00zswROmtYRkv4wH2nnQEmHSLpH0qyq22XW\naX4jyDpG0meAFwMHAZsj4h8rbpJZxzlpWsdIGkc2uMrTwB+Ff7msC/n03DppInAIcChZb9Os67in\naR0jaSVwJXA0cFREfKziJpl13JgYGs5GP0kfAJ6NiBWSXgTcIml+RKypuGlmHeWepplZAl/TNDNL\n4KRpZpbASdPMLIGTpplZAidNM7METppmZgmcNM3MEjhpmpkl+P+7zFuTqPArBgAAAABJRU5ErkJg\ngg==\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -1158,7 +1158,7 @@ "source": [ "# Extract thermal nu-fission rates from pandas\n", "fiss = df[df['score'] == 'nu-fission']\n", - "fiss = fiss[fiss['energy low [MeV]'] == 0.0]\n", + "fiss = fiss[fiss['energy low [MeV]'] == '0.00e+00']\n", "\n", "# Extract mean and reshape as 2D NumPy arrays\n", "mean = fiss['mean'].reshape((17,17))\n", @@ -2359,7 +2359,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 38, @@ -2370,7 +2370,7 @@ "data": { "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -2397,7 +2397,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 39, @@ -2408,7 +2408,7 @@ "data": { "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, diff --git a/docs/source/pythonapi/examples/tally-arithmetic.ipynb b/docs/source/pythonapi/examples/tally-arithmetic.ipynb index 91514719db..5c77dcf9cd 100644 --- a/docs/source/pythonapi/examples/tally-arithmetic.ipynb +++ b/docs/source/pythonapi/examples/tally-arithmetic.ipynb @@ -366,7 +366,7 @@ "outputs": [ { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBhQ1GVhO3EQAAALKSURBVGje7dpLcqQwDAbgHHE2\nYeEj+D4cwQucBUfo+3CEXoSp8OhuhF70T4qpKXmdr21LogK2Pj7A8QmNP+HDhw8fPnz48Kf6VH9G\n+66vy+je8k19jnf8C5dXIPv86ms56lPdjvaYbyodx3ze+XLE76cXFiD4zPji99z0/AJ4n1lfvJ6f\nnl0A6x+578efMSg1wPr172/jPO5yFXM+Ef78gdblM+WPHyguP//t1/g6pA0wfln+ho/fwgYYn19C\n/xwDvwHGc9OvC+hs37DTrwuwfWanXxdQTC9Mvyygs3wjTL8uwPJpn/tNDbSGz7T0SBEWw4vLXzbQ\n6b6RoveIoO6TvPxlA63qs7z8ZQPF9F+SH22vbX8OQKf5Rtv+EgDNJ3X58wZaxWd1+fMGiuFvir8b\nvjp8J/tGy/6jAmRvhW8fwL3vVT+o3grfPoB7r/IpALI3tz8FoJN84/NV873hB8UnM3xzANtf8nb4\ndwmg3grfFEDJO8JPE0i9Ff4pAYL3pI8mkHor/HMCeO9JH00g9SafEsh7T/ppARBvp48UwJnelT5S\nACd7O31TAlnvKx9SQCd7B58KgPO+8iMFuPWe9E8F8BveWX7bAjzX9y4//Jve+fhsH6Ctv7n8PTzj\nvY/v9gEOHz58+PBX+6v/f/wPvnd54f3j6venE/yl769Xv7+j3x/o98/V32/o9+fl389Xnx+g5x/o\n+Qt6/oOeP6HnX+j5G3z+h54/ouefV5/foufP6Pk3ev4On/+j9w/o/Qd6/4Le/6D3T/D9V67Y/ZsV\nQBq+s+8f0ftP+P41axXguP9NWgDuu/Cdfv+N3r/D9/9TAID+A7T/Ae2/gPs/0P4TtP8F7r9J3AIO\n9P+g/Udw/9Oygbf7r9D+L7j/DO1/Q/vv4P4/tP8Q7n9E+y/h/k+0/xTuf4X7b+H+X7T/+BPuf3aM\n8OHDhw8fPnz4w/4vzcvgeY10sY0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDItMDZUMTU6NTM6\nMjQtMDU6MDBiAB8/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAyLTA2VDE1OjUzOjI0LTA1OjAw\nE12ngwAAAABJRU5ErkJggg==\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBxMQBoBGcLYAAALKSURBVGje7dpLcqQwDAbgHHE2\nYeEj+D4cwQucBUfo+3CEXoSp8OhuhF70T4qpKXmdr21LogK2Pj7A8QmNP+HDhw8fPnz48Kf6VH9G\n+66vy+je8k19jnf8C5dXIPv86ms56lPdjvaYbyodx3ze+XLE76cXFiD4zPji99z0/AJ4n1lfvJ6f\nnl0A6x+578efMSg1wPr172/jPO5yFXM+Ef78gdblM+WPHyguP//t1/g6pA0wfln+ho/fwgYYn19C\n/xwDvwHGc9OvC+hs37DTrwuwfWanXxdQTC9Mvyygs3wjTL8uwPJpn/tNDbSGz7T0SBEWw4vLXzbQ\n6b6RoveIoO6TvPxlA63qs7z8ZQPF9F+SH22vbX8OQKf5Rtv+EgDNJ3X58wZaxWd1+fMGiuFvir8b\nvjp8J/tGy/6jAmRvhW8fwL3vVT+o3grfPoB7r/IpALI3tz8FoJN84/NV873hB8UnM3xzANtf8nb4\ndwmg3grfFEDJO8JPE0i9Ff4pAYL3pI8mkHor/HMCeO9JH00g9SafEsh7T/ppARBvp48UwJnelT5S\nACd7O31TAlnvKx9SQCd7B58KgPO+8iMFuPWe9E8F8BveWX7bAjzX9y4//Jve+fhsH6Ctv7n8PTzj\nvY/v9gEOHz58+PBX+6v/f/wPvnd54f3j6venE/yl769Xv7+j3x/o98/V32/o9+fl389Xnx+g5x/o\n+Qt6/oOeP6HnX+j5G3z+h54/ouefV5/foufP6Pk3ev4On/+j9w/o/Qd6/4Le/6D3T/D9V67Y/ZsV\nQBq+s+8f0ftP+P41axXguP9NWgDuu/Cdfv+N3r/D9/9TAID+A7T/Ae2/gPs/0P4TtP8F7r9J3AIO\n9P+g/Udw/9Oygbf7r9D+L7j/DO1/Q/vv4P4/tP8Q7n9E+y/h/k+0/xTuf4X7b+H+X7T/+BPuf3aM\n8OHDhw8fPnz4w/4vzcvgeY10sY0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDItMDdUMTQ6MTY6\nMDYtMDU6MDCStPm5AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAyLTA3VDE0OjE2OjA2LTA1OjAw\n4+lBBQAAAABJRU5ErkJggg==\n", "text/plain": [ "" ] @@ -577,7 +577,7 @@ " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", - " Date/Time: 2016-02-06 15:53:27\n", + " Date/Time: 2016-02-07 14:16:08\n", " MPI Processes: 1\n", "\n", " ===========================================================================\n", @@ -634,20 +634,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 3.8900E-01 seconds\n", - " Reading cross sections = 8.8000E-02 seconds\n", - " Total time in simulation = 8.0560E+00 seconds\n", - " Time in transport only = 8.0400E+00 seconds\n", - " Time in inactive batches = 1.1570E+00 seconds\n", - " Time in active batches = 6.8990E+00 seconds\n", - " Time synchronizing fission bank = 3.0000E-03 seconds\n", - " Sampling source sites = 3.0000E-03 seconds\n", - " SEND/RECV source sites = 0.0000E+00 seconds\n", + " Total time for initialization = 4.0900E-01 seconds\n", + " Reading cross sections = 1.0100E-01 seconds\n", + " Total time in simulation = 7.8100E+00 seconds\n", + " Time in transport only = 7.7980E+00 seconds\n", + " Time in inactive batches = 1.3850E+00 seconds\n", + " Time in active batches = 6.4250E+00 seconds\n", + " Time synchronizing fission bank = 1.0000E-03 seconds\n", + " Sampling source sites = 0.0000E+00 seconds\n", + " SEND/RECV source sites = 1.0000E-03 seconds\n", " Time accumulating tallies = 0.0000E+00 seconds\n", - " Total time for finalization = 2.0000E-03 seconds\n", - " Total time elapsed = 8.4560E+00 seconds\n", - " Calculation Rate (inactive) = 10803.8 neutrons/second\n", - " Calculation Rate (active) = 5435.57 neutrons/second\n", + " Total time for finalization = 1.0000E-03 seconds\n", + " Total time elapsed = 8.2360E+00 seconds\n", + " Calculation Rate (inactive) = 9025.27 neutrons/second\n", + " Calculation Rate (active) = 5836.58 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -821,8 +821,8 @@ " \n", " \n", " 0\n", - " 0\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " total\n", " absorption\n", " 0.694707\n", @@ -833,11 +833,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] nuclide score mean \\\n", - "0 0 0.000001 total absorption 0.694707 \n", - "\n", - " std. dev. \n", - "0 0.006699 " + " energy low [MeV] energy high [MeV] nuclide score mean std. dev.\n", + "0 0.00e+00 6.25e-07 total absorption 0.694707 0.006699" ] }, "execution_count": 27, @@ -886,8 +883,8 @@ " \n", " \n", " 0\n", - " 0\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " total\n", " nu-fission\n", " 1.201216\n", @@ -898,11 +895,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] nuclide score mean \\\n", - "0 0 0.000001 total nu-fission 1.201216 \n", - "\n", - " std. dev. \n", - "0 0.012288 " + " energy low [MeV] energy high [MeV] nuclide score mean std. dev.\n", + "0 0.00e+00 6.25e-07 total nu-fission 1.201216 0.012288" ] }, "execution_count": 28, @@ -953,8 +947,8 @@ " \n", " \n", " 0\n", - " 0\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " 10000\n", " total\n", " absorption\n", @@ -966,8 +960,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] cell nuclide score mean \\\n", - "0 0 0.000001 10000 total absorption 0.74925 \n", + " energy low [MeV] energy high [MeV] cell nuclide score mean \\\n", + "0 0.00e+00 6.25e-07 10000 total absorption 0.74925 \n", "\n", " std. dev. \n", "0 0.008257 " @@ -1019,8 +1013,8 @@ " \n", " \n", " 0\n", - " 0\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " 10000\n", " total\n", " (nu-fission / absorption)\n", @@ -1032,8 +1026,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] cell nuclide \\\n", - "0 0 0.000001 10000 total \n", + " energy low [MeV] energy high [MeV] cell nuclide \\\n", + "0 0.00e+00 6.25e-07 10000 total \n", "\n", " score mean std. dev. \n", "0 (nu-fission / absorption) 1.663616 0.018624 " @@ -1084,8 +1078,8 @@ " \n", " \n", " 0\n", - " 0\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " 10000\n", " total\n", " (((absorption * nu-fission) * absorption) * (n...\n", @@ -1097,8 +1091,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] cell nuclide \\\n", - "0 0 0.000001 10000 total \n", + " energy low [MeV] energy high [MeV] cell nuclide \\\n", + "0 0.00e+00 6.25e-07 10000 total \n", "\n", " score mean std. dev. \n", "0 (((absorption * nu-fission) * absorption) * (n... 1.040166 0.021928 " @@ -1167,8 +1161,8 @@ " \n", " 0\n", " 10000\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " (U-238 / total)\n", " (nu-fission / flux)\n", " 0.000001\n", @@ -1177,8 +1171,8 @@ " \n", " 1\n", " 10000\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " (U-238 / total)\n", " (scatter / flux)\n", " 0.209989\n", @@ -1187,8 +1181,8 @@ " \n", " 2\n", " 10000\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " (U-235 / total)\n", " (nu-fission / flux)\n", " 0.356420\n", @@ -1197,8 +1191,8 @@ " \n", " 3\n", " 10000\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " (U-235 / total)\n", " (scatter / flux)\n", " 0.005555\n", @@ -1207,8 +1201,8 @@ " \n", " 4\n", " 10000\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " (U-238 / total)\n", " (nu-fission / flux)\n", " 0.007155\n", @@ -1217,8 +1211,8 @@ " \n", " 5\n", " 10000\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " (U-238 / total)\n", " (scatter / flux)\n", " 0.227770\n", @@ -1227,8 +1221,8 @@ " \n", " 6\n", " 10000\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " (U-235 / total)\n", " (nu-fission / flux)\n", " 0.008067\n", @@ -1237,8 +1231,8 @@ " \n", " 7\n", " 10000\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " (U-235 / total)\n", " (scatter / flux)\n", " 0.003367\n", @@ -1249,15 +1243,15 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 10000 0.000000 0.000001 (U-238 / total) \n", - "1 10000 0.000000 0.000001 (U-238 / total) \n", - "2 10000 0.000000 0.000001 (U-235 / total) \n", - "3 10000 0.000000 0.000001 (U-235 / total) \n", - "4 10000 0.000001 20.000000 (U-238 / total) \n", - "5 10000 0.000001 20.000000 (U-238 / total) \n", - "6 10000 0.000001 20.000000 (U-235 / total) \n", - "7 10000 0.000001 20.000000 (U-235 / total) \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 10000 0.00e+00 6.25e-07 (U-238 / total) \n", + "1 10000 0.00e+00 6.25e-07 (U-238 / total) \n", + "2 10000 0.00e+00 6.25e-07 (U-235 / total) \n", + "3 10000 0.00e+00 6.25e-07 (U-235 / total) \n", + "4 10000 6.25e-07 2.00e+01 (U-238 / total) \n", + "5 10000 6.25e-07 2.00e+01 (U-238 / total) \n", + "6 10000 6.25e-07 2.00e+01 (U-235 / total) \n", + "7 10000 6.25e-07 2.00e+01 (U-235 / total) \n", "\n", " score mean std. dev. \n", "0 (nu-fission / flux) 0.000001 7.377419e-09 \n", @@ -1402,8 +1396,8 @@ " \n", " 0\n", " 10000\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " U-238\n", " nu-fission\n", " 0.000002\n", @@ -1412,8 +1406,8 @@ " \n", " 1\n", " 10000\n", - " 0.000000\n", - " 0.000001\n", + " 0.00e+00\n", + " 6.25e-07\n", " U-235\n", " nu-fission\n", " 0.868553\n", @@ -1422,8 +1416,8 @@ " \n", " 2\n", " 10000\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " U-238\n", " nu-fission\n", " 0.082149\n", @@ -1432,8 +1426,8 @@ " \n", " 3\n", " 10000\n", - " 0.000001\n", - " 20.000000\n", + " 6.25e-07\n", + " 2.00e+01\n", " U-235\n", " nu-fission\n", " 0.092618\n", @@ -1444,11 +1438,11 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", - "0 10000 0.000000 0.000001 U-238 nu-fission 0.000002 \n", - "1 10000 0.000000 0.000001 U-235 nu-fission 0.868553 \n", - "2 10000 0.000001 20.000000 U-238 nu-fission 0.082149 \n", - "3 10000 0.000001 20.000000 U-235 nu-fission 0.092618 \n", + " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 10000 0.00e+00 6.25e-07 U-238 nu-fission 0.000002 \n", + "1 10000 0.00e+00 6.25e-07 U-235 nu-fission 0.868553 \n", + "2 10000 6.25e-07 2.00e+01 U-238 nu-fission 0.082149 \n", + "3 10000 6.25e-07 2.00e+01 U-235 nu-fission 0.092618 \n", "\n", " std. dev. \n", "0 1.283958e-08 \n", @@ -1496,8 +1490,8 @@ " \n", " 0\n", " 10002\n", - " 1.000000e-08\n", - " 0.000000\n", + " 1.00e-08\n", + " 1.08e-07\n", " H-1\n", " scatter\n", " 4.619398\n", @@ -1506,8 +1500,8 @@ " \n", " 1\n", " 10002\n", - " 1.080060e-07\n", - " 0.000001\n", + " 1.08e-07\n", + " 1.17e-06\n", " H-1\n", " scatter\n", " 2.030757\n", @@ -1516,8 +1510,8 @@ " \n", " 2\n", " 10002\n", - " 1.166529e-06\n", - " 0.000013\n", + " 1.17e-06\n", + " 1.26e-05\n", " H-1\n", " scatter\n", " 1.658488\n", @@ -1526,8 +1520,8 @@ " \n", " 3\n", " 10002\n", - " 1.259921e-05\n", - " 0.000136\n", + " 1.26e-05\n", + " 1.36e-04\n", " H-1\n", " scatter\n", " 1.853002\n", @@ -1536,8 +1530,8 @@ " \n", " 4\n", " 10002\n", - " 1.360790e-04\n", - " 0.001470\n", + " 1.36e-04\n", + " 1.47e-03\n", " H-1\n", " scatter\n", " 2.050773\n", @@ -1546,8 +1540,8 @@ " \n", " 5\n", " 10002\n", - " 1.469734e-03\n", - " 0.015874\n", + " 1.47e-03\n", + " 1.59e-02\n", " H-1\n", " scatter\n", " 2.131759\n", @@ -1556,8 +1550,8 @@ " \n", " 6\n", " 10002\n", - " 1.587401e-02\n", - " 0.171449\n", + " 1.59e-02\n", + " 1.71e-01\n", " H-1\n", " scatter\n", " 2.213710\n", @@ -1566,8 +1560,8 @@ " \n", " 7\n", " 10002\n", - " 1.714488e-01\n", - " 1.851749\n", + " 1.71e-01\n", + " 1.85e+00\n", " H-1\n", " scatter\n", " 2.011925\n", @@ -1576,8 +1570,8 @@ " \n", " 8\n", " 10002\n", - " 1.851749e+00\n", - " 20.000000\n", + " 1.85e+00\n", + " 2.00e+01\n", " H-1\n", " scatter\n", " 0.371280\n", @@ -1588,16 +1582,16 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", - "0 10002 1.000000e-08 0.000000 H-1 scatter 4.619398 \n", - "1 10002 1.080060e-07 0.000001 H-1 scatter 2.030757 \n", - "2 10002 1.166529e-06 0.000013 H-1 scatter 1.658488 \n", - "3 10002 1.259921e-05 0.000136 H-1 scatter 1.853002 \n", - "4 10002 1.360790e-04 0.001470 H-1 scatter 2.050773 \n", - "5 10002 1.469734e-03 0.015874 H-1 scatter 2.131759 \n", - "6 10002 1.587401e-02 0.171449 H-1 scatter 2.213710 \n", - "7 10002 1.714488e-01 1.851749 H-1 scatter 2.011925 \n", - "8 10002 1.851749e+00 20.000000 H-1 scatter 0.371280 \n", + " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 10002 1.00e-08 1.08e-07 H-1 scatter 4.619398 \n", + "1 10002 1.08e-07 1.17e-06 H-1 scatter 2.030757 \n", + "2 10002 1.17e-06 1.26e-05 H-1 scatter 1.658488 \n", + "3 10002 1.26e-05 1.36e-04 H-1 scatter 1.853002 \n", + "4 10002 1.36e-04 1.47e-03 H-1 scatter 2.050773 \n", + "5 10002 1.47e-03 1.59e-02 H-1 scatter 2.131759 \n", + "6 10002 1.59e-02 1.71e-01 H-1 scatter 2.213710 \n", + "7 10002 1.71e-01 1.85e+00 H-1 scatter 2.011925 \n", + "8 10002 1.85e+00 2.00e+01 H-1 scatter 0.371280 \n", "\n", " std. dev. \n", "0 0.040124 \n", diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index 8574c4873e..f6094533a7 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -430,7 +430,7 @@ class CrossFilter(object): filter_index = left_index * self.right_filter.num_bins + right_index return filter_index - def get_pandas_dataframe(self, datasize, summary=None): + def get_pandas_dataframe(self, datasize, summary=None, **kwargs): """Builds a Pandas DataFrame for the CrossFilter's bins. This method constructs a Pandas DataFrame object for the CrossFilter @@ -454,6 +454,14 @@ class CrossFilter(object): column with a geometric "path" to each distribcell instance. NOTE: This option requires the OpenCG Python package. + Keyword arguments + ----------------- + energy_fmt : None or string + If a format string is provided, energy and energyout filter bins + will be converted from floats to strings using the given format. If + None is provided, the values will be left as floats. The default is + '{:.2e}'. + Returns ------- pandas.DataFrame @@ -472,12 +480,15 @@ class CrossFilter(object): # If left and right filters are identical, do not combine bins if self.left_filter == self.right_filter: - df = self.left_filter.get_pandas_dataframe(datasize, summary) + df = self.left_filter.get_pandas_dataframe(datasize, summary, + **kwargs) # If left and right filters are different, combine their bins else: - left_df = self.left_filter.get_pandas_dataframe(datasize, summary) - right_df = self.right_filter.get_pandas_dataframe(datasize, summary) + left_df = self.left_filter.get_pandas_dataframe(datasize, summary, + **kwargs) + right_df = self.right_filter.get_pandas_dataframe(datasize, summary, + **kwargs) left_df = left_df.astype(str) right_df = right_df.astype(str) df = '(' + left_df + ' ' + self.binary_op + ' ' + right_df + ')' @@ -831,7 +842,7 @@ class AggregateFilter(object): else: return 0 - def get_pandas_dataframe(self, datasize, summary=None): + def get_pandas_dataframe(self, datasize, summary=None, **kwargs): """Builds a Pandas DataFrame for the AggregateFilter's bins. This method constructs a Pandas DataFrame object for the AggregateFilter diff --git a/openmc/filter.py b/openmc/filter.py index a27e17cd96..d6f604108c 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -462,7 +462,7 @@ class Filter(object): return filter_bin - def get_pandas_dataframe(self, data_size, summary=None): + def get_pandas_dataframe(self, data_size, summary=None, **kwargs): """Builds a Pandas DataFrame for the Filter's bins. This method constructs a Pandas DataFrame object for the filter with @@ -484,6 +484,14 @@ class Filter(object): column with a geometric "path" to each distribcell instance. NOTE: This option requires the OpenCG Python package. + Keyword arguments + ----------------- + energy_fmt : None or string + If a format string is provided, energy and energyout filter bins + will be converted from floats to strings using the given format. If + None is provided, the values will be left as floats. The default is + '{:.2e}'. + Returns ------- pandas.DataFrame @@ -727,6 +735,12 @@ class Filter(object): lo_bins = np.tile(lo_bins, tile_factor) hi_bins = np.tile(hi_bins, tile_factor) + # Format the energy values, if necessary. + energy_fmt = kwargs.setdefault('energy_fmt', '{:.2e}') + if energy_fmt is not None: + lo_bins = [energy_fmt.format(E) for E in lo_bins] + hi_bins = [energy_fmt.format(E) for E in hi_bins] + # Add the new energy columns to the DataFrame. df.loc[:, self.type + ' low [MeV]'] = lo_bins df.loc[:, self.type + ' high [MeV]'] = hi_bins diff --git a/openmc/tallies.py b/openmc/tallies.py index 3294a1d062..f98be83a2a 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -1244,7 +1244,7 @@ class Tally(object): return data def get_pandas_dataframe(self, filters=True, nuclides=True, - scores=True, summary=None): + scores=True, summary=None, **kwargs): """Build a Pandas DataFrame for the Tally data. This method constructs a Pandas DataFrame object for the Tally data @@ -1269,6 +1269,14 @@ class Tally(object): column with a geometric "path" to each distribcell intance. NOTE: This option requires the OpenCG Python package. + Keyword arguments + ----------------- + energy_fmt : None or string + If a format string is provided, energy and energyout filter bins + will be converted from floats to strings using the given format. If + None is provided, the values will be left as floats. The default is + '{:.2e}'. + Returns ------- pandas.DataFrame @@ -1316,7 +1324,8 @@ class Tally(object): # Append each Filter's DataFrame to the overall DataFrame for self_filter in self.filters: - filter_df = self_filter.get_pandas_dataframe(data_size, summary) + filter_df = self_filter.get_pandas_dataframe(data_size, summary, + **kwargs) df = pd.concat([df, filter_df], axis=1) # Include DataFrame column for nuclides if user requested it From 912aa360caac20a563263bf2624482e29172d54d Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sun, 7 Feb 2016 15:00:18 -0500 Subject: [PATCH 097/149] Implement azim. and polar filters in Pandas output --- openmc/filter.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/openmc/filter.py b/openmc/filter.py index 54814a6b6f..0535a80d7d 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -735,6 +735,19 @@ class Filter(object): filter_bins = filter_bins df = pd.concat([df, pd.DataFrame({self.type + ' [MeV]' : filter_bins})]) + elif self.type in ('azimuthal', 'polar'): + # Extract the lower and upper angle bounds, then repeat and tile + # them as necessary to account for other filters. + lo_bins = np.repeat(self.bins[:-1], self.stride) + hi_bins = np.repeat(self.bins[1:], self.stride) + tile_factor = data_size / len(lo_bins) + lo_bins = np.tile(lo_bins, tile_factor) + hi_bins = np.tile(hi_bins, tile_factor) + + # Add the new angle columns to the DataFrame. + df.loc[:, self.type + ' low'] = lo_bins + df.loc[:, self.type + ' high'] = hi_bins + # universe, material, surface, cell, and cellborn filters else: filter_bins = np.repeat(self.bins, self.stride) From 5dfc9e91fcac03766e86b6a145989dd8b67c32f0 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sun, 7 Feb 2016 16:06:33 -0500 Subject: [PATCH 098/149] Improve Pandas float handling --- .../pythonapi/examples/mgxs-part-i.ipynb | 115 ++- .../examples/pandas-dataframes.ipynb | 703 +++++++++--------- .../pythonapi/examples/tally-arithmetic.ipynb | 262 +++---- openmc/arithmetic.py | 21 +- openmc/filter.py | 16 +- openmc/tallies.py | 21 +- 6 files changed, 549 insertions(+), 589 deletions(-) diff --git a/docs/source/pythonapi/examples/mgxs-part-i.ipynb b/docs/source/pythonapi/examples/mgxs-part-i.ipynb index 211829be64..104fbe759b 100644 --- a/docs/source/pythonapi/examples/mgxs-part-i.ipynb +++ b/docs/source/pythonapi/examples/mgxs-part-i.ipynb @@ -519,7 +519,7 @@ " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", - " Date/Time: 2016-02-07 14:10:52\n", + " Date/Time: 2016-02-07 15:58:16\n", " MPI Processes: 1\n", "\n", " ===========================================================================\n", @@ -605,20 +605,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 8.7800E-01 seconds\n", - " Reading cross sections = 1.9200E-01 seconds\n", - " Total time in simulation = 1.3677E+01 seconds\n", - " Time in transport only = 1.3579E+01 seconds\n", - " Time in inactive batches = 1.7900E+00 seconds\n", - " Time in active batches = 1.1887E+01 seconds\n", - " Time synchronizing fission bank = 6.0000E-03 seconds\n", - " Sampling source sites = 2.0000E-03 seconds\n", + " Total time for initialization = 3.2100E-01 seconds\n", + " Reading cross sections = 7.4000E-02 seconds\n", + " Total time in simulation = 8.3830E+00 seconds\n", + " Time in transport only = 8.3670E+00 seconds\n", + " Time in inactive batches = 1.0330E+00 seconds\n", + " Time in active batches = 7.3500E+00 seconds\n", + " Time synchronizing fission bank = 4.0000E-03 seconds\n", + " Sampling source sites = 1.0000E-03 seconds\n", " SEND/RECV source sites = 3.0000E-03 seconds\n", - " Time accumulating tallies = 1.0000E-03 seconds\n", + " Time accumulating tallies = 0.0000E+00 seconds\n", " Total time for finalization = 1.0000E-03 seconds\n", - " Total time elapsed = 1.4578E+01 seconds\n", - " Calculation Rate (inactive) = 13966.5 neutrons/second\n", - " Calculation Rate (active) = 8412.55 neutrons/second\n", + " Total time elapsed = 8.7140E+00 seconds\n", + " Calculation Rate (inactive) = 24201.4 neutrons/second\n", + " Calculation Rate (active) = 13605.4 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -909,8 +909,8 @@ " \n", " 0\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " total\n", " (((total / flux) - (absorption / flux)) - (sca...\n", " 4.884981e-15\n", @@ -919,8 +919,8 @@ " \n", " 1\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " total\n", " (((total / flux) - (absorption / flux)) - (sca...\n", " 1.221245e-15\n", @@ -931,13 +931,13 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.00e+00 6.25e-07 total \n", - "1 1 6.25e-07 2.00e+01 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", - " score mean std. dev. \n", - "0 (((total / flux) - (absorption / flux)) - (sca... 4.884981e-15 0.011274 \n", - "1 (((total / flux) - (absorption / flux)) - (sca... 1.221245e-15 0.001802 " + " score mean std. dev. \n", + "0 (((total / flux) - (absorption / flux)) - (sca... 4.88e-15 1.13e-02 \n", + "1 (((total / flux) - (absorption / flux)) - (sca... 1.22e-15 1.80e-03 " ] }, "execution_count": 23, @@ -988,8 +988,8 @@ " \n", " 0\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " total\n", " ((absorption / flux) / (total / flux))\n", " 0.076219\n", @@ -998,8 +998,8 @@ " \n", " 1\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " total\n", " ((absorption / flux) / (total / flux))\n", " 0.019319\n", @@ -1010,13 +1010,13 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.00e+00 6.25e-07 total \n", - "1 1 6.25e-07 2.00e+01 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", - " score mean std. dev. \n", - "0 ((absorption / flux) / (total / flux)) 0.076219 0.000651 \n", - "1 ((absorption / flux) / (total / flux)) 0.019319 0.000086 " + " score mean std. dev. \n", + "0 ((absorption / flux) / (total / flux)) 7.62e-02 6.51e-04 \n", + "1 ((absorption / flux) / (total / flux)) 1.93e-02 8.65e-05 " ] }, "execution_count": 24, @@ -1060,8 +1060,8 @@ " \n", " 0\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " total\n", " ((scatter / flux) / (total / flux))\n", " 0.923781\n", @@ -1070,8 +1070,8 @@ " \n", " 1\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " total\n", " ((scatter / flux) / (total / flux))\n", " 0.980681\n", @@ -1082,13 +1082,13 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.00e+00 6.25e-07 total \n", - "1 1 6.25e-07 2.00e+01 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", - " score mean std. dev. \n", - "0 ((scatter / flux) / (total / flux)) 0.923781 0.007714 \n", - "1 ((scatter / flux) / (total / flux)) 0.980681 0.002617 " + " score mean std. dev. \n", + "0 ((scatter / flux) / (total / flux)) 9.24e-01 7.71e-03 \n", + "1 ((scatter / flux) / (total / flux)) 9.81e-01 2.62e-03 " ] }, "execution_count": 25, @@ -1139,8 +1139,8 @@ " \n", " 0\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " total\n", " (((absorption / flux) / (total / flux)) + ((sc...\n", " 1\n", @@ -1149,8 +1149,8 @@ " \n", " 1\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " total\n", " (((absorption / flux) / (total / flux)) + ((sc...\n", " 1\n", @@ -1161,13 +1161,13 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 1 0.00e+00 6.25e-07 total \n", - "1 1 6.25e-07 2.00e+01 total \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 1 0.00e+00 6.25e-07 total \n", + "1 1 6.25e-07 2.00e+01 total \n", "\n", - " score mean std. dev. \n", - "0 (((absorption / flux) / (total / flux)) + ((sc... 1 0.007741 \n", - "1 (((absorption / flux) / (total / flux)) + ((sc... 1 0.002619 " + " score mean std. dev. \n", + "0 (((absorption / flux) / (total / flux)) + ((sc... 1.00e+00 7.74e-03 \n", + "1 (((absorption / flux) / (total / flux)) + ((sc... 1.00e+00 2.62e-03 " ] }, "execution_count": 26, @@ -1182,15 +1182,6 @@ "# The scattering-to-total ratio is a derived tally which can generate Pandas DataFrames for inspection\n", "sum_ratio.get_pandas_dataframe()" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/docs/source/pythonapi/examples/pandas-dataframes.ipynb b/docs/source/pythonapi/examples/pandas-dataframes.ipynb index 45868ab769..9e08acccda 100644 --- a/docs/source/pythonapi/examples/pandas-dataframes.ipynb +++ b/docs/source/pythonapi/examples/pandas-dataframes.ipynb @@ -382,7 +382,7 @@ "outputs": [ { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBxMOKxHYExwAAAPZSURBVGje7Zs7buMwEIZ9iey5\n0gyNjQpXKTYudIScgkdQYTfut1idwkdQkQNsYQO2Qj0sPiVK+mlQDmwgwIcgg8Cc4fCTSK5W4OeF\nkM8rHv+2I/rgxPZEPZgR7XtQxKdXYuUXJSUnBQ/9WCgo4vOSJ+WFUvF7E08mlia+rn7VcKXP8sRs\nzFX8b2MdX2y6v1Tw6MZUw4H4ojfIjD8mvn/qRL5p4+vvlMqvp2EhR8WBzfiz20hXORmP9fi/bM9E\neUFvV5H/0yRkeSbiGRfFJErxD9ENdz7Mbhig/h89fvtFdMiI/ePUIXV4lXju8K3DKv9NThOZ3q2K\nmUy6grxFES8rjeyic+FFQav+ncg3fXjH+Ts+/iibztFqOiZuZP/Z3OafPX40NGgST2r+uvQkXXp6\ncKvmr+r0e1Eef5um3+JHP3IFF1D/seNZJgaDmvY0Gav1s+2f1fqpIcublfKGt6apotG/NVx3SInW\ntLX+7Vg/Pv1YqOsnun6JSVdOXT/X7vk75f938QP+8OmSBs0fXtymMhJbf8qlPynYmpKCh7OB1fzN\nalOj1sl0ZAruHLiA+RM73pDe/VjMVP89+aTXwjyc/x5n+u991895/utrJTy8/06TXh0r/5JOa2Jm\nYmqi4r/vUm/H4wLmT+z4anhr05X+q6KUXhtzr/9qSff5L5uMT//V/NdU4YuBTPa/8P67l/6r44ds\n+hYuoP5jx9ciy6XTWlibBrmx8V/TdMfjkP+6pOsu/lvM9N90sf7r+f6m/65n+S8p/itN15v0UkW3\n/+48+PRfJX6S9Joo4g+G/1qYG9KroqP/WypcuvyXPf13wH89/hHef7MB6R3Cqn55U4rv4kfH3zaS\ngQuYP7HjVf89tXrbO+hfLdr+Ozv/SP1dgtQ/Ov8C+i/3+q/Zf2D/HWi6bjT6rym9I/v/03/b+LHS\n4cTg/utTsV7/net/Afzz4f0XGX84/2j9xZ4/sePR/of2X7D/o+vPo/sv6h9B/Bfxr9j1Hz2eN/hO\n8/wfff4A848+f/1A/530/I0+/8PvH9D3H9HnT+R49P0b+v4PfP/4E/wXfP8Mvf9G37/D/ovuP8Se\nP7Hj0f0vdP8tqP9O339cyv7p3P1fdP8Z3v9G999j13/seMax8x/o+ZN7+O+E8zdP/8XOf8Hnz9Dz\nb7HnT+x49PxlCp7/BM+fOv13wvnXBfivt2lMvD8TyH/Hnb+Gz3+j589jz5/Y8ej9h4D+W7qQmf57\nefqv239n3T+C7z+h969i13/seMax+3/o/cMcu/8Y2H9n3p+J6r98pv8m4fwXuH+M3n+OO3++AX9c\nlR+4PhbRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTAyLTA3VDE0OjE0OjQzLTA1OjAwQDMI2QAA\nACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMi0wN1QxNDoxNDo0My0wNTowMDFusGUAAAAASUVORK5C\nYII=\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBxUBN4bMLy4AAAPZSURBVGje7Zs7buMwEIZ9iey5\n0gyNjQpXKTYudIScgkdQYTfut1idwkdQkQNsYQO2Qj0sPiVK+mlQDmwgwIcgg8Cc4fCTSK5W4OeF\nkM8rHv+2I/rgxPZEPZgR7XtQxKdXYuUXJSUnBQ/9WCgo4vOSJ+WFUvF7E08mlia+rn7VcKXP8sRs\nzFX8b2MdX2y6v1Tw6MZUw4H4ojfIjD8mvn/qRL5p4+vvlMqvp2EhR8WBzfiz20hXORmP9fi/bM9E\neUFvV5H/0yRkeSbiGRfFJErxD9ENdz7Mbhig/h89fvtFdMiI/ePUIXV4lXju8K3DKv9NThOZ3q2K\nmUy6grxFES8rjeyic+FFQav+ncg3fXjH+Ts+/iibztFqOiZuZP/Z3OafPX40NGgST2r+uvQkXXp6\ncKvmr+r0e1Eef5um3+JHP3IFF1D/seNZJgaDmvY0Gav1s+2f1fqpIcublfKGt6apotG/NVx3SInW\ntLX+7Vg/Pv1YqOsnun6JSVdOXT/X7vk75f938QP+8OmSBs0fXtymMhJbf8qlPynYmpKCh7OB1fzN\nalOj1sl0ZAruHLiA+RM73pDe/VjMVP89+aTXwjyc/x5n+u991895/utrJTy8/06TXh0r/5JOa2Jm\nYmqi4r/vUm/H4wLmT+z4anhr05X+q6KUXhtzr/9qSff5L5uMT//V/NdU4YuBTPa/8P67l/6r44ds\n+hYuoP5jx9ciy6XTWlibBrmx8V/TdMfjkP+6pOsu/lvM9N90sf7r+f6m/65n+S8p/itN15v0UkW3\n/+48+PRfJX6S9Joo4g+G/1qYG9KroqP/WypcuvyXPf13wH89/hHef7MB6R3Cqn55U4rv4kfH3zaS\ngQuYP7HjVf89tXrbO+hfLdr+Ozv/SP1dgtQ/Ov8C+i/3+q/Zf2D/HWi6bjT6rym9I/v/03/b+LHS\n4cTg/utTsV7/net/Afzz4f0XGX84/2j9xZ4/sePR/of2X7D/o+vPo/sv6h9B/Bfxr9j1Hz2eN/hO\n8/wfff4A848+f/1A/530/I0+/8PvH9D3H9HnT+R49P0b+v4PfP/4E/wXfP8Mvf9G37/D/ovuP8Se\nP7Hj0f0vdP8tqP9O339cyv7p3P1fdP8Z3v9G999j13/seMax8x/o+ZN7+O+E8zdP/8XOf8Hnz9Dz\nb7HnT+x49PxlCp7/BM+fOv13wvnXBfivt2lMvD8TyH/Hnb+Gz3+j589jz5/Y8ej9h4D+W7qQmf57\nefqv239n3T+C7z+h969i13/seMax+3/o/cMcu/8Y2H9n3p+J6r98pv8m4fwXuH+M3n+OO3++AX9c\nlR+4PhbRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTAyLTA3VDE2OjAxOjU1LTA1OjAwqLKcsgAA\nACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMi0wN1QxNjowMTo1NS0wNTowMNnvJA4AAAAASUVORK5C\nYII=\n", "text/plain": [ "" ] @@ -572,7 +572,7 @@ " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", - " Date/Time: 2016-02-07 14:14:45\n", + " Date/Time: 2016-02-07 16:01:57\n", " MPI Processes: 1\n", "\n", " ===========================================================================\n", @@ -637,20 +637,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 3.1700E-01 seconds\n", - " Reading cross sections = 8.0000E-02 seconds\n", - " Total time in simulation = 4.7680E+00 seconds\n", - " Time in transport only = 4.7530E+00 seconds\n", - " Time in inactive batches = 7.0700E-01 seconds\n", - " Time in active batches = 4.0610E+00 seconds\n", - " Time synchronizing fission bank = 3.0000E-03 seconds\n", - " Sampling source sites = 2.0000E-03 seconds\n", + " Total time for initialization = 3.0900E-01 seconds\n", + " Reading cross sections = 7.8000E-02 seconds\n", + " Total time in simulation = 4.9560E+00 seconds\n", + " Time in transport only = 4.9400E+00 seconds\n", + " Time in inactive batches = 7.3100E-01 seconds\n", + " Time in active batches = 4.2250E+00 seconds\n", + " Time synchronizing fission bank = 4.0000E-03 seconds\n", + " Sampling source sites = 3.0000E-03 seconds\n", " SEND/RECV source sites = 1.0000E-03 seconds\n", - " Time accumulating tallies = 0.0000E+00 seconds\n", + " Time accumulating tallies = 1.0000E-03 seconds\n", " Total time for finalization = 0.0000E+00 seconds\n", - " Total time elapsed = 5.0960E+00 seconds\n", - " Calculation Rate (inactive) = 17680.3 neutrons/second\n", - " Calculation Rate (active) = 9234.18 neutrons/second\n", + " Total time elapsed = 5.2780E+00 seconds\n", + " Calculation Rate (inactive) = 17099.9 neutrons/second\n", + " Calculation Rate (active) = 8875.74 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -825,269 +825,269 @@ " 1\n", " 1\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", - " 0.000202\n", - " 0.000037\n", + " 2.02e-04\n", + " 3.69e-05\n", " \n", " \n", " 1 \n", " 1\n", " 1\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", - " 0.000492\n", - " 0.000090\n", + " 4.92e-04\n", + " 8.98e-05\n", " \n", " \n", " 2 \n", " 1\n", " 1\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", - " 0.000076\n", - " 0.000004\n", + " 7.62e-05\n", + " 3.74e-06\n", " \n", " \n", " 3 \n", " 1\n", " 1\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", - " 0.000204\n", - " 0.000010\n", + " 2.04e-04\n", + " 9.88e-06\n", " \n", " \n", " 4 \n", " 1\n", " 2\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", - " 0.000375\n", - " 0.000039\n", + " 3.75e-04\n", + " 3.86e-05\n", " \n", " \n", " 5 \n", " 1\n", " 2\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", - " 0.000914\n", - " 0.000094\n", + " 9.14e-04\n", + " 9.41e-05\n", " \n", " \n", " 6 \n", " 1\n", " 2\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", - " 0.000107\n", - " 0.000013\n", + " 1.07e-04\n", + " 1.26e-05\n", " \n", " \n", " 7 \n", " 1\n", " 2\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", - " 0.000278\n", - " 0.000032\n", + " 2.78e-04\n", + " 3.16e-05\n", " \n", " \n", " 8 \n", " 1\n", " 3\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", - " 0.000564\n", - " 0.000056\n", + " 5.64e-04\n", + " 5.60e-05\n", " \n", " \n", " 9 \n", " 1\n", " 3\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", - " 0.001374\n", - " 0.000137\n", + " 1.37e-03\n", + " 1.37e-04\n", " \n", " \n", " 10\n", " 1\n", " 3\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", - " 0.000149\n", - " 0.000007\n", + " 1.49e-04\n", + " 7.25e-06\n", " \n", " \n", " 11\n", " 1\n", " 3\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", - " 0.000388\n", - " 0.000018\n", + " 3.88e-04\n", + " 1.78e-05\n", " \n", " \n", " 12\n", " 1\n", " 4\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", - " 0.000669\n", - " 0.000044\n", + " 6.69e-04\n", + " 4.44e-05\n", " \n", " \n", " 13\n", " 1\n", " 4\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", - " 0.001631\n", - " 0.000108\n", + " 1.63e-03\n", + " 1.08e-04\n", " \n", " \n", " 14\n", " 1\n", " 4\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", - " 0.000165\n", - " 0.000011\n", + " 1.65e-04\n", + " 1.09e-05\n", " \n", " \n", " 15\n", " 1\n", " 4\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", - " 0.000433\n", - " 0.000029\n", + " 4.33e-04\n", + " 2.89e-05\n", " \n", " \n", " 16\n", " 1\n", " 5\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " fission\n", - " 0.000932\n", - " 0.000069\n", + " 9.32e-04\n", + " 6.90e-05\n", " \n", " \n", " 17\n", " 1\n", " 5\n", " 1\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.00e+00\n", + " 6.25e-07\n", " nu-fission\n", - " 0.002270\n", - " 0.000168\n", + " 2.27e-03\n", + " 1.68e-04\n", " \n", " \n", " 18\n", " 1\n", " 5\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " fission\n", - " 0.000183\n", - " 0.000011\n", + " 1.83e-04\n", + " 1.10e-05\n", " \n", " \n", " 19\n", " 1\n", " 5\n", " 1\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 6.25e-07\n", + " 2.00e+01\n", " nu-fission\n", - " 0.000477\n", - " 0.000028\n", + " 4.77e-04\n", + " 2.77e-05\n", " \n", " \n", "\n", "" ], "text/plain": [ - " (mesh 1, x) (mesh 1, y) (mesh 1, z) energy low [MeV] energy high [MeV] \\\n", - "0 1 1 1 0.00e+00 6.25e-07 \n", - "1 1 1 1 0.00e+00 6.25e-07 \n", - "2 1 1 1 6.25e-07 2.00e+01 \n", - "3 1 1 1 6.25e-07 2.00e+01 \n", - "4 1 2 1 0.00e+00 6.25e-07 \n", - "5 1 2 1 0.00e+00 6.25e-07 \n", - "6 1 2 1 6.25e-07 2.00e+01 \n", - "7 1 2 1 6.25e-07 2.00e+01 \n", - "8 1 3 1 0.00e+00 6.25e-07 \n", - "9 1 3 1 0.00e+00 6.25e-07 \n", - "10 1 3 1 6.25e-07 2.00e+01 \n", - "11 1 3 1 6.25e-07 2.00e+01 \n", - "12 1 4 1 0.00e+00 6.25e-07 \n", - "13 1 4 1 0.00e+00 6.25e-07 \n", - "14 1 4 1 6.25e-07 2.00e+01 \n", - "15 1 4 1 6.25e-07 2.00e+01 \n", - "16 1 5 1 0.00e+00 6.25e-07 \n", - "17 1 5 1 0.00e+00 6.25e-07 \n", - "18 1 5 1 6.25e-07 2.00e+01 \n", - "19 1 5 1 6.25e-07 2.00e+01 \n", + " (mesh 1, x) (mesh 1, y) (mesh 1, z) energy low [MeV] \\\n", + "0 1 1 1 0.00e+00 \n", + "1 1 1 1 0.00e+00 \n", + "2 1 1 1 6.25e-07 \n", + "3 1 1 1 6.25e-07 \n", + "4 1 2 1 0.00e+00 \n", + "5 1 2 1 0.00e+00 \n", + "6 1 2 1 6.25e-07 \n", + "7 1 2 1 6.25e-07 \n", + "8 1 3 1 0.00e+00 \n", + "9 1 3 1 0.00e+00 \n", + "10 1 3 1 6.25e-07 \n", + "11 1 3 1 6.25e-07 \n", + "12 1 4 1 0.00e+00 \n", + "13 1 4 1 0.00e+00 \n", + "14 1 4 1 6.25e-07 \n", + "15 1 4 1 6.25e-07 \n", + "16 1 5 1 0.00e+00 \n", + "17 1 5 1 0.00e+00 \n", + "18 1 5 1 6.25e-07 \n", + "19 1 5 1 6.25e-07 \n", "\n", - " score mean std. dev. \n", - "0 fission 0.000202 0.000037 \n", - "1 nu-fission 0.000492 0.000090 \n", - "2 fission 0.000076 0.000004 \n", - "3 nu-fission 0.000204 0.000010 \n", - "4 fission 0.000375 0.000039 \n", - "5 nu-fission 0.000914 0.000094 \n", - "6 fission 0.000107 0.000013 \n", - "7 nu-fission 0.000278 0.000032 \n", - "8 fission 0.000564 0.000056 \n", - "9 nu-fission 0.001374 0.000137 \n", - "10 fission 0.000149 0.000007 \n", - "11 nu-fission 0.000388 0.000018 \n", - "12 fission 0.000669 0.000044 \n", - "13 nu-fission 0.001631 0.000108 \n", - "14 fission 0.000165 0.000011 \n", - "15 nu-fission 0.000433 0.000029 \n", - "16 fission 0.000932 0.000069 \n", - "17 nu-fission 0.002270 0.000168 \n", - "18 fission 0.000183 0.000011 \n", - "19 nu-fission 0.000477 0.000028 " + " energy high [MeV] score mean std. dev. \n", + "0 6.25e-07 fission 2.02e-04 3.69e-05 \n", + "1 6.25e-07 nu-fission 4.92e-04 8.98e-05 \n", + "2 2.00e+01 fission 7.62e-05 3.74e-06 \n", + "3 2.00e+01 nu-fission 2.04e-04 9.88e-06 \n", + "4 6.25e-07 fission 3.75e-04 3.86e-05 \n", + "5 6.25e-07 nu-fission 9.14e-04 9.41e-05 \n", + "6 2.00e+01 fission 1.07e-04 1.26e-05 \n", + "7 2.00e+01 nu-fission 2.78e-04 3.16e-05 \n", + "8 6.25e-07 fission 5.64e-04 5.60e-05 \n", + "9 6.25e-07 nu-fission 1.37e-03 1.37e-04 \n", + "10 2.00e+01 fission 1.49e-04 7.25e-06 \n", + "11 2.00e+01 nu-fission 3.88e-04 1.78e-05 \n", + "12 6.25e-07 fission 6.69e-04 4.44e-05 \n", + "13 6.25e-07 nu-fission 1.63e-03 1.08e-04 \n", + "14 2.00e+01 fission 1.65e-04 1.09e-05 \n", + "15 2.00e+01 nu-fission 4.33e-04 2.89e-05 \n", + "16 6.25e-07 fission 9.32e-04 6.90e-05 \n", + "17 6.25e-07 nu-fission 2.27e-03 1.68e-04 \n", + "18 2.00e+01 fission 1.83e-04 1.10e-05 \n", + "19 2.00e+01 nu-fission 4.77e-04 2.77e-05 " ] }, "execution_count": 25, @@ -1099,6 +1099,10 @@ "# Get a pandas dataframe for the mesh tally data\n", "df = tally.get_pandas_dataframe(nuclides=False)\n", "\n", + "# Set the Pandas float display settings\n", + "import pandas as pd\n", + "pd.set_option('display.float_format', '{:.2e}'.format)\n", + "\n", "# Print the first twenty rows in the dataframe\n", "df.head(20)" ] @@ -1114,7 +1118,7 @@ "data": { "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -1137,7 +1141,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 27, @@ -1148,7 +1152,7 @@ "data": { "image/png": "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\ngg==\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -1158,7 +1162,7 @@ "source": [ "# Extract thermal nu-fission rates from pandas\n", "fiss = df[df['score'] == 'nu-fission']\n", - "fiss = fiss[fiss['energy low [MeV]'] == '0.00e+00']\n", + "fiss = fiss[fiss['energy low [MeV]'] == 0.0]\n", "\n", "# Extract mean and reshape as 2D NumPy arrays\n", "mean = fiss['mean'].reshape((17,17))\n", @@ -1236,144 +1240,144 @@ " 10000\n", " U-235\n", " scatter-Y0,0\n", - " 0.037095\n", - " 0.001150\n", + " 3.71e-02\n", + " 1.15e-03\n", " \n", " \n", " 1 \n", " 10000\n", " U-235\n", " scatter-Y1,-1\n", - " 0.000266\n", - " 0.000323\n", + " 2.66e-04\n", + " 3.23e-04\n", " \n", " \n", " 2 \n", " 10000\n", " U-235\n", " scatter-Y1,0\n", - " -0.000417\n", - " 0.000274\n", + " -4.17e-04\n", + " 2.74e-04\n", " \n", " \n", " 3 \n", " 10000\n", " U-235\n", " scatter-Y1,1\n", - " -0.000228\n", - " 0.000237\n", + " -2.28e-04\n", + " 2.37e-04\n", " \n", " \n", " 4 \n", " 10000\n", " U-235\n", " scatter-Y2,-2\n", - " 0.000026\n", - " 0.000199\n", + " 2.57e-05\n", + " 1.99e-04\n", " \n", " \n", " 5 \n", " 10000\n", " U-235\n", " scatter-Y2,-1\n", - " -0.000115\n", - " 0.000185\n", + " -1.15e-04\n", + " 1.85e-04\n", " \n", " \n", " 6 \n", " 10000\n", " U-235\n", " scatter-Y2,0\n", - " 0.000151\n", - " 0.000159\n", + " 1.51e-04\n", + " 1.59e-04\n", " \n", " \n", " 7 \n", " 10000\n", " U-235\n", " scatter-Y2,1\n", - " -0.000122\n", - " 0.000280\n", + " -1.22e-04\n", + " 2.80e-04\n", " \n", " \n", " 8 \n", " 10000\n", " U-235\n", " scatter-Y2,2\n", - " 0.000008\n", - " 0.000181\n", + " 7.65e-06\n", + " 1.81e-04\n", " \n", " \n", " 9 \n", " 10000\n", " U-238\n", " scatter-Y0,0\n", - " 2.328632\n", - " 0.013107\n", + " 2.33e+00\n", + " 1.31e-02\n", " \n", " \n", " 10\n", " 10000\n", " U-238\n", " scatter-Y1,-1\n", - " 0.024530\n", - " 0.002272\n", + " 2.45e-02\n", + " 2.27e-03\n", " \n", " \n", " 11\n", " 10000\n", " U-238\n", " scatter-Y1,0\n", - " -0.000059\n", - " 0.002804\n", + " -5.87e-05\n", + " 2.80e-03\n", " \n", " \n", " 12\n", " 10000\n", " U-238\n", " scatter-Y1,1\n", - " -0.027990\n", - " 0.002536\n", + " -2.80e-02\n", + " 2.54e-03\n", " \n", " \n", " 13\n", " 10000\n", " U-238\n", " scatter-Y2,-2\n", - " -0.004861\n", - " 0.001575\n", + " -4.86e-03\n", + " 1.58e-03\n", " \n", " \n", " 14\n", " 10000\n", " U-238\n", " scatter-Y2,-1\n", - " 0.000557\n", - " 0.002018\n", + " 5.57e-04\n", + " 2.02e-03\n", " \n", " \n", " 15\n", " 10000\n", " U-238\n", " scatter-Y2,0\n", - " 0.006236\n", - " 0.001627\n", + " 6.24e-03\n", + " 1.63e-03\n", " \n", " \n", " 16\n", " 10000\n", " U-238\n", " scatter-Y2,1\n", - " -0.000648\n", - " 0.001551\n", + " -6.48e-04\n", + " 1.55e-03\n", " \n", " \n", " 17\n", " 10000\n", " U-238\n", " scatter-Y2,2\n", - " -0.001031\n", - " 0.001310\n", + " -1.03e-03\n", + " 1.31e-03\n", " \n", " \n", "\n", @@ -1381,24 +1385,24 @@ ], "text/plain": [ " cell nuclide score mean std. dev.\n", - "0 10000 U-235 scatter-Y0,0 0.037095 0.001150\n", - "1 10000 U-235 scatter-Y1,-1 0.000266 0.000323\n", - "2 10000 U-235 scatter-Y1,0 -0.000417 0.000274\n", - "3 10000 U-235 scatter-Y1,1 -0.000228 0.000237\n", - "4 10000 U-235 scatter-Y2,-2 0.000026 0.000199\n", - "5 10000 U-235 scatter-Y2,-1 -0.000115 0.000185\n", - "6 10000 U-235 scatter-Y2,0 0.000151 0.000159\n", - "7 10000 U-235 scatter-Y2,1 -0.000122 0.000280\n", - "8 10000 U-235 scatter-Y2,2 0.000008 0.000181\n", - "9 10000 U-238 scatter-Y0,0 2.328632 0.013107\n", - "10 10000 U-238 scatter-Y1,-1 0.024530 0.002272\n", - "11 10000 U-238 scatter-Y1,0 -0.000059 0.002804\n", - "12 10000 U-238 scatter-Y1,1 -0.027990 0.002536\n", - "13 10000 U-238 scatter-Y2,-2 -0.004861 0.001575\n", - "14 10000 U-238 scatter-Y2,-1 0.000557 0.002018\n", - "15 10000 U-238 scatter-Y2,0 0.006236 0.001627\n", - "16 10000 U-238 scatter-Y2,1 -0.000648 0.001551\n", - "17 10000 U-238 scatter-Y2,2 -0.001031 0.001310" + "0 10000 U-235 scatter-Y0,0 3.71e-02 1.15e-03\n", + "1 10000 U-235 scatter-Y1,-1 2.66e-04 3.23e-04\n", + "2 10000 U-235 scatter-Y1,0 -4.17e-04 2.74e-04\n", + "3 10000 U-235 scatter-Y1,1 -2.28e-04 2.37e-04\n", + "4 10000 U-235 scatter-Y2,-2 2.57e-05 1.99e-04\n", + "5 10000 U-235 scatter-Y2,-1 -1.15e-04 1.85e-04\n", + "6 10000 U-235 scatter-Y2,0 1.51e-04 1.59e-04\n", + "7 10000 U-235 scatter-Y2,1 -1.22e-04 2.80e-04\n", + "8 10000 U-235 scatter-Y2,2 7.65e-06 1.81e-04\n", + "9 10000 U-238 scatter-Y0,0 2.33e+00 1.31e-02\n", + "10 10000 U-238 scatter-Y1,-1 2.45e-02 2.27e-03\n", + "11 10000 U-238 scatter-Y1,0 -5.87e-05 2.80e-03\n", + "12 10000 U-238 scatter-Y1,1 -2.80e-02 2.54e-03\n", + "13 10000 U-238 scatter-Y2,-2 -4.86e-03 1.58e-03\n", + "14 10000 U-238 scatter-Y2,-1 5.57e-04 2.02e-03\n", + "15 10000 U-238 scatter-Y2,0 6.24e-03 1.63e-03\n", + "16 10000 U-238 scatter-Y2,1 -6.48e-04 1.55e-03\n", + "17 10000 U-238 scatter-Y2,2 -1.03e-03 1.31e-03" ] }, "execution_count": 29, @@ -1546,168 +1550,168 @@ " 558\n", " 279\n", " absorption\n", - " 0.000093\n", - " 0.000013\n", + " 9.27e-05\n", + " 1.33e-05\n", " \n", " \n", " 559\n", " 279\n", " scatter\n", - " 0.013504\n", - " 0.000805\n", + " 1.35e-02\n", + " 8.05e-04\n", " \n", " \n", " 560\n", " 280\n", " absorption\n", - " 0.000084\n", - " 0.000010\n", + " 8.41e-05\n", + " 9.92e-06\n", " \n", " \n", " 561\n", " 280\n", " scatter\n", - " 0.014215\n", - " 0.000612\n", + " 1.42e-02\n", + " 6.12e-04\n", " \n", " \n", " 562\n", " 281\n", " absorption\n", - " 0.000091\n", - " 0.000008\n", + " 9.12e-05\n", + " 8.26e-06\n", " \n", " \n", " 563\n", " 281\n", " scatter\n", - " 0.014545\n", - " 0.000590\n", + " 1.45e-02\n", + " 5.90e-04\n", " \n", " \n", " 564\n", " 282\n", " absorption\n", - " 0.000112\n", - " 0.000012\n", + " 1.12e-04\n", + " 1.24e-05\n", " \n", " \n", " 565\n", " 282\n", " scatter\n", - " 0.016321\n", - " 0.000729\n", + " 1.63e-02\n", + " 7.29e-04\n", " \n", " \n", " 566\n", " 283\n", " absorption\n", - " 0.000092\n", - " 0.000007\n", + " 9.18e-05\n", + " 7.12e-06\n", " \n", " \n", " 567\n", " 283\n", " scatter\n", - " 0.016163\n", - " 0.000661\n", + " 1.62e-02\n", + " 6.61e-04\n", " \n", " \n", " 568\n", " 284\n", " absorption\n", - " 0.000104\n", - " 0.000011\n", + " 1.04e-04\n", + " 1.10e-05\n", " \n", " \n", " 569\n", " 284\n", " scatter\n", - " 0.017384\n", - " 0.000599\n", + " 1.74e-02\n", + " 5.99e-04\n", " \n", " \n", " 570\n", " 285\n", " absorption\n", - " 0.000111\n", - " 0.000011\n", + " 1.11e-04\n", + " 1.14e-05\n", " \n", " \n", " 571\n", " 285\n", " scatter\n", - " 0.018015\n", - " 0.000774\n", + " 1.80e-02\n", + " 7.74e-04\n", " \n", " \n", " 572\n", " 286\n", " absorption\n", - " 0.000125\n", - " 0.000012\n", + " 1.25e-04\n", + " 1.20e-05\n", " \n", " \n", " 573\n", " 286\n", " scatter\n", - " 0.018294\n", - " 0.000828\n", + " 1.83e-02\n", + " 8.28e-04\n", " \n", " \n", " 574\n", " 287\n", " absorption\n", - " 0.000119\n", - " 0.000013\n", + " 1.19e-04\n", + " 1.30e-05\n", " \n", " \n", " 575\n", " 287\n", " scatter\n", - " 0.017483\n", - " 0.000757\n", + " 1.75e-02\n", + " 7.57e-04\n", " \n", " \n", " 576\n", " 288\n", " absorption\n", - " 0.000113\n", - " 0.000014\n", + " 1.13e-04\n", + " 1.40e-05\n", " \n", " \n", " 577\n", " 288\n", " scatter\n", - " 0.018248\n", - " 0.000782\n", + " 1.82e-02\n", + " 7.82e-04\n", " \n", " \n", "\n", "" ], "text/plain": [ - " distribcell score mean std. dev.\n", - "558 279 absorption 0.000093 0.000013\n", - "559 279 scatter 0.013504 0.000805\n", - "560 280 absorption 0.000084 0.000010\n", - "561 280 scatter 0.014215 0.000612\n", - "562 281 absorption 0.000091 0.000008\n", - "563 281 scatter 0.014545 0.000590\n", - "564 282 absorption 0.000112 0.000012\n", - "565 282 scatter 0.016321 0.000729\n", - "566 283 absorption 0.000092 0.000007\n", - "567 283 scatter 0.016163 0.000661\n", - "568 284 absorption 0.000104 0.000011\n", - "569 284 scatter 0.017384 0.000599\n", - "570 285 absorption 0.000111 0.000011\n", - "571 285 scatter 0.018015 0.000774\n", - "572 286 absorption 0.000125 0.000012\n", - "573 286 scatter 0.018294 0.000828\n", - "574 287 absorption 0.000119 0.000013\n", - "575 287 scatter 0.017483 0.000757\n", - "576 288 absorption 0.000113 0.000014\n", - "577 288 scatter 0.018248 0.000782" + " distribcell score mean std. dev.\n", + "558 279 absorption 9.27e-05 1.33e-05\n", + "559 279 scatter 1.35e-02 8.05e-04\n", + "560 280 absorption 8.41e-05 9.92e-06\n", + "561 280 scatter 1.42e-02 6.12e-04\n", + "562 281 absorption 9.12e-05 8.26e-06\n", + "563 281 scatter 1.45e-02 5.90e-04\n", + "564 282 absorption 1.12e-04 1.24e-05\n", + "565 282 scatter 1.63e-02 7.29e-04\n", + "566 283 absorption 9.18e-05 7.12e-06\n", + "567 283 scatter 1.62e-02 6.61e-04\n", + "568 284 absorption 1.04e-04 1.10e-05\n", + "569 284 scatter 1.74e-02 5.99e-04\n", + "570 285 absorption 1.11e-04 1.14e-05\n", + "571 285 scatter 1.80e-02 7.74e-04\n", + "572 286 absorption 1.25e-04 1.20e-05\n", + "573 286 scatter 1.83e-02 8.28e-04\n", + "574 287 absorption 1.19e-04 1.30e-05\n", + "575 287 scatter 1.75e-02 7.57e-04\n", + "576 288 absorption 1.13e-04 1.40e-05\n", + "577 288 scatter 1.82e-02 7.82e-04" ] }, "execution_count": 33, @@ -1772,8 +1776,8 @@ " 10000\n", " 0\n", " absorption\n", - " 0.000123\n", - " 0.000012\n", + " 1.23e-04\n", + " 1.19e-05\n", " \n", " \n", " 1 \n", @@ -1787,8 +1791,8 @@ " 10000\n", " 0\n", " scatter\n", - " 0.017805\n", - " 0.000808\n", + " 1.78e-02\n", + " 8.08e-04\n", " \n", " \n", " 2 \n", @@ -1802,8 +1806,8 @@ " 10000\n", " 1\n", " absorption\n", - " 0.000217\n", - " 0.000020\n", + " 2.17e-04\n", + " 1.96e-05\n", " \n", " \n", " 3 \n", @@ -1817,8 +1821,8 @@ " 10000\n", " 1\n", " scatter\n", - " 0.028867\n", - " 0.001263\n", + " 2.89e-02\n", + " 1.26e-03\n", " \n", " \n", " 4 \n", @@ -1832,8 +1836,8 @@ " 10000\n", " 2\n", " absorption\n", - " 0.000318\n", - " 0.000020\n", + " 3.18e-04\n", + " 2.03e-05\n", " \n", " \n", " 5 \n", @@ -1847,8 +1851,8 @@ " 10000\n", " 2\n", " scatter\n", - " 0.040493\n", - " 0.001269\n", + " 4.05e-02\n", + " 1.27e-03\n", " \n", " \n", " 6 \n", @@ -1862,8 +1866,8 @@ " 10000\n", " 3\n", " absorption\n", - " 0.000386\n", - " 0.000018\n", + " 3.86e-04\n", + " 1.80e-05\n", " \n", " \n", " 7 \n", @@ -1877,8 +1881,8 @@ " 10000\n", " 3\n", " scatter\n", - " 0.048576\n", - " 0.001337\n", + " 4.86e-02\n", + " 1.34e-03\n", " \n", " \n", " 8 \n", @@ -1892,8 +1896,8 @@ " 10000\n", " 4\n", " absorption\n", - " 0.000501\n", - " 0.000026\n", + " 5.01e-04\n", + " 2.60e-05\n", " \n", " \n", " 9 \n", @@ -1907,8 +1911,8 @@ " 10000\n", " 4\n", " scatter\n", - " 0.057063\n", - " 0.001715\n", + " 5.71e-02\n", + " 1.72e-03\n", " \n", " \n", " 10\n", @@ -1922,8 +1926,8 @@ " 10000\n", " 5\n", " absorption\n", - " 0.000484\n", - " 0.000026\n", + " 4.84e-04\n", + " 2.58e-05\n", " \n", " \n", " 11\n", @@ -1937,8 +1941,8 @@ " 10000\n", " 5\n", " scatter\n", - " 0.060822\n", - " 0.001581\n", + " 6.08e-02\n", + " 1.58e-03\n", " \n", " \n", " 12\n", @@ -1952,8 +1956,8 @@ " 10000\n", " 6\n", " absorption\n", - " 0.000532\n", - " 0.000039\n", + " 5.32e-04\n", + " 3.90e-05\n", " \n", " \n", " 13\n", @@ -1967,8 +1971,8 @@ " 10000\n", " 6\n", " scatter\n", - " 0.069101\n", - " 0.002249\n", + " 6.91e-02\n", + " 2.25e-03\n", " \n", " \n", " 14\n", @@ -1982,8 +1986,8 @@ " 10000\n", " 7\n", " absorption\n", - " 0.000577\n", - " 0.000039\n", + " 5.77e-04\n", + " 3.92e-05\n", " \n", " \n", " 15\n", @@ -1997,8 +2001,8 @@ " 10000\n", " 7\n", " scatter\n", - " 0.076722\n", - " 0.002335\n", + " 7.67e-02\n", + " 2.34e-03\n", " \n", " \n", " 16\n", @@ -2012,8 +2016,8 @@ " 10000\n", " 8\n", " absorption\n", - " 0.000649\n", - " 0.000039\n", + " 6.49e-04\n", + " 3.90e-05\n", " \n", " \n", " 17\n", @@ -2027,8 +2031,8 @@ " 10000\n", " 8\n", " scatter\n", - " 0.081564\n", - " 0.001610\n", + " 8.16e-02\n", + " 1.61e-03\n", " \n", " \n", " 18\n", @@ -2042,8 +2046,8 @@ " 10000\n", " 9\n", " absorption\n", - " 0.000680\n", - " 0.000032\n", + " 6.80e-04\n", + " 3.17e-05\n", " \n", " \n", " 19\n", @@ -2057,8 +2061,8 @@ " 10000\n", " 9\n", " scatter\n", - " 0.087715\n", - " 0.001959\n", + " 8.77e-02\n", + " 1.96e-03\n", " \n", " \n", "\n", @@ -2131,27 +2135,27 @@ "18 10002 10000 9 absorption \n", "19 10002 10000 9 scatter \n", "\n", - " mean std. dev. \n", - "0 0.000123 0.000012 \n", - "1 0.017805 0.000808 \n", - "2 0.000217 0.000020 \n", - "3 0.028867 0.001263 \n", - "4 0.000318 0.000020 \n", - "5 0.040493 0.001269 \n", - "6 0.000386 0.000018 \n", - "7 0.048576 0.001337 \n", - "8 0.000501 0.000026 \n", - "9 0.057063 0.001715 \n", - "10 0.000484 0.000026 \n", - "11 0.060822 0.001581 \n", - "12 0.000532 0.000039 \n", - "13 0.069101 0.002249 \n", - "14 0.000577 0.000039 \n", - "15 0.076722 0.002335 \n", - "16 0.000649 0.000039 \n", - "17 0.081564 0.001610 \n", - "18 0.000680 0.000032 \n", - "19 0.087715 0.001959 " + " mean std. dev. \n", + "0 1.23e-04 1.19e-05 \n", + "1 1.78e-02 8.08e-04 \n", + "2 2.17e-04 1.96e-05 \n", + "3 2.89e-02 1.26e-03 \n", + "4 3.18e-04 2.03e-05 \n", + "5 4.05e-02 1.27e-03 \n", + "6 3.86e-04 1.80e-05 \n", + "7 4.86e-02 1.34e-03 \n", + "8 5.01e-04 2.60e-05 \n", + "9 5.71e-02 1.72e-03 \n", + "10 4.84e-04 2.58e-05 \n", + "11 6.08e-02 1.58e-03 \n", + "12 5.32e-04 3.90e-05 \n", + "13 6.91e-02 2.25e-03 \n", + "14 5.77e-04 3.92e-05 \n", + "15 7.67e-02 2.34e-03 \n", + "16 6.49e-04 3.90e-05 \n", + "17 8.16e-02 1.61e-03 \n", + "18 6.80e-04 3.17e-05 \n", + "19 8.77e-02 1.96e-03 " ] }, "execution_count": 34, @@ -2189,58 +2193,58 @@ " \n", " \n", " count\n", - " 289.000000\n", - " 289.000000\n", + " 2.89e+02\n", + " 2.89e+02\n", " \n", " \n", " mean\n", - " 0.000418\n", - " 0.000022\n", + " 4.18e-04\n", + " 2.17e-05\n", " \n", " \n", " std\n", - " 0.000239\n", - " 0.000009\n", + " 2.39e-04\n", + " 8.82e-06\n", " \n", " \n", " min\n", - " 0.000018\n", - " 0.000004\n", + " 1.81e-05\n", + " 3.82e-06\n", " \n", " \n", " 25%\n", - " 0.000202\n", - " 0.000015\n", + " 2.02e-04\n", + " 1.49e-05\n", " \n", " \n", " 50%\n", - " 0.000402\n", - " 0.000021\n", + " 4.02e-04\n", + " 2.11e-05\n", " \n", " \n", " 75%\n", - " 0.000615\n", - " 0.000027\n", + " 6.15e-04\n", + " 2.67e-05\n", " \n", " \n", " max\n", - " 0.000892\n", - " 0.000044\n", + " 8.92e-04\n", + " 4.43e-05\n", " \n", " \n", "\n", "" ], "text/plain": [ - " mean std. dev.\n", - "count 289.000000 289.000000\n", - "mean 0.000418 0.000022\n", - "std 0.000239 0.000009\n", - "min 0.000018 0.000004\n", - "25% 0.000202 0.000015\n", - "50% 0.000402 0.000021\n", - "75% 0.000615 0.000027\n", - "max 0.000892 0.000044" + " mean std. dev.\n", + "count 2.89e+02 2.89e+02\n", + "mean 4.18e-04 2.17e-05\n", + "std 2.39e-04 8.82e-06\n", + "min 1.81e-05 3.82e-06\n", + "25% 2.02e-04 1.49e-05\n", + "50% 4.02e-04 2.11e-05\n", + "75% 6.15e-04 2.67e-05\n", + "max 8.92e-04 4.43e-05" ] }, "execution_count": 35, @@ -2359,7 +2363,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 38, @@ -2370,7 +2374,7 @@ "data": { "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -2397,7 +2401,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 39, @@ -2408,7 +2412,7 @@ "data": { "image/png": "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\n", "text/plain": [ - "" + "" ] }, "metadata": {}, @@ -2423,15 +2427,6 @@ "pylab.xlabel('Mean')\n", "pylab.legend(['KDE', 'Histogram'])" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/docs/source/pythonapi/examples/tally-arithmetic.ipynb b/docs/source/pythonapi/examples/tally-arithmetic.ipynb index 5c77dcf9cd..e357e73fcd 100644 --- a/docs/source/pythonapi/examples/tally-arithmetic.ipynb +++ b/docs/source/pythonapi/examples/tally-arithmetic.ipynb @@ -366,7 +366,7 @@ "outputs": [ { "data": { - "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBxMQBoBGcLYAAALKSURBVGje7dpLcqQwDAbgHHE2\nYeEj+D4cwQucBUfo+3CEXoSp8OhuhF70T4qpKXmdr21LogK2Pj7A8QmNP+HDhw8fPnz48Kf6VH9G\n+66vy+je8k19jnf8C5dXIPv86ms56lPdjvaYbyodx3ze+XLE76cXFiD4zPji99z0/AJ4n1lfvJ6f\nnl0A6x+578efMSg1wPr172/jPO5yFXM+Ef78gdblM+WPHyguP//t1/g6pA0wfln+ho/fwgYYn19C\n/xwDvwHGc9OvC+hs37DTrwuwfWanXxdQTC9Mvyygs3wjTL8uwPJpn/tNDbSGz7T0SBEWw4vLXzbQ\n6b6RoveIoO6TvPxlA63qs7z8ZQPF9F+SH22vbX8OQKf5Rtv+EgDNJ3X58wZaxWd1+fMGiuFvir8b\nvjp8J/tGy/6jAmRvhW8fwL3vVT+o3grfPoB7r/IpALI3tz8FoJN84/NV873hB8UnM3xzANtf8nb4\ndwmg3grfFEDJO8JPE0i9Ff4pAYL3pI8mkHor/HMCeO9JH00g9SafEsh7T/ppARBvp48UwJnelT5S\nACd7O31TAlnvKx9SQCd7B58KgPO+8iMFuPWe9E8F8BveWX7bAjzX9y4//Jve+fhsH6Ctv7n8PTzj\nvY/v9gEOHz58+PBX+6v/f/wPvnd54f3j6venE/yl769Xv7+j3x/o98/V32/o9+fl389Xnx+g5x/o\n+Qt6/oOeP6HnX+j5G3z+h54/ouefV5/foufP6Pk3ev4On/+j9w/o/Qd6/4Le/6D3T/D9V67Y/ZsV\nQBq+s+8f0ftP+P41axXguP9NWgDuu/Cdfv+N3r/D9/9TAID+A7T/Ae2/gPs/0P4TtP8F7r9J3AIO\n9P+g/Udw/9Oygbf7r9D+L7j/DO1/Q/vv4P4/tP8Q7n9E+y/h/k+0/xTuf4X7b+H+X7T/+BPuf3aM\n8OHDhw8fPnz4w/4vzcvgeY10sY0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDItMDdUMTQ6MTY6\nMDYtMDU6MDCStPm5AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAyLTA3VDE0OjE2OjA2LTA1OjAw\n4+lBBQAAAABJRU5ErkJggg==\n", + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6AgMAAAD1grKuAAAABGdBTUEAALGPC/xhBQAAACBjSFJN\nAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX///9yEhLpgJFNv8Tq\nQYT7AAAAAWJLR0QAiAUdSAAAAAd0SU1FB+ACBxUFD8qiUrQAAALKSURBVGje7dpLcqQwDAbgHHE2\nYeEj+D4cwQucBUfo+3CEXoSp8OhuhF70T4qpKXmdr21LogK2Pj7A8QmNP+HDhw8fPnz48Kf6VH9G\n+66vy+je8k19jnf8C5dXIPv86ms56lPdjvaYbyodx3ze+XLE76cXFiD4zPji99z0/AJ4n1lfvJ6f\nnl0A6x+578efMSg1wPr172/jPO5yFXM+Ef78gdblM+WPHyguP//t1/g6pA0wfln+ho/fwgYYn19C\n/xwDvwHGc9OvC+hs37DTrwuwfWanXxdQTC9Mvyygs3wjTL8uwPJpn/tNDbSGz7T0SBEWw4vLXzbQ\n6b6RoveIoO6TvPxlA63qs7z8ZQPF9F+SH22vbX8OQKf5Rtv+EgDNJ3X58wZaxWd1+fMGiuFvir8b\nvjp8J/tGy/6jAmRvhW8fwL3vVT+o3grfPoB7r/IpALI3tz8FoJN84/NV873hB8UnM3xzANtf8nb4\ndwmg3grfFEDJO8JPE0i9Ff4pAYL3pI8mkHor/HMCeO9JH00g9SafEsh7T/ppARBvp48UwJnelT5S\nACd7O31TAlnvKx9SQCd7B58KgPO+8iMFuPWe9E8F8BveWX7bAjzX9y4//Jve+fhsH6Ctv7n8PTzj\nvY/v9gEOHz58+PBX+6v/f/wPvnd54f3j6venE/yl769Xv7+j3x/o98/V32/o9+fl389Xnx+g5x/o\n+Qt6/oOeP6HnX+j5G3z+h54/ouefV5/foufP6Pk3ev4On/+j9w/o/Qd6/4Le/6D3T/D9V67Y/ZsV\nQBq+s+8f0ftP+P41axXguP9NWgDuu/Cdfv+N3r/D9/9TAID+A7T/Ae2/gPs/0P4TtP8F7r9J3AIO\n9P+g/Udw/9Oygbf7r9D+L7j/DO1/Q/vv4P4/tP8Q7n9E+y/h/k+0/xTuf4X7b+H+X7T/+BPuf3aM\n8OHDhw8fPnz4w/4vzcvgeY10sY0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDItMDdUMTY6MDU6\nMTUtMDU6MDAlEzIyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAyLTA3VDE2OjA1OjE1LTA1OjAw\nVE6KjgAAAABJRU5ErkJggg==\n", "text/plain": [ "" ] @@ -577,7 +577,7 @@ " License: http://mit-crpg.github.io/openmc/license.html\n", " Version: 0.7.1\n", " Git SHA1: 34381b40a9445a727e360873aaa6ef892af1cb6a\n", - " Date/Time: 2016-02-07 14:16:08\n", + " Date/Time: 2016-02-07 16:05:17\n", " MPI Processes: 1\n", "\n", " ===========================================================================\n", @@ -634,20 +634,20 @@ "\n", " =======================> TIMING STATISTICS <=======================\n", "\n", - " Total time for initialization = 4.0900E-01 seconds\n", - " Reading cross sections = 1.0100E-01 seconds\n", - " Total time in simulation = 7.8100E+00 seconds\n", - " Time in transport only = 7.7980E+00 seconds\n", - " Time in inactive batches = 1.3850E+00 seconds\n", - " Time in active batches = 6.4250E+00 seconds\n", - " Time synchronizing fission bank = 1.0000E-03 seconds\n", - " Sampling source sites = 0.0000E+00 seconds\n", - " SEND/RECV source sites = 1.0000E-03 seconds\n", + " Total time for initialization = 3.4700E-01 seconds\n", + " Reading cross sections = 9.1000E-02 seconds\n", + " Total time in simulation = 7.3920E+00 seconds\n", + " Time in transport only = 7.3820E+00 seconds\n", + " Time in inactive batches = 1.0930E+00 seconds\n", + " Time in active batches = 6.2990E+00 seconds\n", + " Time synchronizing fission bank = 2.0000E-03 seconds\n", + " Sampling source sites = 1.0000E-03 seconds\n", + " SEND/RECV source sites = 0.0000E+00 seconds\n", " Time accumulating tallies = 0.0000E+00 seconds\n", - " Total time for finalization = 1.0000E-03 seconds\n", - " Total time elapsed = 8.2360E+00 seconds\n", - " Calculation Rate (inactive) = 9025.27 neutrons/second\n", - " Calculation Rate (active) = 5836.58 neutrons/second\n", + " Total time for finalization = 2.0000E-03 seconds\n", + " Total time elapsed = 7.7510E+00 seconds\n", + " Calculation Rate (inactive) = 11436.4 neutrons/second\n", + " Calculation Rate (active) = 5953.33 neutrons/second\n", "\n", " ============================> RESULTS <============================\n", "\n", @@ -769,8 +769,8 @@ "" ], "text/plain": [ - " nuclide score mean std. dev.\n", - "0 total (nu-fission / absorption) 1.040166 0.009069" + " nuclide score mean std. dev.\n", + "0 total (nu-fission / absorption) 1.04e+00 9.07e-03" ] }, "execution_count": 26, @@ -821,8 +821,8 @@ " \n", " \n", " 0\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0\n", + " 0.000001\n", " total\n", " absorption\n", " 0.694707\n", @@ -833,8 +833,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] nuclide score mean std. dev.\n", - "0 0.00e+00 6.25e-07 total absorption 0.694707 0.006699" + " energy low [MeV] energy high [MeV] nuclide score mean std. dev.\n", + "0 0.00e+00 6.25e-07 total absorption 6.95e-01 6.70e-03" ] }, "execution_count": 27, @@ -883,8 +883,8 @@ " \n", " \n", " 0\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0\n", + " 0.000001\n", " total\n", " nu-fission\n", " 1.201216\n", @@ -895,8 +895,8 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] nuclide score mean std. dev.\n", - "0 0.00e+00 6.25e-07 total nu-fission 1.201216 0.012288" + " energy low [MeV] energy high [MeV] nuclide score mean std. dev.\n", + "0 0.00e+00 6.25e-07 total nu-fission 1.20e+00 1.23e-02" ] }, "execution_count": 28, @@ -947,8 +947,8 @@ " \n", " \n", " 0\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0\n", + " 0.000001\n", " 10000\n", " total\n", " absorption\n", @@ -960,11 +960,11 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] cell nuclide score mean \\\n", - "0 0.00e+00 6.25e-07 10000 total absorption 0.74925 \n", + " energy low [MeV] energy high [MeV] cell nuclide score mean \\\n", + "0 0.00e+00 6.25e-07 10000 total absorption 7.49e-01 \n", "\n", " std. dev. \n", - "0 0.008257 " + "0 8.26e-03 " ] }, "execution_count": 29, @@ -1013,8 +1013,8 @@ " \n", " \n", " 0\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0\n", + " 0.000001\n", " 10000\n", " total\n", " (nu-fission / absorption)\n", @@ -1026,11 +1026,11 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] cell nuclide \\\n", - "0 0.00e+00 6.25e-07 10000 total \n", + " energy low [MeV] energy high [MeV] cell nuclide \\\n", + "0 0.00e+00 6.25e-07 10000 total \n", "\n", - " score mean std. dev. \n", - "0 (nu-fission / absorption) 1.663616 0.018624 " + " score mean std. dev. \n", + "0 (nu-fission / absorption) 1.66e+00 1.86e-02 " ] }, "execution_count": 30, @@ -1078,8 +1078,8 @@ " \n", " \n", " 0\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0\n", + " 0.000001\n", " 10000\n", " total\n", " (((absorption * nu-fission) * absorption) * (n...\n", @@ -1091,11 +1091,11 @@ "" ], "text/plain": [ - " energy low [MeV] energy high [MeV] cell nuclide \\\n", - "0 0.00e+00 6.25e-07 10000 total \n", + " energy low [MeV] energy high [MeV] cell nuclide \\\n", + "0 0.00e+00 6.25e-07 10000 total \n", "\n", - " score mean std. dev. \n", - "0 (((absorption * nu-fission) * absorption) * (n... 1.040166 0.021928 " + " score mean std. dev. \n", + "0 (((absorption * nu-fission) * absorption) * (n... 1.04e+00 2.19e-02 " ] }, "execution_count": 31, @@ -1161,8 +1161,8 @@ " \n", " 0\n", " 10000\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " (U-238 / total)\n", " (nu-fission / flux)\n", " 0.000001\n", @@ -1171,8 +1171,8 @@ " \n", " 1\n", " 10000\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " (U-238 / total)\n", " (scatter / flux)\n", " 0.209989\n", @@ -1181,8 +1181,8 @@ " \n", " 2\n", " 10000\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " (U-235 / total)\n", " (nu-fission / flux)\n", " 0.356420\n", @@ -1191,8 +1191,8 @@ " \n", " 3\n", " 10000\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " (U-235 / total)\n", " (scatter / flux)\n", " 0.005555\n", @@ -1201,8 +1201,8 @@ " \n", " 4\n", " 10000\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " (U-238 / total)\n", " (nu-fission / flux)\n", " 0.007155\n", @@ -1211,8 +1211,8 @@ " \n", " 5\n", " 10000\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " (U-238 / total)\n", " (scatter / flux)\n", " 0.227770\n", @@ -1221,8 +1221,8 @@ " \n", " 6\n", " 10000\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " (U-235 / total)\n", " (nu-fission / flux)\n", " 0.008067\n", @@ -1231,8 +1231,8 @@ " \n", " 7\n", " 10000\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " (U-235 / total)\n", " (scatter / flux)\n", " 0.003367\n", @@ -1243,25 +1243,25 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide \\\n", - "0 10000 0.00e+00 6.25e-07 (U-238 / total) \n", - "1 10000 0.00e+00 6.25e-07 (U-238 / total) \n", - "2 10000 0.00e+00 6.25e-07 (U-235 / total) \n", - "3 10000 0.00e+00 6.25e-07 (U-235 / total) \n", - "4 10000 6.25e-07 2.00e+01 (U-238 / total) \n", - "5 10000 6.25e-07 2.00e+01 (U-238 / total) \n", - "6 10000 6.25e-07 2.00e+01 (U-235 / total) \n", - "7 10000 6.25e-07 2.00e+01 (U-235 / total) \n", + " cell energy low [MeV] energy high [MeV] nuclide \\\n", + "0 10000 0.00e+00 6.25e-07 (U-238 / total) \n", + "1 10000 0.00e+00 6.25e-07 (U-238 / total) \n", + "2 10000 0.00e+00 6.25e-07 (U-235 / total) \n", + "3 10000 0.00e+00 6.25e-07 (U-235 / total) \n", + "4 10000 6.25e-07 2.00e+01 (U-238 / total) \n", + "5 10000 6.25e-07 2.00e+01 (U-238 / total) \n", + "6 10000 6.25e-07 2.00e+01 (U-235 / total) \n", + "7 10000 6.25e-07 2.00e+01 (U-235 / total) \n", "\n", - " score mean std. dev. \n", - "0 (nu-fission / flux) 0.000001 7.377419e-09 \n", - "1 (scatter / flux) 0.209989 2.303838e-03 \n", - "2 (nu-fission / flux) 0.356420 3.951669e-03 \n", - "3 (scatter / flux) 0.005555 6.101004e-05 \n", - "4 (nu-fission / flux) 0.007155 8.053460e-05 \n", - "5 (scatter / flux) 0.227770 1.079289e-03 \n", - "6 (nu-fission / flux) 0.008067 5.254797e-05 \n", - "7 (scatter / flux) 0.003367 1.647058e-05 " + " score mean std. dev. \n", + "0 (nu-fission / flux) 6.66e-07 7.38e-09 \n", + "1 (scatter / flux) 2.10e-01 2.30e-03 \n", + "2 (nu-fission / flux) 3.56e-01 3.95e-03 \n", + "3 (scatter / flux) 5.56e-03 6.10e-05 \n", + "4 (nu-fission / flux) 7.15e-03 8.05e-05 \n", + "5 (scatter / flux) 2.28e-01 1.08e-03 \n", + "6 (nu-fission / flux) 8.07e-03 5.25e-05 \n", + "7 (scatter / flux) 3.37e-03 1.65e-05 " ] }, "execution_count": 33, @@ -1396,8 +1396,8 @@ " \n", " 0\n", " 10000\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " U-238\n", " nu-fission\n", " 0.000002\n", @@ -1406,8 +1406,8 @@ " \n", " 1\n", " 10000\n", - " 0.00e+00\n", - " 6.25e-07\n", + " 0.000000\n", + " 0.000001\n", " U-235\n", " nu-fission\n", " 0.868553\n", @@ -1416,8 +1416,8 @@ " \n", " 2\n", " 10000\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " U-238\n", " nu-fission\n", " 0.082149\n", @@ -1426,8 +1426,8 @@ " \n", " 3\n", " 10000\n", - " 6.25e-07\n", - " 2.00e+01\n", + " 0.000001\n", + " 20.000000\n", " U-235\n", " nu-fission\n", " 0.092618\n", @@ -1438,17 +1438,17 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", - "0 10000 0.00e+00 6.25e-07 U-238 nu-fission 0.000002 \n", - "1 10000 0.00e+00 6.25e-07 U-235 nu-fission 0.868553 \n", - "2 10000 6.25e-07 2.00e+01 U-238 nu-fission 0.082149 \n", - "3 10000 6.25e-07 2.00e+01 U-235 nu-fission 0.092618 \n", + " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 10000 0.00e+00 6.25e-07 U-238 nu-fission 1.62e-06 \n", + "1 10000 0.00e+00 6.25e-07 U-235 nu-fission 8.69e-01 \n", + "2 10000 6.25e-07 2.00e+01 U-238 nu-fission 8.21e-02 \n", + "3 10000 6.25e-07 2.00e+01 U-235 nu-fission 9.26e-02 \n", "\n", - " std. dev. \n", - "0 1.283958e-08 \n", - "1 6.880390e-03 \n", - "2 8.837250e-04 \n", - "3 5.195308e-04 " + " std. dev. \n", + "0 1.28e-08 \n", + "1 6.88e-03 \n", + "2 8.84e-04 \n", + "3 5.20e-04 " ] }, "execution_count": 37, @@ -1490,8 +1490,8 @@ " \n", " 0\n", " 10002\n", - " 1.00e-08\n", - " 1.08e-07\n", + " 1.000000e-08\n", + " 0.000000\n", " H-1\n", " scatter\n", " 4.619398\n", @@ -1500,8 +1500,8 @@ " \n", " 1\n", " 10002\n", - " 1.08e-07\n", - " 1.17e-06\n", + " 1.080060e-07\n", + " 0.000001\n", " H-1\n", " scatter\n", " 2.030757\n", @@ -1510,8 +1510,8 @@ " \n", " 2\n", " 10002\n", - " 1.17e-06\n", - " 1.26e-05\n", + " 1.166529e-06\n", + " 0.000013\n", " H-1\n", " scatter\n", " 1.658488\n", @@ -1520,8 +1520,8 @@ " \n", " 3\n", " 10002\n", - " 1.26e-05\n", - " 1.36e-04\n", + " 1.259921e-05\n", + " 0.000136\n", " H-1\n", " scatter\n", " 1.853002\n", @@ -1530,8 +1530,8 @@ " \n", " 4\n", " 10002\n", - " 1.36e-04\n", - " 1.47e-03\n", + " 1.360790e-04\n", + " 0.001470\n", " H-1\n", " scatter\n", " 2.050773\n", @@ -1540,8 +1540,8 @@ " \n", " 5\n", " 10002\n", - " 1.47e-03\n", - " 1.59e-02\n", + " 1.469734e-03\n", + " 0.015874\n", " H-1\n", " scatter\n", " 2.131759\n", @@ -1550,8 +1550,8 @@ " \n", " 6\n", " 10002\n", - " 1.59e-02\n", - " 1.71e-01\n", + " 1.587401e-02\n", + " 0.171449\n", " H-1\n", " scatter\n", " 2.213710\n", @@ -1560,8 +1560,8 @@ " \n", " 7\n", " 10002\n", - " 1.71e-01\n", - " 1.85e+00\n", + " 1.714488e-01\n", + " 1.851749\n", " H-1\n", " scatter\n", " 2.011925\n", @@ -1570,8 +1570,8 @@ " \n", " 8\n", " 10002\n", - " 1.85e+00\n", - " 2.00e+01\n", + " 1.851749e+00\n", + " 20.000000\n", " H-1\n", " scatter\n", " 0.371280\n", @@ -1582,27 +1582,27 @@ "" ], "text/plain": [ - " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", - "0 10002 1.00e-08 1.08e-07 H-1 scatter 4.619398 \n", - "1 10002 1.08e-07 1.17e-06 H-1 scatter 2.030757 \n", - "2 10002 1.17e-06 1.26e-05 H-1 scatter 1.658488 \n", - "3 10002 1.26e-05 1.36e-04 H-1 scatter 1.853002 \n", - "4 10002 1.36e-04 1.47e-03 H-1 scatter 2.050773 \n", - "5 10002 1.47e-03 1.59e-02 H-1 scatter 2.131759 \n", - "6 10002 1.59e-02 1.71e-01 H-1 scatter 2.213710 \n", - "7 10002 1.71e-01 1.85e+00 H-1 scatter 2.011925 \n", - "8 10002 1.85e+00 2.00e+01 H-1 scatter 0.371280 \n", + " cell energy low [MeV] energy high [MeV] nuclide score mean \\\n", + "0 10002 1.00e-08 1.08e-07 H-1 scatter 4.62e+00 \n", + "1 10002 1.08e-07 1.17e-06 H-1 scatter 2.03e+00 \n", + "2 10002 1.17e-06 1.26e-05 H-1 scatter 1.66e+00 \n", + "3 10002 1.26e-05 1.36e-04 H-1 scatter 1.85e+00 \n", + "4 10002 1.36e-04 1.47e-03 H-1 scatter 2.05e+00 \n", + "5 10002 1.47e-03 1.59e-02 H-1 scatter 2.13e+00 \n", + "6 10002 1.59e-02 1.71e-01 H-1 scatter 2.21e+00 \n", + "7 10002 1.71e-01 1.85e+00 H-1 scatter 2.01e+00 \n", + "8 10002 1.85e+00 2.00e+01 H-1 scatter 3.71e-01 \n", "\n", " std. dev. \n", - "0 0.040124 \n", - "1 0.011239 \n", - "2 0.009777 \n", - "3 0.007378 \n", - "4 0.012484 \n", - "5 0.007821 \n", - "6 0.015159 \n", - "7 0.009406 \n", - "8 0.003949 " + "0 4.01e-02 \n", + "1 1.12e-02 \n", + "2 9.78e-03 \n", + "3 7.38e-03 \n", + "4 1.25e-02 \n", + "5 7.82e-03 \n", + "6 1.52e-02 \n", + "7 9.41e-03 \n", + "8 3.95e-03 " ] }, "execution_count": 38, diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index f6094533a7..8574c4873e 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -430,7 +430,7 @@ class CrossFilter(object): filter_index = left_index * self.right_filter.num_bins + right_index return filter_index - def get_pandas_dataframe(self, datasize, summary=None, **kwargs): + def get_pandas_dataframe(self, datasize, summary=None): """Builds a Pandas DataFrame for the CrossFilter's bins. This method constructs a Pandas DataFrame object for the CrossFilter @@ -454,14 +454,6 @@ class CrossFilter(object): column with a geometric "path" to each distribcell instance. NOTE: This option requires the OpenCG Python package. - Keyword arguments - ----------------- - energy_fmt : None or string - If a format string is provided, energy and energyout filter bins - will be converted from floats to strings using the given format. If - None is provided, the values will be left as floats. The default is - '{:.2e}'. - Returns ------- pandas.DataFrame @@ -480,15 +472,12 @@ class CrossFilter(object): # If left and right filters are identical, do not combine bins if self.left_filter == self.right_filter: - df = self.left_filter.get_pandas_dataframe(datasize, summary, - **kwargs) + df = self.left_filter.get_pandas_dataframe(datasize, summary) # If left and right filters are different, combine their bins else: - left_df = self.left_filter.get_pandas_dataframe(datasize, summary, - **kwargs) - right_df = self.right_filter.get_pandas_dataframe(datasize, summary, - **kwargs) + left_df = self.left_filter.get_pandas_dataframe(datasize, summary) + right_df = self.right_filter.get_pandas_dataframe(datasize, summary) left_df = left_df.astype(str) right_df = right_df.astype(str) df = '(' + left_df + ' ' + self.binary_op + ' ' + right_df + ')' @@ -842,7 +831,7 @@ class AggregateFilter(object): else: return 0 - def get_pandas_dataframe(self, datasize, summary=None, **kwargs): + def get_pandas_dataframe(self, datasize, summary=None): """Builds a Pandas DataFrame for the AggregateFilter's bins. This method constructs a Pandas DataFrame object for the AggregateFilter diff --git a/openmc/filter.py b/openmc/filter.py index d6f604108c..a27e17cd96 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -462,7 +462,7 @@ class Filter(object): return filter_bin - def get_pandas_dataframe(self, data_size, summary=None, **kwargs): + def get_pandas_dataframe(self, data_size, summary=None): """Builds a Pandas DataFrame for the Filter's bins. This method constructs a Pandas DataFrame object for the filter with @@ -484,14 +484,6 @@ class Filter(object): column with a geometric "path" to each distribcell instance. NOTE: This option requires the OpenCG Python package. - Keyword arguments - ----------------- - energy_fmt : None or string - If a format string is provided, energy and energyout filter bins - will be converted from floats to strings using the given format. If - None is provided, the values will be left as floats. The default is - '{:.2e}'. - Returns ------- pandas.DataFrame @@ -735,12 +727,6 @@ class Filter(object): lo_bins = np.tile(lo_bins, tile_factor) hi_bins = np.tile(hi_bins, tile_factor) - # Format the energy values, if necessary. - energy_fmt = kwargs.setdefault('energy_fmt', '{:.2e}') - if energy_fmt is not None: - lo_bins = [energy_fmt.format(E) for E in lo_bins] - hi_bins = [energy_fmt.format(E) for E in hi_bins] - # Add the new energy columns to the DataFrame. df.loc[:, self.type + ' low [MeV]'] = lo_bins df.loc[:, self.type + ' high [MeV]'] = hi_bins diff --git a/openmc/tallies.py b/openmc/tallies.py index f98be83a2a..d1666694fe 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -2,6 +2,7 @@ from __future__ import division from collections import Iterable, defaultdict import copy +from functools import partial import os import pickle import itertools @@ -1244,7 +1245,7 @@ class Tally(object): return data def get_pandas_dataframe(self, filters=True, nuclides=True, - scores=True, summary=None, **kwargs): + scores=True, summary=None, float_format='{:.2e}'): """Build a Pandas DataFrame for the Tally data. This method constructs a Pandas DataFrame object for the Tally data @@ -1268,14 +1269,9 @@ class Tally(object): information in the Summary object is embedded into a Multi-index column with a geometric "path" to each distribcell intance. NOTE: This option requires the OpenCG Python package. - - Keyword arguments - ----------------- - energy_fmt : None or string - If a format string is provided, energy and energyout filter bins - will be converted from floats to strings using the given format. If - None is provided, the values will be left as floats. The default is - '{:.2e}'. + float_format : string + All floats in the DataFrame will be formatted using the given + format string before printing. Returns ------- @@ -1324,8 +1320,7 @@ class Tally(object): # Append each Filter's DataFrame to the overall DataFrame for self_filter in self.filters: - filter_df = self_filter.get_pandas_dataframe(data_size, summary, - **kwargs) + filter_df = self_filter.get_pandas_dataframe(data_size, summary) df = pd.concat([df, filter_df], axis=1) # Include DataFrame column for nuclides if user requested it @@ -1376,6 +1371,10 @@ class Tally(object): # Create and set a MultiIndex for the DataFrame's columns df.columns = pd.MultiIndex.from_tuples(columns) + # Modify the df.to_string method so that it prints formatted strings. + # Credit to http://stackoverflow.com/users/3657742/chrisb for this trick + df.to_string = partial(df.to_string, float_format=float_format.format) + return df def get_reshaped_data(self, value='mean'): From 184ed3733b2e81463b1f83aaa98b81ce0229f3a3 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Mon, 8 Feb 2016 00:36:49 -0500 Subject: [PATCH 099/149] Fixed bugs in pandas dataframe construction for AggregateFilter --- openmc/arithmetic.py | 120 +++++++++++++++--- openmc/filter.py | 34 +++-- openmc/mgxs/mgxs.py | 1 - openmc/tallies.py | 34 ++--- .../results_true.dat | 8 +- 5 files changed, 146 insertions(+), 51 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index f6f701d095..13f300968a 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -1,5 +1,7 @@ import sys +import copy from numbers import Integral +from collections import Iterable import numpy as np @@ -430,7 +432,7 @@ class CrossFilter(object): filter_index = left_index * self.right_filter.num_bins + right_index return filter_index - def get_pandas_dataframe(self, datasize, summary=None): + def get_pandas_dataframe(self, data_size, summary=None): """Builds a Pandas DataFrame for the CrossFilter's bins. This method constructs a Pandas DataFrame object for the CrossFilter @@ -445,7 +447,7 @@ class CrossFilter(object): Parameters ---------- - datasize : Integral + data_size : Integral The total number of bins in the tally corresponding to this filter summary : None or Summary An optional Summary object to be used to construct columns for @@ -472,12 +474,12 @@ class CrossFilter(object): # If left and right filters are identical, do not combine bins if self.left_filter == self.right_filter: - df = self.left_filter.get_pandas_dataframe(datasize, summary) + df = self.left_filter.get_pandas_dataframe(data_size, summary) # If left and right filters are different, combine their bins else: - left_df = self.left_filter.get_pandas_dataframe(datasize, summary) - right_df = self.right_filter.get_pandas_dataframe(datasize, summary) + left_df = self.left_filter.get_pandas_dataframe(data_size, summary) + right_df = self.right_filter.get_pandas_dataframe(data_size, summary) left_df = left_df.astype(str) right_df = right_df.astype(str) df = '(' + left_df + ' ' + self.binary_op + ' ' + right_df + ')' @@ -713,6 +715,13 @@ class AggregateFilter(object): def __ne__(self, other): return not self == other + def __gt__(self, other): + # FIXME + return False + + def __lt__(self, other): + return not self > other + def __repr__(self): string = 'AggregateFilter\n' string += '{0: <16}{1}{2}\n'.format('\tType', '=\t', self.type) @@ -757,7 +766,7 @@ class AggregateFilter(object): @property def num_bins(self): - return 1 if self.aggregate_filter else 0 + return len(self.bins) if self.aggregate_filter else 0 @property def stride(self): @@ -779,8 +788,10 @@ class AggregateFilter(object): @bins.setter def bins(self, bins): - cv.check_iterable_type('bins', bins, (Integral, tuple)) - self._bins = bins + cv.check_iterable_type('bins', bins, Iterable) + self._bins = [] + for bin in bins: + self._bins.append(tuple(bin)) @aggregate_op.setter def aggregate_op(self, aggregate_op): @@ -825,9 +836,9 @@ class AggregateFilter(object): '"{0}" is not one of the bins'.format(filter_bin) raise ValueError(msg) else: - return 0 + return self.bins.index(filter_bin) - def get_pandas_dataframe(self, datasize, summary=None): + def get_pandas_dataframe(self, data_size, summary=None): """Builds a Pandas DataFrame for the AggregateFilter's bins. This method constructs a Pandas DataFrame object for the AggregateFilter @@ -836,7 +847,7 @@ class AggregateFilter(object): Parameters ---------- - datasize : Integral + data_size : Integral The total number of bins in the tally corresponding to this filter summary : None or Summary An optional Summary object to be used to construct columns for @@ -864,14 +875,85 @@ class AggregateFilter(object): import pandas as pd - # Construct a sring representing the filter aggregation - aggregate_bin = '{0}('.format(self.aggregate_op) - aggregate_bin += ', '.join(map(str, self.bins)) + ')' + # Create NumPy array of the bin tuples for repeating / tiling + filter_bins = np.empty(self.num_bins, dtype=tuple) + for i, bin in enumerate(self.bins): + filter_bins[i] = bin - # Construct NumPy array of bin repeated for each element in dataframe - aggregate_bin_array = np.array([aggregate_bin]) - aggregate_bin_array = np.repeat(aggregate_bin_array, datasize) + # Repeat and tile bins as needed for DataFrame + filter_bins = np.repeat(filter_bins, self.stride) + tile_factor = data_size / len(filter_bins) + filter_bins = np.tile(filter_bins, tile_factor) - # Construct Pandas DataFrame for the AggregateFilter - df = pd.DataFrame({self.type: aggregate_bin_array}) + # Create DataFrame with aggregated bins + df = pd.DataFrame({self.type: filter_bins}) return df + + def can_merge(self, other): + """Determine if AggregateFilter can be merged with another. + + Parameters + ---------- + other : AggregateFilter + Filter to compare with + + Returns + ------- + bool + Whether the filter can be merged + + """ + + if not isinstance(other, AggregateFilter): + return False + + # Filters must be of the same type + elif self.type != other.type: + return False + + # None of the bins in this filter should match in the other filter + for bin in self.bins: + if bin in other.bins: + return False + + # None of the bins in the other filter should match in this filter + for bin in other.bins: + if bin in self.bins: + return False + + # If all conditional checks passed then filters are mergeable + return True + + def merge(self, other): + """Merge this aggregatefilter with another. + + Parameters + ---------- + other : AggregateFilter + Filter to merge with + + Returns + ------- + merged_filter : AggregateFilter + Filter resulting from the merge + + """ + + if not self.can_merge(other): + msg = 'Unable to merge "{0}" with "{1}" ' \ + 'filters'.format(self.type, other.type) + raise ValueError(msg) + + # Create deep copy of filter to return as merged filter + merged_filter = copy.deepcopy(self) + + # Merge unique filter bins + merged_bins = self.bins + other.bins + + # Sort energy bin edges + if 'energy' in self.type: + merged_bins = sorted(merged_bins) + + # Assign merged bins to merged filter + merged_filter.bins = list(merged_bins) + return merged_filter \ No newline at end of file diff --git a/openmc/filter.py b/openmc/filter.py index 21797264b3..f8484ec767 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -263,11 +263,11 @@ class Filter(object): return False # Filters must be of the same type - elif self.type != other.type: + if self.type != other.type: return False # Distribcell filters cannot have more than one bin - elif self.type == 'distribcell': + if self.type == 'distribcell': return False # Mesh filters cannot have more than one bin @@ -289,6 +289,24 @@ class Filter(object): else: return True + ''' + # FIXME: Should all bins be completely separate??? + # FIMXE: This is necessary if merging will choose out unique bins + else: + # None of the bins in this filter should match in the other filter + for bin in self.bins: + if bin in other.bins: + return False + + # None of the bins in the other filter should match in this filter + for bin in other.bins: + if bin in self.bins: + return False + + # If all conditional checks pass then filters are mergeable + return True + ''' + def merge(self, other): """Merge this filter with another. @@ -313,7 +331,8 @@ class Filter(object): merged_filter = copy.deepcopy(self) # Merge unique filter bins - merged_bins = set(np.concatenate((self.bins, other.bins))) + merged_bins = np.concatenate((self.bins, other.bins)) + merged_bins = np.unique(merged_bins) # Sort energy bin edges if 'energy' in self.type: @@ -557,14 +576,8 @@ class Filter(object): """ - # Attempt to import Pandas - try: - import pandas as pd - except ImportError: - msg = 'The Pandas Python package must be installed on your system' - raise ImportError(msg) - # Initialize Pandas DataFrame + import pandas as pd df = pd.DataFrame() # mesh filters @@ -743,7 +756,6 @@ class Filter(object): filter_bins = np.repeat(filter_bins, self.stride) tile_factor = data_size / len(filter_bins) filter_bins = np.tile(filter_bins, tile_factor) - filter_bins = filter_bins df = pd.DataFrame({self.type : filter_bins}) # If OpenCG level info DataFrame was created, concatenate diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index a382c629b1..b82426e7df 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -1368,7 +1368,6 @@ class MGXS(object): # Sort the dataframe by domain type id (e.g., distribcell id) and # energy groups such that data is from fast to thermal df.sort([self.domain_type] + columns, inplace=True) - return df diff --git a/openmc/tallies.py b/openmc/tallies.py index d88519ba3b..c04ee001a7 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -301,7 +301,7 @@ class Tally(object): @property def sum(self): - if not self._sp_filename: + if not self._sp_filename or self.derived: return None if not self._results_read: @@ -924,6 +924,17 @@ class Tally(object): if score not in merged_tally.scores: merged_tally.add_score(score) + # Add triggers from other tally to merged tally + for trigger in other.triggers: + merged_tally.add_trigger(trigger) + + # If results have not been read, then return tally for input generation + if self._sp_filename is None: + return merged_tally + #Otherwise, this is a derived tally which needs merged results arrays + else: + self._derived = True + # Update filter strides in merged tally merged_tally._update_filter_strides() @@ -986,10 +997,6 @@ class Tally(object): # Sparsify merged tally if both tallies are sparse merged_tally.sparse = self.sparse and other.sparse - # Add triggers from other tally to merged tally - for trigger in other.triggers: - merged_tally.add_trigger(trigger) - return merged_tally def get_tally_xml(self): @@ -1538,14 +1545,8 @@ class Tally(object): 'Summary info'.format(self.id) raise KeyError(msg) - # Attempt to import Pandas - try: - import pandas as pd - except ImportError: - msg = 'The Pandas Python package must be installed on your system' - raise ImportError(msg) - # Initialize a pandas dataframe for the tally data + import pandas as pd df = pd.DataFrame() # Find the total length of the tally data array @@ -2189,8 +2190,8 @@ class Tally(object): # 'since it does not contain any results.'.format(self.id) # raise ValueError(msg) - cv.check_type('filter1', filter1, Filter) - cv.check_type('filter2', filter2, Filter) + cv.check_type('filter1', filter1, (Filter, CrossFilter, AggregateFilter)) + cv.check_type('filter2', filter2, (Filter, CrossFilter, AggregateFilter)) # Check that the filters exist in the tally and are not the same if filter1 == filter2: @@ -2923,6 +2924,7 @@ class Tally(object): # Create deep copy of tally to return as sliced tally new_tally = copy.deepcopy(self) + new_tally._derived = True # Differentiate Tally with a new auto-generated Tally ID new_tally.id = None @@ -3094,7 +3096,7 @@ class Tally(object): # Add AggregateFilter to the tally sum if not remove_filter: filter_sum = \ - AggregateFilter(self_filter, filter_bins, 'sum') + AggregateFilter(self_filter, [tuple(filter_bins)], 'sum') tally_sum.add_filter(filter_sum) # Add a copy of each filter not summed across to the tally sum @@ -3243,7 +3245,7 @@ class Tally(object): # Add AggregateFilter to the tally avg if not remove_filter: filter_sum = \ - AggregateFilter(self_filter, filter_bins, 'avg') + AggregateFilter(self_filter, [tuple(filter_bins)], 'avg') tally_avg.add_filter(filter_sum) # Add a copy of each filter not averaged across to the tally avg diff --git a/tests/test_mgxs_library_distribcell/results_true.dat b/tests/test_mgxs_library_distribcell/results_true.dat index 4936da4cec..7b4be0f468 100644 --- a/tests/test_mgxs_library_distribcell/results_true.dat +++ b/tests/test_mgxs_library_distribcell/results_true.dat @@ -1,5 +1,5 @@ sum(distribcell) group in nuclide mean std. dev. -0 sum(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, ... 1 total 0.720213 1.424323 sum(distribcell) group in nuclide mean std. dev. -0 sum(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, ... 1 total 0 0 sum(distribcell) group in group out nuclide mean std. dev. -0 sum(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, ... 1 1 total 0.70466 1.403916 sum(distribcell) group out nuclide mean std. dev. -0 sum(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, ... 1 total 0 0 \ No newline at end of file +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0.720213 1.424323 sum(distribcell) group in nuclide mean std. dev. +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0 0 sum(distribcell) group in group out nuclide mean std. dev. +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 1 total 0.70466 1.403916 sum(distribcell) group out nuclide mean std. dev. +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0 0 \ No newline at end of file From ef60d9d2f5e22a5d23654f23906a553c52d79c81 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Mon, 8 Feb 2016 15:40:58 -0500 Subject: [PATCH 100/149] Implemented MGXS merging --- openmc/filter.py | 18 --------- openmc/mgxs/groups.py | 67 +++++++++++++++++++++++++++++++- openmc/mgxs/mgxs.py | 90 +++++++++++++++++++++++++++++++++++++++++-- openmc/tallies.py | 6 ++- 4 files changed, 157 insertions(+), 24 deletions(-) diff --git a/openmc/filter.py b/openmc/filter.py index f8484ec767..2c310bebb4 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -289,24 +289,6 @@ class Filter(object): else: return True - ''' - # FIXME: Should all bins be completely separate??? - # FIMXE: This is necessary if merging will choose out unique bins - else: - # None of the bins in this filter should match in the other filter - for bin in self.bins: - if bin in other.bins: - return False - - # None of the bins in the other filter should match in this filter - for bin in other.bins: - if bin in self.bins: - return False - - # If all conditional checks pass then filters are mergeable - return True - ''' - def merge(self, other): """Merge this filter with another. diff --git a/openmc/mgxs/groups.py b/openmc/mgxs/groups.py index 3436c0e037..16e94ee451 100644 --- a/openmc/mgxs/groups.py +++ b/openmc/mgxs/groups.py @@ -54,10 +54,12 @@ class EnergyGroups(object): def __eq__(self, other): if not isinstance(other, EnergyGroups): return False - elif self.group_edges != other.group_edges: + elif self.num_groups != other.num_groups: return False - else: + elif np.allclose(self.group_edges, other.group_edges): return True + else: + return False def __ne__(self, other): return not self == other @@ -236,3 +238,64 @@ class EnergyGroups(object): condensed_groups.group_edges = group_edges return condensed_groups + + def can_merge(self, other): + """Determine if energy groups can be merged with another. + + Parameters + ---------- + other : EnergyGroups + EnergyGroups to compare with + + Returns + ------- + bool + Whether the energy groups can be merged + + """ + + if not isinstance(other, EnergyGroups): + return False + + # If the energy group structures match then groups are mergeable + if self == other: + return True + + # This low energy edge coincides with other's high energy edge + if self.group_edges[0] == other.group_edges[-1]: + return True + # This high energy edge coincides with other's low energy edge + elif self.group_edges[-1] == other.group_edges[0]: + return True + else: + return False + + def merge(self, other): + """Merge this energy groups with another. + + Parameters + ---------- + other : EnergyGroups + EnergyGroups to merge with + + Returns + ------- + merged_groups : EnergyGroups + EnergyGroups resulting from the merge + + """ + + if not self.can_merge(other): + raise ValueError('Unable to merge energy groups') + + # Create deep copy to return as merged energy groups + merged_groups = copy.deepcopy(self) + + # Merge unique filter bins + merged_edges = np.concatenate((self.group_edges, other.group_edges)) + merged_edges = np.unique(merged_edges) + merged_edges = sorted(merged_edges) + + # Assign merged edges to merged groups + merged_groups.group_edges = list(merged_edges) + return merged_groups \ No newline at end of file diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index b82426e7df..b4c107139d 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -155,7 +155,7 @@ class MGXS(object): clone._name = self.name clone._rxn_type = self.rxn_type clone._by_nuclide = self.by_nuclide - clone._nuclides = self._nuclides + clone._nuclides = copy.deepcopy(self._nuclides) clone._domain = self.domain clone._domain_type = self.domain_type clone._energy_groups = copy.deepcopy(self.energy_groups, memo) @@ -953,9 +953,93 @@ class MGXS(object): slice_xs.sparse = self.sparse return slice_xs - # FIXME + def can_merge(self, other): + """Determine if another MGXS can be merged with this one + + If results have been loaded from a statepoint, then MGXS are only + mergeable along one and only one of enegy groups or nuclides. + + Parameters + ---------- + other : MGXS + MGXS to check for merging + + """ + + if not isinstance(other, type(self)): + return False + + # Compare reaction type, energy groups, nuclides, domain type + if self.rxn_type != other.rxn_type: + return False + elif not self.energy_groups.can_merge(other.energy_groups): + return False + elif self.by_nuclide != other.by_nuclide: + return False + elif self.domain_type != other.domain_type: + return False + elif 'distribcell' not in self.domain_type and self.domain != other.domain: + return False + elif len(self.tallies) != len(other.tallies): + return False + + # See if each individual tally is mergeable + for tally_key in self.tallies: + if not self.tallies[tally_key].can_merge(other.tallies[tally_key]): + return False + + # If all conditionals pass then MGXS are mergeable + return True + def merge(self, other): - raise NotImplementedError('not yet implemented') + """Merge another MGXS with this one + + If results have been loaded from a statepoint, then MGXS are only + mergeable along one and only one of energy groups or nuclides. + + Parameters + ---------- + other : MGXS + MGXS to merge with this one + + Returns + ------- + merged_mgxs : MGXS + Merged MGXS + + """ + + if not self.can_merge(other): + raise ValueError('Unable to merge MGXS') + + # Create deep copy of tally to return as merged tally + merged_mgxs = copy.deepcopy(self) + merged_mgxs._rxn_rate_tally = None + merged_mgxs._xs_tally = None + + # Merge energy groups + if self.energy_groups != other.energy_groups: + merged_groups = self.energy_groups.merge(other.energy_groups) + merged_mgxs.energy_groups = merged_groups + + # Merge nuclides + if self.nuclides != other.nuclides: + + # The nuclides must be mutually exclusive + for nuclide in self.nuclides: + if nuclide in other.nuclides: + msg = 'Unable to merge MGXS with shared nuclides' + raise ValueError(msg) + + # Concatenate lists of nuclides for the merged MGXS + merged_mgxs.nuclides = self.nuclides + other.nuclides + + # Merge tallies + for tally_key in self.tallies: + merged_tally = self.tallies[tally_key].merge(other.tallies[tally_key]) + merged_mgxs.tallies[tally_key] = merged_tally + + return merged_mgxs def print_xs(self, subdomains='all', nuclides='all', xs_type='macro'): """Print a string representation for the multi-group cross section. diff --git a/openmc/tallies.py b/openmc/tallies.py index c04ee001a7..6b04403329 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -859,7 +859,7 @@ class Tally(object): Parameters ---------- - tally : Tally + other : Tally Tally to merge with this one Returns @@ -880,6 +880,10 @@ class Tally(object): # Differentiate Tally with a new auto-generated Tally ID merged_tally.id = None + # If the two tallies are equal, simpy return copy + if self == other: + return merged_tally + # Create deep copy of other tally to use for array concatenation other_copy = copy.deepcopy(other) From 65825b1b4ff68acff6f01c41c0efd3942a534b15 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 8 Feb 2016 19:43:35 -0500 Subject: [PATCH 101/149] Resolving style comments from @paulromano --- .../usersguide/output/particle_restart.rst | 2 +- src/ace_header.F90 | 5 +- src/global.F90 | 2 +- src/macroxs_header.F90 | 97 ++++++-------- src/{macroxs.F90 => macroxs_operations.F90} | 62 ++++----- src/mgxs_data.F90 | 8 +- src/nuclide_header.F90 | 64 +++++---- src/particle_header.F90 | 8 +- src/physics_mg.F90 | 6 +- src/sab_header.F90 | 4 +- src/scattdata_header.F90 | 121 +++++++++--------- src/tracking.F90 | 34 ++--- 12 files changed, 194 insertions(+), 219 deletions(-) rename src/{macroxs.F90 => macroxs_operations.F90} (80%) diff --git a/docs/source/usersguide/output/particle_restart.rst b/docs/source/usersguide/output/particle_restart.rst index eeb40a526e..1ed6077108 100644 --- a/docs/source/usersguide/output/particle_restart.rst +++ b/docs/source/usersguide/output/particle_restart.rst @@ -49,7 +49,7 @@ The current revision of the particle restart file format is 2. Energy of the particle in MeV. This is always provided but only used for continuous-energy mode. -**/energy_group** (*double*) +**/energy_group** (*int*) Energy group of the particle. This is always provided but only used for multi-group mode. diff --git a/src/ace_header.F90 b/src/ace_header.F90 index 497a16d3bf..ae5000e5ab 100644 --- a/src/ace_header.F90 +++ b/src/ace_header.F90 @@ -24,9 +24,8 @@ module ace_header real(8), allocatable :: sigma(:) ! Cross section values type(SecondaryDistribution) :: secondary - ! Type-Bound procedures - contains - procedure :: clear => reaction_clear ! Deallocates Reaction + contains + procedure :: clear => reaction_clear ! Deallocates Reaction end type Reaction !=============================================================================== diff --git a/src/global.F90 b/src/global.F90 index 02f53a4f7d..17477ed80b 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -5,7 +5,7 @@ module global use constants use dict_header, only: DictCharInt, DictIntInt use geometry_header, only: Cell, Universe, Lattice, LatticeContainer - use macroxs_header, only: MacroXS_Base, MacroXSContainer + use macroxs_header, only: MacroXSContainer use material_header, only: Material use mesh_header, only: RegularMesh use nuclide_header diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index 95053789f5..0f838967ea 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -14,26 +14,24 @@ module macroxs_header ! particle is traveling through !=============================================================================== - type, abstract :: MacroXS_Base + type, abstract :: MacroXS ! Data Order integer :: order - ! Type-Bound procedures contains - procedure(macroxs_init_), deferred, pass :: init ! initializes object - procedure(macroxs_get_xs_), deferred, pass :: get_xs ! Return xs - end type MacroXS_Base + procedure(macroxs_init_), deferred :: init ! initializes object + procedure(macroxs_get_xs_), deferred :: get_xs ! Return xs + end type MacroXS abstract interface subroutine macroxs_init_(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, & error_code, error_text) - - import MacroXS_Base + import MacroXS import Material import NuclideMGContainer import MAX_LINE_LEN - class(MacroXS_Base), intent(inout) :: this ! The MacroXS to initialize + class(MacroXS), intent(inout) :: this ! The MacroXS to initialize type(Material), pointer, intent(in) :: mat ! base material type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from integer, intent(in) :: groups ! Number of E groups @@ -44,47 +42,36 @@ module macroxs_header integer, intent(in) :: legendre_mu_points ! Treat as Leg or Tabular? integer, intent(inout) :: error_code ! Code signifying error character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print - end subroutine macroxs_init_ function macroxs_get_xs_(this, g, xstype, gout, uvw) result(xs) - import MacroXS_Base - class(MacroXS_Base), intent(in) :: this ! The MacroXS to initialize + import MacroXS + class(MacroXS), intent(in) :: this ! The MacroXS to initialize integer, intent(in) :: g ! Incoming Energy group character(*) , intent(in) :: xstype ! Cross Section Type integer, optional, intent(in) :: gout ! Outgoing Energy group real(8), optional, intent(in) :: uvw(3) ! Requested Angle real(8) :: xs ! Resultant xs - end function macroxs_get_xs_ - - subroutine macroxs_clear_(this) - - import MacroXS_Base - class(MacroXS_Base), intent(inout) :: this ! The MacroXS to clear - - end subroutine macroxs_clear_ - end interface - type, extends(MacroXS_Base) :: MacroXS_Iso + type, extends(MacroXS) :: MacroXSIso ! Microscopic cross sections real(8), allocatable :: total(:) ! total cross section real(8), allocatable :: absorption(:) ! absorption cross section - class(ScattData_Base), allocatable :: scatter ! scattering information + class(ScattData), allocatable :: scatter ! scattering information real(8), allocatable :: nu_fission(:) ! nu-fission real(8), allocatable :: k_fission(:) ! kappa-fission real(8), allocatable :: fission(:) ! fission x/s real(8), allocatable :: scattxs(:) ! scattering xs real(8), allocatable :: chi(:,:) ! fission spectra - ! Type-Bound procedures contains - procedure, pass :: init => macroxs_iso_init ! inits object - procedure, pass :: get_xs => macroxs_iso_get_xs ! Returns xs - end type MacroXS_Iso + procedure :: init => macroxsiso_init ! inits object + procedure :: get_xs => macroxsiso_get_xs ! Returns xs + end type MacroXSIso - type, extends(MacroXS_Base) :: MacroXS_Angle + type, extends(MacroXS) :: MacroXSAngle ! Macroscopic cross sections real(8), allocatable :: total(:,:,:) ! total cross section real(8), allocatable :: absorption(:,:,:) ! absorption cross section @@ -97,18 +84,17 @@ module macroxs_header real(8), allocatable :: polar(:) ! polar angles real(8), allocatable :: azimuthal(:) ! azimuthal angles - ! Type-Bound procedures contains - procedure, pass :: init => macroxs_angle_init ! inits object - procedure, pass :: get_xs => macroxs_angle_get_xs ! Returns xs - end type MacroXS_Angle + procedure :: init => macroxsangle_init ! inits object + procedure :: get_xs => macroxsangle_get_xs ! Returns xs + end type MacroXSAngle !=============================================================================== ! MACROXSCONTAINER pointer array for storing MacroXS objects. !=============================================================================== type MacroXSContainer - class(MacroXS_Base), allocatable :: obj + class(MacroXS), allocatable :: obj end type MacroXSContainer contains @@ -117,10 +103,9 @@ contains ! MACROXS*_INIT sets the MacroXS Data !=============================================================================== - subroutine macroxs_iso_init(this, mat, nuclides, groups, get_kfiss, get_fiss, & + subroutine macroxsiso_init(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, error_code, error_text) - - class(MacroXS_Iso), intent(inout) :: this ! The MacroXS to initialize + class(MacroXSIso), intent(inout) :: this ! The MacroXS to initialize type(Material), pointer, intent(in) :: mat ! base material type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from integer, intent(in) :: groups ! Number of E groups @@ -135,7 +120,6 @@ contains integer :: i ! loop index over nuclides integer :: gin, gout ! group indices real(8) :: atom_density ! atom density of a nuclide - ! class(NuclideBase), pointer :: nuc ! current nuclide integer :: imu real(8) :: norm integer :: mat_max_order, order, l @@ -164,7 +148,7 @@ contains ! Allocate stuff for later allocate(scatt_coeffs(order, groups, groups)) scatt_coeffs = ZERO - allocate(ScattData_Histogram :: this % scatter) + allocate(ScattDataHistogram :: this % scatter) else if (scatt_type == ANGLE_TABULAR) then ! Check all scattering data of same size @@ -182,7 +166,7 @@ contains ! Allocate stuff for later allocate(scatt_coeffs(order, groups, groups)) scatt_coeffs = ZERO - allocate(ScattData_Tabular :: this % scatter) + allocate(ScattDataTabular :: this % scatter) else if (scatt_type == ANGLE_LEGENDRE) then ! Otherwise find the maximum scattering order @@ -203,9 +187,9 @@ contains allocate(scatt_coeffs(order + 1, groups, groups)) scatt_coeffs = ZERO if (legendre_mu_points == 1) then - allocate(ScattData_Legendre :: this % scatter) + allocate(ScattDataLegendre :: this % scatter) else - allocate(ScattData_Tabular :: this % scatter) + allocate(ScattDataTabular :: this % scatter) end if end if @@ -307,7 +291,7 @@ contains end do type is (NuclideAngle) error_code = 1 - error_text = "Invalid Passing of NuclideAngle to MacroXS_Iso Object" + error_text = "Invalid Passing of NuclideAngle to MacroXSIso Object" return end select end do @@ -360,12 +344,11 @@ contains ! Deallocate temporaries for the next material deallocate(scatt_coeffs, temp_energy, temp_mult) - end subroutine macroxs_iso_init + end subroutine macroxsiso_init - subroutine macroxs_angle_init(this, mat, nuclides, groups, get_kfiss, get_fiss, & + subroutine macroxsangle_init(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, error_code, error_text) - - class(MacroXS_Angle), intent(inout) :: this ! The MacroXS to initialize + class(MacroXSAngle), intent(inout) :: this ! The MacroXS to initialize type(Material), pointer, intent(in) :: mat ! base material type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from integer, intent(in) :: groups ! Number of E groups @@ -435,7 +418,7 @@ contains allocate(this % scatter(nazi, npol)) do ipol = 1, npol do iazi = 1, nazi - allocate(ScattData_Histogram :: this % scatter(iazi, ipol) % obj) + allocate(ScattDataHistogram :: this % scatter(iazi, ipol) % obj) end do end do @@ -458,7 +441,7 @@ contains allocate(this % scatter(nazi, npol)) do ipol = 1, npol do iazi = 1, nazi - allocate(ScattData_Tabular :: this % scatter(iazi, ipol) % obj) + allocate(ScattDataTabular :: this % scatter(iazi, ipol) % obj) end do end do @@ -484,9 +467,9 @@ contains do ipol = 1, npol do iazi = 1, nazi if (legendre_mu_points == 1) then - allocate(ScattData_Legendre :: this % scatter(iazi, ipol) % obj) + allocate(ScattDataLegendre :: this % scatter(iazi, ipol) % obj) else - allocate(ScattData_Tabular :: this % scatter(iazi, ipol) % obj) + allocate(ScattDataTabular :: this % scatter(iazi, ipol) % obj) end if end do end do @@ -524,7 +507,7 @@ contains select type(nuc => nuclides(mat % nuclide(i)) % obj) type is (NuclideIso) error_code = 1 - error_text = "Invalid Passing of NuclideIso to MacroXS_Angle Object" + error_text = "Invalid Passing of NuclideIso to MacroXSAngle Object" return type is (NuclideAngle) ! Add contributions to total, absorption, and fission data (if necessary) @@ -652,14 +635,14 @@ contains ! Deallocate temporaries for the next material deallocate(scatt_coeffs, temp_energy, temp_mult) - end subroutine macroxs_angle_init + end subroutine macroxsangle_init !=============================================================================== ! MACROXS_*_GET_XS returns the requested data type !=============================================================================== - function macroxs_iso_get_xs(this, g, xstype, gout, uvw) result(xs) - class(MacroXS_Iso), intent(in) :: this ! The MacroXS to initialize + function macroxsiso_get_xs(this, g, xstype, gout, uvw) result(xs) + class(MacroXSIso), intent(in) :: this ! The MacroXS to initialize integer, intent(in) :: g ! Incoming Energy group character(*) , intent(in) :: xstype ! Type of xs requested integer, optional, intent(in) :: gout ! Outgoing Energy group @@ -687,10 +670,10 @@ contains end if end select - end function macroxs_iso_get_xs + end function macroxsiso_get_xs - function macroxs_angle_get_xs(this, g, xstype, gout,uvw) result(xs) - class(MacroXS_Angle), intent(in) :: this ! The MacroXS to initialize + function macroxsangle_get_xs(this, g, xstype, gout,uvw) result(xs) + class(MacroXSAngle), intent(in) :: this ! The MacroXS to initialize integer, intent(in) :: g ! Incoming Energy group character(*) , intent(in) :: xstype ! Type of xs requested integer, optional, intent(in) :: gout ! Outgoing Energy group @@ -723,6 +706,6 @@ contains end select end if - end function macroxs_angle_get_xs + end function macroxsangle_get_xs end module macroxs_header diff --git a/src/macroxs.F90 b/src/macroxs_operations.F90 similarity index 80% rename from src/macroxs.F90 rename to src/macroxs_operations.F90 index 170f5fb19a..4fc13910ca 100644 --- a/src/macroxs.F90 +++ b/src/macroxs_operations.F90 @@ -1,7 +1,7 @@ -module macroxs +module macroxs_operations use constants - use macroxs_header, only: MacroXS_Base, MacroXS_Iso, MacroXS_Angle, & + use macroxs_header, only: MacroXS, MacroXSIso, MacroXSAngle, & expand_harmonic use material_header, only: Material use math @@ -20,7 +20,7 @@ contains !=============================================================================== subroutine calculate_mgxs(this, gin, uvw, xs) - class(MacroXS_Base), intent(in) :: this + class(MacroXS), intent(in) :: this integer, intent(in) :: gin ! Incoming neutron group real(8), intent(in) :: uvw(3) ! Incoming neutron direction type(MaterialMacroXS), intent(inout) :: xs @@ -28,13 +28,13 @@ contains integer :: iazi, ipol select type(this) - type is (MacroXS_Iso) + type is (MacroXSIso) xs % total = this % total(gin) xs % elastic = this % scattxs(gin) xs % absorption = this % absorption(gin) xs % nu_fission = this % nu_fission(gin) - type is (MacroXS_Angle) + type is (MacroXSAngle) call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) xs % total = this % total(gin, iazi, ipol) xs % elastic = this % scattxs(gin, iazi, ipol) @@ -50,16 +50,16 @@ contains !=============================================================================== function sample_fission_energy(this, gin, uvw) result(gout) - class(MacroXS_Base), intent(in) :: this ! Data to work with + class(MacroXS), intent(in) :: this ! Data to work with integer, intent(in) :: gin ! Incoming energy group real(8), intent(in) :: uvw(3) ! Particle Direction integer :: gout ! Sampled outgoing group select type(this) - type is (MacroXS_Iso) - gout = macroxs_iso_sample_fission_energy(this, gin, uvw) - type is (MacroXS_Angle) - gout = macroxs_angle_sample_fission_energy(this, gin, uvw) + type is (MacroXSIso) + gout = macroxsiso_sample_fission_energy(this, gin, uvw) + type is (MacroXSAngle) + gout = macroxsangle_sample_fission_energy(this, gin, uvw) end select end function sample_fission_energy @@ -69,11 +69,11 @@ contains ! Implemented as % scatter. !=============================================================================== - function macroxs_iso_sample_fission_energy(this, gin, uvw) result(gout) - class(MacroXS_Iso), intent(in) :: this ! Data to work with - integer, intent(in) :: gin ! Incoming energy group - real(8), intent(in) :: uvw(3) ! Particle Direction - integer :: gout ! Sampled outgoing group + function macroxsiso_sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXSIso), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group real(8) :: xi ! Our random number real(8) :: prob ! Running probability @@ -86,10 +86,10 @@ contains prob = prob + this % chi(gout,gin) end do - end function macroxs_iso_sample_fission_energy + end function macroxsiso_sample_fission_energy - function macroxs_angle_sample_fission_energy(this, gin, uvw) result(gout) - class(MacroXS_Angle), intent(in) :: this ! Data to work with + function macroxsangle_sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXSAngle), intent(in) :: this ! Data to work with integer, intent(in) :: gin ! Incoming energy group real(8), intent(in) :: uvw(3) ! Particle Direction integer :: gout ! Sampled outgoing group @@ -108,14 +108,14 @@ contains prob = prob + this % chi(gout,gin,iazi,ipol) end do - end function macroxs_angle_sample_fission_energy + end function macroxsangle_sample_fission_energy !=============================================================================== ! SAMPLE_SCATTER acts as a templating code for macroxs_*_sample_scatter !=============================================================================== subroutine sample_scatter(this, uvw, gin, gout, mu, wgt) - class(MacroXS_Base), intent(in) :: this + class(MacroXS), intent(in) :: this real(8), intent(in) :: uvw(3) ! Incoming neutron direction integer, intent(in) :: gin ! Incoming neutron group integer, intent(out) :: gout ! Sampled outgoin group @@ -125,9 +125,9 @@ contains integer :: iazi, ipol ! Angular indices select type(this) - type is (MacroXS_Iso) + type is (MacroXSIso) call macroxs_sample_scatter(this % scatter, gin, gout, mu, wgt) - type is (MacroXS_Angle) + type is (MacroXSAngle) call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) call macroxs_sample_scatter(this % scatter(iazi,ipol) % obj,gin,gout,mu,wgt) end select @@ -140,11 +140,11 @@ contains !=============================================================================== subroutine macroxs_sample_scatter(scatt, gin, gout, mu, wgt) - class(ScattData_Base), intent(in) :: scatt ! Scattering Object to Use - integer, intent(in) :: gin ! Incoming neutron group - integer, intent(out) :: gout ! Sampled outgoin group - real(8), intent(out) :: mu ! Sampled change in angle - real(8), intent(inout) :: wgt ! Particle weight + class(ScattData), intent(in) :: scatt ! Scattering Object to Use + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight real(8) :: xi ! Our random number real(8) :: prob ! Running probability @@ -164,7 +164,7 @@ contains end do select type (scatt) - type is (ScattData_Histogram) + type is (ScattDataHistogram) xi = prn() if (xi < scatt % data(1,gout,gin)) then imu = 1 @@ -176,7 +176,7 @@ contains ! Randomly select a mu in this bin. mu = prn() * scatt % dmu + scatt % mu(imu) - type is (ScattData_Tabular) + type is (ScattDataTabular) ! determine outgoing cosine bin NP = size(scatt % data(:,gout,gin)) xi = prn() @@ -211,7 +211,7 @@ contains mu = ONE end if - type is (ScattData_Legendre) + type is (ScattDataLegendre) ! Now we can sample mu using the legendre representation of the scattering ! kernel in data(1:this % order) @@ -240,4 +240,4 @@ contains end subroutine macroxs_sample_scatter -end module macroxs \ No newline at end of file +end module macroxs_operations \ No newline at end of file diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index d9c397f5bb..94546c10dc 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -486,7 +486,7 @@ contains return call get_node_array(node_xsdata, "polar", this % polar) else - dangle = PI / (real(this % Npol,8)) + dangle = PI / real(this % Npol,8) do iangle = 1, this % Npol this % polar(iangle) = (real(iangle,8) - 0.5_8) * dangle end do @@ -497,7 +497,7 @@ contains return call get_node_array(node_xsdata, "azimuthal", this % azimuthal) else - dangle = TWO * PI / (real(this % Nazi,8)) + dangle = TWO * PI / real(this % Nazi,8) do iangle = 1, this % Nazi this % azimuthal(iangle) = -PI + (real(iangle,8) - 0.5_8) * dangle end do @@ -685,9 +685,9 @@ contains ! Now allocate accordingly select case(representation) case(MGXS_ISOTROPIC) - allocate(MacroXS_Iso :: macro_xs(i_mat) % obj) + allocate(MacroXSIso :: macro_xs(i_mat) % obj) case(MGXS_ANGLE) - allocate(MacroXS_Angle :: macro_xs(i_mat) % obj) + allocate(MacroXSAngle :: macro_xs(i_mat) % obj) end select call macro_xs(i_mat) % obj % init(mat, nuclides_MG, energy_groups, & diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 095155a33b..caf0c10729 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -12,12 +12,12 @@ module nuclide_header implicit none !=============================================================================== -! NuclideBase contains the base nuclidic data for a nuclide, which does not depend +! Nuclide contains the base nuclidic data for a nuclide, which does not depend ! upon how the nuclear data is represented (i.e., CE, or any variant of MG). ! The extended types, NuclideCE and NuclideMG deal with the rest !=============================================================================== - type, abstract :: NuclideBase + type, abstract :: Nuclide character(12) :: name ! name of nuclide, e.g. 92235.03c integer :: zaid ! Z and A identifier, e.g. 92235 real(8) :: awr ! Atomic Weight Ratio @@ -30,21 +30,21 @@ module nuclide_header ! Fission information logical :: fissionable ! nuclide is fissionable? - contains - procedure(print_nuclide_), deferred, pass :: print ! Writes nuclide info - end type NuclideBase + contains + procedure(print_nuclide_), deferred :: print ! Writes nuclide info + end type Nuclide abstract interface subroutine print_nuclide_(this, unit) - import NuclideBase - class(NuclideBase),intent(in) :: this - integer, optional, intent(in) :: unit + import Nuclide + class(Nuclide),intent(in) :: this + integer, optional, intent(in) :: unit end subroutine print_nuclide_ end interface - type, extends(NuclideBase) :: NuclideCE + type, extends(Nuclide) :: NuclideCE ! Energy grid information integer :: n_grid ! # of nuclide grid points integer, allocatable :: grid_index(:) ! log grid mapping indices @@ -100,13 +100,12 @@ module nuclide_header type(DictIntInt) :: reaction_index ! map MT values to index in reactions ! array; used at tally-time - ! Type-Bound procedures - contains - procedure, pass :: clear => nuclidece_clear - procedure, pass :: print => nuclidece_print + contains + procedure :: clear => nuclidece_clear + procedure :: print => nuclidece_print end type NuclideCE - type, abstract, extends(NuclideBase) :: NuclideMG + type, abstract, extends(Nuclide) :: NuclideMG ! Scattering Order Information integer :: order ! Order of data (Scattering for NuclideIso, ! Number of angles for all in NuclideAngle) @@ -114,10 +113,9 @@ module nuclide_header integer :: legendre_mu_points ! Number of tabular points to use to represent ! Legendre distribs, -1 if sample with the ! Legendres themselves -! Type-Bound procedures - contains - procedure(nuclidemg_get_xs), deferred, pass :: get_xs ! Get the xs - procedure(nuclide_calc_f_), deferred, pass :: calc_f ! Calculates f, given mu + contains + procedure(nuclidemg_get_xs), deferred :: get_xs ! Get the xs + procedure(nuclide_calc_f_), deferred :: calc_f ! Calculates f, given mu end type NuclideMG abstract interface @@ -166,11 +164,10 @@ module nuclide_header real(8), allocatable :: chi(:) ! Fission Spectra real(8), allocatable :: mult(:,:) ! Scatter multiplicity (Gout x Gin) - ! Type-Bound procedures - contains - procedure, pass :: print => nuclideiso_print ! Writes nuclide info - procedure, pass :: get_xs => nuclideiso_get_xs ! Gets Size of Data w/in Object - procedure, pass :: calc_f => nuclideiso_calc_f ! Calcs f given mu + contains + procedure :: print => nuclideiso_print ! Writes nuclide info + procedure :: get_xs => nuclideiso_get_xs ! Gets Size of Data w/in Object + procedure :: calc_f => nuclideiso_calc_f ! Calcs f given mu end type NuclideIso !=============================================================================== @@ -196,11 +193,10 @@ module nuclide_header real(8), allocatable :: polar(:) ! polar angles real(8), allocatable :: azimuthal(:) ! azimuthal angles - ! Type-Bound procedures - contains - procedure, pass :: print => nuclideangle_print ! Gets Size of Data w/in Object - procedure, pass :: get_xs => nuclideangle_get_xs ! Gets Size of Data w/in Object - procedure, pass :: calc_f => nuclideangle_calc_f ! Calcs f given mu + contains + procedure :: print => nuclideangle_print ! Gets Size of Data w/in Object + procedure :: get_xs => nuclideangle_get_xs ! Gets Size of Data w/in Object + procedure :: calc_f => nuclideangle_calc_f ! Calcs f given mu end type NuclideAngle !=============================================================================== @@ -217,14 +213,12 @@ module nuclide_header !=============================================================================== type Nuclide0K - character(10) :: nuclide ! name of nuclide, e.g. U-238 character(16) :: scheme = 'ares' ! target velocity sampling scheme character(10) :: name ! name of nuclide, e.g. 92235.03c character(10) :: name_0K ! name of 0K nuclide, e.g. 92235.00c real(8) :: E_min = 0.01e-6_8 ! lower cutoff energy for res scattering real(8) :: E_max = 1000.0e-6_8 ! upper cutoff energy for res scattering - end type Nuclide0K !=============================================================================== @@ -289,7 +283,7 @@ module nuclide_header contains !=============================================================================== -! NUCLIDECE_CLEAR resets and deallocates data in NuclideBase, NuclideIso +! NUCLIDECE_CLEAR resets and deallocates data in Nuclide, NuclideIso ! or NuclideAngle !=============================================================================== @@ -648,7 +642,7 @@ module nuclide_header if (this % scatt_type == ANGLE_LEGENDRE) then f = evaluate_legendre(this % scatter(gout,gin,:), mu) else if (this % scatt_type == ANGLE_TABULAR) then - dmu = TWO / (real(this % order) - 1) + dmu = TWO / real(this % order - 1) ! Find mu bin algebraically, knowing that the spacing is equal f = (mu + ONE) / dmu + ONE imu = floor(f) @@ -702,7 +696,7 @@ module nuclide_header if (this % scatt_type == ANGLE_LEGENDRE) then f = evaluate_legendre(this % scatter(gout,gin,:,i_azi_,i_pol_), mu) else if (this % scatt_type == ANGLE_TABULAR) then - dmu = TWO / (real(this % order) - 1) + dmu = TWO / real(this % order - 1) ! Find mu bin algebraically, knowing that the spacing is equal f = (mu + ONE) / dmu + ONE imu = floor(f) @@ -751,9 +745,9 @@ module nuclide_header my_azi = atan2(uvw(2), uvw(1)) ! Search for equi-binned angles - dangle = PI / (real(size(polar),8)) + dangle = PI / real(size(polar),8) i_pol = floor(my_pol / dangle + ONE) - dangle = TWO * PI / (real(size(azimuthal),8)) + dangle = TWO * PI / real(size(azimuthal),8) i_azi = floor((my_azi + PI) / dangle + ONE) end subroutine find_angle diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 0426acd924..3c687eb02f 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -94,10 +94,10 @@ module particle_header type(Bank) :: secondary_bank(MAX_SECONDARY) contains - procedure, pass :: initialize => initialize_particle - procedure, pass :: clear => clear_particle - procedure, pass :: initialize_from_source => initialize_from_source - procedure, pass :: create_secondary => create_secondary + procedure :: initialize => initialize_particle + procedure :: clear => clear_particle + procedure :: initialize_from_source => initialize_from_source + procedure :: create_secondary => create_secondary end type Particle contains diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 048f3ce54f..a0d8eb6e1d 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -5,8 +5,8 @@ module physics_mg use constants use error, only: fatal_error, warning use global - use macroxs_header, only: MacroXS_Base, MacroXSContainer - use macroxs, only: sample_fission_energy, sample_scatter + use macroxs_header, only: MacroXS, MacroXSContainer + use macroxs_operations, only: sample_fission_energy, sample_scatter use material_header, only: Material use math, only: rotate_angle use mesh, only: get_mesh_indices @@ -179,7 +179,7 @@ contains real(8) :: phi ! fission neutron azimuthal angle real(8) :: weight ! weight adjustment for ufs method logical :: in_mesh ! source site in ufs mesh? - class(MacroXS_Base), pointer :: xs + class(MacroXS), pointer :: xs ! Get Pointers xs => macro_xs(p % material) % obj diff --git a/src/sab_header.F90 b/src/sab_header.F90 index 56617dd01d..695f735c05 100644 --- a/src/sab_header.F90 +++ b/src/sab_header.F90 @@ -60,8 +60,8 @@ module sab_header real(8), allocatable :: elastic_e_in(:) real(8), allocatable :: elastic_P(:) real(8), allocatable :: elastic_mu(:,:) - contains - procedure, pass :: print => print_sab_table + contains + procedure :: print => print_sab_table end type SAlphaBeta contains diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index 091a77741a..62b382d36c 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -10,68 +10,67 @@ module scattdata_header ! angular distribution !=============================================================================== - type, abstract :: ScattData_Base + type, abstract :: ScattData ! p0 matrix on its own for sampling energy real(8), allocatable :: energy(:,:) ! (Gout x Gin) real(8), allocatable :: mult(:,:) ! (Gout x Gin) real(8), allocatable :: data(:,:,:) ! (Order/Nmu x Gout x Gin) - ! Type-Bound procedures contains - procedure(init_), deferred, pass :: init ! Initializes ScattData - procedure(calc_f_), deferred, pass :: calc_f ! Calculates f, given mu - end type ScattData_Base + procedure(init_), deferred :: init ! Initializes ScattData + procedure(calc_f_), deferred :: calc_f ! Calculates f, given mu + end type ScattData abstract interface subroutine init_(this, order, energy, mult, coeffs) - import ScattData_Base - class(ScattData_Base), intent(inout) :: this ! Object to work on - integer, intent(in) :: order ! Data Order - real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix - real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix - real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use + import ScattData + class(ScattData), intent(inout) :: this ! Object to work on + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use end subroutine init_ pure function calc_f_(this, gin, gout, mu) result(f) - import ScattData_Base - class(ScattData_Base), intent(in) :: this ! The ScattData to evaluate - integer, intent(in) :: gin ! Incoming Energy Group - integer, intent(in) :: gout ! Outgoing Energy Group - real(8), intent(in) :: mu ! Angle of interest - real(8) :: f ! Return value of f(mu) + import ScattData + class(ScattData), intent(in) :: this ! The ScattData to evaluate + integer, intent(in) :: gin ! Incoming Energy Group + integer, intent(in) :: gout ! Outgoing Energy Group + real(8), intent(in) :: mu ! Angle of interest + real(8) :: f ! Return value of f(mu) end function calc_f_ end interface - type, extends(ScattData_Base) :: ScattData_Legendre + type, extends(ScattData) :: ScattDataLegendre contains - procedure, pass :: init => scattdata_legendre_init - procedure, pass :: calc_f => scattdata_legendre_calc_f - end type ScattData_Legendre + procedure :: init => scattdatalegendre_init + procedure :: calc_f => scattdatalegendre_calc_f + end type ScattDataLegendre - type, extends(ScattData_Base) :: ScattData_Histogram - real(8), allocatable :: mu(:) ! Mu bins - real(8) :: dmu ! Mu spacing + type, extends(ScattData) :: ScattDataHistogram + real(8), allocatable :: mu(:) ! Mu bins + real(8) :: dmu ! Mu spacing contains - procedure, pass :: init => scattdata_histogram_init - procedure, pass :: calc_f => scattdata_histogram_calc_f - end type ScattData_Histogram + procedure :: init => scattdatahistogram_init + procedure :: calc_f => scattdatahistogram_calc_f + end type ScattDataHistogram - type, extends(ScattData_Base) :: ScattData_Tabular - real(8), allocatable :: mu(:) ! Mu bins - real(8) :: dmu ! Mu spacing - real(8), allocatable :: fmu(:,:,:) ! PDF of f(mu) + type, extends(ScattData) :: ScattDataTabular + real(8), allocatable :: mu(:) ! Mu bins + real(8) :: dmu ! Mu spacing + real(8), allocatable :: fmu(:,:,:) ! PDF of f(mu) contains - procedure, pass :: init => scattdata_tabular_init - procedure, pass :: calc_f => scattdata_tabular_calc_f - end type ScattData_Tabular + procedure :: init => scattdatatabular_init + procedure :: calc_f => scattdatatabular_calc_f + end type ScattDataTabular !=============================================================================== ! SCATTDATACONTAINER allocatable array for storing ScattData Objects (for angle) !=============================================================================== type ScattDataContainer - class(ScattData_Base), allocatable :: obj + class(ScattData), allocatable :: obj end type ScattDataContainer contains @@ -80,8 +79,8 @@ contains ! SCATTDATA_INIT builds the scattdata object !=============================================================================== - subroutine scattdata_base_init(this, order, energy, mult) - class(ScattData_Base), intent(inout) :: this ! Object to work on + subroutine scattdatabase_init(this, order, energy, mult) + class(ScattData), intent(inout) :: this ! Object to work on integer, intent(in) :: order ! Data Order real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix @@ -97,23 +96,23 @@ contains allocate(this % data(order, groups, groups)) this % data = ZERO - end subroutine scattdata_base_init + end subroutine scattdatabase_init - subroutine scattdata_legendre_init(this, order, energy, mult, coeffs) - class(ScattData_Legendre), intent(inout) :: this ! Object to work on + subroutine scattdatalegendre_init(this, order, energy, mult, coeffs) + class(ScattDataLegendre), intent(inout) :: this ! Object to work on integer, intent(in) :: order ! Data Order real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use - call scattdata_base_init(this, order, energy, mult) + call scattdatabase_init(this, order, energy, mult) this % data = coeffs - end subroutine scattdata_legendre_init + end subroutine scattdatalegendre_init - subroutine scattdata_histogram_init(this, order, energy, mult, coeffs) - class(ScattData_Histogram), intent(inout) :: this ! Object to work on + subroutine scattdatahistogram_init(this, order, energy, mult, coeffs) + class(ScattDataHistogram), intent(inout) :: this ! Object to work on integer, intent(in) :: order ! Data Order real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix @@ -124,10 +123,10 @@ contains groups = size(energy,dim=1) - call scattdata_base_init(this, order, energy, mult) + call scattdatabase_init(this, order, energy, mult) allocate(this % mu(order)) - this % dmu = TWO / (real(order,8)) + this % dmu = TWO / real(order,8) this % mu(1) = -ONE do imu = 2, order this % mu(imu) = -ONE + (imu - 1) * this % dmu @@ -152,10 +151,10 @@ contains end do end do - end subroutine scattdata_histogram_init + end subroutine scattdatahistogram_init - subroutine scattdata_tabular_init(this, order, energy, mult, coeffs) - class(ScattData_Tabular), intent(inout) :: this ! Object to work on + subroutine scattdatatabular_init(this, order, energy, mult, coeffs) + class(ScattDataTabular), intent(inout) :: this ! Object to work on integer, intent(in) :: order ! Data Order real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix @@ -176,10 +175,10 @@ contains groups = size(energy,dim=1) - call scattdata_base_init(this, this_order, energy, mult) + call scattdatabase_init(this, this_order, energy, mult) allocate(this % mu(this_order)) - this % dmu = TWO / (real(this_order) - 1) + this % dmu = TWO / real(this_order - 1) do imu = 1, this_order - 1 this % mu(imu) = -ONE + real(imu - 1) * this % dmu end do @@ -228,14 +227,14 @@ contains end do end do - end subroutine scattdata_tabular_init + end subroutine scattdatatabular_init !=============================================================================== ! SCATTDATA_*_CALC_F Calculates the value of f given mu (and gin,gout pair) !=============================================================================== - pure function scattdata_legendre_calc_f(this, gin, gout, mu) result(f) - class(ScattData_Legendre), intent(in) :: this ! The ScattData to evaluate + pure function scattdatalegendre_calc_f(this, gin, gout, mu) result(f) + class(ScattDataLegendre), intent(in) :: this ! The ScattData to evaluate integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group real(8), intent(in) :: mu ! Angle of interest @@ -244,10 +243,10 @@ contains ! Plug mu in to the legendre expansion and go from there f = evaluate_legendre(this % data(:, gout, gin), mu) - end function scattdata_legendre_calc_f + end function scattdatalegendre_calc_f - pure function scattdata_histogram_calc_f(this, gin, gout, mu) result(f) - class(ScattData_Histogram), intent(in) :: this ! The ScattData to evaluate + pure function scattdatahistogram_calc_f(this, gin, gout, mu) result(f) + class(ScattDataHistogram), intent(in) :: this ! The ScattData to evaluate integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group real(8), intent(in) :: mu ! Angle of interest @@ -265,10 +264,10 @@ contains ! Use histogram interpolation to find f(mu) f = this % data(imu, gout, gin) - end function scattdata_histogram_calc_f + end function scattdatahistogram_calc_f - pure function scattdata_tabular_calc_f(this, gin, gout, mu) result(f) - class(ScattData_Tabular), intent(in) :: this ! The ScattData to evaluate + pure function scattdatatabular_calc_f(this, gin, gout, mu) result(f) + class(ScattDataTabular), intent(in) :: this ! The ScattData to evaluate integer, intent(in) :: gin ! Incoming Energy Group integer, intent(in) :: gout ! Outgoing Energy Group real(8), intent(in) :: mu ! Angle of interest @@ -289,6 +288,6 @@ contains f = (ONE - r) * this % data(imu, gout, gin) + & r * this % data(imu + 1, gout, gin) - end function scattdata_tabular_calc_f + end function scattdatatabular_calc_f end module scattdata_header \ No newline at end of file diff --git a/src/tracking.F90 b/src/tracking.F90 index 0b2719ef5d..98e5483a0a 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -1,23 +1,23 @@ module tracking - use constants, only: MODE_EIGENVALUE - use cross_section, only: calculate_xs - use error, only: fatal_error, warning - use geometry, only: find_cell, distance_to_boundary, cross_surface, & - cross_lattice, check_cell_overlap - use geometry_header, only: Universe, BASE_UNIVERSE + use constants, only: MODE_EIGENVALUE + use cross_section, only: calculate_xs + use error, only: fatal_error, warning + use geometry, only: find_cell, distance_to_boundary, cross_surface, & + cross_lattice, check_cell_overlap + use geometry_header, only: Universe, BASE_UNIVERSE use global - use macroxs, only: calculate_mgxs - use output, only: write_message - use particle_header, only: LocalCoord, Particle - use physics, only: collision - use physics_mg, only: collision_mg - use random_lcg, only: prn - use string, only: to_str - use tally, only: score_analog_tally, score_tracklength_tally, & - score_collision_tally, score_surface_current - use track_output, only: initialize_particle_track, write_particle_track, & - add_particle_track, finalize_particle_track + use macroxs_operations, only: calculate_mgxs + use output, only: write_message + use particle_header, only: LocalCoord, Particle + use physics, only: collision + use physics_mg, only: collision_mg + use random_lcg, only: prn + use string, only: to_str + use tally, only: score_analog_tally, score_tracklength_tally, & + score_collision_tally, score_surface_current + use track_output, only: initialize_particle_track, write_particle_track, & + add_particle_track, finalize_particle_track implicit none From 307617538c887a3ed8db2fd0a19640b6383553b4 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 10 Feb 2016 20:39:03 -0500 Subject: [PATCH 102/149] Fixing bugs associated with enabling tabular representation of legendre data --- openmc/mgxs_library.py | 5 ++++- src/mgxs_data.F90 | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index f3e7b92184..ea6407f968 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -289,7 +289,10 @@ class XSdata(object): check_value('num_points', num_points, Integral) check_greater_than('num_points', num_points, 0) else: - num_points = 33 + if enable == False: + num_points = 1 + else: + num_points = 33 self._tabular_legendre = {'enable': enable, 'num_points': num_points} @num_polar.setter diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 94546c10dc..715b52b132 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -261,6 +261,7 @@ contains enable_leg_mu = .true. elseif (temp_str == 'false' .or. temp_str == '0') then enable_leg_mu = .false. + this % legendre_mu_points = 1 else call fatal_error("Unrecognized tabular_legendre/enable: " // temp_str) end if From bbbb115196b479a117d6dc48021c1a2bdb62bbe8 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 11 Feb 2016 12:07:23 -0500 Subject: [PATCH 103/149] Implemented __gt__ method for AggregateFilter --- openmc/arithmetic.py | 20 +++++++++++++------- openmc/element.py | 3 +++ openmc/mgxs/mgxs.py | 5 +++-- openmc/tallies.py | 6 ------ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index 13f300968a..bbb303b140 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -647,7 +647,7 @@ class AggregateNuclide(object): @nuclides.setter def nuclides(self, nuclides): cv.check_iterable_type('nuclides', nuclides, - (basestring, Nuclide, CrossNuclide)) + (basestring, Nuclide, CrossNuclide)) self._nuclides = nuclides @aggregate_op.setter @@ -716,8 +716,16 @@ class AggregateFilter(object): return not self == other def __gt__(self, other): - # FIXME - return False + if self.type != other.type: + if self.aggregate_filter.type in _FILTER_TYPES and \ + other.aggregate_filter.type in _FILTER_TYPES: + delta = _FILTER_TYPES.index(self.aggregate_filter.type) - \ + _FILTER_TYPES.index(other.aggregate_filter.type) + return True if delta > 0 else False + else: + return False + else: + return False def __lt__(self, other): return not self > other @@ -789,9 +797,7 @@ class AggregateFilter(object): @bins.setter def bins(self, bins): cv.check_iterable_type('bins', bins, Iterable) - self._bins = [] - for bin in bins: - self._bins.append(tuple(bin)) + self._bins = map(tuple, bins) @aggregate_op.setter def aggregate_op(self, aggregate_op): @@ -956,4 +962,4 @@ class AggregateFilter(object): # Assign merged bins to merged filter merged_filter.bins = list(merged_bins) - return merged_filter \ No newline at end of file + return merged_filter diff --git a/openmc/element.py b/openmc/element.py index 4880dfaf23..dda110ea7a 100644 --- a/openmc/element.py +++ b/openmc/element.py @@ -57,6 +57,9 @@ class Element(object): def __ne__(self, other): return not self == other + def __gt__(self, other): + return repr(self) > repr(other) + def __lt__(self, other): return not self > other diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index b4c107139d..fb70b1bc8d 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -1917,7 +1917,8 @@ class ScatterMatrixXS(MGXS): self._correction = correction def get_slice(self, nuclides=[], groups=[]): - """Build a sliced MGXS for the specified nuclides and energy groups. + """Build a sliced ScatterMatrix for the specified nuclides and + energy groups. This method constructs a new MGXS to encapsulate a subset of the data represented by this MGXS. The subset of data to include in the tally @@ -2308,7 +2309,7 @@ class Chi(MGXS): return self._xs_tally def get_slice(self, nuclides=[], groups=[]): - """Build a sliced MGXS for the specified nuclides and energy groups. + """Build a sliced Chi for the specified nuclides and energy groups. This method constructs a new MGXS to encapsulate a subset of the data represented by this MGXS. The subset of data to include in the tally diff --git a/openmc/tallies.py b/openmc/tallies.py index 6b04403329..b15e730386 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -2188,12 +2188,6 @@ class Tally(object): """ - # Check that results have been read -# if not self.derived and self.sum is None: -# msg = 'Unable to use tally arithmetic with Tally ID="{0}" ' \ -# 'since it does not contain any results.'.format(self.id) -# raise ValueError(msg) - cv.check_type('filter1', filter1, (Filter, CrossFilter, AggregateFilter)) cv.check_type('filter2', filter2, (Filter, CrossFilter, AggregateFilter)) From 23353fa097ec736a813386ceecd1b89cd26173dc Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 11 Feb 2016 12:59:14 -0500 Subject: [PATCH 104/149] Added new tally slice and merge test --- openmc/arithmetic.py | 2 +- tests/test_tally_slice_merge/inputs_true.dat | 1 + tests/test_tally_slice_merge/results_true.dat | 49 ++++++ .../test_tally_slice_merge.py | 165 ++++++++++++++++++ 4 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 tests/test_tally_slice_merge/inputs_true.dat create mode 100644 tests/test_tally_slice_merge/results_true.dat create mode 100644 tests/test_tally_slice_merge/test_tally_slice_merge.py diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index bbb303b140..4ddf3b1f91 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -797,7 +797,7 @@ class AggregateFilter(object): @bins.setter def bins(self, bins): cv.check_iterable_type('bins', bins, Iterable) - self._bins = map(tuple, bins) + self._bins = list(map(tuple, bins)) @aggregate_op.setter def aggregate_op(self, aggregate_op): diff --git a/tests/test_tally_slice_merge/inputs_true.dat b/tests/test_tally_slice_merge/inputs_true.dat new file mode 100644 index 0000000000..29f0f1d827 --- /dev/null +++ b/tests/test_tally_slice_merge/inputs_true.dat @@ -0,0 +1 @@ +8d1ab9e4add51b99045e990ac9c3dad9447e9720d811bc430d4bfdd7c2c035424bcb7750e4a4d0ec0460ea1ef4be46ac58372ed01d55f5d8cfeebbce75559066 \ No newline at end of file diff --git a/tests/test_tally_slice_merge/results_true.dat b/tests/test_tally_slice_merge/results_true.dat new file mode 100644 index 0000000000..6aeb5735a8 --- /dev/null +++ b/tests/test_tally_slice_merge/results_true.dat @@ -0,0 +1,49 @@ + energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 21 U-235 fission 0.098638 0.009195 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 21 U-235 nu-fission 0.240351 0.022405 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 21 U-238 fission 1.371663e-07 1.284884e-08 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 21 U-238 nu-fission 3.418304e-07 3.202044e-08 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 21 U-235 fission 0.027879 0.000602 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 21 U-235 nu-fission 0.068241 0.001458 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 21 U-238 fission 0.016638 0.001146 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 21 U-238 nu-fission 0.045776 0.003342 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 27 U-235 fission 0.057752 0.004818 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 27 U-235 nu-fission 0.140724 0.011739 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 27 U-238 fission 8.177167e-08 7.061683e-09 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 27 U-238 nu-fission 2.037822e-07 1.759834e-08 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 27 U-235 fission 0.01763 0.001937 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 27 U-235 nu-fission 0.04314 0.004737 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 27 U-238 fission 0.009883 0.001934 energy [MeV] cell nuclide score mean std. dev. +0 (6.3e-07 - 2.0e+01) 27 U-238 nu-fission 0.027068 0.005207 energy [MeV] cell nuclide score mean std. dev. +0 (0.0e+00 - 6.3e-07) 21 U-235 fission 9.863775e-02 9.194846e-03 +1 (0.0e+00 - 6.3e-07) 21 U-235 nu-fission 2.403506e-01 2.240508e-02 +2 (0.0e+00 - 6.3e-07) 21 U-238 fission 1.371663e-07 1.284884e-08 +3 (0.0e+00 - 6.3e-07) 21 U-238 nu-fission 3.418304e-07 3.202044e-08 +4 (0.0e+00 - 6.3e-07) 27 U-235 fission 5.775195e-02 4.817512e-03 +5 (0.0e+00 - 6.3e-07) 27 U-235 nu-fission 1.407242e-01 1.173883e-02 +6 (0.0e+00 - 6.3e-07) 27 U-238 fission 8.177167e-08 7.061683e-09 +7 (0.0e+00 - 6.3e-07) 27 U-238 nu-fission 2.037822e-07 1.759834e-08 +8 (6.3e-07 - 2.0e+01) 21 U-235 fission 2.787911e-02 6.020399e-04 +9 (6.3e-07 - 2.0e+01) 21 U-235 nu-fission 6.824140e-02 1.457590e-03 +10 (6.3e-07 - 2.0e+01) 21 U-238 fission 1.663756e-02 1.145703e-03 +11 (6.3e-07 - 2.0e+01) 21 U-238 nu-fission 4.577562e-02 3.342394e-03 +12 (6.3e-07 - 2.0e+01) 27 U-235 fission 1.763014e-02 1.937151e-03 +13 (6.3e-07 - 2.0e+01) 27 U-235 nu-fission 4.313951e-02 4.737423e-03 +14 (6.3e-07 - 2.0e+01) 27 U-238 fission 9.883451e-03 1.933519e-03 +15 (6.3e-07 - 2.0e+01) 27 U-238 nu-fission 2.706776e-02 5.206818e-03 sum(distribcell) energy [MeV] nuclide score mean std. dev. +0 (0, 100, 2000, 30000) (0.0e+00 - 6.3e-07) U-235 fission 0 0 +1 (0, 100, 2000, 30000) (0.0e+00 - 6.3e-07) U-235 nu-fission 0 0 +2 (0, 100, 2000, 30000) (0.0e+00 - 6.3e-07) U-238 fission 0 0 +3 (0, 100, 2000, 30000) (0.0e+00 - 6.3e-07) U-238 nu-fission 0 0 +4 (0, 100, 2000, 30000) (6.3e-07 - 2.0e+01) U-235 fission 0 0 +5 (0, 100, 2000, 30000) (6.3e-07 - 2.0e+01) U-235 nu-fission 0 0 +6 (0, 100, 2000, 30000) (6.3e-07 - 2.0e+01) U-238 fission 0 0 +7 (0, 100, 2000, 30000) (6.3e-07 - 2.0e+01) U-238 nu-fission 0 0 +8 (500, 5000, 50000) (0.0e+00 - 6.3e-07) U-235 fission 0 0 +9 (500, 5000, 50000) (0.0e+00 - 6.3e-07) U-235 nu-fission 0 0 +10 (500, 5000, 50000) (0.0e+00 - 6.3e-07) U-238 fission 0 0 +11 (500, 5000, 50000) (0.0e+00 - 6.3e-07) U-238 nu-fission 0 0 +12 (500, 5000, 50000) (6.3e-07 - 2.0e+01) U-235 fission 0 0 +13 (500, 5000, 50000) (6.3e-07 - 2.0e+01) U-235 nu-fission 0 0 +14 (500, 5000, 50000) (6.3e-07 - 2.0e+01) U-238 fission 0 0 +15 (500, 5000, 50000) (6.3e-07 - 2.0e+01) U-238 nu-fission 0 0 \ No newline at end of file diff --git a/tests/test_tally_slice_merge/test_tally_slice_merge.py b/tests/test_tally_slice_merge/test_tally_slice_merge.py new file mode 100644 index 0000000000..403f1827dd --- /dev/null +++ b/tests/test_tally_slice_merge/test_tally_slice_merge.py @@ -0,0 +1,165 @@ +#!/usr/bin/env python + +import os +import sys +import glob +import hashlib +import itertools +sys.path.insert(0, os.pardir) +from testing_harness import PyAPITestHarness +import openmc + + +class TallySliceMergeTestHarness(PyAPITestHarness): + def _build_inputs(self): + + # The summary.h5 file needs to be created to read in the tallies + self._input_set.settings.output = {'summary': True} + + # Initialize the tallies file + tallies_file = openmc.TalliesFile() + + # Define nuclides and scores to add to both tallies + self.nuclides = ['U-235', 'U-238'] + self.scores = ['fission', 'nu-fission'] + + # Define filters for energy and spatial domain + + low_energy = openmc.Filter(type='energy', bins=[0., 0.625e-6]) + high_energy = openmc.Filter(type='energy', bins=[0.625e-6, 20.]) + merged_energies = low_energy.merge(high_energy) + + cell_21 = openmc.Filter(type='cell', bins=[21]) + cell_27 = openmc.Filter(type='cell', bins=[27]) + distribcell_filter = openmc.Filter(type='distribcell', bins=[21]) + + self.cell_filters = [cell_21, cell_27] + self.energy_filters = [low_energy, high_energy] + + # Initialize cell tallies with filters, nuclides and scores + tallies = [] + for cell_filter in self.energy_filters: + for energy_filter in self.cell_filters: + for nuclide in self.nuclides: + for score in self.scores: + tally = openmc.Tally() + tally.estimator = 'tracklength' + tally.add_score(score) + tally.add_nuclide(nuclide) + tally.add_filter(cell_filter) + tally.add_filter(energy_filter) + tallies.append(tally) + + # Merge all cell tallies together + while len(tallies) != 1: + halfway = int(len(tallies) / 2) + zip_split = zip(tallies[:halfway], tallies[halfway:]) + tallies = list(map(lambda xy: xy[0].merge(xy[1]), zip_split)) + + # Specify a name for the tally + tallies[0].name = 'cell tally' + + # Initialize a distribcell tally + distribcell_tally = openmc.Tally(name='distribcell tally') + distribcell_tally.estimator = 'tracklength' + distribcell_tally.add_filter(distribcell_filter) + distribcell_tally.add_filter(merged_energies) + for score in self.scores: + distribcell_tally.add_score(score) + for nuclide in self.nuclides: + distribcell_tally.add_nuclide(nuclide) + + # Add tallies to a TalliesFile + tallies_file = openmc.TalliesFile() + tallies_file.add_tally(tallies[0]) + tallies_file.add_tally(distribcell_tally) + + # Export tallies to file + self._input_set.tallies = tallies_file + super(TallySliceMergeTestHarness, self)._build_inputs() + + def _get_results(self, hash_output=False): + """Digest info in the statepoint and return as a string.""" + + # Read the statepoint file. + statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name))[0] + sp = openmc.StatePoint(statepoint) + + # Read the summary file. + summary = glob.glob(os.path.join(os.getcwd(), 'summary.h5'))[0] + su = openmc.Summary(summary) + sp.link_with_summary(su) + + # Extract the cell tally + tallies = [sp.get_tally(name='cell tally')] + + # Slice the tallies by cell filter bins + cell_filter_prod = itertools.product(tallies, self.cell_filters) + tallies = map(lambda tf: tf[0].get_slice(filters=[tf[1].type], + filter_bins=[tf[1].get_bin(0)]), cell_filter_prod) + + # Slice the tallies by energy filter bins + energy_filter_prod = itertools.product(tallies, self.energy_filters) + tallies = map(lambda tf: tf[0].get_slice(filters=[tf[1].type], + filter_bins=[(tf[1].get_bin(0),)]), energy_filter_prod) + + # Slice the tallies by nuclide + nuclide_prod = itertools.product(tallies, self.nuclides) + tallies = map(lambda tn: tn[0].get_slice(nuclides=[tn[1]]), nuclide_prod) + + # Slice the tallies by score + score_prod = itertools.product(tallies, self.scores) + tallies = map(lambda ts: ts[0].get_slice(scores=[ts[1]]), score_prod) + + # Initialize an output string + outstr = '' + + # Append sliced Tally Pandas DataFrames to output string + for tally in tallies: + df = tally.get_pandas_dataframe() + outstr += df.to_string() + + # Merge all tallies together + while len(list(tallies)) != 1: + tallies = list(tallies) + halfway = int(len(tallies) / 2) + zip_split = zip(tallies[:halfway], tallies[halfway:]) + tallies = map(lambda xy: xy[0].merge(xy[1]), zip_split) + + # Append merged Tally Pandas DataFrame to output string + df = tallies[0].get_pandas_dataframe() + outstr += df.to_string() + + # Extract the distribcell tally + distribcell_tally = sp.get_tally(name='distribcell tally') + + # Sum up a few subdomains from the distribcell tally + sum1 = distribcell_tally.summation(filter_type='distribcell', + filter_bins=[0,100,2000,30000]) + # Sum up a few subdomains from the distribcell tally + sum2 = distribcell_tally.summation(filter_type='distribcell', + filter_bins=[500,5000,50000]) + + # Merge the distribcell tally slices + merge_tally = sum1.merge(sum2) + + # Append merged Tally Pandas DataFrame to output string + df = merge_tally.get_pandas_dataframe() + outstr += df.to_string() + + # Hash the results if necessary + if hash_output: + sha512 = hashlib.sha512() + sha512.update(outstr.encode('utf-8')) + outstr = sha512.hexdigest() + + return outstr + + def _cleanup(self): + super(TallySliceMergeTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + +if __name__ == '__main__': + harness = TallySliceMergeTestHarness('statepoint.10.h5', True) + harness.main() From baad8a998a33173f70c239b4741437936c9ed35a Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 11 Feb 2016 16:27:03 -0500 Subject: [PATCH 105/149] Fixed Python 3 issue in tally slice-merge test --- tests/test_tally_slice_merge/test_tally_slice_merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_tally_slice_merge/test_tally_slice_merge.py b/tests/test_tally_slice_merge/test_tally_slice_merge.py index 403f1827dd..79acf182d6 100644 --- a/tests/test_tally_slice_merge/test_tally_slice_merge.py +++ b/tests/test_tally_slice_merge/test_tally_slice_merge.py @@ -110,6 +110,7 @@ class TallySliceMergeTestHarness(PyAPITestHarness): # Slice the tallies by score score_prod = itertools.product(tallies, self.scores) tallies = map(lambda ts: ts[0].get_slice(scores=[ts[1]]), score_prod) + tallies = list(tallies) # Initialize an output string outstr = '' @@ -120,11 +121,10 @@ class TallySliceMergeTestHarness(PyAPITestHarness): outstr += df.to_string() # Merge all tallies together - while len(list(tallies)) != 1: - tallies = list(tallies) + while len(tallies) != 1: halfway = int(len(tallies) / 2) zip_split = zip(tallies[:halfway], tallies[halfway:]) - tallies = map(lambda xy: xy[0].merge(xy[1]), zip_split) + tallies = list(map(lambda xy: xy[0].merge(xy[1]), zip_split)) # Append merged Tally Pandas DataFrame to output string df = tallies[0].get_pandas_dataframe() From e40fd13d80e228c3edc173b87cc6a170dc7baa2d Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 11 Feb 2016 17:17:36 -0500 Subject: [PATCH 106/149] Removed old FIXME comment tags from tallies.py --- openmc/tallies.py | 8 +- tests/test_tally_arithmetic/geometry.xml | 148 ++++++++++++ tests/test_tally_arithmetic/inputs_test.dat | 1 + tests/test_tally_arithmetic/materials.xml | 246 ++++++++++++++++++++ tests/test_tally_arithmetic/settings.xml | 16 ++ tests/test_tally_arithmetic/tallies.xml | 21 ++ 6 files changed, 433 insertions(+), 7 deletions(-) create mode 100644 tests/test_tally_arithmetic/geometry.xml create mode 100644 tests/test_tally_arithmetic/inputs_test.dat create mode 100644 tests/test_tally_arithmetic/materials.xml create mode 100644 tests/test_tally_arithmetic/settings.xml create mode 100644 tests/test_tally_arithmetic/tallies.xml diff --git a/openmc/tallies.py b/openmc/tallies.py index b15e730386..91a1fb0eef 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -887,7 +887,7 @@ class Tally(object): # Create deep copy of other tally to use for array concatenation other_copy = copy.deepcopy(other) - # FIXME: document and create vars for merge_filters, etc. + # Identify if filters, nuclides and scores are mergeable and/or equal merge_filters = self._can_merge_filters(other) merge_nuclides = self._can_merge_nuclides(other) merge_scores = self._can_merge_scores(other) @@ -2224,8 +2224,6 @@ class Tally(object): else: filter2_bins = [filter2.get_bin(i) for i in range(filter2.num_bins)] - # FIXME: Why doesn't this swap data for sum and sum_sq??? - # Adjust the mean data array to relect the new filter order if self.mean is not None: for bin1, bin2 in itertools.product(filter1_bins, filter2_bins): @@ -2297,8 +2295,6 @@ class Tally(object): self.nuclides[nuclide1_index] = nuclide2 self.nuclides[nuclide2_index] = nuclide1 - # FIXME: Why doesn't this swap data for sum and sum_sq??? - # Adjust the mean data array to relect the new nuclide order if self.mean is not None: nuclide1_mean = self.mean[:, nuclide1_index, :].copy() @@ -2371,8 +2367,6 @@ class Tally(object): self.scores[score1_index] = score2 self.scores[score2_index] = score1 - # FIXME: Why doesn't this swap data for sum and sum_sq??? - # Adjust the mean data array to relect the new nuclide order if self.mean is not None: score1_mean = self.mean[:, :, score1_index].copy() diff --git a/tests/test_tally_arithmetic/geometry.xml b/tests/test_tally_arithmetic/geometry.xml new file mode 100644 index 0000000000..ed66ef8e6b --- /dev/null +++ b/tests/test_tally_arithmetic/geometry.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.26 1.26 + 17 17 + -10.71 -10.71 + +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 +1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 +1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + + + 1.26 1.26 + 17 17 + -10.71 -10.71 + +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 +3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 +3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 + + + 21.42 21.42 + 21 21 + -224.91 -224.91 + +5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 +5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 +5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 +5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 +5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 +5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 +5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 +5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 +5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 +5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 +5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 +5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 +5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 +5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 + + + 21.42 21.42 + 21 21 + -224.91 -224.91 + +7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 +7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 +7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 +7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 +7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 +7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 +7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 +7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 +7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 +7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 +7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 +7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 +7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 +7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_tally_arithmetic/inputs_test.dat b/tests/test_tally_arithmetic/inputs_test.dat new file mode 100644 index 0000000000..1b6046f1ae --- /dev/null +++ b/tests/test_tally_arithmetic/inputs_test.dat @@ -0,0 +1 @@ +57384883e37964076aa82c19fa542434331cdb09735d710485b5aa0ca3445d543729e40cb9c7b6a70e7101ef186923eb1ff6315c73b01ff257052838add68fc7 \ No newline at end of file diff --git a/tests/test_tally_arithmetic/materials.xml b/tests/test_tally_arithmetic/materials.xml new file mode 100644 index 0000000000..9454c0d8e6 --- /dev/null +++ b/tests/test_tally_arithmetic/materials.xml @@ -0,0 +1,246 @@ + + + 71c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_tally_arithmetic/settings.xml b/tests/test_tally_arithmetic/settings.xml new file mode 100644 index 0000000000..64f95a3a46 --- /dev/null +++ b/tests/test_tally_arithmetic/settings.xml @@ -0,0 +1,16 @@ + + + + 100 + 10 + 5 + + + + -160 -160 -183 160 160 183 + + + + true + + diff --git a/tests/test_tally_arithmetic/tallies.xml b/tests/test_tally_arithmetic/tallies.xml new file mode 100644 index 0000000000..ab4d1c37d8 --- /dev/null +++ b/tests/test_tally_arithmetic/tallies.xml @@ -0,0 +1,21 @@ + + + + 2 2 2 + -160.0 -160.0 -183.0 + 160.0 160.0 183.0 + + + + + + U-235 Pu-239 + nu-fission total + + + + + U-238 U-235 + total fission + + From 1cb7ef8f1cb3bf035e00b6d005df82596e168d08 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 11 Feb 2016 17:21:37 -0500 Subject: [PATCH 107/149] Removed XML files from tally arithmetic test --- tests/test_tally_arithmetic/geometry.xml | 148 ------------ tests/test_tally_arithmetic/inputs_test.dat | 1 - tests/test_tally_arithmetic/materials.xml | 246 -------------------- tests/test_tally_arithmetic/settings.xml | 16 -- tests/test_tally_arithmetic/tallies.xml | 21 -- 5 files changed, 432 deletions(-) delete mode 100644 tests/test_tally_arithmetic/geometry.xml delete mode 100644 tests/test_tally_arithmetic/inputs_test.dat delete mode 100644 tests/test_tally_arithmetic/materials.xml delete mode 100644 tests/test_tally_arithmetic/settings.xml delete mode 100644 tests/test_tally_arithmetic/tallies.xml diff --git a/tests/test_tally_arithmetic/geometry.xml b/tests/test_tally_arithmetic/geometry.xml deleted file mode 100644 index ed66ef8e6b..0000000000 --- a/tests/test_tally_arithmetic/geometry.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.26 1.26 - 17 17 - -10.71 -10.71 - -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 -1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 -1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - - 1.26 1.26 - 17 17 - -10.71 -10.71 - -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 -3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 -3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - - - 21.42 21.42 - 21 21 - -224.91 -224.91 - -5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 -5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 -5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 -5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 -5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 -5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 -5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 -5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 -5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 -5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 -5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 -5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 -5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 -5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - - - 21.42 21.42 - 21 21 - -224.91 -224.91 - -7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 -7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 -7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 -7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 -7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 -7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 -7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 -7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 -7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 -7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 -7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 -7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 -7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 -7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - - - - - - - - - - - - - - - - - - - diff --git a/tests/test_tally_arithmetic/inputs_test.dat b/tests/test_tally_arithmetic/inputs_test.dat deleted file mode 100644 index 1b6046f1ae..0000000000 --- a/tests/test_tally_arithmetic/inputs_test.dat +++ /dev/null @@ -1 +0,0 @@ -57384883e37964076aa82c19fa542434331cdb09735d710485b5aa0ca3445d543729e40cb9c7b6a70e7101ef186923eb1ff6315c73b01ff257052838add68fc7 \ No newline at end of file diff --git a/tests/test_tally_arithmetic/materials.xml b/tests/test_tally_arithmetic/materials.xml deleted file mode 100644 index 9454c0d8e6..0000000000 --- a/tests/test_tally_arithmetic/materials.xml +++ /dev/null @@ -1,246 +0,0 @@ - - - 71c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/test_tally_arithmetic/settings.xml b/tests/test_tally_arithmetic/settings.xml deleted file mode 100644 index 64f95a3a46..0000000000 --- a/tests/test_tally_arithmetic/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - 100 - 10 - 5 - - - - -160 -160 -183 160 160 183 - - - - true - - diff --git a/tests/test_tally_arithmetic/tallies.xml b/tests/test_tally_arithmetic/tallies.xml deleted file mode 100644 index ab4d1c37d8..0000000000 --- a/tests/test_tally_arithmetic/tallies.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - 2 2 2 - -160.0 -160.0 -183.0 - 160.0 160.0 183.0 - - - - - - U-235 Pu-239 - nu-fission total - - - - - U-238 U-235 - total fission - - From 9f02388647d31d529d10a4c0e179fcbfab364d4a Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 12 Feb 2016 04:58:11 -0500 Subject: [PATCH 108/149] Implementing minor edits from review on 1/11 by @paulromano --- src/initialize.F90 | 2 +- src/input_xml.F90 | 68 ++++++++------------ src/macroxs_header.F90 | 11 ++-- src/math.F90 | 6 +- src/mgxs_data.F90 | 131 ++++++++++++++++++--------------------- src/nuclide_header.F90 | 10 +-- src/particle_header.F90 | 4 +- src/scattdata_header.F90 | 10 +-- src/source.F90 | 48 +++++++------- 9 files changed, 130 insertions(+), 160 deletions(-) diff --git a/src/initialize.F90 b/src/initialize.F90 index 88a10fb550..d8bbcb0d8c 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -126,7 +126,7 @@ contains if (run_CE) then call same_nuclide_list() else - call same_NuclideMG_list() + call same_nuclidemg_list() end if ! Construct information needed for nuclear data diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 2a21bac215..50e8ca30dc 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -216,8 +216,8 @@ contains end if ! Make sure that either eigenvalue or fixed source was specified - if (.not.check_for_node(doc, "eigenvalue") .and. & - .not.check_for_node(doc, "fixed_source")) then + if (.not. check_for_node(doc, "eigenvalue") .and. & + .not. check_for_node(doc, "fixed_source")) then call fatal_error(" or not specified.") end if @@ -230,7 +230,7 @@ contains call get_node_ptr(doc, "eigenvalue", node_mode) ! Check number of particles - if (.not.check_for_node(node_mode, "particles")) then + if (.not. check_for_node(node_mode, "particles")) then call fatal_error("Need to specify number of particles per generation.") end if @@ -300,7 +300,7 @@ contains call get_node_ptr(doc, "fixed_source", node_mode) ! Check number of particles - if (.not.check_for_node(node_mode, "particles")) then + if (.not. check_for_node(node_mode, "particles")) then call fatal_error("Need to specify number of particles per batch.") end if @@ -2050,9 +2050,9 @@ contains ! READ AND PARSE TAGS ! Check to ensure material has at least one nuclide - if ((.not. check_for_node(node_mat, "nuclide") .and. & - .not. check_for_node(node_mat, "element")) .and. & - (.not. check_for_node(node_mat, "macroscopic"))) then + if (.not. check_for_node(node_mat, "nuclide") .and. & + .not. check_for_node(node_mat, "element") .and. & + .not. check_for_node(node_mat, "macroscopic")) then call fatal_error("No macroscopic data, nuclides or natural elements & &specified on material " // trim(to_str(mat % id))) end if @@ -2061,7 +2061,7 @@ contains ! them as nuclides. This is all really a facade so the user thinks they ! are entering in macroscopic data but the code treats them the same ! as nuclides internally. - ! Get pointer list of XML + ! Get pointer list of XML call get_node_list(node_mat, "macroscopic", node_macro_list) if (get_list_size(node_macro_list) > 1) then call fatal_error("Only one macroscopic object permitted per material, " & @@ -2077,7 +2077,7 @@ contains end if ! Check for cross section - if (.not.check_for_node(node_nuc, "xs")) then + if (.not. check_for_node(node_nuc, "xs")) then if (default_xs == '') then call fatal_error("No cross section specified for macroscopic data & & in material " // trim(to_str(mat % id))) @@ -2130,13 +2130,13 @@ contains call get_list_item(node_nuc_list, j, node_nuc) ! Check for empty name on nuclide - if (.not.check_for_node(node_nuc, "name")) then + if (.not. check_for_node(node_nuc, "name")) then call fatal_error("No name specified on nuclide in material " & // trim(to_str(mat % id))) end if ! Check for cross section - if (.not.check_for_node(node_nuc, "xs")) then + if (.not. check_for_node(node_nuc, "xs")) then if (default_xs == '') then call fatal_error("No cross section specified for nuclide in & &material " // trim(to_str(mat % id))) @@ -2160,8 +2160,8 @@ contains if (units == 'macro') then call list_density % append(ONE) else - if (.not.check_for_node(node_nuc, "ao") .and. & - .not.check_for_node(node_nuc, "wo")) then + if (.not. check_for_node(node_nuc, "ao") .and. & + .not. check_for_node(node_nuc, "wo")) then call fatal_error("No atom or weight percent specified for nuclide " & // trim(name)) elseif (check_for_node(node_nuc, "ao") .and. & @@ -2192,7 +2192,7 @@ contains call get_list_item(node_ele_list, j, node_ele) ! Check for empty name on natural element - if (.not.check_for_node(node_ele, "name")) then + if (.not. check_for_node(node_ele, "name")) then call fatal_error("No name specified on nuclide in material " & // trim(to_str(mat % id))) end if @@ -2212,8 +2212,8 @@ contains ! Check if no atom/weight percents were specified or if both atom and ! weight percents were specified - if (.not.check_for_node(node_ele, "ao") .and. & - .not.check_for_node(node_ele, "wo")) then + if (.not. check_for_node(node_ele, "ao") .and. & + .not. check_for_node(node_ele, "wo")) then call fatal_error("No atom or weight percent specified for element " & // trim(name)) elseif (check_for_node(node_ele, "ao") .and. & @@ -2357,8 +2357,8 @@ contains call get_list_item(node_sab_list, j, node_sab) ! Determine name of S(a,b) table - if (.not.check_for_node(node_sab, "name") .or. & - .not.check_for_node(node_sab, "xs")) then + if (.not. check_for_node(node_sab, "name") .or. & + .not. check_for_node(node_sab, "xs")) then call fatal_error("Need to specify and for S(a,b) & &table.") end if @@ -2588,8 +2588,8 @@ contains end if ! Make sure either upper-right or width was specified - if (.not.check_for_node(node_mesh, "upper_right") .and. & - .not.check_for_node(node_mesh, "width")) then + if (.not. check_for_node(node_mesh, "upper_right") .and. & + .not. check_for_node(node_mesh, "width")) then call fatal_error("Must specify either and on a & &tally mesh.") end if @@ -3377,30 +3377,12 @@ contains case ('n2n', '(n,2n)') t % score_bins(j) = N_2N - ! Disallow for MG mode since data not present - if (.not. run_CE) then - call fatal_error("Cannot tally (n,2n) reaction rate in & - &multi-group mode") - end if - case ('n3n', '(n,3n)') t % score_bins(j) = N_3N - ! Disallow for MG mode since data not present - if (.not. run_CE) then - call fatal_error("Cannot tally (n,3n) reaction rate in & - &multi-group mode") - end if - case ('n4n', '(n,4n)') t % score_bins(j) = N_4N - ! Disallow for MG mode since data not present - if (.not. run_CE) then - call fatal_error("Cannot tally (n,4n) reaction rate in & - &multi-group mode") - end if - case ('absorption') t % score_bins(j) = SCORE_ABSORPTION if (t % find_filter(FILTER_ENERGYOUT) > 0) then @@ -3590,10 +3572,10 @@ contains ! Do a check at the end (instead of for every case) to make sure ! the tallies are compatible with MG mode where we have less detailed ! nuclear data - if (.not. run_CE .and. t % score_bins(j) > 0) then - call fatal_error("Cannot tally " // trim(score_name) // & - " reaction rate in multi-group mode") - end if + if (.not. run_CE .and. t % score_bins(j) > 0) then + call fatal_error("Cannot tally " // trim(score_name) // & + " reaction rate in multi-group mode") + end if end do t % n_score_bins = n_scores @@ -4455,7 +4437,7 @@ contains end if ! determine metastable state - if (.not.check_for_node(node_ace, "metastable")) then + if (.not. check_for_node(node_ace, "metastable")) then listing % metastable = .false. else listing % metastable = .true. diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index 0f838967ea..c435686b5d 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -27,10 +27,7 @@ module macroxs_header subroutine macroxs_init_(this, mat, nuclides, groups, get_kfiss, get_fiss, & max_order, scatt_type, legendre_mu_points, & error_code, error_text) - import MacroXS - import Material - import NuclideMGContainer - import MAX_LINE_LEN + import MacroXS, Material, NuclideMGContainer, MAX_LINE_LEN class(MacroXS), intent(inout) :: this ! The MacroXS to initialize type(Material), pointer, intent(in) :: mat ! base material type(NuclideMGContainer), intent(in) :: nuclides(:) ! List of nuclides to harvest from @@ -383,14 +380,14 @@ contains select type(nuc => nuclides(mat % nuclide(i)) % obj) type is (NuclideAngle) if (npol == -1) then - npol = nuc % Npol - nazi = nuc % Nazi + npol = nuc % n_pol + nazi = nuc % n_azi allocate(this % polar(npol)) this % polar = nuc % polar allocate(this % azimuthal(nazi)) this % azimuthal = nuc % azimuthal else - if ((npol /= nuc % Npol) .or. (nazi /= nuc % Nazi)) then + if ((npol /= nuc % n_pol) .or. (nazi /= nuc % n_azi)) then error_code = 1 error_text = "All Angular Data Must Be Same Length!" end if diff --git a/src/math.F90 b/src/math.F90 index 36c65a2402..c7ede8d2a5 100644 --- a/src/math.F90 +++ b/src/math.F90 @@ -560,6 +560,7 @@ contains !=============================================================================== ! EXPAND_HARMONIC expands a given series of real spherical harmonics !=============================================================================== + pure function expand_harmonic(data, order, uvw) result(val) real(8), intent(in) :: data(:) integer, intent(in) :: order @@ -584,6 +585,7 @@ contains ! EVALUATE_LEGENDRE Find the value of f(x) given a set of Legendre coefficients ! and the value of x !=============================================================================== + pure function evaluate_legendre(data, x) result(val) real(8), intent(in) :: data(:) real(8), intent(in) :: x @@ -591,9 +593,9 @@ contains integer :: l - val = 0.5_8 * data(1) + val = HALF * data(1) do l = 1, size(data) - 1 - val = val + (real(l,8) + 0.5_8) * data(l + 1) * calc_pn(l,x) + val = val + (real(l,8) + HALF) * data(l + 1) * calc_pn(l,x) end do end function evaluate_legendre diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 715b52b132..9fa0aeb2ba 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -125,7 +125,7 @@ contains end select ! Now read in the data specific to the type we just declared - call NuclideMG_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & + call nuclidemg_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & energy_groups, get_kfiss, get_fiss, error_code, & error_text) @@ -169,13 +169,13 @@ contains end subroutine read_mgxs !=============================================================================== -! SAME_NUCLIDE_LIST creates a linked list for each nuclide containing the +! SAME_NUCLIDEMG_LIST creates a linked list for each nuclide containing the ! indices in the nuclides array of all other instances of that nuclide. For ! example, the same nuclide may exist at multiple temperatures resulting ! in multiple entries in the nuclides array for a single zaid number. !=============================================================================== - subroutine same_NuclideMG_list() + subroutine same_nuclidemg_list() integer :: i ! index in nuclides array integer :: j ! index in nuclides array @@ -188,21 +188,21 @@ contains end do end do - end subroutine same_NuclideMG_list + end subroutine same_nuclidemg_list !=============================================================================== ! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed !=============================================================================== - subroutine NuclideMG_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + subroutine nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) class(NuclideMG), intent(inout) :: this ! Working Object - type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml - integer, intent(in) :: groups ! Number of Energy groups - logical, intent(in) :: get_kfiss ! Need Kappa-Fission? - logical, intent(in) :: get_fiss ! Should we get fiss data? - integer, intent(inout) :: error_code ! Code signifying error - character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print + type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Should we get fiss data? + integer, intent(inout) :: error_code ! Code signifying error + character(MAX_LINE_LEN), intent(inout) :: error_text ! Error to print type(Node), pointer :: node_legendre_mu character(MAX_LINE_LEN) :: temp_str @@ -298,16 +298,16 @@ contains select type(this) type is (NuclideIso) - call NuclideIso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + call nuclideiso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) type is (NuclideAngle) - call NuclideAngle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + call nuclideangle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) end select - end subroutine NuclideMG_init + end subroutine nuclidemg_init - subroutine NuclideIso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + subroutine nuclideiso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & error_code, error_text) class(NuclideIso), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml @@ -436,10 +436,10 @@ contains this % mult = ONE end if - end subroutine NuclideIso_init + end subroutine nuclideiso_init - subroutine NuclideAngle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & - error_code, error_text) + subroutine nuclideangle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & + error_code, error_text) class(NuclideAngle), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml integer, intent(in) :: groups ! Number of Energy groups @@ -463,7 +463,7 @@ contains end if if (check_for_node(node_xsdata, "num_polar")) then - call get_node_value(node_xsdata, "num_polar", this % Npol) + call get_node_value(node_xsdata, "num_polar", this % n_pol) else error_code = 1 error_text = "num_polar Must Be Provided!" @@ -471,7 +471,7 @@ contains end if if (check_for_node(node_xsdata, "num_azimuthal")) then - call get_node_value(node_xsdata, "num_azimuthal", this % Nazi) + call get_node_value(node_xsdata, "num_azimuthal", this % n_azi) else error_code = 1 error_text = "num_azimuthal Must Be Provided!" @@ -479,17 +479,17 @@ contains end if ! Load angle data, if present (else equally spaced) - allocate(this % polar(this % Npol)) - allocate(this % azimuthal(this % Nazi)) + allocate(this % polar(this % n_pol)) + allocate(this % azimuthal(this % n_azi)) if (check_for_node(node_xsdata, "polar")) then error_code = 1 error_text = "User-Specified polar angle bins not yet supported!" return call get_node_array(node_xsdata, "polar", this % polar) else - dangle = PI / real(this % Npol,8) - do iangle = 1, this % Npol - this % polar(iangle) = (real(iangle,8) - 0.5_8) * dangle + dangle = PI / real(this % n_pol,8) + do iangle = 1, this % n_pol + this % polar(iangle) = (real(iangle,8) - HALF) * dangle end do end if if (check_for_node(node_xsdata, "azimuthal")) then @@ -498,9 +498,9 @@ contains return call get_node_array(node_xsdata, "azimuthal", this % azimuthal) else - dangle = TWO * PI / real(this % Nazi,8) - do iangle = 1, this % Nazi - this % azimuthal(iangle) = -PI + (real(iangle,8) - 0.5_8) * dangle + dangle = TWO * PI / real(this % n_azi,8) + do iangle = 1, this % n_azi + this % azimuthal(iangle) = -PI + (real(iangle,8) - HALF) * dangle end do end if @@ -509,19 +509,19 @@ contains if (check_for_node(node_xsdata, "chi")) then ! Get chi - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "chi", temp_arr) - allocate(this % chi(groups, this % Nazi, this % Npol)) - this % chi = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + allocate(this % chi(groups, this % n_azi, this % n_pol)) + this % chi = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) deallocate(temp_arr) ! Get nu_fission (as a vector) if (check_for_node(node_xsdata, "nu_fission")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "nu_fission", temp_arr) - allocate(this % nu_fission(groups, 1, this % Nazi, this % Npol)) - this % nu_fission = reshape(temp_arr, (/groups, 1, this % Nazi, & - this % Npol/)) + allocate(this % nu_fission(groups, 1, this % n_azi, this % n_pol)) + this % nu_fission = reshape(temp_arr, (/groups, 1, this % n_azi, & + this % n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -533,11 +533,11 @@ contains ! Get nu_fission (as a matrix) if (check_for_node(node_xsdata, "nu_fission")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "nu_fission", temp_arr) - allocate(this % nu_fission(groups, groups, this % Nazi, this % Npol)) + allocate(this % nu_fission(groups, groups, this % n_azi, this % n_pol)) this % nu_fission = reshape(temp_arr, (/groups, groups, & - this % Nazi, this % Npol/)) + this % n_azi, this % n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -547,10 +547,10 @@ contains end if if (get_fiss) then if (check_for_node(node_xsdata, "fission")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "fission", temp_arr) - allocate(this % fission(groups, this % Nazi, this % Npol)) - this % fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + allocate(this % fission(groups, this % n_azi, this % n_pol)) + this % fission = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -561,10 +561,10 @@ contains end if if (get_kfiss) then if (check_for_node(node_xsdata, "kappa_fission")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "kappa_fission", temp_arr) - allocate(this % k_fission(groups, this % Nazi, this % Npol)) - this % k_fission = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + allocate(this % k_fission(groups, this % n_azi, this % n_pol)) + this % k_fission = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -576,10 +576,10 @@ contains end if if (check_for_node(node_xsdata, "absorption")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "absorption", temp_arr) - allocate(this % absorption(groups, this % Nazi, this % Npol)) - this % absorption = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + allocate(this % absorption(groups, this % n_azi, this % n_pol)) + this % absorption = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -587,12 +587,12 @@ contains return end if - allocate(this % scatter(groups, groups, order_dim, this % Nazi, this % Npol)) + allocate(this % scatter(groups, groups, order_dim, this % n_azi, this % n_pol)) if (check_for_node(node_xsdata, "scatter")) then - allocate(temp_arr(groups * groups * order_dim * this % Nazi * this%Npol)) + allocate(temp_arr(groups * groups * order_dim * this % n_azi * this%n_pol)) call get_node_array(node_xsdata, "scatter", temp_arr) this % scatter = reshape(temp_arr, (/groups, groups, order_dim, & - this%Nazi,this%Npol/)) + this%n_azi,this%n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -601,23 +601,23 @@ contains end if if (check_for_node(node_xsdata, "total")) then - allocate(temp_arr(groups * this % Nazi * this % Npol)) + allocate(temp_arr(groups * this % n_azi * this % n_pol)) call get_node_array(node_xsdata, "total", temp_arr) - allocate(this % total(groups, this % Nazi, this % Npol)) - this % total = reshape(temp_arr, (/groups, this % Nazi, this % Npol/)) + allocate(this % total(groups, this % n_azi, this % n_pol)) + this % total = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) deallocate(temp_arr) else this % total = this % absorption + sum(this%scatter(:,:,1,:,:),dim=1) end if ! Get Mult Data - allocate(this % mult(groups, groups, this % Nazi, this % Npol)) + allocate(this % mult(groups, groups, this % n_azi, this % n_pol)) if (check_for_node(node_xsdata, "multiplicity")) then arr_len = get_arraysize_double(node_xsdata, "multiplicity") - if (arr_len == groups * groups * this % Nazi * this % Npol) then + if (arr_len == groups * groups * this % n_azi * this % n_pol) then allocate(temp_arr(arr_len)) call get_node_array(node_xsdata, "multiplicity", temp_arr) - this % mult = reshape(temp_arr, (/groups, groups, this % Nazi, this % Npol/)) + this % mult = reshape(temp_arr, (/groups, groups, this % n_azi, this % n_pol/)) deallocate(temp_arr) else error_code = 1 @@ -628,7 +628,7 @@ contains this % mult = ONE end if - end subroutine NuclideAngle_init + end subroutine nuclideangle_init !=============================================================================== @@ -643,7 +643,6 @@ contains logical :: get_kfiss, get_fiss integer :: error_code character(MAX_LINE_LEN) :: error_text - integer :: representation integer :: scatt_type integer :: legendre_mu_points @@ -675,19 +674,11 @@ contains ! At the same time, we will find the scattering type, as that will dictate ! how we allocate the scatter object within macroxs legendre_mu_points = nuclides_MG(mat % nuclide(1)) % obj % legendre_mu_points + scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type select type(nuc => nuclides_MG(mat % nuclide(1)) % obj) type is (NuclideIso) - representation = MGXS_ISOTROPIC - type is (NuclideAngle) - representation = MGXS_ANGLE - end select - scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type - - ! Now allocate accordingly - select case(representation) - case(MGXS_ISOTROPIC) allocate(MacroXSIso :: macro_xs(i_mat) % obj) - case(MGXS_ANGLE) + type is (NuclideAngle) allocate(MacroXSAngle :: macro_xs(i_mat) % obj) end select @@ -696,9 +687,7 @@ contains scatt_type, legendre_mu_points, & error_code, error_text) ! Handle any errors - if (error_code /= 0) then - call fatal_error(trim(error_text)) - end if + if (error_code /= 0) call fatal_error(trim(error_text)) end do end subroutine create_macro_xs diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index caf0c10729..2f62b86672 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -177,7 +177,7 @@ module nuclide_header type, extends(NuclideMG) :: NuclideAngle - ! Microscopic cross sections. Dimensions are: (Npol, Nazi, Nl, Ng, Ng) + ! Microscopic cross sections. Dimensions are: (n_pol, n_azi, Nl, Ng, Ng) real(8), allocatable :: total(:,:,:) ! total cross section real(8), allocatable :: absorption(:,:,:) ! absorption cross section real(8), allocatable :: scatter(:,:,:,:,:) ! scattering information @@ -188,8 +188,8 @@ module nuclide_header real(8), allocatable :: mult(:,:,:,:) ! Scatter multiplicity (Gout x Gin) ! In all cases, right-most indices are theta, phi - integer :: Npol ! Number of polar angles - integer :: Nazi ! Number of azimuthal angles + integer :: n_pol ! Number of polar angles + integer :: n_azi ! Number of azimuthal angles real(8), allocatable :: polar(:) ! polar angles real(8), allocatable :: azimuthal(:) ! azimuthal angles @@ -476,8 +476,8 @@ module nuclide_header ! Write Basic Nuclide Information call nuclidemg_print(this, unit_) - write(unit_,*) ' # of Polar Angles = ' // trim(to_str(this % Npol)) - write(unit_,*) ' # of Azimuthal Angles = ' // trim(to_str(this % Nazi)) + write(unit_,*) ' # of Polar Angles = ' // trim(to_str(this % n_pol)) + write(unit_,*) ' # of Azimuthal Angles = ' // trim(to_str(this % n_azi)) ! Determine size of mgxs and scattering matrices size_scattmat = (size(this % scatter) + size(this % mult)) * 8 diff --git a/src/particle_header.F90 b/src/particle_header.F90 index 3c687eb02f..bf820ceb35 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -96,8 +96,8 @@ module particle_header contains procedure :: initialize => initialize_particle procedure :: clear => clear_particle - procedure :: initialize_from_source => initialize_from_source - procedure :: create_secondary => create_secondary + procedure :: initialize_from_source + procedure :: create_secondary end type Particle contains diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index 62b382d36c..b9dcdadd41 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -79,7 +79,7 @@ contains ! SCATTDATA_INIT builds the scattdata object !=============================================================================== - subroutine scattdatabase_init(this, order, energy, mult) + subroutine scattdata_init(this, order, energy, mult) class(ScattData), intent(inout) :: this ! Object to work on integer, intent(in) :: order ! Data Order real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix @@ -96,7 +96,7 @@ contains allocate(this % data(order, groups, groups)) this % data = ZERO - end subroutine scattdatabase_init + end subroutine scattdata_init subroutine scattdatalegendre_init(this, order, energy, mult, coeffs) class(ScattDataLegendre), intent(inout) :: this ! Object to work on @@ -105,7 +105,7 @@ contains real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use - call scattdatabase_init(this, order, energy, mult) + call scattdata_init(this, order, energy, mult) this % data = coeffs @@ -123,7 +123,7 @@ contains groups = size(energy,dim=1) - call scattdatabase_init(this, order, energy, mult) + call scattdata_init(this, order, energy, mult) allocate(this % mu(order)) this % dmu = TWO / real(order,8) @@ -175,7 +175,7 @@ contains groups = size(energy,dim=1) - call scattdatabase_init(this, this_order, energy, mult) + call scattdata_init(this, this_order, energy, mult) allocate(this % mu(this_order)) this % dmu = TWO / real(this_order - 1) diff --git a/src/source.F90 b/src/source.F90 index 1fb9de5c58..0a7fa790d5 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -110,7 +110,7 @@ contains integer, save :: num_resamples = 0 ! Number of resamples encountered ! Set weight to one by default - site%wgt = ONE + site % wgt = ONE ! Set the random number generator to the source stream. call prn_set_stream(STREAM_SOURCE) @@ -118,10 +118,10 @@ contains ! Sample from among multiple source distributions n_source = size(external_source) if (n_source > 1) then - r(1) = prn()*sum(external_source(:)%strength) + r(1) = prn()*sum(external_source(:) % strength) c = ZERO do i = 1, n_source - c = c + external_source(i)%strength + c = c + external_source(i) % strength if (r(1) < c) exit end do else @@ -132,14 +132,14 @@ contains found = .false. do while (.not.found) ! Set particle defaults - call p%initialize() + call p % initialize() ! Sample spatial distribution - site%xyz(:) = external_source(i)%space%sample() + site % xyz(:) = external_source(i) % space % sample() ! Fill p with needed data - p%coord(1)%xyz(:) = site%xyz - p%coord(1)%uvw(:) = [ ONE, ZERO, ZERO ] + p % coord(1) % xyz(:) = site % xyz + p % coord(1) % uvw(:) = [ ONE, ZERO, ZERO ] ! Now search to see if location exists in geometry call find_cell(p, found) @@ -152,27 +152,27 @@ contains end if ! Check if spatial site is in fissionable material - select type (space => external_source(i)%space) + select type (space => external_source(i) % space) type is (SpatialBox) - if (space%only_fissionable) then - if (p%material == MATERIAL_VOID) then + if (space % only_fissionable) then + if (p % material == MATERIAL_VOID) then found = .false. - elseif (.not. materials(p%material)%fissionable) then + elseif (.not. materials(p % material) % fissionable) then found = .false. end if end if end select end do - call p%clear() + call p % clear() ! Sample angle - site%uvw(:) = external_source(i)%angle%sample() + site % uvw(:) = external_source(i) % angle % sample() ! Check for monoenergetic source above maximum neutron energy - select type (energy => external_source(i)%energy) + select type (energy => external_source(i) % energy) type is (Discrete) - if (any(energy%x >= energy_max_neutron)) then + if (any(energy % x >= energy_max_neutron)) then call fatal_error("Source energy above range of energies of at least & &one cross section table") end if @@ -180,23 +180,23 @@ contains do ! Sample energy spectrum - site%E = external_source(i)%energy%sample() + site % E = external_source(i) % energy % sample() ! resample if energy is greater than maximum neutron energy - if (site%E < energy_max_neutron) exit + if (site % E < energy_max_neutron) exit end do ! Set delayed group - site%delayed_group = 0 + site % delayed_group = 0 - ! If running in MG, convert site%E to group + ! If running in MG, convert site % E to group if (.not. run_CE) then - if (site%E <= energy_bins(1)) then - site%g = 1 - else if (site%E > energy_bins(energy_groups + 1)) then - site%g = energy_groups + if (site % E <= energy_bins(1)) then + site % g = 1 + else if (site % E > energy_bins(energy_groups + 1)) then + site % g = energy_groups else - site%g = binary_search(energy_bins, energy_groups + 1, site%E) + site % g = binary_search(energy_bins, energy_groups + 1, site % E) end if end if From 02a9441522163bd0092285e6e7241018a7ee723b Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 12 Feb 2016 05:22:18 -0500 Subject: [PATCH 109/149] Fixes to move nuclidemg_init routines to the actual class, now that circular dependencies are gone --- src/mgxs_data.F90 | 454 +---------------------------------------- src/nuclide_header.F90 | 417 ++++++++++++++++++++++++++++++++++++- 2 files changed, 412 insertions(+), 459 deletions(-) diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index 9fa0aeb2ba..796269151c 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -35,8 +35,7 @@ contains type(Node), pointer :: node_xsdata type(NodeList), pointer :: node_xsdata_list => null() logical :: file_exists - integer :: error_code - character(MAX_LINE_LEN) :: error_text, temp_str + character(MAX_LINE_LEN) :: temp_str logical :: get_kfiss, get_fiss integer :: l @@ -125,18 +124,12 @@ contains end select ! Now read in the data specific to the type we just declared - call nuclidemg_init(nuclides_MG(i_nuclide) % obj, node_xsdata, & - energy_groups, get_kfiss, get_fiss, error_code, & - error_text) + call nuclides_MG(i_nuclide) % obj % init(node_xsdata, energy_groups, & + get_kfiss, get_fiss) ! Keep track of what listing is associated with this nuclide nuclides_MG(i_nuclide) % obj % listing = i_listing - ! Handle any errors - if (error_code /= 0) then - call fatal_error(trim(error_text)) - end if - ! Add name and alias to dictionary call already_read % add(name) call already_read % add(alias) @@ -190,447 +183,6 @@ contains end subroutine same_nuclidemg_list -!=============================================================================== -! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed -!=============================================================================== - - subroutine nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss, & - error_code, error_text) - class(NuclideMG), intent(inout) :: this ! Working Object - type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml - integer, intent(in) :: groups ! Number of Energy groups - logical, intent(in) :: get_kfiss ! Need Kappa-Fission? - logical, intent(in) :: get_fiss ! Should we get fiss data? - integer, intent(inout) :: error_code ! Code signifying error - character(MAX_LINE_LEN), intent(inout) :: error_text ! Error to print - - type(Node), pointer :: node_legendre_mu - character(MAX_LINE_LEN) :: temp_str - logical :: enable_leg_mu - - ! Initialize error data - error_code = 0 - error_text = '' - - ! Load the data - call get_node_value(node_xsdata, "name", this % name) - this % name = to_lower(this % name) - if (check_for_node(node_xsdata, "kT")) then - call get_node_value(node_xsdata, "kT", this % kT) - else - this % kT = ZERO - end if - if (check_for_node(node_xsdata, "zaid")) then - call get_node_value(node_xsdata, "zaid", this % zaid) - else - this % zaid = -1 - end if - if (check_for_node(node_xsdata, "scatt_type")) then - call get_node_value(node_xsdata, "scatt_type", temp_str) - temp_str = trim(to_lower(temp_str)) - if (temp_str == 'legendre') then - this % scatt_type = ANGLE_LEGENDRE - else if (temp_str == 'histogram') then - this % scatt_type = ANGLE_HISTOGRAM - else if (temp_str == 'tabular') then - this % scatt_type = ANGLE_TABULAR - else - error_code = 1 - error_text = "Invalid Scatt Type Option!" - return - end if - else - this % scatt_type = ANGLE_LEGENDRE - end if - - if (check_for_node(node_xsdata, "order")) then - call get_node_value(node_xsdata, "order", this % order) - else - error_code = 1 - error_text = "Order Must Be Provided!" - return - end if - - ! Get scattering treatment - if (check_for_node(node_xsdata, "tabular_legendre")) then - call get_node_ptr(node_xsdata, "tabular_legendre", node_legendre_mu) - if (check_for_node(node_legendre_mu, "enable")) then - call get_node_value(node_legendre_mu, "enable", temp_str) - temp_str = trim(to_lower(temp_str)) - if (temp_str == 'true' .or. temp_str == '1') then - enable_leg_mu = .true. - elseif (temp_str == 'false' .or. temp_str == '0') then - enable_leg_mu = .false. - this % legendre_mu_points = 1 - else - call fatal_error("Unrecognized tabular_legendre/enable: " // temp_str) - end if - else - enable_leg_mu = .true. - this % legendre_mu_points = 33 - end if - if (enable_leg_mu .and. & - check_for_node(node_legendre_mu, "num_points")) then - call get_node_value(node_legendre_mu, "num_points", & - this % legendre_mu_points) - if (this % legendre_mu_points <= 0) then - call fatal_error("num_points element must be positive and non-zero!") - end if - this % legendre_mu_points = -1 * this % legendre_mu_points - end if - else - this % legendre_mu_points = 1 - end if - - if (check_for_node(node_xsdata, "fissionable")) then - call get_node_value(node_xsdata, "fissionable", temp_str) - temp_str = to_lower(temp_str) - if (trim(temp_str) == 'true' .or. trim(temp_str) == '1') then - this % fissionable = .true. - else - this % fissionable = .false. - end if - else - error_code = 1 - error_text = "Fissionable element must be set!" - return - end if - - select type(this) - type is (NuclideIso) - call nuclideiso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & - error_code, error_text) - type is (NuclideAngle) - call nuclideangle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & - error_code, error_text) - end select - - end subroutine nuclidemg_init - - subroutine nuclideiso_init(this, node_xsdata, groups, get_kfiss, get_fiss, & - error_code, error_text) - class(NuclideIso), intent(inout) :: this ! Working Object - type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml - integer, intent(in) :: groups ! Number of Energy groups - logical, intent(in) :: get_kfiss ! Need Kappa-Fission? - logical, intent(in) :: get_fiss ! Need fiss data? - integer, intent(inout) :: error_code ! Code signifying error - character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print - - real(8), allocatable :: temp_arr(:) - integer :: arr_len - integer :: order_dim - - ! Load the more specific data - if (this % fissionable) then - - if (check_for_node(node_xsdata, "chi")) then - ! Get chi - allocate(this % chi(groups)) - call get_node_array(node_xsdata, "chi", this % chi) - - ! Get nu_fission (as a vector) - if (check_for_node(node_xsdata, "nu_fission")) then - allocate(temp_arr(groups * 1)) - call get_node_array(node_xsdata, "nu_fission", temp_arr) - allocate(this % nu_fission(groups, 1)) - this % nu_fission = reshape(temp_arr, (/groups, 1/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "If fissionable, must provide nu_fission!" - return - end if - - else - ! Get nu_fission (as a matrix) - if (check_for_node(node_xsdata, "nu_fission")) then - - allocate(temp_arr(groups*groups)) - call get_node_array(node_xsdata, "nu_fission", temp_arr) - allocate(this % nu_fission(groups, groups)) - this % nu_fission = reshape(temp_arr, (/groups, groups/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "If fissionable, must provide nu_fission!" - return - end if - end if - if (get_fiss) then - allocate(this % fission(groups)) - if (check_for_node(node_xsdata, "fission")) then - call get_node_array(node_xsdata, "fission", this % fission) - else - error_code = 1 - error_text = "Fission data missing, required due to fission& - & tallies in tallies.xml file!" - return - end if - end if - if (get_kfiss) then - allocate(this % k_fission(groups)) - if (check_for_node(node_xsdata, "kappa_fission")) then - call get_node_array(node_xsdata, "kappa_fission", this % k_fission) - else - error_code = 1 - error_text = "kappa_fission data missing, required due to & - &kappa-fission tallies in tallies.xml file!" - return - end if - end if - end if - - allocate(this % absorption(groups)) - if (check_for_node(node_xsdata, "absorption")) then - call get_node_array(node_xsdata, "absorption", this % absorption) - else - error_code = 1 - error_text = "Must provide absorption!" - return - end if - - if (this % scatt_type == ANGLE_LEGENDRE) then - order_dim = this % order + 1 - else if (this % scatt_type == ANGLE_HISTOGRAM) then - order_dim = this % order - else if (this % scatt_type == ANGLE_TABULAR) then - order_dim = this % order - end if - - allocate(this % scatter(groups, groups, order_dim)) - if (check_for_node(node_xsdata, "scatter")) then - allocate(temp_arr(groups * groups * order_dim)) - call get_node_array(node_xsdata, "scatter", temp_arr) - this % scatter = reshape(temp_arr, (/groups, groups, order_dim/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "Must provide scatter!" - return - end if - - - allocate(this % total(groups)) - if (check_for_node(node_xsdata, "total")) then - call get_node_array(node_xsdata, "total", this % total) - else - this % total = this % absorption + sum(this%scatter(:,:,1),dim=1) - end if - - ! Get Mult Data - allocate(this % mult(groups, groups)) - if (check_for_node(node_xsdata, "multiplicity")) then - arr_len = get_arraysize_double(node_xsdata, "multiplicity") - if (arr_len == groups * groups) then - allocate(temp_arr(arr_len)) - call get_node_array(node_xsdata, "multiplicity", temp_arr) - this % mult = reshape(temp_arr, (/groups, groups/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "Multiplicity Length Not Same as number of groups squared!" - return - end if - else - this % mult = ONE - end if - - end subroutine nuclideiso_init - - subroutine nuclideangle_init(this, node_xsdata, groups, get_kfiss, get_fiss, & - error_code, error_text) - class(NuclideAngle), intent(inout) :: this ! Working Object - type(Node), pointer, intent(in) :: node_xsdata ! Data from data.xml - integer, intent(in) :: groups ! Number of Energy groups - logical, intent(in) :: get_kfiss ! Need Kappa-Fission? - logical, intent(in) :: get_fiss ! Should we get fiss data? - integer, intent(inout) :: error_code ! Code signifying error - character(MAX_LINE_LEN), intent(inout) :: error_text ! Error message to print - - real(8), allocatable :: temp_arr(:) - integer :: arr_len - real(8) :: dangle - integer :: iangle - integer :: order_dim - - if (this % scatt_type == ANGLE_LEGENDRE) then - order_dim = this % order + 1 - else if (this % scatt_type == ANGLE_HISTOGRAM) then - order_dim = this % order - else if (this % scatt_type == ANGLE_TABULAR) then - order_dim = this % order - end if - - if (check_for_node(node_xsdata, "num_polar")) then - call get_node_value(node_xsdata, "num_polar", this % n_pol) - else - error_code = 1 - error_text = "num_polar Must Be Provided!" - return - end if - - if (check_for_node(node_xsdata, "num_azimuthal")) then - call get_node_value(node_xsdata, "num_azimuthal", this % n_azi) - else - error_code = 1 - error_text = "num_azimuthal Must Be Provided!" - return - end if - - ! Load angle data, if present (else equally spaced) - allocate(this % polar(this % n_pol)) - allocate(this % azimuthal(this % n_azi)) - if (check_for_node(node_xsdata, "polar")) then - error_code = 1 - error_text = "User-Specified polar angle bins not yet supported!" - return - call get_node_array(node_xsdata, "polar", this % polar) - else - dangle = PI / real(this % n_pol,8) - do iangle = 1, this % n_pol - this % polar(iangle) = (real(iangle,8) - HALF) * dangle - end do - end if - if (check_for_node(node_xsdata, "azimuthal")) then - error_code = 1 - error_text = "User-Specified azimuthal angle bins not yet supported!" - return - call get_node_array(node_xsdata, "azimuthal", this % azimuthal) - else - dangle = TWO * PI / real(this % n_azi,8) - do iangle = 1, this % n_azi - this % azimuthal(iangle) = -PI + (real(iangle,8) - HALF) * dangle - end do - end if - - ! Load the more specific data - if (this % fissionable) then - - if (check_for_node(node_xsdata, "chi")) then - ! Get chi - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "chi", temp_arr) - allocate(this % chi(groups, this % n_azi, this % n_pol)) - this % chi = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) - deallocate(temp_arr) - - ! Get nu_fission (as a vector) - if (check_for_node(node_xsdata, "nu_fission")) then - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "nu_fission", temp_arr) - allocate(this % nu_fission(groups, 1, this % n_azi, this % n_pol)) - this % nu_fission = reshape(temp_arr, (/groups, 1, this % n_azi, & - this % n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "If fissionable, must provide nu_fission!" - return - end if - - else - ! Get nu_fission (as a matrix) - if (check_for_node(node_xsdata, "nu_fission")) then - - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "nu_fission", temp_arr) - allocate(this % nu_fission(groups, groups, this % n_azi, this % n_pol)) - this % nu_fission = reshape(temp_arr, (/groups, groups, & - this % n_azi, this % n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "If fissionable, must provide nu_fission!" - return - end if - end if - if (get_fiss) then - if (check_for_node(node_xsdata, "fission")) then - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "fission", temp_arr) - allocate(this % fission(groups, this % n_azi, this % n_pol)) - this % fission = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "Fission data missing, required due to fission& - & tallies in tallies.xml file!" - return - end if - end if - if (get_kfiss) then - if (check_for_node(node_xsdata, "kappa_fission")) then - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "kappa_fission", temp_arr) - allocate(this % k_fission(groups, this % n_azi, this % n_pol)) - this % k_fission = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "kappa_fission data missing, required due to & - &kappa-fission tallies in tallies.xml file!" - return - end if - end if - end if - - if (check_for_node(node_xsdata, "absorption")) then - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "absorption", temp_arr) - allocate(this % absorption(groups, this % n_azi, this % n_pol)) - this % absorption = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "Must provide absorption!" - return - end if - - allocate(this % scatter(groups, groups, order_dim, this % n_azi, this % n_pol)) - if (check_for_node(node_xsdata, "scatter")) then - allocate(temp_arr(groups * groups * order_dim * this % n_azi * this%n_pol)) - call get_node_array(node_xsdata, "scatter", temp_arr) - this % scatter = reshape(temp_arr, (/groups, groups, order_dim, & - this%n_azi,this%n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "Must provide scatter!" - return - end if - - if (check_for_node(node_xsdata, "total")) then - allocate(temp_arr(groups * this % n_azi * this % n_pol)) - call get_node_array(node_xsdata, "total", temp_arr) - allocate(this % total(groups, this % n_azi, this % n_pol)) - this % total = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) - deallocate(temp_arr) - else - this % total = this % absorption + sum(this%scatter(:,:,1,:,:),dim=1) - end if - - ! Get Mult Data - allocate(this % mult(groups, groups, this % n_azi, this % n_pol)) - if (check_for_node(node_xsdata, "multiplicity")) then - arr_len = get_arraysize_double(node_xsdata, "multiplicity") - if (arr_len == groups * groups * this % n_azi * this % n_pol) then - allocate(temp_arr(arr_len)) - call get_node_array(node_xsdata, "multiplicity", temp_arr) - this % mult = reshape(temp_arr, (/groups, groups, this % n_azi, this % n_pol/)) - deallocate(temp_arr) - else - error_code = 1 - error_text = "Multiplicity Length Does Not Match!" - return - end if - else - this % mult = ONE - end if - - end subroutine nuclideangle_init - - !=============================================================================== ! CREATE_MACRO_XS generates the macroscopic x/s from the microscopic input data !=============================================================================== diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 2f62b86672..7569d9ea80 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -5,10 +5,11 @@ module nuclide_header use ace_header use constants use endf, only: reaction_name + use error, only: fatal_error use list_header, only: ListInt use math, only: evaluate_legendre use string - + use xml_interface implicit none !=============================================================================== @@ -31,7 +32,7 @@ module nuclide_header logical :: fissionable ! nuclide is fissionable? contains - procedure(print_nuclide_), deferred :: print ! Writes nuclide info + procedure(print_nuclide_), deferred :: print ! Writes nuclide info end type Nuclide abstract interface @@ -114,12 +115,23 @@ module nuclide_header ! Legendre distribs, -1 if sample with the ! Legendres themselves contains - procedure(nuclidemg_get_xs), deferred :: get_xs ! Get the xs - procedure(nuclide_calc_f_), deferred :: calc_f ! Calculates f, given mu + procedure(nuclidemg_init_), deferred :: init ! Initialize the data + procedure(nuclidemg_get_xs_), deferred :: get_xs ! Get the requested xs + procedure(nuclidemg_calc_f_), deferred :: calc_f ! Calculates f, given mu end type NuclideMG abstract interface - function nuclidemg_get_xs(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & + + subroutine nuclidemg_init_(this, node_xsdata, groups, get_kfiss, get_fiss) + import NuclideMG, Node + class(NuclideMG), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from MGXS xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Should we get fiss data? + end subroutine nuclidemg_init_ + + function nuclidemg_get_xs_(this, g, xstype, gout, uvw, mu, i_azi, i_pol) & result(xs) import NuclideMG class(NuclideMG), intent(in) :: this @@ -131,9 +143,9 @@ module nuclide_header integer, optional, intent(in) :: i_azi ! Azimuthal Index integer, optional, intent(in) :: i_pol ! Polar Index real(8) :: xs ! Resultant xs - end function nuclidemg_get_xs + end function nuclidemg_get_xs_ - pure function nuclide_calc_f_(this, gin, gout, mu, uvw, i_azi, i_pol) result(f) + pure function nuclidemg_calc_f_(this, gin, gout, mu, uvw, i_azi, i_pol) result(f) import NuclideMG class(NuclideMG), intent(in) :: this integer, intent(in) :: gin ! Incoming Energy Group @@ -144,7 +156,7 @@ module nuclide_header integer, intent(in), optional :: i_pol ! Outgoing Energy Group real(8) :: f ! Return value of f(mu) - end function nuclide_calc_f_ + end function nuclidemg_calc_f_ end interface !=============================================================================== @@ -165,6 +177,7 @@ module nuclide_header real(8), allocatable :: mult(:,:) ! Scatter multiplicity (Gout x Gin) contains + procedure :: init => nuclideiso_init ! Initialize Nuclidic MGXS Data procedure :: print => nuclideiso_print ! Writes nuclide info procedure :: get_xs => nuclideiso_get_xs ! Gets Size of Data w/in Object procedure :: calc_f => nuclideiso_calc_f ! Calcs f given mu @@ -194,6 +207,7 @@ module nuclide_header real(8), allocatable :: azimuthal(:) ! azimuthal angles contains + procedure :: init => nuclideangle_init ! Initialize Nuclidic MGXS Data procedure :: print => nuclideangle_print ! Gets Size of Data w/in Object procedure :: get_xs => nuclideangle_get_xs ! Gets Size of Data w/in Object procedure :: calc_f => nuclideangle_calc_f ! Calcs f given mu @@ -282,6 +296,393 @@ module nuclide_header contains +!=============================================================================== +! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed +!=============================================================================== + + subroutine nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss) + class(NuclideMG), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from MGXS xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Should we get fiss data? + + type(Node), pointer :: node_legendre_mu + character(MAX_LINE_LEN) :: temp_str + logical :: enable_leg_mu + + ! Load the data + call get_node_value(node_xsdata, "name", this % name) + this % name = to_lower(this % name) + if (check_for_node(node_xsdata, "kT")) then + call get_node_value(node_xsdata, "kT", this % kT) + else + this % kT = ZERO + end if + if (check_for_node(node_xsdata, "zaid")) then + call get_node_value(node_xsdata, "zaid", this % zaid) + else + this % zaid = -1 + end if + if (check_for_node(node_xsdata, "scatt_type")) then + call get_node_value(node_xsdata, "scatt_type", temp_str) + temp_str = trim(to_lower(temp_str)) + if (temp_str == 'legendre') then + this % scatt_type = ANGLE_LEGENDRE + else if (temp_str == 'histogram') then + this % scatt_type = ANGLE_HISTOGRAM + else if (temp_str == 'tabular') then + this % scatt_type = ANGLE_TABULAR + else + call fatal_error("Invalid Scatt Type Option!") + end if + else + this % scatt_type = ANGLE_LEGENDRE + end if + + if (check_for_node(node_xsdata, "order")) then + call get_node_value(node_xsdata, "order", this % order) + else + call fatal_error("Order Must Be Provided!") + end if + + ! Get scattering treatment + if (check_for_node(node_xsdata, "tabular_legendre")) then + call get_node_ptr(node_xsdata, "tabular_legendre", node_legendre_mu) + if (check_for_node(node_legendre_mu, "enable")) then + call get_node_value(node_legendre_mu, "enable", temp_str) + temp_str = trim(to_lower(temp_str)) + if (temp_str == 'true' .or. temp_str == '1') then + enable_leg_mu = .true. + elseif (temp_str == 'false' .or. temp_str == '0') then + enable_leg_mu = .false. + this % legendre_mu_points = 1 + else + call fatal_error("Unrecognized tabular_legendre/enable: " // temp_str) + end if + else + enable_leg_mu = .true. + this % legendre_mu_points = 33 + end if + if (enable_leg_mu .and. & + check_for_node(node_legendre_mu, "num_points")) then + call get_node_value(node_legendre_mu, "num_points", & + this % legendre_mu_points) + if (this % legendre_mu_points <= 0) then + call fatal_error("num_points element must be positive and non-zero!") + end if + this % legendre_mu_points = -1 * this % legendre_mu_points + end if + else + this % legendre_mu_points = 1 + end if + + if (check_for_node(node_xsdata, "fissionable")) then + call get_node_value(node_xsdata, "fissionable", temp_str) + temp_str = to_lower(temp_str) + if (trim(temp_str) == 'true' .or. trim(temp_str) == '1') then + this % fissionable = .true. + else + this % fissionable = .false. + end if + else + call fatal_error("Fissionable element must be set!") + end if + + end subroutine nuclidemg_init + + subroutine nuclideiso_init(this, node_xsdata, groups, get_kfiss, get_fiss) + class(NuclideIso), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from MGXS xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Need fiss data? + + real(8), allocatable :: temp_arr(:) + integer :: arr_len + integer :: order_dim + + ! Call generic data gathering routine + call nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss) + + ! Load the more specific data + if (this % fissionable) then + + if (check_for_node(node_xsdata, "chi")) then + ! Get chi + allocate(this % chi(groups)) + call get_node_array(node_xsdata, "chi", this % chi) + + ! Get nu_fission (as a vector) + if (check_for_node(node_xsdata, "nu_fission")) then + allocate(temp_arr(groups * 1)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, 1)) + this % nu_fission = reshape(temp_arr, (/groups, 1/)) + deallocate(temp_arr) + else + call fatal_error("If fissionable, must provide nu_fission!") + end if + + else + ! Get nu_fission (as a matrix) + if (check_for_node(node_xsdata, "nu_fission")) then + + allocate(temp_arr(groups*groups)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, groups)) + this % nu_fission = reshape(temp_arr, (/groups, groups/)) + deallocate(temp_arr) + else + call fatal_error("If fissionable, must provide nu_fission!") + end if + end if + if (get_fiss) then + allocate(this % fission(groups)) + if (check_for_node(node_xsdata, "fission")) then + call get_node_array(node_xsdata, "fission", this % fission) + else + call fatal_error("Fission data missing, required due to fission& + & tallies in tallies.xml file!") + end if + end if + if (get_kfiss) then + allocate(this % k_fission(groups)) + if (check_for_node(node_xsdata, "kappa_fission")) then + call get_node_array(node_xsdata, "kappa_fission", this % k_fission) + else + call fatal_error("kappa_fission data missing, required due to & + &kappa-fission tallies in tallies.xml file!") + end if + end if + end if + + allocate(this % absorption(groups)) + if (check_for_node(node_xsdata, "absorption")) then + call get_node_array(node_xsdata, "absorption", this % absorption) + else + call fatal_error("Must provide absorption!") + end if + + if (this % scatt_type == ANGLE_LEGENDRE) then + order_dim = this % order + 1 + else if (this % scatt_type == ANGLE_HISTOGRAM) then + order_dim = this % order + else if (this % scatt_type == ANGLE_TABULAR) then + order_dim = this % order + end if + + allocate(this % scatter(groups, groups, order_dim)) + if (check_for_node(node_xsdata, "scatter")) then + allocate(temp_arr(groups * groups * order_dim)) + call get_node_array(node_xsdata, "scatter", temp_arr) + this % scatter = reshape(temp_arr, (/groups, groups, order_dim/)) + deallocate(temp_arr) + else + call fatal_error("Must provide scatter!") + return + end if + + + allocate(this % total(groups)) + if (check_for_node(node_xsdata, "total")) then + call get_node_array(node_xsdata, "total", this % total) + else + this % total = this % absorption + sum(this%scatter(:,:,1),dim=1) + end if + + ! Get Mult Data + allocate(this % mult(groups, groups)) + if (check_for_node(node_xsdata, "multiplicity")) then + arr_len = get_arraysize_double(node_xsdata, "multiplicity") + if (arr_len == groups * groups) then + allocate(temp_arr(arr_len)) + call get_node_array(node_xsdata, "multiplicity", temp_arr) + this % mult = reshape(temp_arr, (/groups, groups/)) + deallocate(temp_arr) + else + call fatal_error("Multiplicity length not same as number of groups& + & squared!") + return + end if + else + this % mult = ONE + end if + + end subroutine nuclideiso_init + + subroutine nuclideangle_init(this, node_xsdata, groups, get_kfiss, get_fiss) + class(NuclideAngle), intent(inout) :: this ! Working Object + type(Node), pointer, intent(in) :: node_xsdata ! Data from MGXS xml + integer, intent(in) :: groups ! Number of Energy groups + logical, intent(in) :: get_kfiss ! Need Kappa-Fission? + logical, intent(in) :: get_fiss ! Should we get fiss data? + + real(8), allocatable :: temp_arr(:) + integer :: arr_len + real(8) :: dangle + integer :: iangle + integer :: order_dim + + ! Call generic data gathering routine + call nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss) + + if (this % scatt_type == ANGLE_LEGENDRE) then + order_dim = this % order + 1 + else if (this % scatt_type == ANGLE_HISTOGRAM) then + order_dim = this % order + else if (this % scatt_type == ANGLE_TABULAR) then + order_dim = this % order + end if + + if (check_for_node(node_xsdata, "num_polar")) then + call get_node_value(node_xsdata, "num_polar", this % n_pol) + else + call fatal_error("num_polar Must Be Provided!") + end if + + if (check_for_node(node_xsdata, "num_azimuthal")) then + call get_node_value(node_xsdata, "num_azimuthal", this % n_azi) + else + call fatal_error("num_azimuthal Must Be Provided!") + end if + + ! Load angle data, if present (else equally spaced) + allocate(this % polar(this % n_pol)) + allocate(this % azimuthal(this % n_azi)) + if (check_for_node(node_xsdata, "polar")) then + call fatal_error("User-Specified polar angle bins not yet supported!") + ! When this feature is supported, this line will be activated + call get_node_array(node_xsdata, "polar", this % polar) + else + dangle = PI / real(this % n_pol,8) + do iangle = 1, this % n_pol + this % polar(iangle) = (real(iangle,8) - HALF) * dangle + end do + end if + if (check_for_node(node_xsdata, "azimuthal")) then + call fatal_error("User-Specified azimuthal angle bins not yet supported!") + ! When this feature is supported, this line will be activated + call get_node_array(node_xsdata, "azimuthal", this % azimuthal) + else + dangle = TWO * PI / real(this % n_azi,8) + do iangle = 1, this % n_azi + this % azimuthal(iangle) = -PI + (real(iangle,8) - HALF) * dangle + end do + end if + + ! Load the more specific data + if (this % fissionable) then + + if (check_for_node(node_xsdata, "chi")) then + ! Get chi + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "chi", temp_arr) + allocate(this % chi(groups, this % n_azi, this % n_pol)) + this % chi = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) + deallocate(temp_arr) + + ! Get nu_fission (as a vector) + if (check_for_node(node_xsdata, "nu_fission")) then + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, 1, this % n_azi, this % n_pol)) + this % nu_fission = reshape(temp_arr, (/groups, 1, this % n_azi, & + this % n_pol/)) + deallocate(temp_arr) + else + call fatal_error("If fissionable, must provide nu_fission!") + end if + + else + ! Get nu_fission (as a matrix) + if (check_for_node(node_xsdata, "nu_fission")) then + + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "nu_fission", temp_arr) + allocate(this % nu_fission(groups, groups, this % n_azi, this % n_pol)) + this % nu_fission = reshape(temp_arr, (/groups, groups, & + this % n_azi, this % n_pol/)) + deallocate(temp_arr) + else + call fatal_error("If fissionable, must provide nu_fission!") + end if + end if + if (get_fiss) then + if (check_for_node(node_xsdata, "fission")) then + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "fission", temp_arr) + allocate(this % fission(groups, this % n_azi, this % n_pol)) + this % fission = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) + deallocate(temp_arr) + else + call fatal_error("Fission data missing, required due to fission& + & tallies in tallies.xml file!") + end if + end if + if (get_kfiss) then + if (check_for_node(node_xsdata, "kappa_fission")) then + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "kappa_fission", temp_arr) + allocate(this % k_fission(groups, this % n_azi, this % n_pol)) + this % k_fission = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) + deallocate(temp_arr) + else + call fatal_error("kappa_fission data missing, required due to & + &kappa-fission tallies in tallies.xml file!") + end if + end if + end if + + if (check_for_node(node_xsdata, "absorption")) then + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "absorption", temp_arr) + allocate(this % absorption(groups, this % n_azi, this % n_pol)) + this % absorption = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) + deallocate(temp_arr) + else + call fatal_error("Must provide absorption!") + end if + + allocate(this % scatter(groups, groups, order_dim, this % n_azi, this % n_pol)) + if (check_for_node(node_xsdata, "scatter")) then + allocate(temp_arr(groups * groups * order_dim * this % n_azi * this%n_pol)) + call get_node_array(node_xsdata, "scatter", temp_arr) + this % scatter = reshape(temp_arr, (/groups, groups, order_dim, & + this%n_azi,this%n_pol/)) + deallocate(temp_arr) + else + call fatal_error("Must provide scatter!") + end if + + if (check_for_node(node_xsdata, "total")) then + allocate(temp_arr(groups * this % n_azi * this % n_pol)) + call get_node_array(node_xsdata, "total", temp_arr) + allocate(this % total(groups, this % n_azi, this % n_pol)) + this % total = reshape(temp_arr, (/groups, this % n_azi, this % n_pol/)) + deallocate(temp_arr) + else + this % total = this % absorption + sum(this%scatter(:,:,1,:,:),dim=1) + end if + + ! Get Mult Data + allocate(this % mult(groups, groups, this % n_azi, this % n_pol)) + if (check_for_node(node_xsdata, "multiplicity")) then + arr_len = get_arraysize_double(node_xsdata, "multiplicity") + if (arr_len == groups * groups * this % n_azi * this % n_pol) then + allocate(temp_arr(arr_len)) + call get_node_array(node_xsdata, "multiplicity", temp_arr) + this % mult = reshape(temp_arr, (/groups, groups, this % n_azi, this % n_pol/)) + deallocate(temp_arr) + else + call fatal_error("Multiplicity Length Does Not Match!") + end if + else + this % mult = ONE + end if + + end subroutine nuclideangle_init + !=============================================================================== ! NUCLIDECE_CLEAR resets and deallocates data in Nuclide, NuclideIso ! or NuclideAngle From 8a14d600b08b7046409fc332f03a2803bbb49a55 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 12 Feb 2016 06:23:23 -0500 Subject: [PATCH 110/149] fixed check_source finds --- src/input_xml.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 50e8ca30dc..eca7e8ca15 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2051,8 +2051,8 @@ contains ! Check to ensure material has at least one nuclide if (.not. check_for_node(node_mat, "nuclide") .and. & - .not. check_for_node(node_mat, "element") .and. & - .not. check_for_node(node_mat, "macroscopic")) then + .not. check_for_node(node_mat, "element") .and. & + .not. check_for_node(node_mat, "macroscopic")) then call fatal_error("No macroscopic data, nuclides or natural elements & &specified on material " // trim(to_str(mat % id))) end if From db48ed6fb744867f3f4d2413228847dc99bfb504 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 12 Feb 2016 18:20:38 -0500 Subject: [PATCH 111/149] Fixed bug when merging tallies with more than two filters --- openmc/tallies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/tallies.py b/openmc/tallies.py index 91a1fb0eef..79baf2b503 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -699,8 +699,8 @@ class Tally(object): return False # Look to see if all filters are the same, or one or more can be merged - merge_filters = False for filter1 in self.filters: + merge_filters = False mergeable_filter = False for filter2 in other.filters: From 8c43a32130664e6173d1448727f83c2717e2f81c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 12 Feb 2016 21:44:21 -0500 Subject: [PATCH 112/149] Resolved almost all of the comments from @paulromano, save for rejection sampling of the Legendre polynomial. also fixed @samuelshaner comment about the pincell_multigroup problem --- docs/source/usersguide/mgxs_library.rst | 6 +- .../python/pincell_multigroup/build-xml.py | 15 +- examples/xml/pincell_multigroup/materials.xml | 4 +- .../pincell_multigroup/mg_cross_sections.xml | 32 +-- src/input_xml.F90 | 5 +- src/macroxs_header.F90 | 162 +++++++++++- src/macroxs_operations.F90 | 243 ------------------ src/math.F90 | 27 ++ src/nuclide_header.F90 | 50 +--- src/physics_mg.F90 | 9 +- src/scattdata_header.F90 | 164 +++++++++++- src/tracking.F90 | 6 +- 12 files changed, 400 insertions(+), 323 deletions(-) delete mode 100644 src/macroxs_operations.F90 diff --git a/docs/source/usersguide/mgxs_library.rst b/docs/source/usersguide/mgxs_library.rst index 478b060024..ae4ee6681e 100644 --- a/docs/source/usersguide/mgxs_library.rst +++ b/docs/source/usersguide/mgxs_library.rst @@ -82,7 +82,11 @@ well as the actual cross section data. The following are the attributes/sub-elements required to describe the meta-data: :name: - The name of the microscopic or macroscopic data set. + The name of the microscopic or macroscopic data set. An extension to the + name must be provided (e.g., the ``.70m`` in ``UO2.70m``). This extension, + similar to the equivalent in the continuous-energy ``cross_sections.xml`` + file is used to denote variants of the particular nuclide or material of + interest (i.e. the ``UO2`` in this example). *Default*: None, this must be provided. diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py index 17fbae9941..7b8926c346 100644 --- a/examples/python/pincell_multigroup/build-xml.py +++ b/examples/python/pincell_multigroup/build-xml.py @@ -1,5 +1,7 @@ import openmc import openmc.mgxs +from openmc.source import Source +from openmc.stats import Box import numpy as np ############################################################################### @@ -20,7 +22,7 @@ groups = openmc.mgxs.EnergyGroups(group_edges=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) # Instantiate the 7-group (C5G7) cross section data -uo2_xsdata = openmc.XSdata('UO2.300K', groups) +uo2_xsdata = openmc.XSdata('UO2.70m', groups) uo2_xsdata.order = 0 uo2_xsdata.total = np.array([0.1779492, 0.3298048, 0.4803882, 0.5543674, 0.3118013, 0.3951678, 0.5644058]) @@ -43,7 +45,7 @@ uo2_xsdata.nu_fission = np.array([2.005998E-02, 2.027303E-03, 1.570599E-02, uo2_xsdata.chi = np.array([5.8791E-01, 4.1176E-01, 3.3906E-04, 1.1761E-07, 0.0000E+00, 0.0000E+00, 0.0000E+00]) -h2o_xsdata = openmc.XSdata('LWTR.300K', groups) +h2o_xsdata = openmc.XSdata('LWTR.70m', groups) h2o_xsdata.order = 0 h2o_xsdata.total = np.array([0.15920605, 0.412969593, 0.59030986, 0.58435, 0.718, 1.2544497, 2.650379]) @@ -69,8 +71,8 @@ mg_cross_sections_file.export_to_xml() ############################################################################### # Instantiate some Macroscopic Data -uo2_data = openmc.Macroscopic('UO2', '300K') -h2o_data = openmc.Macroscopic('LWTR', '300K') +uo2_data = openmc.Macroscopic('UO2', '70m') +h2o_data = openmc.Macroscopic('LWTR', '70m') # Instantiate some Materials and register the appropriate Macroscopic objects uo2 = openmc.Material(material_id=1, name='UO2 fuel') @@ -83,7 +85,7 @@ water.add_macroscopic(h2o_data) # Instantiate a MaterialsFile, register all Materials, and export to XML materials_file = openmc.MaterialsFile() -materials_file.default_xs = '300K' +materials_file.default_xs = '70m' materials_file.add_materials([uo2, water]) materials_file.export_to_xml() @@ -143,8 +145,7 @@ settings_file.cross_sections = "./mg_cross_sections.xml" settings_file.batches = batches settings_file.inactive = inactive settings_file.particles = particles -settings_file.set_source_space('box', [-0.63, -0.63, -1, \ - 0.63, 0.63, 1]) +settings_file.source = Source(space=Box([-0.63, -0.63, -1.], [0.63, 0.63, 1.])) ############################################################################### # Exporting to OpenMC tallies.xml File diff --git a/examples/xml/pincell_multigroup/materials.xml b/examples/xml/pincell_multigroup/materials.xml index 4b14f4a795..c94629665b 100644 --- a/examples/xml/pincell_multigroup/materials.xml +++ b/examples/xml/pincell_multigroup/materials.xml @@ -1,7 +1,7 @@ - - 300K + + 70m diff --git a/examples/xml/pincell_multigroup/mg_cross_sections.xml b/examples/xml/pincell_multigroup/mg_cross_sections.xml index ec85d4b593..d38d2d9c21 100644 --- a/examples/xml/pincell_multigroup/mg_cross_sections.xml +++ b/examples/xml/pincell_multigroup/mg_cross_sections.xml @@ -11,8 +11,8 @@ --> - UO2.71c - UO2.71c + UO2.70m + UO2.70m 2.53E-8 0 true @@ -67,8 +67,8 @@ - MOX1.71c - MOX1.71c + MOX1.70m + MOX1.70m 2.53E-8 0 true @@ -124,8 +124,8 @@ - MOX2.71c - MOX2.71c + MOX2.70m + MOX2.70m 2.53E-8 0 true @@ -180,8 +180,8 @@ - MOX3.71c - MOX3.71c + MOX3.70m + MOX3.70m 2.53E-8 0 true @@ -236,8 +236,8 @@ - FC.71c - FC.71c + FC.70m + FC.70m 2.53E-8 0 true @@ -286,8 +286,8 @@ - GT.71c - GT.71c + GT.70m + GT.70m 2.53E-8 0 false @@ -318,8 +318,8 @@ - LWTR.71c - LWTR.71c + LWTR.70m + LWTR.70m 2.53E-8 0 false @@ -351,8 +351,8 @@ - CR.71c - CR.71c + CR.70m + CR.70m 2.53E-8 0 false diff --git a/src/input_xml.F90 b/src/input_xml.F90 index eca7e8ca15..9fc490a33b 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2063,7 +2063,10 @@ contains ! as nuclides internally. ! Get pointer list of XML call get_node_list(node_mat, "macroscopic", node_macro_list) - if (get_list_size(node_macro_list) > 1) then + if (run_CE .and. (get_list_size(node_macro_list) > 0)) then + call fatal_error("Macroscopic can not be used in continuous-energy& + & mode!") + else if (get_list_size(node_macro_list) > 1) then call fatal_error("Only one macroscopic object permitted per material, " & // trim(to_str(mat % id))) else if (get_list_size(node_macro_list) == 1) then diff --git a/src/macroxs_header.F90 b/src/macroxs_header.F90 index c435686b5d..2a12345108 100644 --- a/src/macroxs_header.F90 +++ b/src/macroxs_header.F90 @@ -3,8 +3,9 @@ module macroxs_header use constants, only: MAX_FILE_LEN, ZERO, ONE, TWO, PI use list_header, only: ListInt use material_header, only: material - use math, only: calc_pn, calc_rn, expand_harmonic + use math, only: calc_pn, calc_rn, expand_harmonic, find_angle use nuclide_header + use random_lcg, only: prn use scattdata_header implicit none @@ -19,8 +20,14 @@ module macroxs_header integer :: order contains - procedure(macroxs_init_), deferred :: init ! initializes object - procedure(macroxs_get_xs_), deferred :: get_xs ! Return xs + procedure(macroxs_init_), deferred :: init ! initializes object + procedure(macroxs_get_xs_), deferred :: get_xs ! Return xs + ! Sample the outgoing energy from a fission event + procedure(macroxs_sample_fission_), deferred :: sample_fission_energy + ! Sample the outgoing energy and angle from a scatter event + procedure(macroxs_sample_scatter_), deferred :: sample_scatter + ! Calculate the material specific MGXS data from the nuclides + procedure(macroxs_calculate_xs_), deferred :: calculate_xs end type MacroXS abstract interface @@ -50,6 +57,33 @@ module macroxs_header real(8), optional, intent(in) :: uvw(3) ! Requested Angle real(8) :: xs ! Resultant xs end function macroxs_get_xs_ + + function macroxs_sample_fission_(this, gin, uvw) result(gout) + import MacroXS + class(MacroXS), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group + + end function macroxs_sample_fission_ + + subroutine macroxs_sample_scatter_(this, uvw, gin, gout, mu, wgt) + import MacroXS + class(MacroXS), intent(in) :: this + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + end subroutine macroxs_sample_scatter_ + + subroutine macroxs_calculate_xs_(this, gin, uvw, xs) + import MacroXS, MaterialMacroXS + class(MacroXS), intent(in) :: this + integer, intent(in) :: gin ! Incoming neutron group + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + type(MaterialMacroXS), intent(inout) :: xs + end subroutine macroxs_calculate_xs_ end interface type, extends(MacroXS) :: MacroXSIso @@ -64,8 +98,11 @@ module macroxs_header real(8), allocatable :: chi(:,:) ! fission spectra contains - procedure :: init => macroxsiso_init ! inits object - procedure :: get_xs => macroxsiso_get_xs ! Returns xs + procedure :: init => macroxsiso_init ! inits object + procedure :: get_xs => macroxsiso_get_xs ! Returns xs + procedure :: sample_fission_energy => macroxsiso_sample_fission_energy + procedure :: sample_scatter => macroxsiso_sample_scatter + procedure :: calculate_xs => macroxsiso_calculate_xs end type MacroXSIso type, extends(MacroXS) :: MacroXSAngle @@ -84,6 +121,9 @@ module macroxs_header contains procedure :: init => macroxsangle_init ! inits object procedure :: get_xs => macroxsangle_get_xs ! Returns xs + procedure :: sample_fission_energy => macroxsangle_sample_fission_energy + procedure :: sample_scatter => macroxsangle_sample_scatter + procedure :: calculate_xs => macroxsangle_calculate_xs end type MacroXSAngle !=============================================================================== @@ -705,4 +745,116 @@ contains end function macroxsangle_get_xs +!=============================================================================== +! MACROXS_*_SAMPLE_FISSION_ENERGY samples the outgoing energy from a fission +! event +!=============================================================================== + + function macroxsiso_sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXSIso), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % chi(gout,gin) + end do + + end function macroxsiso_sample_fission_energy + + function macroxsangle_sample_fission_energy(this, gin, uvw) result(gout) + class(MacroXSAngle), intent(in) :: this ! Data to work with + integer, intent(in) :: gin ! Incoming energy group + real(8), intent(in) :: uvw(3) ! Particle Direction + integer :: gout ! Sampled outgoing group + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + integer :: iazi, ipol + + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % chi(gout,gin,iazi,ipol) + end do + + end function macroxsangle_sample_fission_energy + +!=============================================================================== +! MACROXS*_SAMPLE_SCATTER Selects outgoing energy and angle after a scatter +! event +!=============================================================================== + + subroutine macroxsiso_sample_scatter(this, uvw, gin, gout, mu, wgt) + class(MacroXSIso), intent(in) :: this + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + call this % scatter % sample(gin, gout, mu, wgt) + + end subroutine macroxsiso_sample_scatter + + subroutine macroxsangle_sample_scatter(this, uvw, gin, gout, mu, wgt) + class(MacroXSAngle), intent(in) :: this + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + integer :: iazi, ipol ! Angular indices + + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + call this % scatter(iazi,ipol) % obj % sample(gin,gout,mu,wgt) + + end subroutine macroxsangle_sample_scatter + +!=============================================================================== +! MACROXS*_CALCULATE_XS determines the multi-group macroscopic cross sections +! for the material the particle is currently traveling through. +!=============================================================================== + + subroutine macroxsiso_calculate_xs(this, gin, uvw, xs) + class(MacroXSIso), intent(in) :: this + integer, intent(in) :: gin ! Incoming neutron group + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + type(MaterialMacroXS), intent(inout) :: xs ! Resultant MacroXS Data + + xs % total = this % total(gin) + xs % elastic = this % scattxs(gin) + xs % absorption = this % absorption(gin) + xs % nu_fission = this % nu_fission(gin) + + end subroutine macroxsiso_calculate_xs + + subroutine macroxsangle_calculate_xs(this, gin, uvw, xs) + class(MacroXSAngle), intent(in) :: this + integer, intent(in) :: gin ! Incoming neutron group + real(8), intent(in) :: uvw(3) ! Incoming neutron direction + type(MaterialMacroXS), intent(inout) :: xs ! Resultant MacroXS Data + + integer :: iazi, ipol + + call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) + xs % total = this % total(gin, iazi, ipol) + xs % elastic = this % scattxs(gin, iazi, ipol) + xs % absorption = this % absorption(gin, iazi, ipol) + xs % nu_fission = this % nu_fission(gin, iazi, ipol) + + end subroutine macroxsangle_calculate_xs + end module macroxs_header diff --git a/src/macroxs_operations.F90 b/src/macroxs_operations.F90 deleted file mode 100644 index 4fc13910ca..0000000000 --- a/src/macroxs_operations.F90 +++ /dev/null @@ -1,243 +0,0 @@ -module macroxs_operations - - use constants - use macroxs_header, only: MacroXS, MacroXSIso, MacroXSAngle, & - expand_harmonic - use material_header, only: Material - use math - use nuclide_header, only: find_angle, MaterialMacroXS, NuclideMicroXS, & - NuclideMG, NuclideMGContainer - use random_lcg, only: prn - use scattdata_header - use search - - implicit none - -contains - -!=============================================================================== -! UPDATE_XS stores the xs to work with -!=============================================================================== - - subroutine calculate_mgxs(this, gin, uvw, xs) - class(MacroXS), intent(in) :: this - integer, intent(in) :: gin ! Incoming neutron group - real(8), intent(in) :: uvw(3) ! Incoming neutron direction - type(MaterialMacroXS), intent(inout) :: xs - - integer :: iazi, ipol - - select type(this) - type is (MacroXSIso) - xs % total = this % total(gin) - xs % elastic = this % scattxs(gin) - xs % absorption = this % absorption(gin) - xs % nu_fission = this % nu_fission(gin) - - type is (MacroXSAngle) - call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) - xs % total = this % total(gin, iazi, ipol) - xs % elastic = this % scattxs(gin, iazi, ipol) - xs % absorption = this % absorption(gin, iazi, ipol) - xs % nu_fission = this % nu_fission(gin, iazi, ipol) - end select - - end subroutine calculate_mgxs - - -!=============================================================================== -! SAMPLE_FISSION_ENERGY acts as a templating code for macroxs_*_sample_fission_energy -!=============================================================================== - - function sample_fission_energy(this, gin, uvw) result(gout) - class(MacroXS), intent(in) :: this ! Data to work with - integer, intent(in) :: gin ! Incoming energy group - real(8), intent(in) :: uvw(3) ! Particle Direction - integer :: gout ! Sampled outgoing group - - select type(this) - type is (MacroXSIso) - gout = macroxsiso_sample_fission_energy(this, gin, uvw) - type is (MacroXSAngle) - gout = macroxsangle_sample_fission_energy(this, gin, uvw) - end select - - end function sample_fission_energy - -!=============================================================================== -! MACROXS_*_SAMPLE_FISSION_ENERGY samples the outgoing energy and mu from a scatter event. -! Implemented as % scatter. -!=============================================================================== - - function macroxsiso_sample_fission_energy(this, gin, uvw) result(gout) - class(MacroXSIso), intent(in) :: this ! Data to work with - integer, intent(in) :: gin ! Incoming energy group - real(8), intent(in) :: uvw(3) ! Particle Direction - integer :: gout ! Sampled outgoing group - real(8) :: xi ! Our random number - real(8) :: prob ! Running probability - - xi = prn() - prob = ZERO - gout = 0 - - do while (prob < xi) - gout = gout + 1 - prob = prob + this % chi(gout,gin) - end do - - end function macroxsiso_sample_fission_energy - - function macroxsangle_sample_fission_energy(this, gin, uvw) result(gout) - class(MacroXSAngle), intent(in) :: this ! Data to work with - integer, intent(in) :: gin ! Incoming energy group - real(8), intent(in) :: uvw(3) ! Particle Direction - integer :: gout ! Sampled outgoing group - real(8) :: xi ! Our random number - real(8) :: prob ! Running probability - integer :: iazi, ipol - - call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) - - xi = prn() - prob = ZERO - gout = 0 - - do while (prob < xi) - gout = gout + 1 - prob = prob + this % chi(gout,gin,iazi,ipol) - end do - - end function macroxsangle_sample_fission_energy - -!=============================================================================== -! SAMPLE_SCATTER acts as a templating code for macroxs_*_sample_scatter -!=============================================================================== - - subroutine sample_scatter(this, uvw, gin, gout, mu, wgt) - class(MacroXS), intent(in) :: this - real(8), intent(in) :: uvw(3) ! Incoming neutron direction - integer, intent(in) :: gin ! Incoming neutron group - integer, intent(out) :: gout ! Sampled outgoin group - real(8), intent(out) :: mu ! Sampled change in angle - real(8), intent(inout) :: wgt ! Particle weight - - integer :: iazi, ipol ! Angular indices - - select type(this) - type is (MacroXSIso) - call macroxs_sample_scatter(this % scatter, gin, gout, mu, wgt) - type is (MacroXSAngle) - call find_angle(this % polar, this % azimuthal, uvw, iazi, ipol) - call macroxs_sample_scatter(this % scatter(iazi,ipol) % obj,gin,gout,mu,wgt) - end select - - end subroutine sample_scatter - -!=============================================================================== -! MACROXS_SAMPLE_SCATTER performs the work with ScattData to sample outgoing -! energy and change in angle. -!=============================================================================== - - subroutine macroxs_sample_scatter(scatt, gin, gout, mu, wgt) - class(ScattData), intent(in) :: scatt ! Scattering Object to Use - integer, intent(in) :: gin ! Incoming neutron group - integer, intent(out) :: gout ! Sampled outgoin group - real(8), intent(out) :: mu ! Sampled change in angle - real(8), intent(inout) :: wgt ! Particle weight - - real(8) :: xi ! Our random number - real(8) :: prob ! Running probability - integer :: imu - real(8) :: u, f, M - real(8) :: mu0, frac, mu1 - real(8) :: c_k, c_k1, p0, p1 - integer :: k, NP, samples - - xi = prn() - prob = ZERO - gout = 0 - - do while (prob < xi) - gout = gout + 1 - prob = prob + scatt % energy(gout,gin) - end do - - select type (scatt) - type is (ScattDataHistogram) - xi = prn() - if (xi < scatt % data(1,gout,gin)) then - imu = 1 - else - imu = binary_search(scatt % data(:,gout,gin), & - size(scatt % data(:,gout,gin)), xi) - end if - - ! Randomly select a mu in this bin. - mu = prn() * scatt % dmu + scatt % mu(imu) - - type is (ScattDataTabular) - ! determine outgoing cosine bin - NP = size(scatt % data(:,gout,gin)) - xi = prn() - - c_k = scatt % data(1,gout,gin) - do k = 1, NP - 1 - c_k1 = scatt % data(k+1,gout,gin) - if (xi < c_k1) exit - c_k = c_k1 - end do - - ! check to make sure k is <= NP - 1 - k = min(k, NP - 1) - - p0 = scatt % fmu(k,gout,gin) - mu0 = scatt % mu(k) - ! Linear-linear interpolation to find mu value w/in bin. - p1 = scatt % fmu(k+1,gout,gin) - mu1 = scatt % mu(k+1) - - frac = (p1 - p0)/(mu1 - mu0) - - if (frac == ZERO) then - mu = mu0 + (xi - c_k)/p0 - else - mu = mu0 + (sqrt(max(ZERO, p0*p0 + TWO*frac*(xi - c_k))) - p0)/frac - end if - - if (mu <= -ONE) then - mu = -ONE - else if (mu >= ONE) then - mu = ONE - end if - - type is (ScattDataLegendre) - ! Now we can sample mu using the legendre representation of the scattering - ! kernel in data(1:this % order) - - ! Do with rejection sampling - ! Set upper bound (instead of searching for max - though this is inefficient) - M = 4.0_8 - samples = 0 - do - mu = TWO * prn() - ONE - f = scatt % calc_f(gin,gout,mu) - if (f > ZERO) then - u = prn() * M - if (u <= f) then - exit - end if - end if - samples = samples + 1 - if (samples > MAX_SAMPLE) then - ! Exit with an isotropic event. - exit - end if - end do - end select - - wgt = wgt * scatt % mult(gout,gin) - - end subroutine macroxs_sample_scatter - -end module macroxs_operations \ No newline at end of file diff --git a/src/math.F90 b/src/math.F90 index c7ede8d2a5..f49220da76 100644 --- a/src/math.F90 +++ b/src/math.F90 @@ -702,4 +702,31 @@ contains end function watt_spectrum + +!=============================================================================== +! find_angle finds the closest angle on the data grid and returns that index +!=============================================================================== + + pure subroutine find_angle(polar, azimuthal, uvw, i_azi, i_pol) + real(8), intent(in) :: polar(:) ! Polar angles [0,pi] + real(8), intent(in) :: azimuthal(:) ! Azi. angles [-pi,pi] + real(8), intent(in) :: uvw(3) ! Direction of motion + integer, intent(inout) :: i_pol ! Closest polar bin + integer, intent(inout) :: i_azi ! Closest azi bin + + real(8) :: my_pol, my_azi, dangle + + ! Convert uvw to polar and azi + + my_pol = acos(uvw(3)) + my_azi = atan2(uvw(2), uvw(1)) + + ! Search for equi-binned angles + dangle = PI / real(size(polar),8) + i_pol = floor(my_pol / dangle + ONE) + dangle = TWO * PI / real(size(azimuthal),8) + i_azi = floor((my_azi + PI) / dangle + ONE) + + end subroutine find_angle + end module math diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 7569d9ea80..9bcce57a75 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -7,9 +7,10 @@ module nuclide_header use endf, only: reaction_name use error, only: fatal_error use list_header, only: ListInt - use math, only: evaluate_legendre + use math, only: evaluate_legendre, find_angle use string use xml_interface + implicit none !=============================================================================== @@ -300,12 +301,9 @@ module nuclide_header ! NUCLIDE_*_INIT reads in the data from the XML file, as already accessed !=============================================================================== - subroutine nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss) + subroutine nuclidemg_init(this, node_xsdata) class(NuclideMG), intent(inout) :: this ! Working Object type(Node), pointer, intent(in) :: node_xsdata ! Data from MGXS xml - integer, intent(in) :: groups ! Number of Energy groups - logical, intent(in) :: get_kfiss ! Need Kappa-Fission? - logical, intent(in) :: get_fiss ! Should we get fiss data? type(Node), pointer :: node_legendre_mu character(MAX_LINE_LEN) :: temp_str @@ -403,7 +401,7 @@ module nuclide_header integer :: order_dim ! Call generic data gathering routine - call nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss) + call nuclidemg_init(this, node_xsdata) ! Load the more specific data if (this % fissionable) then @@ -525,7 +523,7 @@ module nuclide_header integer :: order_dim ! Call generic data gathering routine - call nuclidemg_init(this, node_xsdata, groups, get_kfiss, get_fiss) + call nuclidemg_init(this, node_xsdata) if (this % scatt_type == ANGLE_LEGENDRE) then order_dim = this % order + 1 @@ -1043,13 +1041,13 @@ module nuclide_header if (this % scatt_type == ANGLE_LEGENDRE) then f = evaluate_legendre(this % scatter(gout,gin,:), mu) else if (this % scatt_type == ANGLE_TABULAR) then - dmu = TWO / real(this % order - 1) + dmu = TWO / real(this % order - 1,8) ! Find mu bin algebraically, knowing that the spacing is equal f = (mu + ONE) / dmu + ONE imu = floor(f) ! But save the amount that mu is past the previous index ! so we can use interpolation later. - f = f - real(imu) + f = f - real(imu,8) ! Adjust so interpolation works on the last bin if necessary if (imu == size(this % scatter, dim=3)) then imu = imu - 1 @@ -1060,7 +1058,7 @@ module nuclide_header f = (ONE - r) * this % scatter(gout,gin,imu) + & r * this % scatter(gout,gin,imu+1) else ! (ANGLE_HISTOGRAM) - dmu = TWO / real(this % order) + dmu = TWO / real(this % order,8) ! Find mu bin algebraically, knowing that the spacing is equal imu = floor((mu + ONE) / dmu + ONE) ! Adjust so interpolation works on the last bin if necessary @@ -1097,13 +1095,13 @@ module nuclide_header if (this % scatt_type == ANGLE_LEGENDRE) then f = evaluate_legendre(this % scatter(gout,gin,:,i_azi_,i_pol_), mu) else if (this % scatt_type == ANGLE_TABULAR) then - dmu = TWO / real(this % order - 1) + dmu = TWO / real(this % order - 1,8) ! Find mu bin algebraically, knowing that the spacing is equal f = (mu + ONE) / dmu + ONE imu = floor(f) ! But save the amount that mu is past the previous index ! so we can use interpolation later. - f = f - real(imu) + f = f - real(imu,8) ! Adjust so interpolation works on the last bin if necessary if (imu == size(this % scatter, dim=3)) then imu = imu - 1 @@ -1114,7 +1112,7 @@ module nuclide_header f = (ONE - r) * this % scatter(gout,gin,imu,i_azi_,i_pol_) + & r * this % scatter(gout,gin,imu+1,i_azi_,i_pol_) else ! (ANGLE_HISTOGRAM) - dmu = TWO / real(this % order) + dmu = TWO / real(this % order,8) ! Find mu bin algebraically, knowing that the spacing is equal imu = floor((mu + ONE) / dmu + ONE) ! Adjust so interpolation works on the last bin if necessary @@ -1127,30 +1125,4 @@ module nuclide_header end function nuclideangle_calc_f -!=============================================================================== -! find_angle finds the closest angle on the data grid and returns that index -!=============================================================================== - - pure subroutine find_angle(polar, azimuthal, uvw, i_azi, i_pol) - real(8), intent(in) :: polar(:) ! Polar angles [0,pi] - real(8), intent(in) :: azimuthal(:) ! Azi. angles [-pi,pi] - real(8), intent(in) :: uvw(3) ! Direction of motion - integer, intent(inout) :: i_pol ! Closest polar bin - integer, intent(inout) :: i_azi ! Closest azi bin - - real(8) my_pol, my_azi, dangle - - ! Convert uvw to polar and azi - - my_pol = acos(uvw(3)) - my_azi = atan2(uvw(2), uvw(1)) - - ! Search for equi-binned angles - dangle = PI / real(size(polar),8) - i_pol = floor(my_pol / dangle + ONE) - dangle = TWO * PI / real(size(azimuthal),8) - i_azi = floor((my_azi + PI) / dangle + ONE) - - end subroutine find_angle - end module nuclide_header diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index a0d8eb6e1d..ce296c48e6 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -6,7 +6,6 @@ module physics_mg use error, only: fatal_error, warning use global use macroxs_header, only: MacroXS, MacroXSContainer - use macroxs_operations, only: sample_fission_energy, sample_scatter use material_header, only: Material use math, only: rotate_angle use mesh, only: get_mesh_indices @@ -146,9 +145,9 @@ contains type(Particle), intent(inout) :: p - call sample_scatter(macro_xs(p % material) % obj, & - p % coord(1) % uvw, p % last_g, p % g, & - p % mu, p % wgt) + call macro_xs(p % material) % obj % sample_scatter(p % coord(1) % uvw, & + p % last_g, p % g, & + p % mu, p % wgt) ! Update energy value for downstream compatability (in tallying) p % E = energy_bin_avg(p % g) @@ -256,7 +255,7 @@ contains ! Sample secondary energy distribution for fission reaction and set energy ! in fission bank - bank_array(i) % g = sample_fission_energy(xs, p % g, fission_bank(i) % uvw) + bank_array(i) % g = xs % sample_fission_energy(p % g, fission_bank(i) % uvw) bank_array(i) % E = energy_bin_avg(fission_bank(i) % g) end do diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index b9dcdadd41..e02ba9172f 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -1,7 +1,10 @@ module scattdata_header - use math use constants + use error, only: fatal_error + use math + use random_lcg, only: prn + use search, only: binary_search implicit none @@ -19,6 +22,7 @@ module scattdata_header contains procedure(init_), deferred :: init ! Initializes ScattData procedure(calc_f_), deferred :: calc_f ! Calculates f, given mu + procedure(sample_), deferred :: sample ! sample the scatter event end type ScattData abstract interface @@ -40,12 +44,22 @@ module scattdata_header real(8) :: f ! Return value of f(mu) end function calc_f_ + + subroutine sample_(this, gin, gout, mu, wgt) + import ScattData + class(ScattData), intent(in) :: this ! Scattering Object to Use + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + end subroutine sample_ end interface type, extends(ScattData) :: ScattDataLegendre contains procedure :: init => scattdatalegendre_init procedure :: calc_f => scattdatalegendre_calc_f + procedure :: sample => scattdatalegendre_sample end type ScattDataLegendre type, extends(ScattData) :: ScattDataHistogram @@ -54,6 +68,7 @@ module scattdata_header contains procedure :: init => scattdatahistogram_init procedure :: calc_f => scattdatahistogram_calc_f + procedure :: sample => scattdatahistogram_sample end type ScattDataHistogram type, extends(ScattData) :: ScattDataTabular @@ -63,6 +78,7 @@ module scattdata_header contains procedure :: init => scattdatatabular_init procedure :: calc_f => scattdatatabular_calc_f + procedure :: sample => scattdatatabular_sample end type ScattDataTabular !=============================================================================== @@ -290,4 +306,150 @@ contains end function scattdatatabular_calc_f +!=============================================================================== +! SCATTDATA*_SCATTER Samples the outgoing energy and change in angle. +!=============================================================================== + + subroutine scattdatalegendre_sample(this, gin, gout, mu, wgt) + class(ScattDataLegendre), intent(in) :: this ! Scattering object to use + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + real(8) :: u, f, M + integer :: samples + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % energy(gout,gin) + end do + + ! Now we can sample mu using the legendre representation of the thisering + ! kernel in data(1:this % order) + + ! Do with rejection sampling + ! Set upper bound (instead of searching for max - though this is inefficient) + M = 4.0_8 + samples = 0 + do + mu = TWO * prn() - ONE + f = this % calc_f(gin,gout,mu) + if (f > ZERO) then + u = prn() * M + if (u <= f) then + exit + end if + end if + samples = samples + 1 + if (samples > MAX_SAMPLE) then + call fatal_error("Maximum number of Legendre expansion samples reached!") + end if + end do + + wgt = wgt * this % mult(gout,gin) + + end subroutine scattdatalegendre_sample + + subroutine scattdatahistogram_sample(this, gin, gout, mu, wgt) + class(ScattDataHistogram), intent(in) :: this ! Scattering object to use + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + integer :: imu + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % energy(gout,gin) + end do + + xi = prn() + if (xi < this % data(1,gout,gin)) then + imu = 1 + else + imu = binary_search(this % data(:,gout,gin), & + size(this % data(:,gout,gin)), xi) + end if + + ! Randomly select a mu in this bin. + mu = prn() * this % dmu + this % mu(imu) + + wgt = wgt * this % mult(gout,gin) + + end subroutine scattdatahistogram_sample + + subroutine scattdatatabular_sample(this, gin, gout, mu, wgt) + class(ScattDataTabular), intent(in) :: this ! Scattering object to use + integer, intent(in) :: gin ! Incoming neutron group + integer, intent(out) :: gout ! Sampled outgoin group + real(8), intent(out) :: mu ! Sampled change in angle + real(8), intent(inout) :: wgt ! Particle weight + + real(8) :: xi ! Our random number + real(8) :: prob ! Running probability + real(8) :: mu0, frac, mu1 + real(8) :: c_k, c_k1, p0, p1 + integer :: k, NP + + xi = prn() + prob = ZERO + gout = 0 + + do while (prob < xi) + gout = gout + 1 + prob = prob + this % energy(gout,gin) + end do + + ! determine outgoing cosine bin + NP = size(this % data(:,gout,gin)) + xi = prn() + + c_k = this % data(1,gout,gin) + do k = 1, NP - 1 + c_k1 = this % data(k+1,gout,gin) + if (xi < c_k1) exit + c_k = c_k1 + end do + + ! check to make sure k is <= NP - 1 + k = min(k, NP - 1) + + p0 = this % fmu(k,gout,gin) + mu0 = this % mu(k) + ! Linear-linear interpolation to find mu value w/in bin. + p1 = this % fmu(k+1,gout,gin) + mu1 = this % mu(k+1) + + frac = (p1 - p0)/(mu1 - mu0) + + if (frac == ZERO) then + mu = mu0 + (xi - c_k)/p0 + else + mu = mu0 + (sqrt(max(ZERO, p0*p0 + TWO*frac*(xi - c_k))) - p0)/frac + end if + + if (mu <= -ONE) then + mu = -ONE + else if (mu >= ONE) then + mu = ONE + end if + + wgt = wgt * this % mult(gout,gin) + + end subroutine scattdatatabular_sample + end module scattdata_header \ No newline at end of file diff --git a/src/tracking.F90 b/src/tracking.F90 index 98e5483a0a..17fc855591 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -7,7 +7,7 @@ module tracking cross_lattice, check_cell_overlap use geometry_header, only: Universe, BASE_UNIVERSE use global - use macroxs_operations, only: calculate_mgxs + use macroxs_header, only: MacroXS use output, only: write_message use particle_header, only: LocalCoord, Particle use physics, only: collision @@ -92,8 +92,8 @@ contains ! Since the MGXS can be angle dependent, this needs to be done ! After every collision for the MGXS mode if (p % material /= MATERIAL_VOID) then - call calculate_mgxs(macro_xs(p % material) % obj, p % g, & - p % coord(p % n_coord) % uvw, material_xs) + call macro_xs(p % material) % obj % calculate_xs(p % g, & + p % coord(p % n_coord) % uvw, material_xs) else material_xs % total = ZERO material_xs % elastic = ZERO From 391e8b18058df84330a80db7cb2eb9797f6d800e Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 13 Feb 2016 05:18:19 -0500 Subject: [PATCH 113/149] previous commit changed library extension from example problem to 70m from 300K. This puts them back to being 300K and then adds size to the default_xs variable to allow for 5 total characters in the extension.' --- docs/source/usersguide/mgxs_library.rst | 9 ++++-- .../python/pincell_multigroup/build-xml.py | 10 +++--- examples/xml/pincell_multigroup/materials.xml | 4 +-- .../pincell_multigroup/mg_cross_sections.xml | 32 +++++++++---------- src/global.F90 | 4 +-- src/input_xml.F90 | 2 +- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/docs/source/usersguide/mgxs_library.rst b/docs/source/usersguide/mgxs_library.rst index ae4ee6681e..4cc36f1e89 100644 --- a/docs/source/usersguide/mgxs_library.rst +++ b/docs/source/usersguide/mgxs_library.rst @@ -83,10 +83,13 @@ attributes/sub-elements required to describe the meta-data: :name: The name of the microscopic or macroscopic data set. An extension to the - name must be provided (e.g., the ``.70m`` in ``UO2.70m``). This extension, + name must be provided (e.g., the ``.300K`` in ``UO2.300K``). The name and + extension together must be twelve or less characters in length. This + extension must follow a period and be five characters or less in length. similar to the equivalent in the continuous-energy ``cross_sections.xml`` - file is used to denote variants of the particular nuclide or material of - interest (i.e. the ``UO2`` in this example). + file, is used to denote variants of the particular nuclide or material of + interest (i.e. the ``UO2`` data in this example could have been generated + at a temperature of 300K). *Default*: None, this must be provided. diff --git a/examples/python/pincell_multigroup/build-xml.py b/examples/python/pincell_multigroup/build-xml.py index 7b8926c346..ff75a64d93 100644 --- a/examples/python/pincell_multigroup/build-xml.py +++ b/examples/python/pincell_multigroup/build-xml.py @@ -22,7 +22,7 @@ groups = openmc.mgxs.EnergyGroups(group_edges=[1E-11, 0.0635E-6, 10.0E-6, 1.0E-4, 1.0E-3, 0.5, 1.0, 20.0]) # Instantiate the 7-group (C5G7) cross section data -uo2_xsdata = openmc.XSdata('UO2.70m', groups) +uo2_xsdata = openmc.XSdata('UO2.300K', groups) uo2_xsdata.order = 0 uo2_xsdata.total = np.array([0.1779492, 0.3298048, 0.4803882, 0.5543674, 0.3118013, 0.3951678, 0.5644058]) @@ -45,7 +45,7 @@ uo2_xsdata.nu_fission = np.array([2.005998E-02, 2.027303E-03, 1.570599E-02, uo2_xsdata.chi = np.array([5.8791E-01, 4.1176E-01, 3.3906E-04, 1.1761E-07, 0.0000E+00, 0.0000E+00, 0.0000E+00]) -h2o_xsdata = openmc.XSdata('LWTR.70m', groups) +h2o_xsdata = openmc.XSdata('LWTR.300K', groups) h2o_xsdata.order = 0 h2o_xsdata.total = np.array([0.15920605, 0.412969593, 0.59030986, 0.58435, 0.718, 1.2544497, 2.650379]) @@ -71,8 +71,8 @@ mg_cross_sections_file.export_to_xml() ############################################################################### # Instantiate some Macroscopic Data -uo2_data = openmc.Macroscopic('UO2', '70m') -h2o_data = openmc.Macroscopic('LWTR', '70m') +uo2_data = openmc.Macroscopic('UO2', '300K') +h2o_data = openmc.Macroscopic('LWTR', '300K') # Instantiate some Materials and register the appropriate Macroscopic objects uo2 = openmc.Material(material_id=1, name='UO2 fuel') @@ -85,7 +85,7 @@ water.add_macroscopic(h2o_data) # Instantiate a MaterialsFile, register all Materials, and export to XML materials_file = openmc.MaterialsFile() -materials_file.default_xs = '70m' +materials_file.default_xs = '300K' materials_file.add_materials([uo2, water]) materials_file.export_to_xml() diff --git a/examples/xml/pincell_multigroup/materials.xml b/examples/xml/pincell_multigroup/materials.xml index c94629665b..6961166541 100644 --- a/examples/xml/pincell_multigroup/materials.xml +++ b/examples/xml/pincell_multigroup/materials.xml @@ -1,7 +1,7 @@ - - 70m + + 300K diff --git a/examples/xml/pincell_multigroup/mg_cross_sections.xml b/examples/xml/pincell_multigroup/mg_cross_sections.xml index d38d2d9c21..3c671a1922 100644 --- a/examples/xml/pincell_multigroup/mg_cross_sections.xml +++ b/examples/xml/pincell_multigroup/mg_cross_sections.xml @@ -11,8 +11,8 @@ --> - UO2.70m - UO2.70m + UO2.300K + UO2.300K 2.53E-8 0 true @@ -67,8 +67,8 @@ - MOX1.70m - MOX1.70m + MOX1.300K + MOX1.300K 2.53E-8 0 true @@ -124,8 +124,8 @@ - MOX2.70m - MOX2.70m + MOX2.300K + MOX2.300K 2.53E-8 0 true @@ -180,8 +180,8 @@ - MOX3.70m - MOX3.70m + MOX3.300K + MOX3.300K 2.53E-8 0 true @@ -236,8 +236,8 @@ - FC.70m - FC.70m + FC.300K + FC.300K 2.53E-8 0 true @@ -286,8 +286,8 @@ - GT.70m - GT.70m + GT.300K + GT.300K 2.53E-8 0 false @@ -318,8 +318,8 @@ - LWTR.70m - LWTR.70m + LWTR.300K + LWTR.300K 2.53E-8 0 false @@ -351,8 +351,8 @@ - CR.70m - CR.70m + CR.300K + CR.300K 2.53E-8 0 false diff --git a/src/global.F90 b/src/global.F90 index 17477ed80b..970f89f9ba 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -79,8 +79,8 @@ module global type(DictCharInt) :: nuclide_dict type(DictCharInt) :: xs_listing_dict - ! Default xs identifier (e.g. 70c) - character(3):: default_xs + ! Default xs identifier (e.g. 70c or 300K) + character(5):: default_xs ! ============================================================================ ! CONTINUOUS-ENERGY CROSS SECTION RELATED VARIABLES diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 9fc490a33b..eb504f43a1 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -3072,7 +3072,7 @@ contains ! Append default_xs specifier to nuclide if needed if ((default_xs /= '') .and. (.not. ends_with(sarray(j), 'c'))) then - word = trim(word) // "." // default_xs + word = trim(word) // "." // trim(default_xs) end if ! Search through nuclides From e89b584a7b434c68c91c3550e413f9f9fa9eb4d9 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 13 Feb 2016 05:48:36 -0500 Subject: [PATCH 114/149] added in smarter maximal value detection for rejection sampling of scattering angles represented as polynomial legendres --- src/scattdata_header.F90 | 49 +++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index e02ba9172f..b2c8ba3e3c 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -56,6 +56,8 @@ module scattdata_header end interface type, extends(ScattData) :: ScattDataLegendre + ! Maximal value for rejection sampling from rectangle + real(8), allocatable :: max_val(:,:) contains procedure :: init => scattdatalegendre_init procedure :: calc_f => scattdatalegendre_calc_f @@ -116,15 +118,47 @@ contains subroutine scattdatalegendre_init(this, order, energy, mult, coeffs) class(ScattDataLegendre), intent(inout) :: this ! Object to work on - integer, intent(in) :: order ! Data Order - real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix - real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix + integer, intent(in) :: order ! Data Order + real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix + real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use + real(8) :: dmu, mu, f + integer :: imu, Nmu, gout, gin, groups + call scattdata_init(this, order, energy, mult) this % data = coeffs + groups = size(this % energy,dim=1) + + allocate(this % max_val(groups, groups)) + this % max_val = ZERO + ! Step through the polynomial with fixed number of points to identify + ! the maximal value. + Nmu = 1001 + dmu = TWO / real(Nmu,8) + do imu = 1, Nmu + ! Update mu. Do first and last seperate to avoid float errors + if (imu == 1) then + mu = -ONE + else if (imu == Nmu) then + mu = ONE + end if + mu = -ONE + real(imu - 1,8) * dmu + do gin = 1, groups + do gout = 1, groups + ! Calculate probability + f = this % calc_f(gin,gout,mu) + ! If this is a new max, store it. + if (f > this % max_val(gout,gin)) this % max_val(gout,gin) = f + end do + end do + end do + + ! Finally, since we may not have caught the exact max, add 10% margin + this % max_val = this % max_val * 1.1_8 + end subroutine scattdatalegendre_init subroutine scattdatahistogram_init(this, order, energy, mult, coeffs) @@ -145,7 +179,7 @@ contains this % dmu = TWO / real(order,8) this % mu(1) = -ONE do imu = 2, order - this % mu(imu) = -ONE + (imu - 1) * this % dmu + this % mu(imu) = -ONE + real(imu - 1,8) * this % dmu end do ! Best to integrate this histogram so we can avoid rejection sampling @@ -335,12 +369,15 @@ contains ! kernel in data(1:this % order) ! Do with rejection sampling - ! Set upper bound (instead of searching for max - though this is inefficient) - M = 4.0_8 + ! Set maximal value + M = this % max_val(gout,gin) samples = 0 do mu = TWO * prn() - ONE f = this % calc_f(gin,gout,mu) +if (f > M) then +call fatal_error("Legendre exceeds Max Value!!!") +end if if (f > ZERO) then u = prn() * M if (u <= f) then From 2c4917bd3f1958fcd31d53c4f04ca12d94e21c0a Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 13 Feb 2016 06:07:19 -0500 Subject: [PATCH 115/149] Updating MG tests which previously failed due to change in rejection sampling algorithm --- tests/test_mg_basic/results_true.dat | 2 +- tests/test_mg_max_order/results_true.dat | 2 +- tests/test_mg_nuclide/results_true.dat | 2 +- tests/test_mg_tallies/results_true.dat | 1306 +++++++++++----------- 4 files changed, 656 insertions(+), 656 deletions(-) diff --git a/tests/test_mg_basic/results_true.dat b/tests/test_mg_basic/results_true.dat index 35e2af7c06..35f3e73d40 100644 --- a/tests/test_mg_basic/results_true.dat +++ b/tests/test_mg_basic/results_true.dat @@ -1,2 +1,2 @@ k-combined: -1.035488E+00 4.058903E-02 +1.045320E+00 5.851680E-02 diff --git a/tests/test_mg_max_order/results_true.dat b/tests/test_mg_max_order/results_true.dat index dfb1c02d79..1b23005602 100644 --- a/tests/test_mg_max_order/results_true.dat +++ b/tests/test_mg_max_order/results_true.dat @@ -1,2 +1,2 @@ k-combined: -1.106635E+00 4.503267E-02 +1.083030E+00 1.855038E-02 diff --git a/tests/test_mg_nuclide/results_true.dat b/tests/test_mg_nuclide/results_true.dat index 26a41ade87..5b60cef222 100644 --- a/tests/test_mg_nuclide/results_true.dat +++ b/tests/test_mg_nuclide/results_true.dat @@ -1,2 +1,2 @@ k-combined: -1.271009E-01 6.377851E-03 +1.380785E-01 5.556526E-03 diff --git a/tests/test_mg_tallies/results_true.dat b/tests/test_mg_tallies/results_true.dat index 4e27ab66b9..0cb47a712d 100644 --- a/tests/test_mg_tallies/results_true.dat +++ b/tests/test_mg_tallies/results_true.dat @@ -1,86 +1,86 @@ k-combined: -1.035488E+00 4.058903E-02 +1.045320E+00 5.851680E-02 tally 1: -2.737079E+00 -1.545362E+00 -7.475678E-02 -1.182688E-03 -3.895146E+00 -3.143927E+00 -3.051980E-02 -2.030656E-04 -7.566509E-02 -1.248142E-03 -2.564678E+00 -1.356531E+00 -6.888583E-02 -1.027172E-03 -3.639176E+00 -2.763465E+00 -2.785332E-02 -1.756457E-04 -6.905430E-02 -1.079605E-03 -2.513858E+00 -1.360648E+00 -7.106151E-02 -1.063532E-03 -3.598310E+00 -2.766916E+00 -2.957807E-02 -1.830650E-04 -7.333034E-02 -1.125208E-03 -2.680537E+00 -1.557625E+00 -7.458823E-02 -1.153071E-03 -3.874223E+00 -3.178628E+00 -3.085079E-02 -1.987973E-04 -7.648569E-02 -1.221907E-03 -2.747094E+00 -1.661126E+00 -7.366404E-02 -1.200019E-03 -3.949477E+00 -3.398210E+00 -2.983494E-02 -2.006053E-04 -7.396717E-02 -1.233020E-03 -2.832153E+00 -1.688117E+00 -7.768421E-02 -1.263525E-03 -4.057661E+00 -3.441857E+00 -3.181289E-02 -2.134911E-04 -7.887092E-02 -1.312222E-03 -2.818292E+00 -1.727700E+00 -8.151103E-02 -1.400727E-03 -4.087366E+00 -3.555489E+00 -3.440824E-02 -2.483234E-04 -8.530537E-02 -1.526319E-03 -2.673498E+00 -1.597867E+00 -8.179404E-02 -1.455604E-03 -4.005194E+00 -3.520971E+00 -3.564373E-02 -2.749065E-04 -8.836840E-02 -1.689712E-03 +2.286064E+00 +1.057353E+00 +6.503987E-02 +8.851627E-04 +3.376363E+00 +2.323627E+00 +2.733240E-02 +1.607534E-04 +6.776283E-02 +9.880704E-04 +2.391658E+00 +1.201477E+00 +7.241106E-02 +1.103780E-03 +3.614949E+00 +2.730438E+00 +3.146867E-02 +2.110753E-04 +7.801752E-02 +1.297373E-03 +2.762725E+00 +1.705088E+00 +8.684520E-02 +1.654173E-03 +4.172232E+00 +3.847245E+00 +3.834947E-02 +3.212662E-04 +9.507651E-02 +1.974662E-03 +2.802290E+00 +1.773339E+00 +8.347451E-02 +1.574952E-03 +4.206829E+00 +3.971225E+00 +3.593646E-02 +2.967708E-04 +8.909414E-02 +1.824101E-03 +2.383708E+00 +1.176784E+00 +7.337273E-02 +1.097240E-03 +3.624903E+00 +2.690697E+00 +3.213890E-02 +2.139948E-04 +7.967917E-02 +1.315319E-03 +2.398216E+00 +1.234567E+00 +6.905889E-02 +9.879327E-04 +3.479138E+00 +2.538252E+00 +2.911091E-02 +1.750648E-04 +7.217215E-02 +1.076035E-03 +2.563998E+00 +1.354089E+00 +7.357381E-02 +1.097086E-03 +3.753156E+00 +2.867475E+00 +3.097034E-02 +1.948794E-04 +7.678206E-02 +1.197826E-03 +2.293243E+00 +1.172767E+00 +6.702582E-02 +9.267762E-04 +3.407144E+00 +2.469472E+00 +2.857514E-02 +1.688581E-04 +7.084385E-02 +1.037886E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -171,86 +171,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.694430E+00 -1.482997E+00 -7.661360E-02 -1.219010E-03 -3.956809E+00 -3.231298E+00 -3.211518E-02 -2.179122E-04 -7.962036E-02 -1.339397E-03 -2.572758E+00 -1.418791E+00 -7.213692E-02 -1.094985E-03 -3.692753E+00 -2.869867E+00 -2.991749E-02 -1.926648E-04 -7.417183E-02 -1.184214E-03 -2.477980E+00 -1.312803E+00 -6.912091E-02 -9.790394E-04 -3.581706E+00 -2.674317E+00 -2.863743E-02 -1.680509E-04 -7.099830E-02 -1.032924E-03 -2.845088E+00 -1.688617E+00 -8.173799E-02 -1.368439E-03 -4.131147E+00 -3.544636E+00 -3.438554E-02 -2.417440E-04 -8.524908E-02 -1.485879E-03 -2.793685E+00 -1.647743E+00 -8.194563E-02 -1.421503E-03 -4.186293E+00 -3.695916E+00 -3.501635E-02 -2.621854E-04 -8.681299E-02 -1.611522E-03 -2.638366E+00 -1.500052E+00 -8.011857E-02 -1.356165E-03 -4.000991E+00 -3.395409E+00 -3.487592E-02 -2.544883E-04 -8.646482E-02 -1.564211E-03 -2.842735E+00 -1.690237E+00 -8.154955E-02 -1.356837E-03 -4.156256E+00 -3.570439E+00 -3.435028E-02 -2.398488E-04 -8.516165E-02 -1.474230E-03 -2.196972E+00 -9.871590E-01 -6.781939E-02 -9.725975E-04 -3.352539E+00 -2.320436E+00 -2.976179E-02 -1.937147E-04 -7.378580E-02 -1.190667E-03 +2.604127E+00 +1.442914E+00 +7.142299E-02 +1.083324E-03 +3.786547E+00 +2.990260E+00 +2.935394E-02 +1.905369E-04 +7.277467E-02 +1.171135E-03 +2.457755E+00 +1.228862E+00 +6.655630E-02 +9.411086E-04 +3.528688E+00 +2.561047E+00 +2.709124E-02 +1.640319E-04 +6.716494E-02 +1.008221E-03 +2.450846E+00 +1.295337E+00 +6.779278E-02 +9.992248E-04 +3.519409E+00 +2.693620E+00 +2.793186E-02 +1.714064E-04 +6.924902E-02 +1.053549E-03 +2.469234E+00 +1.300419E+00 +7.347034E-02 +1.175743E-03 +3.675903E+00 +2.880386E+00 +3.155996E-02 +2.200036E-04 +7.824386E-02 +1.352252E-03 +2.576106E+00 +1.365945E+00 +7.241428E-02 +1.090052E-03 +3.719498E+00 +2.861357E+00 +3.008961E-02 +1.906170E-04 +7.459854E-02 +1.171627E-03 +2.503651E+00 +1.290812E+00 +7.432507E-02 +1.132918E-03 +3.702398E+00 +2.813425E+00 +3.186491E-02 +2.091477E-04 +7.899991E-02 +1.285525E-03 +2.395349E+00 +1.202098E+00 +7.095925E-02 +1.051988E-03 +3.559388E+00 +2.628753E+00 +3.041477E-02 +1.959992E-04 +7.540470E-02 +1.204709E-03 +1.910174E+00 +7.331782E-01 +6.366813E-02 +8.166135E-04 +2.966770E+00 +1.762376E+00 +2.893278E-02 +1.712979E-04 +7.173053E-02 +1.052882E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -341,86 +341,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.641273E+00 -1.597870E+00 -7.598644E-02 -1.292899E-03 -3.853049E+00 -3.336280E+00 -3.203862E-02 -2.292746E-04 -7.943056E-02 -1.409235E-03 -2.708082E+00 -1.522839E+00 -7.654337E-02 -1.221093E-03 -3.905027E+00 -3.156770E+00 -3.189847E-02 -2.134574E-04 -7.908310E-02 -1.312015E-03 -2.691233E+00 -1.524379E+00 -8.054050E-02 -1.365756E-03 -3.962250E+00 -3.258368E+00 -3.462881E-02 -2.628049E-04 -8.585218E-02 -1.615329E-03 -3.018386E+00 -1.917223E+00 -8.348614E-02 -1.445746E-03 -4.283272E+00 -3.833787E+00 -3.429972E-02 -2.430307E-04 -8.503630E-02 -1.493787E-03 -2.929994E+00 -1.836911E+00 -8.927512E-02 -1.624433E-03 -4.372984E+00 -4.002348E+00 -3.882367E-02 -3.051257E-04 -9.625215E-02 -1.875454E-03 -3.119790E+00 -2.050856E+00 -9.534078E-02 -1.868390E-03 -4.698804E+00 -4.587809E+00 -4.157799E-02 -3.523492E-04 -1.030807E-01 -2.165713E-03 -2.868621E+00 -1.702964E+00 -8.398565E-02 -1.456555E-03 -4.247485E+00 -3.715607E+00 -3.580655E-02 -2.676357E-04 -8.877207E-02 -1.645022E-03 -2.497455E+00 -1.252375E+00 -6.446362E-02 -8.477811E-04 -3.507541E+00 -2.474088E+00 -2.542963E-02 -1.367733E-04 -6.304548E-02 -8.406768E-04 +2.593479E+00 +1.421618E+00 +7.731733E-02 +1.249860E-03 +3.880469E+00 +3.167768E+00 +3.330331E-02 +2.319171E-04 +8.256599E-02 +1.425478E-03 +2.563470E+00 +1.449702E+00 +7.411043E-02 +1.158986E-03 +3.692974E+00 +2.935486E+00 +3.125554E-02 +2.061246E-04 +7.748913E-02 +1.266944E-03 +2.657580E+00 +1.493736E+00 +7.749682E-02 +1.277831E-03 +3.892576E+00 +3.190262E+00 +3.289903E-02 +2.334764E-04 +8.156370E-02 +1.435062E-03 +2.701357E+00 +1.517431E+00 +8.804410E-02 +1.639744E-03 +4.161224E+00 +3.606273E+00 +3.959674E-02 +3.345554E-04 +9.816875E-02 +2.056343E-03 +2.745200E+00 +1.523378E+00 +7.925308E-02 +1.270874E-03 +3.962649E+00 +3.165021E+00 +3.340000E-02 +2.283904E-04 +8.280570E-02 +1.403801E-03 +2.678775E+00 +1.492394E+00 +8.646776E-02 +1.554919E-03 +4.147456E+00 +3.551060E+00 +3.875994E-02 +3.125295E-04 +9.609415E-02 +1.920962E-03 +2.678888E+00 +1.497390E+00 +7.616647E-02 +1.203778E-03 +3.868905E+00 +3.108718E+00 +3.186093E-02 +2.136540E-04 +7.899003E-02 +1.313223E-03 +2.189117E+00 +9.756340E-01 +6.824988E-02 +9.549688E-04 +3.259136E+00 +2.150849E+00 +2.997262E-02 +1.883650E-04 +7.430850E-02 +1.157785E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -511,86 +511,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.623441E+00 -1.490238E+00 -8.737054E-02 -1.670677E-03 -4.075246E+00 -3.570201E+00 -3.969459E-02 -3.510115E-04 -9.841135E-02 -2.157491E-03 -2.429458E+00 -1.296272E+00 -7.433515E-02 -1.195439E-03 -3.603045E+00 -2.814355E+00 -3.233556E-02 -2.266091E-04 -8.016674E-02 -1.392852E-03 -2.655653E+00 -1.503631E+00 -7.556244E-02 -1.216313E-03 -3.876149E+00 -3.192723E+00 -3.167217E-02 -2.160892E-04 -7.852205E-02 -1.328191E-03 -2.687380E+00 -1.496815E+00 -7.570314E-02 -1.262722E-03 -3.940616E+00 -3.291028E+00 -3.159442E-02 -2.339022E-04 -7.832928E-02 -1.437679E-03 -2.990160E+00 -1.889612E+00 -7.623143E-02 -1.208898E-03 -4.207001E+00 -3.697140E+00 -2.984188E-02 -1.859848E-04 -7.398438E-02 -1.143155E-03 -2.853430E+00 -1.655915E+00 -7.908369E-02 -1.262135E-03 -4.101975E+00 -3.406862E+00 -3.260559E-02 -2.168450E-04 -8.083620E-02 -1.332837E-03 -2.730969E+00 -1.615691E+00 -7.764021E-02 -1.314394E-03 -3.991873E+00 -3.443169E+00 -3.252644E-02 -2.371617E-04 -8.063998E-02 -1.457714E-03 -2.187664E+00 -9.957750E-01 -6.436381E-02 -8.515751E-04 -3.270736E+00 -2.197812E+00 -2.754849E-02 -1.554780E-04 -6.829858E-02 -9.556448E-04 +2.761165E+00 +1.657839E+00 +7.810542E-02 +1.334149E-03 +4.026290E+00 +3.495574E+00 +3.264226E-02 +2.359256E-04 +8.092710E-02 +1.450116E-03 +2.601284E+00 +1.465130E+00 +7.485486E-02 +1.239170E-03 +3.829638E+00 +3.199488E+00 +3.159745E-02 +2.288567E-04 +7.833681E-02 +1.406667E-03 +2.419174E+00 +1.228134E+00 +7.422066E-02 +1.117508E-03 +3.667795E+00 +2.787048E+00 +3.244938E-02 +2.129012E-04 +8.044893E-02 +1.308597E-03 +2.491535E+00 +1.259222E+00 +7.470359E-02 +1.133979E-03 +3.773164E+00 +2.887196E+00 +3.234132E-02 +2.142511E-04 +8.018101E-02 +1.316894E-03 +2.430358E+00 +1.305969E+00 +7.236826E-02 +1.077801E-03 +3.691969E+00 +2.914191E+00 +3.123416E-02 +2.001679E-04 +7.743613E-02 +1.230332E-03 +3.133682E+00 +1.984584E+00 +8.337467E-02 +1.392595E-03 +4.451265E+00 +3.978527E+00 +3.354318E-02 +2.282172E-04 +8.316070E-02 +1.402736E-03 +2.662704E+00 +1.448336E+00 +7.530385E-02 +1.164529E-03 +3.880423E+00 +3.054138E+00 +3.144058E-02 +2.085301E-04 +7.794791E-02 +1.281730E-03 +2.130205E+00 +9.297660E-01 +6.583066E-02 +8.790174E-04 +3.226341E+00 +2.120506E+00 +2.889944E-02 +1.698754E-04 +7.164788E-02 +1.044139E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -681,86 +681,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.126226E+00 -2.054101E+00 -9.308386E-02 -1.840170E-03 -4.585435E+00 -4.425166E+00 -3.991071E-02 -3.454637E-04 -9.894716E-02 -2.123391E-03 -2.628975E+00 -1.442927E+00 -7.480586E-02 -1.136055E-03 -3.849243E+00 -3.050079E+00 -3.136784E-02 -1.990547E-04 -7.776755E-02 -1.223489E-03 -2.740162E+00 -1.737335E+00 -7.647229E-02 -1.263465E-03 -4.009845E+00 -3.586955E+00 -3.173845E-02 -2.147512E-04 -7.868637E-02 -1.319968E-03 -2.761943E+00 -1.619005E+00 -7.846740E-02 -1.320872E-03 -4.097351E+00 -3.568014E+00 -3.295230E-02 -2.361898E-04 -8.169577E-02 -1.451740E-03 -2.855074E+00 -1.670686E+00 -7.845369E-02 -1.263464E-03 -4.103374E+00 -3.452249E+00 -3.220431E-02 -2.141592E-04 -7.984135E-02 -1.316329E-03 -2.690178E+00 -1.491926E+00 -7.527503E-02 -1.160972E-03 -3.903606E+00 -3.122977E+00 -3.125741E-02 -2.022968E-04 -7.749378E-02 -1.243417E-03 -2.512911E+00 -1.314036E+00 -7.800028E-02 -1.259212E-03 -3.791186E+00 -2.970061E+00 -3.426379E-02 -2.436930E-04 -8.494722E-02 -1.497858E-03 -2.273876E+00 -1.107297E+00 -7.120819E-02 -1.019386E-03 -3.428794E+00 -2.426375E+00 -3.139941E-02 -1.998412E-04 -7.784582E-02 -1.228323E-03 +2.599461E+00 +1.458035E+00 +7.809884E-02 +1.305214E-03 +3.901359E+00 +3.258238E+00 +3.379142E-02 +2.432493E-04 +8.377612E-02 +1.495131E-03 +2.748044E+00 +1.595569E+00 +8.641555E-02 +1.591494E-03 +4.133038E+00 +3.610482E+00 +3.815976E-02 +3.125423E-04 +9.460617E-02 +1.921040E-03 +2.827693E+00 +1.681951E+00 +9.214026E-02 +1.815952E-03 +4.343252E+00 +3.980138E+00 +4.139309E-02 +3.763771E-04 +1.026223E-01 +2.313401E-03 +2.848302E+00 +1.709266E+00 +8.618471E-02 +1.555247E-03 +4.293029E+00 +3.893924E+00 +3.742129E-02 +2.947160E-04 +9.277535E-02 +1.811471E-03 +3.107129E+00 +1.985180E+00 +9.390982E-02 +1.778566E-03 +4.705512E+00 +4.502266E+00 +4.077729E-02 +3.361217E-04 +1.010956E-01 +2.065971E-03 +3.176743E+00 +2.076916E+00 +9.535836E-02 +1.843238E-03 +4.782883E+00 +4.655802E+00 +4.125628E-02 +3.453802E-04 +1.022831E-01 +2.122878E-03 +3.158364E+00 +2.020031E+00 +9.047734E-02 +1.652565E-03 +4.641857E+00 +4.326900E+00 +3.809128E-02 +2.983406E-04 +9.443638E-02 +1.833749E-03 +2.750064E+00 +1.515295E+00 +7.550745E-02 +1.157933E-03 +4.022702E+00 +3.249004E+00 +3.106532E-02 +2.005988E-04 +7.701755E-02 +1.232980E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -851,86 +851,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.416875E+00 -1.198797E+00 -7.051645E-02 -1.018987E-03 -3.608689E+00 -2.679252E+00 -3.004052E-02 -1.872854E-04 -7.447684E-02 -1.151149E-03 -2.573490E+00 -1.402205E+00 -6.633005E-02 -9.194585E-04 -3.559859E+00 -2.675099E+00 -2.604699E-02 -1.426679E-04 -6.457603E-02 -8.769077E-04 -2.701686E+00 -1.530274E+00 -7.570621E-02 -1.220650E-03 -3.972619E+00 -3.322266E+00 -3.152781E-02 -2.138949E-04 -7.816415E-02 -1.314704E-03 -2.920710E+00 -1.813750E+00 -8.167632E-02 -1.397805E-03 -4.220218E+00 -3.751891E+00 -3.388045E-02 -2.397875E-04 -8.399686E-02 -1.473853E-03 -2.886624E+00 -1.697663E+00 -8.812015E-02 -1.584550E-03 -4.350341E+00 -3.846411E+00 -3.842467E-02 -3.055861E-04 -9.526294E-02 -1.878284E-03 -2.805388E+00 -1.631826E+00 -9.017775E-02 -1.681160E-03 -4.264591E+00 -3.742270E+00 -4.026469E-02 -3.387007E-04 -9.982475E-02 -2.081823E-03 -2.789842E+00 -1.599838E+00 -9.325901E-02 -1.771117E-03 -4.331678E+00 -3.825425E+00 -4.241710E-02 -3.690107E-04 -1.051610E-01 -2.268123E-03 -2.406721E+00 -1.197504E+00 -7.197982E-02 -1.055123E-03 -3.523223E+00 -2.545571E+00 -3.093417E-02 -1.962555E-04 -7.669239E-02 -1.206284E-03 +2.571690E+00 +1.405222E+00 +6.998368E-02 +1.010782E-03 +3.645470E+00 +2.775516E+00 +2.848750E-02 +1.694087E-04 +7.062657E-02 +1.041270E-03 +3.305320E+00 +2.344814E+00 +9.985328E-02 +2.111130E-03 +4.992554E+00 +5.332303E+00 +4.332586E-02 +3.970490E-04 +1.074140E-01 +2.440461E-03 +2.746305E+00 +1.652960E+00 +9.402849E-02 +1.982149E-03 +4.315533E+00 +4.099428E+00 +4.322622E-02 +4.235148E-04 +1.071670E-01 +2.603132E-03 +2.975372E+00 +1.824531E+00 +9.627993E-02 +1.863677E-03 +4.624041E+00 +4.351874E+00 +4.324350E-02 +3.743520E-04 +1.072099E-01 +2.300953E-03 +2.968077E+00 +1.807761E+00 +9.337061E-02 +1.790184E-03 +4.455263E+00 +4.056544E+00 +4.122926E-02 +3.540009E-04 +1.022161E-01 +2.175865E-03 +3.337278E+00 +2.233238E+00 +1.017763E-01 +2.083989E-03 +4.981699E+00 +4.981154E+00 +4.428100E-02 +3.964318E-04 +1.097820E-01 +2.436667E-03 +3.083638E+00 +1.958766E+00 +9.111141E-02 +1.726305E-03 +4.546082E+00 +4.260420E+00 +3.895365E-02 +3.200133E-04 +9.657439E-02 +1.966961E-03 +2.644733E+00 +1.407404E+00 +8.635553E-02 +1.527997E-03 +4.094426E+00 +3.382785E+00 +3.888081E-02 +3.161126E-04 +9.639381E-02 +1.942985E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1021,86 +1021,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.670387E+00 -1.493829E+00 -7.916152E-02 -1.323249E-03 -3.980792E+00 -3.341124E+00 -3.398399E-02 -2.477152E-04 -8.425355E-02 -1.522581E-03 -2.643712E+00 -1.525085E+00 -7.477643E-02 -1.211244E-03 -3.829765E+00 -3.171826E+00 -3.119267E-02 -2.143333E-04 -7.733327E-02 -1.317399E-03 -2.775846E+00 -1.674648E+00 -8.464107E-02 -1.549143E-03 -4.133594E+00 -3.716316E+00 -3.679183E-02 -2.932382E-04 -9.121478E-02 -1.802388E-03 -2.954816E+00 -1.930285E+00 -7.887852E-02 -1.287632E-03 -4.192638E+00 -3.786782E+00 -3.177353E-02 -2.052824E-04 -7.877335E-02 -1.261768E-03 -3.031795E+00 -1.932684E+00 -9.082125E-02 -1.719186E-03 -4.462842E+00 -4.170125E+00 -3.909991E-02 -3.173523E-04 -9.693701E-02 -1.950605E-03 -2.773807E+00 -1.592371E+00 -8.755961E-02 -1.597915E-03 -4.234664E+00 -3.713430E+00 -3.882039E-02 -3.159470E-04 -9.624401E-02 -1.941967E-03 -2.528366E+00 -1.320356E+00 -8.486472E-02 -1.488520E-03 -3.935024E+00 -3.188413E+00 -3.866268E-02 -3.104697E-04 -9.585301E-02 -1.908301E-03 -2.814891E+00 -1.783998E+00 -7.956633E-02 -1.440608E-03 -4.087076E+00 -3.738124E+00 -3.321370E-02 -2.578118E-04 -8.234384E-02 -1.584639E-03 +3.316522E+00 +2.302876E+00 +8.987919E-02 +1.676655E-03 +4.716109E+00 +4.596488E+00 +3.654407E-02 +2.855910E-04 +9.060053E-02 +1.755384E-03 +3.091331E+00 +2.117646E+00 +8.528196E-02 +1.564336E-03 +4.492326E+00 +4.405850E+00 +3.513814E-02 +2.665883E-04 +8.711494E-02 +1.638584E-03 +2.649730E+00 +1.444519E+00 +8.510948E-02 +1.506094E-03 +4.117595E+00 +3.501517E+00 +3.810553E-02 +3.052819E-04 +9.447172E-02 +1.876414E-03 +2.875773E+00 +1.758531E+00 +9.127582E-02 +1.780419E-03 +4.328266E+00 +3.989840E+00 +4.045386E-02 +3.513542E-04 +1.002937E-01 +2.159598E-03 +3.102792E+00 +1.949906E+00 +9.153879E-02 +1.691646E-03 +4.578530E+00 +4.235906E+00 +3.913672E-02 +3.094156E-04 +9.702826E-02 +1.901822E-03 +3.238743E+00 +2.146355E+00 +8.902551E-02 +1.593536E-03 +4.683916E+00 +4.438028E+00 +3.660342E-02 +2.683183E-04 +9.074766E-02 +1.649218E-03 +3.006635E+00 +1.887385E+00 +8.716712E-02 +1.586834E-03 +4.383965E+00 +4.008888E+00 +3.688262E-02 +2.862513E-04 +9.143987E-02 +1.759443E-03 +2.749904E+00 +1.550561E+00 +9.244273E-02 +1.748082E-03 +4.241273E+00 +3.669144E+00 +4.208622E-02 +3.633241E-04 +1.043407E-01 +2.233170E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1191,86 +1191,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.360566E+00 -1.164965E+00 -7.582328E-02 -1.239719E-03 -3.614813E+00 -2.742787E+00 -3.388042E-02 -2.553121E-04 -8.399678E-02 -1.569275E-03 -2.546108E+00 -1.399288E+00 -7.762813E-02 -1.316168E-03 -3.859937E+00 -3.260243E+00 -3.384404E-02 -2.538541E-04 -8.390659E-02 -1.560314E-03 -3.332352E+00 -2.369626E+00 -8.799788E-02 -1.625343E-03 -4.655099E+00 -4.594468E+00 -3.514406E-02 -2.612097E-04 -8.712961E-02 -1.605525E-03 -2.601466E+00 -1.427019E+00 -7.052544E-02 -1.078356E-03 -3.725846E+00 -2.956429E+00 -2.871825E-02 -1.843049E-04 -7.119865E-02 -1.132829E-03 -2.954221E+00 -1.775439E+00 -8.854750E-02 -1.593113E-03 -4.427465E+00 -3.982350E+00 -3.824403E-02 -2.969669E-04 -9.481508E-02 -1.825306E-03 -2.855301E+00 -1.652640E+00 -8.473899E-02 -1.471257E-03 -4.218821E+00 -3.612250E+00 -3.633488E-02 -2.751925E-04 -9.008191E-02 -1.691470E-03 -2.632066E+00 -1.437779E+00 -7.298646E-02 -1.093885E-03 -3.785199E+00 -2.966958E+00 -3.009667E-02 -1.863207E-04 -7.461606E-02 -1.145219E-03 -2.629725E+00 -1.564381E+00 -8.162764E-02 -1.547184E-03 -3.953052E+00 -3.585289E+00 -3.581386E-02 -3.025695E-04 -8.879019E-02 -1.859742E-03 +2.556952E+00 +1.416458E+00 +8.087467E-02 +1.431667E-03 +3.806748E+00 +3.158182E+00 +3.571995E-02 +2.831832E-04 +8.855737E-02 +1.740585E-03 +2.546384E+00 +1.446967E+00 +8.000281E-02 +1.363415E-03 +3.844739E+00 +3.222133E+00 +3.533522E-02 +2.621956E-04 +8.760354E-02 +1.611584E-03 +2.474418E+00 +1.302438E+00 +7.728372E-02 +1.265047E-03 +3.818517E+00 +3.076074E+00 +3.414744E-02 +2.483215E-04 +8.465877E-02 +1.526307E-03 +2.478272E+00 +1.299434E+00 +7.866430E-02 +1.293627E-03 +3.758685E+00 +2.973817E+00 +3.491240E-02 +2.542033E-04 +8.655529E-02 +1.562460E-03 +2.941937E+00 +1.842278E+00 +9.491310E-02 +1.902183E-03 +4.564730E+00 +4.427111E+00 +4.252722E-02 +3.828960E-04 +1.054340E-01 +2.353469E-03 +2.850564E+00 +1.719152E+00 +8.118192E-02 +1.404765E-03 +4.190858E+00 +3.722715E+00 +3.411695E-02 +2.522778E-04 +8.458318E-02 +1.550625E-03 +2.726097E+00 +1.648250E+00 +7.879124E-02 +1.424955E-03 +3.940978E+00 +3.461222E+00 +3.322044E-02 +2.688615E-04 +8.236053E-02 +1.652557E-03 +2.304822E+00 +1.153775E+00 +7.500010E-02 +1.314077E-03 +3.542935E+00 +2.786864E+00 +3.369367E-02 +2.798215E-04 +8.353377E-02 +1.719922E-03 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2892,15 +2892,15 @@ tally 1: 0.000000E+00 0.000000E+00 tally 2: -4.012713E+01 -3.286443E+02 -4.014931E+01 -3.290078E+02 -5.982856E+00 -7.510508E+00 -5.983297E+00 -7.511618E+00 -1.223283E+02 -3.075680E+03 -1.223283E+02 -3.075680E+03 +4.283244E+01 +3.698890E+02 +4.285612E+01 +3.702981E+02 +6.926001E+00 +9.669342E+00 +6.926497E+00 +9.670727E+00 +1.223563E+02 +3.025594E+03 +1.223563E+02 +3.025594E+03 From 03b433f8f3f8baee2d433279f87391d4393d67c1 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 13 Feb 2016 14:06:48 -0500 Subject: [PATCH 116/149] Whoops... left in a debug check from rejection sampling. cleaned it up --- src/scattdata_header.F90 | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index b2c8ba3e3c..b04115e570 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -375,9 +375,6 @@ contains do mu = TWO * prn() - ONE f = this % calc_f(gin,gout,mu) -if (f > M) then -call fatal_error("Legendre exceeds Max Value!!!") -end if if (f > ZERO) then u = prn() * M if (u <= f) then From 3ee4325410357de315359b92e58b3c5844fe3862 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Mon, 15 Feb 2016 12:24:10 -0500 Subject: [PATCH 117/149] HDF5 stores now work with subdomain-avg MGXS --- openmc/mgxs/mgxs.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index fb70b1bc8d..39da487d0e 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -696,7 +696,7 @@ class MGXS(object): # Construct a collection of the domain filter bins if not isinstance(subdomains, basestring): - cv.check_iterable_type('subdomains', subdomains, Integral) + cv.check_iterable_type('subdomains', subdomains, Integral, max_depth=2) for subdomain in subdomains: filters.append(self.domain_type) filter_bins.append((subdomain,)) @@ -1195,6 +1195,9 @@ class MGXS(object): cv.check_iterable_type('subdomains', subdomains, Integral) elif self.domain_type == 'distribcell': subdomains = np.arange(self.num_subdomains, dtype=np.int) + elif self.domain_type == 'sum(distribcell)': + domain_filter = self.xs_tally.find_filter('sum(distribcell)') + subdomains = domain_filter.bins else: subdomains = [self.domain.id] @@ -2019,7 +2022,7 @@ class ScatterMatrixXS(MGXS): # Construct a collection of the domain filter bins if not isinstance(subdomains, basestring): - cv.check_iterable_type('subdomains', subdomains, Integral) + cv.check_iterable_type('subdomains', subdomains, Integral, max_depth=2) for subdomain in subdomains: filters.append(self.domain_type) filter_bins.append((subdomain,)) @@ -2416,7 +2419,7 @@ class Chi(MGXS): # Construct a collection of the domain filter bins if not isinstance(subdomains, basestring): - cv.check_iterable_type('subdomains', subdomains, Integral) + cv.check_iterable_type('subdomains', subdomains, Integral, max_depth=2) for subdomain in subdomains: filters.append(self.domain_type) filter_bins.append((subdomain,)) From 7fdca5b9cb24eba20c433965c9e2f80ff6db1562 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Mon, 15 Feb 2016 22:42:57 -0500 Subject: [PATCH 118/149] Added name property to CrossNuclide to fix bug --- openmc/arithmetic.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index 4ddf3b1f91..521d33e9f0 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -188,6 +188,23 @@ class CrossNuclide(object): return existing def __repr__(self): + return self.name + + + @property + def left_nuclide(self): + return self._left_nuclide + + @property + def right_nuclide(self): + return self._right_nuclide + + @property + def binary_op(self): + return self._binary_op + + @property + def name(self): string = '' @@ -209,18 +226,6 @@ class CrossNuclide(object): return string - @property - def left_nuclide(self): - return self._left_nuclide - - @property - def right_nuclide(self): - return self._right_nuclide - - @property - def binary_op(self): - return self._binary_op - @left_nuclide.setter def left_nuclide(self, left_nuclide): cv.check_type('left_nuclide', left_nuclide, From d23149ff94209f9a2b3ecabfd27543e08665b079 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Tue, 16 Feb 2016 10:50:53 -0500 Subject: [PATCH 119/149] Fixed bug in a check for results when merging tallies --- openmc/tallies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/tallies.py b/openmc/tallies.py index 79baf2b503..272896d834 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -933,7 +933,7 @@ class Tally(object): merged_tally.add_trigger(trigger) # If results have not been read, then return tally for input generation - if self._sp_filename is None: + if self._results_read is None: return merged_tally #Otherwise, this is a derived tally which needs merged results arrays else: From e138fb25ea351cd17c9226b482399f011e9f9cdb Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Tue, 16 Feb 2016 16:20:22 -0500 Subject: [PATCH 120/149] Fixed bug in tiling of energies for ScatterMatrix MGXS objects --- openmc/mgxs/mgxs.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 39da487d0e..cc91e9483f 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -1414,12 +1414,11 @@ class MGXS(object): if 'energy [MeV]' in df and 'energyout [MeV]' in df: df.rename(columns={'energy [MeV]': 'group in'}, inplace=True) in_groups = np.tile(all_groups, self.num_subdomains) - in_groups = np.repeat(in_groups, self.num_groups) + in_groups = np.repeat(in_groups, df.shape[0] / in_groups.size) df['group in'] = in_groups df.rename(columns={'energyout [MeV]': 'group out'}, inplace=True) - out_groups = \ - np.tile(all_groups, self.num_subdomains * self.num_groups) + out_groups = np.tile(all_groups, df.shape[0] / all_groups.size) df['group out'] = out_groups columns = ['group in', 'group out'] @@ -1919,7 +1918,7 @@ class ScatterMatrixXS(MGXS): cv.check_value('correction', correction, ('P0', None)) self._correction = correction - def get_slice(self, nuclides=[], groups=[]): + def get_slice(self, nuclides=[], in_groups=[], out_groups=[]): """Build a sliced ScatterMatrix for the specified nuclides and energy groups. @@ -1933,9 +1932,12 @@ class ScatterMatrixXS(MGXS): nuclides : list of str A list of nuclide name strings (e.g., ['U-235', 'U-238']; default is []) - groups : list of Integral - A list of energy group indices starting at 1 for the high energies - (e.g., [1, 2, 3]; default is []) + in_groups : list of Integral + A list of incoming energy group indices starting at 1 for the high + energies (e.g., [1, 2, 3]; default is []) + out_groups : list of Integral + A list of outgoing energy group indices starting at 1 for the high + energies (e.g., [1, 2, 3]; default is []) Returns ------- @@ -1946,14 +1948,14 @@ class ScatterMatrixXS(MGXS): """ # Call super class method and null out derived tallies - slice_xs = super(ScatterMatrixXS, self).get_slice(nuclides, groups) + slice_xs = super(ScatterMatrixXS, self).get_slice(nuclides, in_groups) slice_xs._rxn_rate_tally = None slice_xs._xs_tally = None - # Slice energy groups if needed - if len(groups) != 0: + # Slice outgoing energy groups if needed + if len(out_groups) != 0: filter_bins = [] - for group in groups: + for group in out_groups: group_bounds = self.energy_groups.get_group_bounds(group) filter_bins.append(group_bounds) filter_bins = [tuple(filter_bins)] From f046829c1448e32a6c291bb2c7d9b8827c6e1b64 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 17 Feb 2016 09:36:23 -0600 Subject: [PATCH 121/149] Write summary.h5 by default --- src/global.F90 | 2 +- src/input_xml.F90 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index 4c243ee41f..7652d15804 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -390,7 +390,7 @@ module global type(SetInt) :: sourcepoint_batch ! Various output options - logical :: output_summary = .false. + logical :: output_summary = .true. logical :: output_xs = .false. logical :: output_tallies = .true. diff --git a/src/input_xml.F90 b/src/input_xml.F90 index df9d28e13e..92840db5a4 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -905,8 +905,8 @@ contains if (check_for_node(node_output, "summary")) then call get_node_value(node_output, "summary", temp_str) temp_str = to_lower(temp_str) - if (trim(temp_str) == 'true' .or. & - trim(temp_str) == '1') output_summary = .true. + if (trim(temp_str) == 'false' .or. & + trim(temp_str) == '0') output_summary = .false. end if ! Check for cross sections option From 8f3b6147742cc1779443d0f73682e35cb255a5e6 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 17 Feb 2016 20:47:18 -0600 Subject: [PATCH 122/149] Update documentation/notebooks to reflect default writing of summary.h5 --- docs/source/pythonapi/examples/mgxs-part-i.ipynb | 2 +- docs/source/pythonapi/examples/mgxs-part-ii.ipynb | 2 +- docs/source/pythonapi/examples/mgxs-part-iii.ipynb | 2 +- docs/source/pythonapi/examples/pandas-dataframes.ipynb | 2 +- docs/source/pythonapi/examples/tally-arithmetic.ipynb | 2 +- docs/source/usersguide/input.rst | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/pythonapi/examples/mgxs-part-i.ipynb b/docs/source/pythonapi/examples/mgxs-part-i.ipynb index 104fbe759b..6b78e9d536 100644 --- a/docs/source/pythonapi/examples/mgxs-part-i.ipynb +++ b/docs/source/pythonapi/examples/mgxs-part-i.ipynb @@ -341,7 +341,7 @@ "settings_file.batches = batches\n", "settings_file.inactive = inactive\n", "settings_file.particles = particles\n", - "settings_file.output = {'tallies': True, 'summary': True}\n", + "settings_file.output = {'tallies': True}\n", "bounds = [-0.63, -0.63, -0.63, 0.63, 0.63, 0.63]\n", "settings_file.source = Source(space=Box(\n", " bounds[:3], bounds[3:], only_fissionable=True))\n", diff --git a/docs/source/pythonapi/examples/mgxs-part-ii.ipynb b/docs/source/pythonapi/examples/mgxs-part-ii.ipynb index 593d536474..0a8d7230eb 100644 --- a/docs/source/pythonapi/examples/mgxs-part-ii.ipynb +++ b/docs/source/pythonapi/examples/mgxs-part-ii.ipynb @@ -286,7 +286,7 @@ "settings_file.batches = batches\n", "settings_file.inactive = inactive\n", "settings_file.particles = particles\n", - "settings_file.output = {'tallies': True, 'summary': True}\n", + "settings_file.output = {'tallies': True}\n", "bounds = [-0.63, -0.63, -0.63, 0.63, 0.63, 0.63]\n", "settings_file.source = Source(space=Box(\n", " bounds[:3], bounds[3:], only_fissionable=True))\n", diff --git a/docs/source/pythonapi/examples/mgxs-part-iii.ipynb b/docs/source/pythonapi/examples/mgxs-part-iii.ipynb index a541efbf0b..dcb496160e 100644 --- a/docs/source/pythonapi/examples/mgxs-part-iii.ipynb +++ b/docs/source/pythonapi/examples/mgxs-part-iii.ipynb @@ -392,7 +392,7 @@ "settings_file.batches = batches\n", "settings_file.inactive = inactive\n", "settings_file.particles = particles\n", - "settings_file.output = {'tallies': False, 'summary': True}\n", + "settings_file.output = {'tallies': False}\n", "source_bounds = [-10.71, -10.71, -10, 10.71, 10.71, 10.]\n", "settings_file.source = Source(Box(\n", " source_bounds[:3], source_bounds[3:], only_fissionable=True))\n", diff --git a/docs/source/pythonapi/examples/pandas-dataframes.ipynb b/docs/source/pythonapi/examples/pandas-dataframes.ipynb index 9e08acccda..ac5d4e4109 100644 --- a/docs/source/pythonapi/examples/pandas-dataframes.ipynb +++ b/docs/source/pythonapi/examples/pandas-dataframes.ipynb @@ -302,7 +302,7 @@ "settings_file.batches = min_batches\n", "settings_file.inactive = inactive\n", "settings_file.particles = particles\n", - "settings_file.output = {'tallies': False, 'summary': True}\n", + "settings_file.output = {'tallies': False}\n", "settings_file.trigger_active = True\n", "settings_file.trigger_max_batches = max_batches\n", "source_bounds = [-10.71, -10.71, -10, 10.71, 10.71, 10.]\n", diff --git a/docs/source/pythonapi/examples/tally-arithmetic.ipynb b/docs/source/pythonapi/examples/tally-arithmetic.ipynb index e357e73fcd..3a61b09790 100644 --- a/docs/source/pythonapi/examples/tally-arithmetic.ipynb +++ b/docs/source/pythonapi/examples/tally-arithmetic.ipynb @@ -288,7 +288,7 @@ "settings_file.batches = batches\n", "settings_file.inactive = inactive\n", "settings_file.particles = particles\n", - "settings_file.output = {'tallies': True, 'summary': True}\n", + "settings_file.output = {'tallies': True}\n", "source_bounds = [-0.63, -0.63, -0.63, 0.63, 0.63, 0.63]\n", "settings_file.source = Source(space=Box(\n", " source_bounds[:3], source_bounds[3:]))\n", diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index a9dda8ff47..85736334a9 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -312,10 +312,10 @@ out the file and "false" will not. *Default*: false :summary: - Writes out an ASCII summary file describing all of the user input files that + Writes out an HDF5 summary file describing all of the user input files that were read in. - *Default*: false + *Default*: true :tallies: Write out an ASCII file of tally results. From 128f25fe2b5bedd6b3d9cdaf537a808e2a3767c0 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Thu, 18 Feb 2016 00:45:49 -0500 Subject: [PATCH 123/149] Added methods to Python APIs Geometry class to extract objects by string name --- openmc/geometry.py | 256 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 253 insertions(+), 3 deletions(-) diff --git a/openmc/geometry.py b/openmc/geometry.py index 9788671f5c..fb43bd77f2 100644 --- a/openmc/geometry.py +++ b/openmc/geometry.py @@ -1,5 +1,6 @@ from collections import Iterable, OrderedDict from xml.etree import ElementTree as ET +import re import openmc from openmc.clean_xml import * @@ -94,7 +95,16 @@ class Geometry(object): """ - return self._root_universe.get_all_cells() + all_cells = self._root_universe.get_all_cells() + cells = set() + + for cell_id, cell in all_cells.items(): + if cell._type == 'normal': + cells.add(cell) + + cells = list(cells) + cells.sort(key=lambda x: x.id) + return cells def get_all_universes(self): """Return all universes defined @@ -106,7 +116,16 @@ class Geometry(object): """ - return self._root_universe.get_all_universes() + all_universes = self._root_universe.get_all_universes() + universes = set() + + for universe_id, universe in all_universes.items(): + if universe._type == 'normal': + universes.add(universe) + + universes = list(universes) + universes.sort(key=lambda x: x.id) + return universes def get_all_nuclides(self): """Return all nuclides assigned to a material in the geometry @@ -150,6 +169,15 @@ class Geometry(object): return materials def get_all_material_cells(self): + """Return all cells filled by a material + + Returns + ------- + list of openmc.universe.Cell + Cells filled by Materials in the geometry + + """ + all_cells = self.get_all_cells() material_cells = set() @@ -175,7 +203,7 @@ class Geometry(object): material_universes = set() for universe_id, universe in all_universes.items(): - cells = universe._cells + cells = universe.cells for cell_id, cell in cells.items(): if cell._type == 'normal': material_universes.add(universe) @@ -184,6 +212,228 @@ class Geometry(object): material_universes.sort(key=lambda x: x.id) return material_universes + def get_all_lattices(self): + """Return all lattices defined + + Returns + ------- + list of openmc.universe.Lattice + Lattices in the geometry + + """ + + cells = self.get_all_cells() + lattices = set() + + for cell in cells: + if isinstance(cell.fill, openmc.Lattice): + lattices.add(cell.fill) + + lattices = list(lattices) + lattices.sort(key=lambda x: x.id) + return lattices + + def get_materials_by_name(self, name, case_sensitive=False, matching=False): + """Return a list of materials with names matching a regular expression. + + Parameters + ---------- + name : str + The name to search for (regular expressions are acceptable) + case_sensitive : bool + Whether to distinguish upper and lower case letters in each + material's name (default is True) + matching : bool + Whether the names must match completely (default is True) + + Returns + ------- + list of openmc.material.Material + Materials matching the queried name + + """ + + regex = re.compile(b'{0}'.format(name)) + + all_materials = self.get_all_materials() + materials = set() + + for material in all_materials: + material_name = material.name + if not case_sensitive: + material_name = material_name.lower() + + match = regex.findall(material_name) + if match and matching: + materials.add(material) + elif match and match[0] == name: + materials.add(material) + + materials = list(materials) + materials.sort(key=lambda x: x.id) + return materials + + def get_cells_by_name(self, name, case_sensitive=False, matching=False): + """Return a list of cells with names matching a regular expression. + + Parameters + ---------- + name : str + The name to search for (regular expressions are acceptable) + case_sensitive : bool + Whether to distinguish upper and lower case letters in each + cell's name (default is True) + matching : bool + Whether the names must match completely (default is True) + + Returns + ------- + list of openmc.universe.Cell + Cells matching the queried name + + """ + + regex = re.compile(b'{0}'.format(name)) + + all_cells = self.get_all_cells() + cells = set() + + for cell in all_cells: + cell_name = cell.name + if not case_sensitive: + cell_name = cell_name.lower() + + match = regex.findall(cell_name) + if match and matching: + cells.add(cell) + elif match and match[0] == name: + cells.add(cell) + + cells = list(cells) + cells.sort(key=lambda x: x.id) + return cells + + def get_cells_by_fill_name(self, name, case_sensitive=False, matching=False): + """Return a list of cells with fills with names matching a + regular expression. + + Parameters + ---------- + name : str + The name to search for (regular expressions are acceptable) + case_sensitive : bool + Whether to distinguish upper and lower case letters in each + cell's name (default is True) + matching : bool + Whether the names must match completely (default is True) + + Returns + ------- + list of openmc.universe.Cell + Cells with fills matching the queried name + + """ + + regex = re.compile(b'{0}'.format(name)) + + all_cells = self.get_all_cells() + cells = set() + + for cell in all_cells: + cell_fill_name = cell.fill.name + if not case_sensitive: + cell_fill_name = cell_fill_name.lower() + + match = regex.findall(cell_fill_name) + if match and matching: + cells.add(cell) + elif match and match[0] == name: + cells.add(cell) + + cells = list(cells) + cells.sort(key=lambda x: x.id) + return cells + + def get_universes_by_name(self, name, case_sensitive=False, matching=False): + """Return a list of universes with names matching a regular expression. + + Parameters + ---------- + name : str + The name to search for (regular expressions are acceptable) + case_sensitive : bool + Whether to distinguish upper and lower case letters in each + universe's name (default is True) + matching : bool + Whether the names must match completely (default is True) + + Returns + ------- + list of openmc.universe.Universe + Universes matching the queried name + + """ + + regex = re.compile(b'{0}'.format(name)) + + all_universes = self.get_all_universes() + universes = set() + + for universe in all_universes: + universe_name = universe.name + if not case_sensitive: + universe_name = universe_name.lower() + + match = regex.findall(universe_name) + if match and matching: + universes.add(universe) + elif match and match[0] == name: + universes.add(universe) + + universes = list(universes) + universes.sort(key=lambda x: x.id) + return universes + + def get_lattices_by_name(self, name, case_sensitive=False, matching=False): + """Return a list of lattices with names matching a regular expression. + + Parameters + ---------- + name : str + The name to search for (regular expressions are acceptable) + case_sensitive : bool + Whether to distinguish upper and lower case letters in each + lattice's name (default is True) + matching : bool + Whether the names must match completely (default is True) + + Returns + ------- + list of openmc.universe.Lattice + Lattices matching the queried name + + """ + + regex = re.compile(b'{0}'.format(name)) + + all_lattices = self.get_all_lattices() + lattices = set() + + for lattice in all_lattices: + lattice_name = lattice.name + if not case_sensitive: + lattice_name = lattice_name.lower() + + match = regex.findall(lattice_name) + if match and matching: + lattices.add(lattice) + elif match and match[0] == name: + lattices.add(lattice) + + lattices = list(lattices) + lattices.sort(key=lambda x: x.id) + return lattices + class GeometryFile(object): """Geometry file used for an OpenMC simulation. Corresponds directly to the From 3b719d7a469a13811c4d6430faffa66a870afea9 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Thu, 18 Feb 2016 11:49:03 -0500 Subject: [PATCH 124/149] Fix methods/geometry doc typo --- docs/source/methods/geometry.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/methods/geometry.rst b/docs/source/methods/geometry.rst index c1be68f72e..f642cca108 100644 --- a/docs/source/methods/geometry.rst +++ b/docs/source/methods/geometry.rst @@ -84,10 +84,10 @@ to fully define the surface. | Plane perpendicular | x-plane | :math:`x - x_0 = 0` | :math:`x_0` | | to :math:`x`-axis | | | | +----------------------+------------+------------------------------+-------------------------+ - | Plane perpendicular | y-plane | :math:`x - x_0 = 0` | :math:`y_0` | + | Plane perpendicular | y-plane | :math:`y - y_0 = 0` | :math:`y_0` | | to :math:`y`-axis | | | | +----------------------+------------+------------------------------+-------------------------+ - | Plane perpendicular | z-plane | :math:`x - x_0 = 0` | :math:`z_0` | + | Plane perpendicular | z-plane | :math:`z - z_0 = 0` | :math:`z_0` | | to :math:`z`-axis | | | | +----------------------+------------+------------------------------+-------------------------+ | Arbitrary plane | plane | :math:`Ax + By + Cz = D` | :math:`A\;B\;C\;D` | From 0227f4823080a686e8130df065762d8d855d6f3d Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 19 Feb 2016 07:07:46 -0600 Subject: [PATCH 125/149] Fix bug when sampling multiple energy distributions --- src/secondary_header.F90 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/secondary_header.F90 b/src/secondary_header.F90 index d858074129..7449a5793b 100644 --- a/src/secondary_header.F90 +++ b/src/secondary_header.F90 @@ -1,5 +1,6 @@ module secondary_header + use constants, only: ZERO use endf_header, only: Tab1 use interpolation, only: interpolate_tab1 use random_lcg, only: prn @@ -54,16 +55,19 @@ contains real(8), intent(out) :: mu ! sampled scattering cosine integer :: n ! number of angle-energy distributions - real(8) :: p_valid ! probability that given distribution is valid + real(8) :: prob ! cumulative probability + real(8) :: c ! sampled cumulative probability n = size(this%applicability) if (n > 1) then + prob = ZERO + c = prn() do i = 1, n ! Determine probability that i-th energy distribution is sampled - p_valid = interpolate_tab1(this%applicability(i), E_in) + prob = prob + interpolate_tab1(this%applicability(i), E_in) ! If i-th distribution is sampled, sample energy from the distribution - if (prn() <= p_valid) then + if (c <= prob) then call this%distribution(i)%obj%sample(E_in, E_out, mu) exit end if From 988105dbc3f6a95743b4cfc76dbff048770adac7 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 19 Feb 2016 13:10:20 -0500 Subject: [PATCH 126/149] Fixed Geometry object getter methods to reflect changes in last commit --- openmc/geometry.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/openmc/geometry.py b/openmc/geometry.py index fb43bd77f2..74feaef64b 100644 --- a/openmc/geometry.py +++ b/openmc/geometry.py @@ -66,8 +66,10 @@ class Geometry(object): # Find the distribcell index of the cell. cells = self.get_all_cells() - if path[-1] in cells: - distribcell_index = cells[path[-1]].distribcell_index + for cell in cells: + if cell.id == path[-1]: + distribcell_index = cell.distribcell_index + break else: raise RuntimeError('Could not find cell {} specified in a \ distribcell filter'.format(path[-1])) @@ -181,7 +183,7 @@ class Geometry(object): all_cells = self.get_all_cells() material_cells = set() - for cell_id, cell in all_cells.items(): + for cell in all_cells: if cell._type == 'normal': material_cells.add(cell) @@ -202,9 +204,9 @@ class Geometry(object): all_universes = self.get_all_universes() material_universes = set() - for universe_id, universe in all_universes.items(): + for universe in all_universes: cells = universe.cells - for cell_id, cell in cells.items(): + for cell in cells: if cell._type == 'normal': material_universes.add(universe) From 5ffaed9507f5628f65517d566446ea8b54d93700 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Fri, 19 Feb 2016 15:11:39 -0500 Subject: [PATCH 127/149] Fix load_statepoint bugs, improve restart test --- src/state_point.F90 | 8 +- .../test_statepoint_restart/results_true.dat | 2774 ++++++++--------- .../test_statepoint_restart.py | 15 +- 3 files changed, 1405 insertions(+), 1392 deletions(-) diff --git a/src/state_point.F90 b/src/state_point.F90 index 70ee2d06ad..799610c4ce 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -658,7 +658,10 @@ contains file_id = file_open(path_state_point, 'r', parallel=.true.) ! Read filetype - call read_dataset(file_id, "filetype", int_array(1)) + call read_dataset(file_id, "filetype", word) + if (trim(word) /= 'statepoint') then + call fatal_error("OpenMC tried to restart from a non-statepoint file.") + end if ! Read revision number for state point file and make sure it matches with ! current version @@ -755,7 +758,8 @@ contains ! Check if tally results are present tallies_group = open_group(file_id, "tallies") - call read_dataset(file_id, "tallies_present", int_array(1), indep=.true.) + call read_dataset(tallies_group, "tallies_present", int_array(1), & + indep=.true.) ! Read in sum and sum squared if (int_array(1) == 1) then diff --git a/tests/test_statepoint_restart/results_true.dat b/tests/test_statepoint_restart/results_true.dat index 7fb39ef0ac..0e4eef9a9d 100644 --- a/tests/test_statepoint_restart/results_true.dat +++ b/tests/test_statepoint_restart/results_true.dat @@ -1,16 +1,96 @@ k-combined: -0.000000E+00 0.000000E+00 +3.021779E-01 3.813358E-03 tally 1: +7.000000E-03 +2.100000E-05 +1.127639E-03 +7.464355E-07 +-1.264355E-03 +1.192757E-06 +8.769846E-04 +1.117508E-06 +3.359153E-03 +4.366438E-06 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.107648E-04 +3.730336E-07 1.000000E-03 1.000000E-06 -6.655302E-04 -4.429305E-07 -1.643958E-04 -2.702597E-08 --2.613362E-04 -6.829663E-08 -9.306024E-04 -8.660208E-07 +6.713061E-04 +4.506518E-07 +1.759778E-04 +3.096817E-08 +-2.506458E-04 +6.282332E-08 +6.069794E-04 +3.684240E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +7.000000E-03 +1.500000E-05 +4.398928E-03 +8.198908E-06 +1.784486E-03 +3.422315E-06 +8.494423E-04 +9.262242E-07 +4.566637E-03 +5.646039E-06 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.069794E-04 +3.684240E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.000000E-03 +3.000000E-06 +-1.419189E-03 +9.791601E-07 +-3.125982E-05 +5.086129E-07 +3.291570E-04 +1.943609E-07 +1.525426E-03 +8.346311E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -43,14 +123,14 @@ tally 1: 0.000000E+00 1.000000E-03 1.000000E-06 -3.222834E-05 -1.038666E-09 --4.984420E-04 -2.484444E-07 --4.825883E-05 -2.328915E-09 -1.221939E-03 -7.467452E-07 +-1.542107E-05 +2.378095E-10 +-4.996433E-04 +2.496434E-07 +2.312244E-05 +5.346472E-10 +3.053824E-04 +9.325841E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -81,16 +161,136 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +2.000000E-02 +8.600000E-05 +3.995253E-03 +1.648172E-05 +3.349403E-03 +1.166653E-05 +4.208940E-03 +7.077664E-06 +1.033905E-02 +2.197265E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.029991E-04 +1.818050E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.600000E-02 +1.620000E-04 +7.996640E-03 +1.882484E-05 +3.921034E-03 +1.157453E-05 +1.644629E-03 +3.217857E-06 +1.159182E-02 +3.534975E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.100000E-02 +2.500000E-05 +4.691861E-03 +7.999548E-06 +1.771537E-03 +3.385525E-06 +7.888659E-04 +1.911759E-06 +4.561602E-03 +4.337486E-06 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.107648E-04 +3.730336E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 1.000000E-03 1.000000E-06 --5.510082E-04 -3.036101E-07 --4.458491E-05 -1.987814E-09 -4.082832E-04 -1.666952E-07 -3.102008E-04 -9.622454E-08 +-3.878617E-04 +1.504367E-07 +-2.743449E-04 +7.526515E-08 +4.359210E-04 +1.900271E-07 +3.034897E-04 +9.210600E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -121,216 +321,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -6.000000E-03 -2.000000E-05 --1.959329E-04 -1.780222E-06 --1.481510E-03 -1.429609E-06 -2.196341E-04 -1.036368E-06 -3.355616E-03 -5.662237E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.007686E-04 -9.046177E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.000000E-03 -4.100000E-05 -5.210818E-03 -1.357783E-05 -1.394382E-03 -9.898987E-07 -2.796067E-04 -6.984712E-07 -3.684681E-03 -7.605759E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-03 -8.000000E-06 -1.019723E-03 -2.941013E-06 -3.796068E-04 -1.213513E-06 -6.991567E-04 -2.907192E-07 -2.133677E-03 -2.313409E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -8.000000E-03 -3.200000E-05 -7.394988E-04 -4.098659E-07 -4.040769E-04 -3.143715E-07 -1.784935E-04 -3.163907E-07 -2.744646E-03 -3.801137E-06 +1.600000E-02 +5.600000E-05 +4.563082E-03 +6.119552E-06 +1.839038E-03 +1.089339E-06 +1.944879E-03 +2.372975E-06 +8.524215E-03 +1.874218E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -361,16 +361,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -9.000000E-03 -4.500000E-05 -4.871111E-03 -1.225810E-05 -2.381697E-03 -2.840243E-06 -2.498800E-03 -3.161161E-06 -3.656384E-03 -6.838240E-06 +1.300000E-02 +5.300000E-05 +6.763364E-03 +1.445064E-05 +2.970216E-03 +3.071874E-06 +2.622002E-03 +3.547897E-06 +5.177618E-03 +8.040228E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -401,16 +401,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-03 -5.000000E-06 -9.405302E-04 -8.589283E-07 -2.623590E-03 -3.990114E-06 -6.768145E-04 -3.652890E-07 -1.212507E-03 -9.103805E-07 +8.000000E-03 +1.400000E-05 +1.172941E-04 +1.212454E-06 +4.110442E-04 +5.740547E-06 +1.788140E-03 +9.775061E-07 +3.946448E-03 +3.956113E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -481,16 +481,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.200000E-02 -8.000000E-05 -6.636635E-03 -2.425315E-05 -4.338045E-03 -1.464490E-05 -3.621511E-03 -1.385488E-05 -7.040297E-03 -2.530812E-05 +3.000000E-02 +2.020000E-04 +1.305502E-02 +4.343057E-05 +8.214305E-03 +2.001202E-05 +3.511762E-03 +1.412559E-05 +1.401995E-02 +4.269615E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -521,16 +521,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -5.800000E-05 -1.624971E-03 -3.694766E-06 -1.160491E-03 -1.280447E-06 --8.692024E-05 -3.035696E-06 -4.305083E-03 -1.106984E-05 +2.400000E-02 +1.320000E-04 +5.207205E-03 +9.311400E-06 +3.232372E-03 +3.475980E-06 +2.062884E-03 +4.773104E-06 +1.039066E-02 +2.611825E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -539,8 +539,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +9.171802E-04 +4.646485E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -561,16 +561,16 @@ tally 1: 8.970946E-07 0.000000E+00 0.000000E+00 -2.000000E-03 -4.000000E-06 -3.249184E-04 -1.055720E-07 -9.928009E-04 -9.856536E-07 -1.088489E-03 -1.184808E-06 -9.023059E-04 -8.141559E-07 +1.200000E-02 +5.000000E-05 +2.602864E-03 +4.471106E-06 +4.677566E-03 +1.033338E-05 +3.640584E-03 +3.605122E-06 +4.845169E-03 +8.244364E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -601,16 +601,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-03 -1.000000E-06 -9.686373E-04 -9.382582E-07 -9.073874E-04 -8.233518E-07 -8.191239E-04 -6.709640E-07 -6.204016E-04 -3.848982E-07 +1.100000E-02 +3.700000E-05 +3.786358E-03 +5.908272E-06 +3.416266E-03 +7.032934E-06 +3.353945E-03 +5.140933E-06 +4.261660E-03 +4.981501E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -619,8 +619,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +6.136905E-04 +1.883305E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -641,16 +641,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.500000E-02 -1.530000E-04 -1.597072E-03 -3.005651E-06 -2.949088E-03 -4.679665E-06 -3.631393E-03 -7.090560E-06 -5.460996E-03 -1.769365E-05 +2.700000E-02 +2.090000E-04 +7.046302E-03 +1.594429E-05 +6.489218E-03 +1.057182E-05 +5.057204E-03 +8.269888E-06 +1.274541E-02 +3.591083E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -661,16 +661,16 @@ tally 1: 0.000000E+00 1.503843E-03 2.261544E-06 -2.000000E-03 -4.000000E-06 --1.555019E-04 -2.418085E-08 --6.469952E-05 -4.186027E-09 --1.256495E-04 -1.578779E-08 -2.462742E-03 -3.825930E-06 +3.000000E-03 +5.000000E-06 +3.434984E-04 +2.731822E-07 +-1.911976E-04 +2.018778E-08 +-5.635206E-04 +2.075189E-07 +2.764973E-03 +3.917274E-06 2.000000E-03 2.000000E-06 1.802029E-03 @@ -681,16 +681,16 @@ tally 1: 4.622600E-07 0.000000E+00 0.000000E+00 -1.400000E-02 -1.060000E-04 -3.845354E-03 -1.771893E-05 -7.969986E-04 -1.251583E-05 -2.663540E-03 -3.580311E-06 -7.322201E-03 -2.693121E-05 +2.600000E-02 +1.540000E-04 +1.210267E-02 +4.180540E-05 +5.431699E-03 +2.284317E-05 +6.108638E-03 +1.136078E-05 +1.309420E-02 +3.810504E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -699,8 +699,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +6.124312E-04 +1.875678E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -709,28 +709,28 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -5.800000E-05 -7.529857E-03 -3.304826E-05 -4.385729E-03 -1.180121E-05 -2.219847E-03 -3.711400E-06 -4.549258E-03 -1.248547E-05 +6.044609E-04 +3.653729E-07 +1.000000E-03 +1.000000E-06 +9.341546E-04 +8.726448E-07 +8.089673E-04 +6.544280E-07 +6.367311E-04 +4.054265E-07 +3.022304E-04 +9.134324E-08 +2.100000E-02 +9.900000E-05 +1.206996E-02 +4.033646E-05 +6.345510E-03 +1.603169E-05 +1.976558E-03 +4.386164E-06 +1.001209E-02 +2.316074E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -749,28 +749,28 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +1.815901E-03 +1.829916E-06 +2.000000E-03 +2.000000E-06 +1.977802E-03 +1.955858E-06 +1.933788E-03 +1.869841E-06 +1.868714E-03 +1.746332E-06 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.000000E-03 -5.000000E-06 -1.328181E-03 -8.967072E-07 --4.616880E-04 -2.148940E-07 --1.029769E-03 -5.645716E-07 -1.522708E-03 -1.199054E-06 +1.100000E-02 +3.900000E-05 +2.604154E-03 +9.668124E-06 +1.503936E-04 +1.170450E-06 +5.645599E-04 +1.841604E-06 +5.455481E-03 +1.116233E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -801,16 +801,16 @@ tally 1: 9.256927E-07 0.000000E+00 0.000000E+00 -2.000000E-02 -2.000000E-04 -7.111929E-03 -2.528978E-05 -1.084601E-03 -1.073353E-06 -1.275976E-03 -2.215783E-06 -7.350498E-03 -2.790619E-05 +4.100000E-02 +3.610000E-04 +1.275568E-02 +3.756672E-05 +7.436840E-03 +1.784918E-05 +6.238119E-03 +1.114039E-05 +1.706095E-02 +6.393171E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -819,8 +819,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -6.015373E-04 -3.618471E-07 +1.510747E-03 +8.216143E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -841,16 +841,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -7.000000E-03 -2.500000E-05 -1.990597E-03 -2.484498E-06 --4.860874E-04 -2.969876E-07 -6.661989E-04 -2.268944E-07 -4.577555E-03 -1.050456E-05 +2.500000E-02 +1.570000E-04 +4.743361E-03 +1.500512E-05 +2.243747E-03 +1.216909E-05 +6.504387E-04 +5.012686E-06 +1.369930E-02 +4.220232E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -859,8 +859,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +6.124312E-04 +1.875678E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -869,28 +869,28 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -6.015373E-04 -3.618471E-07 -1.000000E-03 -1.000000E-06 -9.615527E-04 -9.245836E-07 -8.868754E-04 -7.865479E-07 -7.802605E-04 -6.088065E-07 +1.205998E-03 +7.272200E-07 +2.000000E-03 +2.000000E-06 +1.935082E-03 +1.872342E-06 +1.808514E-03 +1.635965E-06 +1.626644E-03 +1.325172E-06 0.000000E+00 0.000000E+00 -1.000000E-03 -1.000000E-06 --3.730183E-04 -1.391426E-07 --2.912860E-04 -8.484756E-08 -4.297706E-04 -1.847027E-07 -9.306024E-04 -8.660208E-07 +1.800000E-02 +1.180000E-04 +6.144587E-03 +1.810176E-05 +3.517233E-03 +7.894223E-06 +5.434668E-03 +1.689927E-05 +7.002945E-03 +1.633731E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -899,6 +899,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +9.111025E-04 +2.767076E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -919,18 +921,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 -3.000000E-03 -5.000000E-06 -2.287183E-03 -2.659902E-06 -1.571504E-03 -1.313687E-06 -1.459898E-03 -1.179754E-06 -9.117381E-04 -4.580716E-07 +6.000000E-03 +1.400000E-05 +2.937841E-03 +3.083257E-06 +1.316488E-03 +1.378720E-06 +1.917209E-03 +1.388887E-06 +2.434865E-03 +1.665821E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -961,16 +961,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -2.200000E-02 -2.600000E-04 -6.732483E-03 -2.695948E-05 -5.717821E-03 -2.889220E-05 --2.356418E-04 -7.546819E-07 -8.892069E-03 -4.212262E-05 +4.100000E-02 +4.290000E-04 +1.555575E-02 +6.845536E-05 +1.492622E-02 +7.523417E-05 +4.779064E-03 +1.568962E-05 +1.858109E-02 +9.770216E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1001,16 +1001,16 @@ tally 1: 1.396226E-10 0.000000E+00 0.000000E+00 -1.300000E-02 -1.450000E-04 -5.254317E-03 -2.007625E-05 -1.153872E-03 -6.667482E-07 -1.643586E-03 -1.926972E-06 -5.733468E-03 -2.652835E-05 +2.300000E-02 +1.870000E-04 +8.530317E-03 +2.513821E-05 +2.769866E-03 +1.832987E-06 +3.367000E-03 +3.408158E-06 +1.029151E-02 +3.475479E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1041,16 +1041,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.100000E-02 -6.100000E-05 -6.423451E-03 -2.063127E-05 -3.306770E-03 -5.779309E-06 -2.784620E-03 -3.970295E-06 -3.976017E-03 -7.971626E-06 +2.300000E-02 +1.110000E-04 +1.493458E-02 +4.520237E-05 +8.130453E-03 +1.434362E-05 +5.917132E-03 +7.829616E-06 +1.005025E-02 +2.033292E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1081,16 +1081,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -4.000000E-03 -8.000000E-06 -6.140550E-04 -1.773047E-06 --1.620585E-04 -8.222999E-07 -1.423762E-03 -1.013556E-06 -1.832908E-03 -1.680177E-06 +7.000000E-03 +1.100000E-05 +2.102923E-03 +3.237003E-06 +5.338761E-04 +1.665334E-06 +2.177563E-03 +1.210407E-06 +3.049393E-03 +2.236660E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1121,16 +1121,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.500000E-02 -1.250000E-04 -4.942916E-03 -1.235885E-05 -1.021964E-03 -5.222106E-07 -9.236822E-04 -1.479238E-06 -7.322201E-03 -2.693121E-05 +3.300000E-02 +2.470000E-04 +1.392809E-02 +4.644694E-05 +6.658849E-03 +2.448402E-05 +2.971606E-03 +4.596585E-06 +1.583003E-02 +5.281056E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1139,8 +1139,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +9.146617E-04 +4.615975E-07 1.000000E-03 1.000000E-06 5.742336E-04 @@ -1149,68 +1149,28 @@ tally 1: 2.898371E-11 -3.879749E-04 1.505245E-07 -3.007686E-04 -9.046177E-08 -1.000000E-03 -1.000000E-06 -9.585989E-04 -9.189118E-07 -8.783677E-04 -7.715298E-07 -7.642712E-04 -5.841105E-07 -3.007686E-04 -9.046177E-08 -1.300000E-02 -8.900000E-05 -5.419508E-03 -1.767227E-05 -2.993901E-03 -4.531596E-06 -2.675067E-03 -3.968688E-06 -5.780629E-03 -1.774150E-05 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.007686E-04 -9.046177E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.221939E-03 -7.467452E-07 +1.213130E-03 +5.521442E-07 2.000000E-03 2.000000E-06 -1.775152E-03 -1.597527E-06 -1.396291E-03 -1.130413E-06 -9.794822E-04 -9.115176E-07 -0.000000E+00 -0.000000E+00 -8.000000E-03 -5.000000E-05 -2.406686E-03 -4.825540E-06 -4.960582E-04 -1.033420E-06 -1.240589E-03 -2.480639E-06 -5.226253E-03 -1.611788E-05 +1.895662E-03 +1.796999E-06 +1.695499E-03 +1.439233E-06 +1.415735E-03 +1.008516E-06 +3.007686E-04 +9.046177E-08 +4.000000E-02 +3.460000E-04 +1.325054E-02 +4.611581E-05 +4.279513E-03 +1.445432E-05 +5.681074E-03 +8.701686E-06 +1.883326E-02 +7.820565E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1219,8 +1179,48 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +9.052295E-04 +4.558347E-07 0.000000E+00 0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.525429E-03 +8.388512E-07 +3.000000E-03 +3.000000E-06 +2.694249E-03 +2.442268E-06 +2.163402E-03 +1.718872E-06 +1.541834E-03 +1.227757E-06 +0.000000E+00 +0.000000E+00 +2.000000E-02 +1.000000E-04 +5.928221E-03 +9.217060E-06 +5.152240E-03 +1.183310E-05 +2.057268E-03 +2.929338E-06 +9.478909E-03 +2.313196E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.057201E-04 +1.834492E-07 1.000000E-03 1.000000E-06 9.405199E-04 @@ -1229,8 +1229,168 @@ tally 1: 6.837084E-07 6.691277E-04 4.477318E-07 -3.102008E-04 -9.622454E-08 +6.124312E-04 +1.875678E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.124312E-04 +1.875678E-07 +1.400000E-02 +5.200000E-05 +6.537971E-03 +1.724690E-05 +3.839523E-03 +8.693753E-06 +4.048043E-03 +5.450370E-06 +7.581656E-03 +1.459334E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.069794E-04 +3.684240E-07 +1.000000E-03 +1.000000E-06 +5.703488E-04 +3.252978E-07 +-1.205336E-05 +1.452836E-10 +-3.916902E-04 +1.534212E-07 +0.000000E+00 +0.000000E+00 +3.200000E-02 +2.340000E-04 +1.368605E-02 +4.005184E-05 +6.894848E-03 +1.073483E-05 +5.553663E-03 +7.001843E-06 +1.492310E-02 +4.851599E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.224455E-03 +5.613642E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.800000E-02 +1.860000E-04 +1.044511E-02 +6.915901E-05 +6.444951E-03 +3.586496E-05 +5.196826E-03 +1.312451E-05 +1.156517E-02 +3.164422E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.057201E-04 +1.834492E-07 +1.000000E-03 +1.000000E-06 +-6.535773E-04 +4.271632E-07 +1.407448E-04 +1.980911E-08 +2.824055E-04 +7.975284E-08 +1.822205E-03 +1.106831E-06 +2.000000E-03 +2.000000E-06 +1.954998E-03 +1.911525E-06 +1.867287E-03 +1.747820E-06 +1.741309E-03 +1.532659E-06 +0.000000E+00 +0.000000E+00 +1.900000E-02 +1.010000E-04 +1.062788E-02 +3.182295E-05 +6.707513E-03 +1.259151E-05 +6.889024E-03 +1.429877E-05 +8.202036E-03 +2.430378E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.306024E-04 +8.660208E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.306024E-04 +8.660208E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1241,16 +1401,176 @@ tally 1: 0.000000E+00 3.102008E-04 9.622454E-08 -6.000000E-03 -2.600000E-05 -8.982135E-05 -2.560934E-07 --7.114096E-04 -2.713326E-07 -8.252336E-04 -1.794332E-06 -2.716350E-03 -5.885778E-06 +1.500000E-02 +4.500000E-05 +3.192578E-03 +7.201112E-06 +4.457942E-03 +6.346144E-06 +3.572536E-03 +4.921318E-06 +7.292620E-03 +1.123722E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.111025E-04 +2.767076E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.069794E-04 +3.684240E-07 +1.000000E-03 +1.000000E-06 +9.537549E-04 +9.096483E-07 +8.644725E-04 +7.473127E-07 +7.383215E-04 +5.451186E-07 +0.000000E+00 +0.000000E+00 +2.300000E-02 +1.310000E-04 +7.696543E-03 +2.602323E-05 +5.553275E-03 +1.677303E-05 +3.110421E-03 +1.605284E-05 +1.157943E-02 +3.065139E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.102008E-04 +9.622454E-08 +1.000000E-03 +1.000000E-06 +-1.849356E-05 +3.420117E-10 +-4.994870E-04 +2.494872E-07 +2.772452E-05 +7.686492E-10 +9.104691E-04 +8.289540E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.600000E-02 +1.460000E-04 +1.097600E-02 +2.696995E-05 +8.425033E-03 +2.480653E-05 +3.259803E-03 +4.519527E-06 +1.278442E-02 +3.571130E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.102008E-04 +9.622454E-08 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.600000E-02 +6.000000E-05 +2.471171E-03 +8.220215E-06 +2.563821E-04 +8.785791E-07 +1.300883E-03 +3.079168E-06 +7.314002E-03 +1.134821E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.022304E-04 +9.134324E-08 +1.000000E-03 +1.000000E-06 +-5.657444E-04 +3.200667E-07 +-1.989995E-05 +3.960081E-10 +3.959267E-04 +1.567580E-07 +3.007686E-04 +9.046177E-08 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +8.000000E-03 +1.800000E-05 +5.436075E-03 +7.868978E-06 +2.425522E-03 +1.963607E-06 +7.168734E-04 +1.273978E-06 +4.589694E-03 +5.548791E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1281,16 +1601,216 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +2.100000E-02 +1.070000E-04 +7.539735E-03 +2.068189E-05 +3.936810E-03 +7.972494E-06 +2.420366E-04 +1.148364E-06 +9.428594E-03 +2.131421E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.053824E-04 +9.325841E-08 +2.000000E-03 +2.000000E-06 +1.606787E-04 +1.589809E-06 +1.384713E-03 +1.050316E-06 +7.117279E-04 +6.789060E-07 +9.257840E-04 +4.781566E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.600000E-02 +5.100000E-04 +1.468472E-02 +4.705766E-05 +8.285657E-03 +2.501121E-05 +5.066048E-03 +7.892505E-06 +1.769628E-02 +7.226941E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.216485E-03 +5.564829E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.300000E-02 +1.130000E-04 +9.030313E-03 +2.036594E-05 +5.561323E-03 +2.088769E-05 +3.949070E-03 +5.399490E-06 +1.065996E-02 +2.405722E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.124312E-04 +1.875678E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.044609E-04 +3.653729E-07 +1.000000E-03 +1.000000E-06 +9.969425E-04 +9.938944E-07 +9.908416E-04 +9.817670E-07 +9.817251E-04 +9.637842E-07 +0.000000E+00 +0.000000E+00 1.300000E-02 -8.900000E-05 -6.195490E-03 -1.953479E-05 -2.111239E-03 -2.311139E-06 -2.268320E-03 -3.353244E-06 -5.808926E-03 -1.694986E-05 +4.300000E-05 +1.119189E-03 +4.668647E-06 +-1.976393E-04 +4.632517E-06 +2.358914E-03 +3.047107E-06 +6.688330E-03 +1.125860E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.102008E-04 +9.622454E-08 +1.000000E-03 +1.000000E-06 +-3.353539E-04 +1.124622E-07 +-3.313067E-04 +1.097641E-07 +4.087442E-04 +1.670718E-07 +9.161472E-04 +8.393257E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.600000E-02 +1.980000E-04 +1.024848E-02 +3.100622E-05 +-1.145555E-04 +2.521646E-06 +1.453177E-03 +1.505423E-06 +1.124135E-02 +3.412415E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.029991E-04 +1.818050E-07 +1.000000E-03 +1.000000E-06 +-2.499079E-04 +6.245395E-08 +-4.063191E-04 +1.650952E-07 +3.358425E-04 +1.127902E-07 +6.044609E-04 +3.653729E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.900000E-02 +8.700000E-05 +6.743817E-03 +2.313239E-05 +1.353852E-03 +7.358462E-06 +3.054381E-03 +5.051576E-06 +7.932519E-03 +1.438883E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1321,98 +1841,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -9.000000E-03 -4.100000E-05 --8.217874E-04 -4.663323E-07 -7.383083E-04 -5.193896E-06 -8.200240E-04 -3.424935E-07 -3.976017E-03 -7.971626E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-03 -8.000000E-06 -2.748347E-03 -4.220881E-06 -2.045316E-03 -2.683544E-06 -2.280529E-03 -2.612273E-06 -6.015373E-04 -3.618471E-07 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.306024E-04 -8.660208E-07 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.306024E-04 -8.660208E-07 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.102008E-04 -9.622454E-08 -6.000000E-03 -1.800000E-05 -2.626871E-03 -3.665081E-06 -1.681981E-03 -1.510257E-06 -1.862830E-03 -2.103749E-06 -2.735214E-03 -4.122645E-06 -0.000000E+00 -0.000000E+00 +2.000000E-02 +9.000000E-05 +4.678519E-03 +8.162854E-06 +2.588181E-03 +7.958110E-06 +2.322176E-03 +3.426024E-06 +8.534070E-03 +1.767419E-05 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1421,6 +1859,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +6.029991E-04 +1.818050E-07 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1442,15 +1882,15 @@ tally 1: 0.000000E+00 0.000000E+00 1.100000E-02 -6.500000E-05 -6.880553E-03 -2.448726E-05 -3.974657E-03 -9.611600E-06 -3.058908E-03 -1.181515E-05 -4.295650E-03 -1.005573E-05 +3.300000E-05 +7.244624E-03 +1.778235E-05 +2.926133E-03 +9.287629E-06 +9.851866E-04 +6.097573E-06 +3.660351E-03 +3.716102E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1459,8 +1899,48 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +3.034897E-04 +9.210600E-08 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.053824E-04 +9.325841E-08 +1.000000E-03 +1.000000E-06 +1.744930E-04 +3.044781E-08 +-4.543283E-04 +2.064142E-07 +-2.484572E-04 +6.173098E-08 +0.000000E+00 +0.000000E+00 +1.000000E-02 +2.600000E-05 +3.641369E-03 +6.818931E-06 +2.110606E-03 +2.176630E-06 +1.892973E-03 +1.812944E-06 +5.777456E-03 +9.494012E-06 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.034897E-04 +9.210600E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1481,16 +1961,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -1.200000E-02 -7.200000E-05 -6.025175E-03 -1.856579E-05 -5.884402E-03 -2.141913E-05 -1.752856E-03 -2.842294E-06 -6.401031E-03 -2.082068E-05 +1.300000E-02 +3.900000E-05 +1.682557E-03 +1.846926E-06 +4.172846E-04 +1.892148E-06 +7.276646E-04 +1.085417E-06 +6.092709E-03 +8.907893E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1499,8 +1979,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -3.102008E-04 -9.622454E-08 +3.053824E-04 +9.325841E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1522,15 +2002,25 @@ tally 1: 0.000000E+00 0.000000E+00 5.000000E-03 -1.700000E-05 -3.189581E-03 -6.250530E-06 -1.000837E-03 -5.036982E-07 --3.117653E-04 -2.901990E-07 -2.754079E-03 -3.853002E-06 +7.000000E-06 +1.580450E-03 +1.753085E-06 +3.349602E-04 +3.639488E-07 +2.690006E-04 +2.374932E-07 +1.830811E-03 +9.321096E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.102008E-04 +9.622454E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -1541,638 +2031,146 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.034897E-04 +9.210600E-08 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.900000E-02 +1.250000E-04 +2.138118E-03 +8.791773E-06 +2.868574E-03 +9.339641E-06 +5.807501E-04 +1.660344E-06 +8.165982E-03 +2.226036E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.102008E-04 +9.622454E-08 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +6.044609E-04 +3.653729E-07 1.000000E-03 1.000000E-06 --5.657444E-04 -3.200667E-07 --1.989995E-05 -3.960081E-10 -3.959267E-04 -1.567580E-07 +2.312419E-04 +5.347280E-08 +-4.197908E-04 +1.762243E-07 +-3.159499E-04 +9.982435E-08 +0.000000E+00 +0.000000E+00 +2.100000E-02 +1.070000E-04 +2.216472E-03 +6.388960E-06 +4.896969E-03 +6.428816E-06 +2.155707E-03 +2.884510E-06 +1.038058E-02 +2.477423E-05 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 3.007686E-04 9.046177E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.000000E-03 -9.000000E-06 -1.797289E-03 -3.230248E-06 -7.121477E-04 -5.071544E-07 -4.492929E-04 -2.018641E-07 -1.551004E-03 -2.405613E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.100000E-02 -6.500000E-05 -6.283851E-03 -1.995229E-05 -1.355416E-03 -1.756870E-06 --4.317669E-04 -7.579610E-07 -4.267354E-03 -9.253637E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 1.000000E-03 1.000000E-06 -9.682863E-04 -9.375784E-07 -9.063676E-04 -8.215023E-07 -8.171815E-04 -6.677855E-07 -6.204016E-04 -3.848982E-07 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.800000E-02 -1.640000E-04 -7.069243E-03 -2.506156E-05 -4.321329E-03 -1.796567E-05 -2.557673E-03 -3.894493E-06 -6.438760E-03 -2.205150E-05 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.200000E-02 -7.200000E-05 -4.666186E-03 -1.284828E-05 -2.641891E-03 -1.762435E-05 -9.754238E-04 -2.039232E-06 -5.498725E-03 -1.512159E-05 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.102008E-04 -9.622454E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-03 -8.000000E-06 -1.714892E-04 -9.981511E-07 --4.305094E-04 -9.268480E-08 --2.287903E-04 -5.786188E-08 -2.443878E-03 -2.986981E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.102008E-04 -9.622454E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.100000E-02 -8.500000E-05 -4.472745E-03 -1.447325E-05 -6.072016E-04 -5.846134E-07 -9.336487E-04 -9.381432E-07 -5.169660E-03 -1.440996E-05 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.007686E-04 -9.046177E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -8.000000E-03 -3.400000E-05 -3.030014E-03 -1.297316E-05 -1.879812E-03 -5.805316E-06 -2.471474E-03 -4.341265E-06 -3.374480E-03 -6.162391E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.102008E-04 -9.622454E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -7.000000E-03 -2.900000E-05 --7.617232E-05 -3.053607E-08 -1.791545E-04 -5.297145E-08 -1.386068E-03 -1.737839E-06 -3.054847E-03 -4.667158E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.007686E-04 -9.046177E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.000000E-03 -4.000000E-06 -1.083160E-03 -1.173236E-06 --4.570050E-05 -2.088536E-09 --6.290949E-04 -3.957604E-07 -6.204016E-04 -3.848982E-07 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 +7.019813E-04 +4.927778E-07 +2.391667E-04 +5.720072E-08 +-1.881699E-04 +3.540793E-08 +2.131373E-03 +2.696833E-06 +1.000000E-03 +1.000000E-06 +9.937981E-04 +9.876347E-07 +9.814521E-04 +9.632483E-07 +9.630767E-04 +9.275168E-07 0.000000E+00 0.000000E+00 6.000000E-03 -2.000000E-05 -2.716180E-03 -5.893679E-06 -1.554292E-03 -1.376524E-06 -7.264867E-04 -1.331497E-06 -3.045415E-03 -4.796216E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -7.000000E-03 -2.500000E-05 -9.648146E-04 -5.981145E-07 -4.634865E-05 -7.955048E-07 --1.328560E-04 -3.379815E-07 -3.355616E-03 -5.662237E-06 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.000000E-03 -5.000000E-06 -1.289998E-03 -8.380263E-07 --3.762753E-05 -1.288533E-07 --2.613682E-04 -4.197617E-08 -1.221939E-03 -7.467452E-07 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.102008E-04 -9.622454E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.100000E-02 -8.500000E-05 -3.095504E-03 -7.078598E-06 --9.175432E-04 -6.837255E-07 --7.570383E-04 -4.237745E-07 -4.530394E-03 -1.567294E-05 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.102008E-04 -9.622454E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.100000E-02 -7.300000E-05 -3.067467E-03 -5.676919E-06 -2.403624E-03 -2.913670E-06 -1.402382E-03 -1.691430E-06 -5.216821E-03 -1.489979E-05 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.007686E-04 -9.046177E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.000000E-03 -5.000000E-06 -1.008832E-03 -8.754929E-07 --8.318856E-04 -3.573666E-07 --9.886180E-04 -7.790297E-07 -1.851773E-03 -2.496075E-06 -0.000000E+00 -0.000000E+00 +1.000000E-05 +2.774441E-03 +2.455060E-06 +-4.125360E-04 +1.557128E-06 +-9.369606E-04 +2.349382E-06 +3.666415E-03 +4.871762E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2181,6 +2179,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +6.057201E-04 +1.834492E-07 1.000000E-03 1.000000E-06 8.429685E-04 @@ -2241,6 +2241,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +8.000000E-03 +4.000000E-05 +-7.915490E-05 +1.150292E-07 +2.293529E-03 +2.932682E-06 +1.356149E-03 +9.471925E-07 +4.579650E-03 +7.918475E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2249,8 +2259,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -6.204016E-04 -3.848982E-07 +3.022304E-04 +9.134324E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2271,26 +2281,16 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.000000E-03 -9.000000E-06 -2.576209E-03 -6.636855E-06 -1.844839E-03 -3.403429E-06 -9.997002E-04 -9.994005E-07 -1.240803E-03 -1.539593E-06 +1.100000E-02 +3.300000E-05 +5.093647E-03 +1.217545E-05 +1.852586E-03 +4.478970E-06 +9.768799E-04 +1.395189E-06 +4.578572E-03 +5.491453E-06 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2309,6 +2309,46 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +3.053824E-04 +9.325841E-08 +1.000000E-03 +1.000000E-06 +9.817451E-04 +9.638234E-07 +9.457351E-04 +8.944149E-07 +8.929546E-04 +7.973680E-07 +0.000000E+00 +0.000000E+00 +4.000000E-03 +4.000000E-06 +-1.284380E-03 +9.356368E-07 +-5.965448E-04 +6.643272E-07 +3.352677E-04 +2.956621E-07 +1.526686E-03 +6.527074E-07 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2323,54 +2363,14 @@ tally 1: 0.000000E+00 1.000000E-03 1.000000E-06 -1.590395E-04 -2.529356E-08 --4.620597E-04 -2.134991E-07 --2.285026E-04 -5.221342E-08 -3.102008E-04 -9.622454E-08 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 +-3.965739E-04 +1.572709E-07 +-2.640937E-04 +6.974547E-08 +4.389371E-04 +1.926657E-07 +3.053824E-04 +9.325841E-08 0.000000E+00 0.000000E+00 0.000000E+00 @@ -2402,11 +2402,11 @@ tally 1: 0.000000E+00 0.000000E+00 tally 2: -2.288800E-01 -2.621372E-02 -2.489848E-01 -3.102301E-02 -1.451035E+00 -1.053707E+00 -1.618797E+01 -1.311489E+02 +5.720364E-01 +6.548043E-02 +6.217988E-01 +7.736906E-02 +3.624477E+00 +2.628737E+00 +4.047526E+01 +3.278231E+02 diff --git a/tests/test_statepoint_restart/test_statepoint_restart.py b/tests/test_statepoint_restart/test_statepoint_restart.py index 59b77a8213..c842689d99 100644 --- a/tests/test_statepoint_restart/test_statepoint_restart.py +++ b/tests/test_statepoint_restart/test_statepoint_restart.py @@ -10,6 +10,11 @@ from openmc.executor import Executor class StatepointRestartTestHarness(TestHarness): + def __init__(self, final_sp, restart_sp, tallies_present=False): + super(StatepointRestartTestHarness, self).__init__(final_sp, + tallies_present) + self._restart_sp = restart_sp + def execute_test(self): """Run OpenMC with the appropriate arguments and check the outputs.""" try: @@ -40,7 +45,9 @@ class StatepointRestartTestHarness(TestHarness): def _run_openmc_restart(self): # Get the name of the statepoint file. - statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name)) + statepoint = glob.glob(os.path.join(os.getcwd(), self._restart_sp)) + assert len(statepoint) == 1 + statepoint = statepoint[0] # Run OpenMC executor = Executor() @@ -52,11 +59,13 @@ class StatepointRestartTestHarness(TestHarness): mpi_exec=self._opts.mpi_exec) else: - returncode = executor.run_simulation(openmc_exec=self._opts.exe) + returncode = executor.run_simulation(openmc_exec=self._opts.exe, + restart_file=statepoint) assert returncode == 0, 'OpenMC did not exit successfully.' if __name__ == '__main__': - harness = StatepointRestartTestHarness('statepoint.07.*', True) + harness = StatepointRestartTestHarness('statepoint.10.h5', + 'statepoint.07.h5', True) harness.main() From a322437f0c218a5111d3cb632c29c4507f309d2e Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 19 Feb 2016 18:21:39 -0500 Subject: [PATCH 128/149] Now using tally averaging for subdomain averaging of MGXS --- openmc/mgxs/mgxs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 8d0ecdb867..35830ff712 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -874,11 +874,11 @@ class MGXS(object): # Average each of the tallies across subdomains for tally_type, tally in avg_xs.tallies.items(): - tally_avg = tally.summation(filter_type=self.domain_type, - filter_bins=subdomains) + tally_avg = tally.average(filter_type=self.domain_type, + filter_bins=subdomains) avg_xs.tallies[tally_type] = tally_avg - avg_xs._domain_type = 'sum({0})'.format(self.domain_type) + avg_xs._domain_type = 'avg({0})'.format(self.domain_type) avg_xs.sparse = self.sparse return avg_xs @@ -1195,8 +1195,8 @@ class MGXS(object): cv.check_iterable_type('subdomains', subdomains, Integral) elif self.domain_type == 'distribcell': subdomains = np.arange(self.num_subdomains, dtype=np.int) - elif self.domain_type == 'sum(distribcell)': - domain_filter = self.xs_tally.find_filter('sum(distribcell)') + elif self.domain_type == 'avg(distribcell)': + domain_filter = self.xs_tally.find_filter('avg(distribcell)') subdomains = domain_filter.bins else: subdomains = [self.domain.id] From c6c3ff74dcec5cea5dbfc92edb57ad0d2e6c95bb Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sat, 20 Feb 2016 12:28:21 -0500 Subject: [PATCH 129/149] Fixed issues with object retrieval by name from Geometry in Python API --- openmc/geometry.py | 65 +++++++++---------- .../test_asymmetric_lattice.py | 16 ++--- .../results_true.dat | 8 +-- 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/openmc/geometry.py b/openmc/geometry.py index 74feaef64b..807dcf7c66 100644 --- a/openmc/geometry.py +++ b/openmc/geometry.py @@ -1,6 +1,5 @@ from collections import Iterable, OrderedDict from xml.etree import ElementTree as ET -import re import openmc from openmc.clean_xml import * @@ -122,8 +121,7 @@ class Geometry(object): universes = set() for universe_id, universe in all_universes.items(): - if universe._type == 'normal': - universes.add(universe) + universes.add(universe) universes = list(universes) universes.sort(key=lambda x: x.id) @@ -236,12 +234,12 @@ class Geometry(object): return lattices def get_materials_by_name(self, name, case_sensitive=False, matching=False): - """Return a list of materials with names matching a regular expression. + """Return a list of materials with matching names. Parameters ---------- name : str - The name to search for (regular expressions are acceptable) + The name to match case_sensitive : bool Whether to distinguish upper and lower case letters in each material's name (default is True) @@ -255,7 +253,8 @@ class Geometry(object): """ - regex = re.compile(b'{0}'.format(name)) + if case_sensitive: + name = name.lower() all_materials = self.get_all_materials() materials = set() @@ -265,10 +264,9 @@ class Geometry(object): if not case_sensitive: material_name = material_name.lower() - match = regex.findall(material_name) - if match and matching: + if material_name == name: materials.add(material) - elif match and match[0] == name: + elif not matching and name in material_name: materials.add(material) materials = list(materials) @@ -276,12 +274,12 @@ class Geometry(object): return materials def get_cells_by_name(self, name, case_sensitive=False, matching=False): - """Return a list of cells with names matching a regular expression. + """Return a list of cells with matching names. Parameters ---------- name : str - The name to search for (regular expressions are acceptable) + The name to search match case_sensitive : bool Whether to distinguish upper and lower case letters in each cell's name (default is True) @@ -295,7 +293,8 @@ class Geometry(object): """ - regex = re.compile(b'{0}'.format(name)) + if case_sensitive: + name = name.lower() all_cells = self.get_all_cells() cells = set() @@ -305,10 +304,9 @@ class Geometry(object): if not case_sensitive: cell_name = cell_name.lower() - match = regex.findall(cell_name) - if match and matching: + if cell_name == name: cells.add(cell) - elif match and match[0] == name: + elif not matching and name in cell_name: cells.add(cell) cells = list(cells) @@ -316,13 +314,12 @@ class Geometry(object): return cells def get_cells_by_fill_name(self, name, case_sensitive=False, matching=False): - """Return a list of cells with fills with names matching a - regular expression. + """Return a list of cells with fills with matching names. Parameters ---------- name : str - The name to search for (regular expressions are acceptable) + The name to match case_sensitive : bool Whether to distinguish upper and lower case letters in each cell's name (default is True) @@ -336,7 +333,8 @@ class Geometry(object): """ - regex = re.compile(b'{0}'.format(name)) + if case_sensitive: + name = name.lower() all_cells = self.get_all_cells() cells = set() @@ -346,10 +344,9 @@ class Geometry(object): if not case_sensitive: cell_fill_name = cell_fill_name.lower() - match = regex.findall(cell_fill_name) - if match and matching: + if cell_fill_name == name: cells.add(cell) - elif match and match[0] == name: + elif not matching and name in cell_fill_name: cells.add(cell) cells = list(cells) @@ -357,12 +354,12 @@ class Geometry(object): return cells def get_universes_by_name(self, name, case_sensitive=False, matching=False): - """Return a list of universes with names matching a regular expression. + """Return a list of universes with matching names. Parameters ---------- name : str - The name to search for (regular expressions are acceptable) + The name to match case_sensitive : bool Whether to distinguish upper and lower case letters in each universe's name (default is True) @@ -376,7 +373,8 @@ class Geometry(object): """ - regex = re.compile(b'{0}'.format(name)) + if case_sensitive: + name = name.lower() all_universes = self.get_all_universes() universes = set() @@ -386,10 +384,9 @@ class Geometry(object): if not case_sensitive: universe_name = universe_name.lower() - match = regex.findall(universe_name) - if match and matching: + if universe_name == name: universes.add(universe) - elif match and match[0] == name: + elif not matching and name in universe_name: universes.add(universe) universes = list(universes) @@ -397,12 +394,12 @@ class Geometry(object): return universes def get_lattices_by_name(self, name, case_sensitive=False, matching=False): - """Return a list of lattices with names matching a regular expression. + """Return a list of lattices with matching names. Parameters ---------- name : str - The name to search for (regular expressions are acceptable) + The name to match case_sensitive : bool Whether to distinguish upper and lower case letters in each lattice's name (default is True) @@ -416,7 +413,8 @@ class Geometry(object): """ - regex = re.compile(b'{0}'.format(name)) + if case_sensitive: + name = name.lower() all_lattices = self.get_all_lattices() lattices = set() @@ -426,10 +424,9 @@ class Geometry(object): if not case_sensitive: lattice_name = lattice_name.lower() - match = regex.findall(lattice_name) - if match and matching: + if lattice_name == name: lattices.add(lattice) - elif match and match[0] == name: + elif not matching and name in lattice_name: lattices.add(lattice) lattices = list(lattices) diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index 5a1d47ef85..fdb21db33c 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -19,13 +19,10 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): # Build full core geometry from underlying input set self._input_set.build_default_materials_and_geometry() - # Extract all universes from the full core geometry - geometry = self._input_set.geometry.geometry - all_univs = geometry.get_all_universes() - # Extract universes encapsulating fuel and water assemblies - water = all_univs[7] - fuel = all_univs[8] + geometry = self._input_set.geometry.geometry + water = geometry.get_universes_by_name('water assembly (hot)')[0] + fuel = geometry.get_universes_by_name('fuel assembly (hot)')[0] # Construct a 3x3 lattice of fuel assemblies core_lat = openmc.RectLattice(name='3x3 Core Lattice', lattice_id=202) @@ -102,9 +99,10 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): outstr += ', '.join(map(str, tally.std_dev.flatten())) + '\n' # Extract fuel assembly lattices from the summary - all_cells = su.openmc_geometry.get_all_cells() - fuel = all_cells[80].fill - core = all_cells[1].fill + core = su.get_cell_by_id(1) + fuel = su.get_cell_by_id(80) + fuel = fuel.fill + core = core.fill # Append a string of lattice distribcell offsets to the string outstr += ', '.join(map(str, fuel.offsets.flatten())) + '\n' diff --git a/tests/test_mgxs_library_distribcell/results_true.dat b/tests/test_mgxs_library_distribcell/results_true.dat index 7b4be0f468..ad9b949de9 100644 --- a/tests/test_mgxs_library_distribcell/results_true.dat +++ b/tests/test_mgxs_library_distribcell/results_true.dat @@ -1,5 +1,5 @@ - sum(distribcell) group in nuclide mean std. dev. -0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0.720213 1.424323 sum(distribcell) group in nuclide mean std. dev. -0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0 0 sum(distribcell) group in group out nuclide mean std. dev. -0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 1 total 0.70466 1.403916 sum(distribcell) group out nuclide mean std. dev. + avg(distribcell) group in nuclide mean std. dev. +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0.720213 1.424323 avg(distribcell) group in nuclide mean std. dev. +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0 0 avg(distribcell) group in group out nuclide mean std. dev. +0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 1 total 0.70466 1.403916 avg(distribcell) group out nuclide mean std. dev. 0 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,... 1 total 0 0 \ No newline at end of file From 6ecc683e2fa450489987291a50ea1ea641dae7ac Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sat, 20 Feb 2016 13:14:45 -0500 Subject: [PATCH 130/149] Python API fix to allow settings UFS Dimension attribute of settings.xml file correctly --- openmc/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/settings.py b/openmc/settings.py index 4ad207c7a3..3d9ec72b91 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -970,7 +970,7 @@ class SettingsFile(object): element = ET.SubElement(self._settings_file, "uniform_fs") subelement = ET.SubElement(element, "dimension") - subelement.text = str(self._ufs_dimension) + subelement.text = ' '.join(map(str, self._ufs_dimension)) subelement = ET.SubElement(element, "lower_left") subelement.text = ' '.join(map(str, self._ufs_lower_left)) From 411e7f241a840d952d95aef171a98323388e1fbb Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sun, 21 Feb 2016 17:15:03 -0500 Subject: [PATCH 131/149] Fixed issue with MGXS merging - now null out base tallies since fluxes cannot be merged and reused to compute merged cross sections --- openmc/mgxs/mgxs.py | 69 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 35830ff712..f5c23dfd55 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -114,6 +114,8 @@ class MGXS(object): sparse : bool Whether or not the MGXS' tallies use SciPy's LIL sparse matrix format for compressed data storage + derived : bool + Whether or not the MGXS is merged from one or more other MGXS """ @@ -135,6 +137,7 @@ class MGXS(object): self._rxn_rate_tally = None self._xs_tally = None self._sparse = False + self._derived = False self.name = name self.by_nuclide = by_nuclide @@ -163,6 +166,7 @@ class MGXS(object): clone._rxn_rate_tally = copy.deepcopy(self._rxn_rate_tally, memo) clone._xs_tally = copy.deepcopy(self._xs_tally, memo) clone._sparse = self.sparse + clone._derived = self.derived clone._tallies = OrderedDict() for tally_type, tally in self.tallies.items(): @@ -255,6 +259,10 @@ class MGXS(object): else: return 'sum' + @property + def derived(self): + return self._derived + @name.setter def name(self, name): cv.check_type('name', name, basestring) @@ -1014,8 +1022,7 @@ class MGXS(object): # Create deep copy of tally to return as merged tally merged_mgxs = copy.deepcopy(self) - merged_mgxs._rxn_rate_tally = None - merged_mgxs._xs_tally = None + merged_mgxs._derived = True # Merge energy groups if self.energy_groups != other.energy_groups: @@ -1034,10 +1041,10 @@ class MGXS(object): # Concatenate lists of nuclides for the merged MGXS merged_mgxs.nuclides = self.nuclides + other.nuclides - # Merge tallies - for tally_key in self.tallies: - merged_tally = self.tallies[tally_key].merge(other.tallies[tally_key]) - merged_mgxs.tallies[tally_key] = merged_tally + # Null base tallies but merge reaction rate and cross section tallies + merged_mgxs._tallies = OrderedDict() + merged_mgxs._rxn_rate_tally = self.rxn_rate_tally.merge(other.rxn_rate_tally) + merged_mgxs._xs_tally = self.xs_tally.merge(other.xs_tally) return merged_mgxs @@ -2377,6 +2384,56 @@ class Chi(MGXS): slice_xs.sparse = self.sparse return slice_xs + def merge(self, other): + """Merge another Chi with this one + + If results have been loaded from a statepoint, then Chi are only + mergeable along one and only one of energy groups or nuclides. + + Parameters + ---------- + other : MGXS + MGXS to merge with this one + + Returns + ------- + merged_mgxs : MGXS + Merged MGXS + """ + + if not self.can_merge(other): + raise ValueError('Unable to merge Chi') + + # Create deep copy of tally to return as merged tally + merged_mgxs = copy.deepcopy(self) + merged_mgxs._derived = True + merged_mgxs._rxn_rate_tally = None + merged_mgxs._xs_tally = None + + # Merge energy groups + if self.energy_groups != other.energy_groups: + merged_groups = self.energy_groups.merge(other.energy_groups) + merged_mgxs.energy_groups = merged_groups + + # Merge nuclides + if self.nuclides != other.nuclides: + + # The nuclides must be mutually exclusive + for nuclide in self.nuclides: + if nuclide in other.nuclides: + msg = 'Unable to merge Chi with shared nuclides' + raise ValueError(msg) + + # Concatenate lists of nuclides for the merged MGXS + merged_mgxs.nuclides = self.nuclides + other.nuclides + + # Merge tallies + for tally_key in self.tallies: + merged_tally = self.tallies[tally_key].merge(other.tallies[tally_key]) + merged_mgxs.tallies[tally_key] = merged_tally + + return merged_mgxs + def get_xs(self, groups='all', subdomains='all', nuclides='all', xs_type='macro', order_groups='increasing', value='mean'): """Returns an array of the fission spectrum. From ead3f50d27ae7b96e5050fb8127f9f12ede93600 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Sun, 21 Feb 2016 21:29:49 -0500 Subject: [PATCH 132/149] Eliminated Pandas deprecation warning from MGXS Pandas DataFrame builder method --- openmc/mgxs/mgxs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index f5c23dfd55..022acef5f4 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -1467,7 +1467,7 @@ class MGXS(object): # Sort the dataframe by domain type id (e.g., distribcell id) and # energy groups such that data is from fast to thermal - df.sort([self.domain_type] + columns, inplace=True) + df.sort_values(by=[self.domain_type] + columns, inplace=True) return df From 63cac1adba85b7e8b041f07c55c3bfa75f9bcea6 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 22 Feb 2016 11:30:07 -0600 Subject: [PATCH 133/149] Add a necessary missing blank line in installation documentation --- docs/source/usersguide/install.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index 4075e03033..be8bc3cf84 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -227,6 +227,7 @@ your PATH environment variable and subsequently uses it to determine library locations and compile flags. If you have multiple installations of HDF5 or one that does not appear on your PATH, you can set the HDF5_ROOT environment variable to the root directory of the HDF5 installation, e.g. + .. code-block:: sh export HDF5_ROOT=/opt/hdf5/1.8.15 From f44446e20e3362849b1abfd92f924c598d6b96bc Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Mon, 22 Feb 2016 15:54:59 -0500 Subject: [PATCH 134/149] Add tally % n_realizations to statepoint restarts --- src/state_point.F90 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/state_point.F90 b/src/state_point.F90 index 799610c4ce..fb7c17788f 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -659,7 +659,7 @@ contains ! Read filetype call read_dataset(file_id, "filetype", word) - if (trim(word) /= 'statepoint') then + if (word /= 'statepoint') then call fatal_error("OpenMC tried to restart from a non-statepoint file.") end if @@ -767,10 +767,12 @@ contains ! Set pointer to tally tally => tallies(i) - ! Read sum and sum_sq for each bin + ! Read sum, sum_sq, and N for each bin tally_group = open_group(tallies_group, "tally " // & - trim(to_str(tally%id))) - call read_dataset(tally_group, "results", tally%results) + trim(to_str(tally % id))) + call read_dataset(tally_group, "results", tally % results) + call read_dataset(tally_group, "n_realizations", & + &tally % n_realizations) call close_group(tally_group) end do TALLY_RESULTS end if From 7261a2d068e4e632123c0c2e715a590f091004d0 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Mon, 22 Feb 2016 17:20:08 -0500 Subject: [PATCH 135/149] Use all processors when restarting in PHDF5 --- src/state_point.F90 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/state_point.F90 b/src/state_point.F90 index fb7c17788f..82c53c80b8 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -747,8 +747,13 @@ contains &file") end if - ! Read tallies to master + ! Read tallies to master. If we are using Parallel HDF5, all processors + ! need to be included in the HDF5 calls. +#ifdef PHDF5 + if (.true.) then +#else if (master) then +#endif ! Read number of realizations for global tallies call read_dataset(file_id, "n_realizations", n_realizations, indep=.true.) From 9cbc1180d03d4ffe019ae4eb991b432057405e04 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 22 Feb 2016 19:51:34 -0500 Subject: [PATCH 136/149] Modified *CROSS_SECTIONS envvar to be OPENMC_*CROSS_SECTIONS, incorporated latest comments from @paulromano. Next is to work on fixing up bank --- docs/source/usersguide/input.rst | 11 ++++++----- docs/source/usersguide/install.rst | 25 ++++++++++++++----------- docs/source/usersguide/mgxs_library.rst | 2 +- openmc/mgxs_library.py | 13 +++++++------ src/bank_header.F90 | 2 +- src/input_xml.F90 | 12 ++++++------ src/relaxng/materials.rnc | 22 +++++++++++----------- 7 files changed, 46 insertions(+), 41 deletions(-) diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index bee60f2218..eb620b650c 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -112,10 +112,11 @@ standard deviation. The ```` element has no attributes and simply indicates the path to an XML cross section listing file (usually named cross_sections.xml). If this -element is absent from the settings.xml file, the :envvar:`CROSS_SECTIONS` -environment variable will be used to find the path to the XML cross section -listing when in continuous-energy mode, and the :envvar:`MG_CROSS_SECTIONS` -environment variable will be used in multi-group mode. +element is absent from the settings.xml file, the +:envvar:`OPENMC_CROSS_SECTIONS` environment variable will be used to find the +path to the XML cross section listing when in continuous-energy mode, and the +:envvar:`OPENMC_MG_CROSS_SECTIONS` environment variable will be used in +multi-group mode. ```` Element -------------------- @@ -1728,7 +1729,7 @@ The ```` element accepts the following sub-elements: |inverse-velocity |The flux-weighted inverse velocity where the | | |velocity is in units of centimeters per second. | | |This score type is not used in the | - | |multi-group :ref:`energy_mode`. | + | |multi-group :ref:`energy_mode`. | +----------------------+---------------------------------------------------+ |kappa-fission |The recoverable energy production rate due to | | |fission. The recoverable energy is defined as the | diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index bbb593beb1..2c7ec1b41f 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -355,7 +355,7 @@ Testing Build ------------- If you have ENDF/B-VII.1 cross sections from NNDC_ you can test your build. -Make sure the **CROSS_SECTIONS** environmental variable is set to the +Make sure the **OPENMC_CROSS_SECTIONS** environmental variable is set to the *cross_sections.xml* file in the *data/nndc* directory. There are two ways to run tests. The first is to use the Makefile present in the source directory and run the following: @@ -405,9 +405,10 @@ extract, and set up a confiuration file: cd openmc/data python get_nndc_data.py -At this point, you should set the :envvar:`CROSS_SECTIONS` environment variable -to the absolute path of the file ``openmc/data/nndc/cross_sections.xml``. This -cross section set is used by the test suite. +At this point, you should set the :envvar:`OPENMC_CROSS_SECTIONS` environment +variable to the absolute path of the file +``openmc/data/nndc/cross_sections.xml``. This cross section set is used by the +test suite. Using JEFF Cross Sections from OECD/NEA --------------------------------------- @@ -433,8 +434,8 @@ the following steps must be taken: 4. Additionally, you may need to change any occurrences of upper-case "ACE" within the ``cross_sections.xml`` file to lower-case. 5. Either set the :ref:`cross_sections` in a settings.xml file or the - :envvar:`CROSS_SECTIONS` environment variable to the absolute path of the - ``cross_sections.xml`` file. + :envvar:`OPENMC_CROSS_SECTIONS` environment variable to the absolute path of + the ``cross_sections.xml`` file. Using Cross Sections from MCNP ------------------------------ @@ -442,8 +443,9 @@ Using Cross Sections from MCNP To use cross sections distributed with MCNP, change the element in the ``cross_sections.xml`` file in the root directory of the OpenMC distribution to the location of the MCNP cross sections. Then, either set the -:ref:`cross_sections` in a settings.xml file or the :envvar:`CROSS_SECTIONS` -environment variable to the absolute path of the ``cross_sections.xml`` file. +:ref:`cross_sections` in a settings.xml file or the +:envvar:`OPENMC_CROSS_SECTIONS` environment variable to the absolute path of +the ``cross_sections.xml`` file. Using Cross Sections from Serpent --------------------------------- @@ -451,8 +453,9 @@ Using Cross Sections from Serpent To use cross sections distributed with Serpent, change the element in the ``cross_sections_serpent.xml`` file in the root directory of the OpenMC distribution to the location of the Serpent cross sections. Then, either set the -:ref:`cross_sections` in a settings.xml file or the :envvar:`CROSS_SECTIONS` -environment variable to the absolute path of the ``cross_sections_serpent.xml`` +:ref:`cross_sections` in a settings.xml file or the +:envvar:`OPENMC_CROSS_SECTIONS` environment variable to the absolute path of +the ``cross_sections_serpent.xml`` file. Using Multi-Group Cross Sections @@ -462,7 +465,7 @@ Multi-group cross section libraries are generally tailored to the specific calculation to be performed. Therefore, at this point in time, OpenMC is not distributed with any pre-existing multi-group cross section libraries. However, if the user has obtained or generated their own library, the user -should set the :envvar:`MG_CROSS_SECTIONS` environment variable +should set the :envvar:`OPENMC_MG_CROSS_SECTIONS` environment variable to the absolute path of the file library expected to used most frequently. .. _NJOY: http://t2.lanl.gov/nis/codes.shtml diff --git a/docs/source/usersguide/mgxs_library.rst b/docs/source/usersguide/mgxs_library.rst index 4cc36f1e89..a5d2ec0d06 100644 --- a/docs/source/usersguide/mgxs_library.rst +++ b/docs/source/usersguide/mgxs_library.rst @@ -270,7 +270,7 @@ attributes/sub-elements required to describe the meta-data: with the inner-dimension being groups, intermediate-dimension being azimuthal angles and outer-dimension being the polar angles. - *Default*: None, this is required only if :ref:`kappa_fission` tallies are + *Default*: None, this is required only if kappa_fission tallies are requested and the material is fissionable. :chi: diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index ea6407f968..b6dd9f09fe 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -17,6 +17,7 @@ from openmc.clean_xml import * # Supported incoming particle MGXS angular treatment representations _REPRESENTATIONS = ['isotropic', 'angle'] + def ndarray_to_string(arr): """Converts a numpy ndarray in to a join with spaces between entries similar to ' '.join(map(str,arr)) but applied to all sub-dimensions. @@ -48,14 +49,14 @@ def ndarray_to_string(arr): for i in range(shape[0]): text += tab for j in range(shape[1]): - text += '{:.7E} '.format(arr[i,j]) + text += '{:.7E} '.format(arr[i, j]) text += indent elif ndim == 3: for i in range(shape[0]): for j in range(shape[1]): text += tab for k in range(shape[2]): - text += '{:.7E} '.format(arr[i,j,k]) + text += '{:.7E} '.format(arr[i, j, k]) text += indent elif ndim == 4: for i in range(shape[0]): @@ -63,7 +64,7 @@ def ndarray_to_string(arr): for k in range(shape[2]): text += tab for l in range(shape[3]): - text += '{:.7E} '.format(arr[i,j,k,l]) + text += '{:.7E} '.format(arr[i, j, k, l]) text += indent elif ndim == 5: for i in range(shape[0]): @@ -72,7 +73,7 @@ def ndarray_to_string(arr): for l in range(shape[3]): text += tab for m in range(shape[4]): - text += '{:.7E} '.format(arr[i,j,k,l,m]) + text += '{:.7E} '.format(arr[i, j, k, l, m]) text += indent return text @@ -289,7 +290,7 @@ class XSdata(object): check_value('num_points', num_points, Integral) check_greater_than('num_points', num_points, 0) else: - if enable == False: + if not enable: num_points = 1 else: num_points = 33 @@ -563,6 +564,7 @@ class XSdata(object): return element + class MGXSLibraryFile(object): """Multi-Group Cross Sections file used for an OpenMC simulation. Corresponds directly to the MG version of the cross_sections.xml input file. @@ -686,7 +688,6 @@ class MGXSLibraryFile(object): xml_element = xsdata._get_xsdata_xml() self._cross_sections_file.append(xml_element) - def export_to_xml(self, filename='mg_cross_sections.xml'): """Create an mg_cross_sections.xml file that can be used for a simulation. diff --git a/src/bank_header.F90 b/src/bank_header.F90 index ad829341f0..c10a93e569 100644 --- a/src/bank_header.F90 +++ b/src/bank_header.F90 @@ -5,7 +5,7 @@ module bank_header implicit none !=============================================================================== -! BANK* is used for storing fission sites in eigenvalue calculations. Since all +! BANK is used for storing fission sites in eigenvalue calculations. Since all ! the state information of a neutron is not needed, this type allows sites to be ! stored with less memory !=============================================================================== diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 49600939c3..9ef439bb04 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -129,11 +129,11 @@ contains ! No cross_sections.xml file specified in settings.xml, check ! environment variable if (run_CE) then - call get_environment_variable("CROSS_SECTIONS", env_variable) + call get_environment_variable("OPENMC_CROSS_SECTIONS", env_variable) if (len_trim(env_variable) == 0) then call fatal_error("No cross_sections.xml file was specified in & - &settings.xml or in the CROSS_SECTIONS environment variable. & - &OpenMC needs such a file to identify where to & + &settings.xml or in the OPENMC_CROSS_SECTIONS environment & + &variable. OpenMC needs such a file to identify where to & &find ACE cross section libraries. Please consult the user's & &guide at http://mit-crpg.github.io/openmc for information on & &how to set up ACE cross section libraries.") @@ -141,11 +141,11 @@ contains path_cross_sections = trim(env_variable) end if else - call get_environment_variable("MG_CROSS_SECTIONS", env_variable) + call get_environment_variable("OPENMC_MG_CROSS_SECTIONS", env_variable) if (len_trim(env_variable) == 0) then call fatal_error("No cross_sections.xml file was specified in & - &settings.xml or in the MG_CROSS_SECTIONS environment variable. & - &OpenMC needs such a file to identify where to & + &settings.xml or in the OPENMC_MG_CROSS_SECTIONS environment & + &variable. OpenMC needs such a file to identify where to & &find the cross section libraries. Please consult the user's & &guide at http://mit-crpg.github.io/openmc for information on & &how to set up the cross section libraries.") diff --git a/src/relaxng/materials.rnc b/src/relaxng/materials.rnc index aec3fbcbc2..21b36c07e1 100644 --- a/src/relaxng/materials.rnc +++ b/src/relaxng/materials.rnc @@ -13,8 +13,8 @@ element materials { element nuclide { (element name { xsd:string { maxLength = "7" } } | attribute name { xsd:string { maxLength = "7" } }) & - (element xs { xsd:string { maxLength = "3" } } | - attribute xs { xsd:string { maxLength = "3" } })? & + (element xs { xsd:string { maxLength = "5" } } | + attribute xs { xsd:string { maxLength = "5" } })? & (element scattering { ( "data" | "iso-in-lab" ) } | attribute scattering { ( "data" | "iso-in-lab" ) })? & ( @@ -24,17 +24,17 @@ element materials { }* & element macroscopic { - (element name { xsd:string { maxLength = "7" } } | - attribute name { xsd:string { maxLength = "7" } }) & - (element xs { xsd:string { maxLength = "3" } } | - attribute xs { xsd:string { maxLength = "3" } }) + (element name { xsd:string } | + attribute name { xsd:string }) & + (element xs { xsd:string { maxLength = "5" } } | + attribute xs { xsd:string { maxLength = "5" } }) }* & element element { (element name { xsd:string { maxLength = "2" } } | attribute name { xsd:string { maxLength = "2" } }) & - (element xs { xsd:string { maxLength = "3" } } | - attribute xs { xsd:string { maxLength = "3" } })? & + (element xs { xsd:string { maxLength = "5" } } | + attribute xs { xsd:string { maxLength = "5" } })? & (element scattering { ( "data" | "iso-in-lab" ) } | attribute scattering { ( "data" | "iso-in-lab" ) })? & ( @@ -46,10 +46,10 @@ element materials { element sab { (element name { xsd:string { maxLength = "7" } } | attribute name { xsd:string { maxLength = "7" } }) & - (element xs { xsd:string { maxLength = "3" } } | - attribute xs { xsd:string { maxLength = "3" } })? + (element xs { xsd:string { maxLength = "5" } } | + attribute xs { xsd:string { maxLength = "5" } })? }* }+ & - element default_xs { xsd:string { maxLength = "3" } }? + element default_xs { xsd:string { maxLength = "5" } }? } From c0a6582248855736604d0c3054f339d1d4b24622 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 22 Feb 2016 20:18:12 -0500 Subject: [PATCH 137/149] Replacing Bank % g with Bank % E which is cast to an integer. --- .../usersguide/output/particle_restart.rst | 11 +++------ docs/source/usersguide/output/source.rst | 2 +- src/bank_header.F90 | 3 +-- src/constants.F90 | 2 +- src/initialize.F90 | 2 -- src/particle_header.F90 | 23 +++++++++++-------- src/particle_restart_write.F90 | 1 - src/physics_mg.F90 | 4 ++-- src/simulation.F90 | 3 ++- src/source.F90 | 7 +++--- src/tally.F90 | 2 +- src/tracking.F90 | 2 +- 12 files changed, 29 insertions(+), 33 deletions(-) diff --git a/docs/source/usersguide/output/particle_restart.rst b/docs/source/usersguide/output/particle_restart.rst index 1ed6077108..70f00a930f 100644 --- a/docs/source/usersguide/output/particle_restart.rst +++ b/docs/source/usersguide/output/particle_restart.rst @@ -4,7 +4,7 @@ Particle Restart File Format ============================ -The current revision of the particle restart file format is 2. +The current revision of the particle restart file format is 1. **/filetype** (*char[]*) @@ -46,13 +46,8 @@ The current revision of the particle restart file format is 2. **/energy** (*double*) - Energy of the particle in MeV. This is always provided but only used - for continuous-energy mode. - -**/energy_group** (*int*) - - Energy group of the particle. This is always provided but only used - for multi-group mode. + Energy of the particle in MeV for continuous-energy mode, or the energy + group of the particle for multi-group mode. **/xyz** (*double[3]*) diff --git a/docs/source/usersguide/output/source.rst b/docs/source/usersguide/output/source.rst index e8867083c1..53841a5ebc 100644 --- a/docs/source/usersguide/output/source.rst +++ b/docs/source/usersguide/output/source.rst @@ -15,6 +15,6 @@ is that documented here. **/source_bank** (Compound type) Source bank information for each particle. The compound type has fields - ``wgt``, ``xyz``, ``uvw``, ``E``, ``g``, and ``delayed_group``, which + ``wgt``, ``xyz``, ``uvw``, ``E``, and ``delayed_group``, which represent the weight, position, direction, energy, energy group, and delayed_group of the source particle, respectively. diff --git a/src/bank_header.F90 b/src/bank_header.F90 index c10a93e569..97fb1f11fa 100644 --- a/src/bank_header.F90 +++ b/src/bank_header.F90 @@ -14,8 +14,7 @@ module bank_header real(C_DOUBLE) :: wgt ! weight of bank site real(C_DOUBLE) :: xyz(3) ! location of bank particle real(C_DOUBLE) :: uvw(3) ! diretional cosines - real(C_DOUBLE) :: E ! energy - integer(C_INT) :: g ! energy group + real(C_DOUBLE) :: E ! energy / energy group if in MG mode. integer(C_INT) :: delayed_group ! delayed group end type Bank diff --git a/src/constants.F90 b/src/constants.F90 index b93abae2b7..0c6f09cdda 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -12,7 +12,7 @@ module constants ! Revision numbers for binary files integer, parameter :: REVISION_STATEPOINT = 15 - integer, parameter :: REVISION_PARTICLE_RESTART = 2 + integer, parameter :: REVISION_PARTICLE_RESTART = 1 integer, parameter :: REVISION_TRACK = 1 integer, parameter :: REVISION_SUMMARY = 3 diff --git a/src/initialize.F90 b/src/initialize.F90 index d8bbcb0d8c..68426d5686 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -327,8 +327,6 @@ contains c_loc(tmpb(1)%uvw)), coordinates_t, hdf5_err) call h5tinsert_f(hdf5_bank_t, "E", h5offsetof(c_loc(tmpb(1)), & c_loc(tmpb(1)%E)), H5T_NATIVE_DOUBLE, hdf5_err) - call h5tinsert_f(hdf5_bank_t, "g", h5offsetof(c_loc(tmpb(1)), & - c_loc(tmpb(1)%g)), H5T_NATIVE_INTEGER, hdf5_err) call h5tinsert_f(hdf5_bank_t, "delayed_group", h5offsetof(c_loc(tmpb(1)), & c_loc(tmpb(1)%delayed_group)), H5T_NATIVE_INTEGER, hdf5_err) diff --git a/src/particle_header.F90 b/src/particle_header.F90 index bf820ceb35..c1f02eca24 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -179,10 +179,11 @@ contains ! fission, or simply as a secondary particle. !=============================================================================== - subroutine initialize_from_source(this, src, run_CE) - class(Particle), intent(inout) :: this - type(Bank), intent(in) :: src - logical, intent(in) :: run_CE + subroutine initialize_from_source(this, src, run_CE, energy_bin_avg) + class(Particle), intent(inout) :: this + type(Bank), intent(in) :: src + logical, intent(in) :: run_CE + real(8), allocatable, intent(in) :: energy_bin_avg(:) ! set defaults call this % initialize() @@ -194,12 +195,14 @@ contains this % coord(1) % uvw = src % uvw this % last_xyz = src % xyz this % last_uvw = src % uvw - this % E = src % E - this % last_E = src % E - if (.not. run_CE) then - this % g = src % g - this % last_g = src % g + if (run_CE) then + this % E = src % E + else + this % g = int(src % E) + this % last_g = int(src % E) + this % E = energy_bin_avg(this % g) end if + this % last_E = src % E end subroutine initialize_from_source @@ -229,7 +232,7 @@ contains this % n_secondary = n this % secondary_bank(this % n_secondary) % E = this % E if (.not. run_CE) then - this % secondary_bank(this % n_secondary) % g = this % g + this % secondary_bank(this % n_secondary) % E = real(this % g, 8) end if end subroutine create_secondary diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index e1a280e9fa..d983b3db8a 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -57,7 +57,6 @@ contains call write_dataset(file_id, 'id', p%id) call write_dataset(file_id, 'weight', src%wgt) call write_dataset(file_id, 'energy', src%E) - call write_dataset(file_id, 'energy_group', src%g) call write_dataset(file_id, 'xyz', src%xyz) call write_dataset(file_id, 'uvw', src%uvw) diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index ce296c48e6..6a58540c17 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -255,8 +255,8 @@ contains ! Sample secondary energy distribution for fission reaction and set energy ! in fission bank - bank_array(i) % g = xs % sample_fission_energy(p % g, fission_bank(i) % uvw) - bank_array(i) % E = energy_bin_avg(fission_bank(i) % g) + bank_array(i) % E = & + real(xs % sample_fission_energy(p % g, fission_bank(i) % uvw), 8) end do ! increment number of bank sites diff --git a/src/simulation.F90 b/src/simulation.F90 index 4a419df906..41a28741c3 100644 --- a/src/simulation.F90 +++ b/src/simulation.F90 @@ -131,7 +131,8 @@ contains integer :: i ! set defaults - call p % initialize_from_source(source_bank(index_source), run_CE) + call p % initialize_from_source(source_bank(index_source), run_CE, & + energy_bin_avg) ! set identifier for particle p % id = work_index(rank) + index_source diff --git a/src/source.F90 b/src/source.F90 index 0a7fa790d5..ad565c95c0 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -192,11 +192,12 @@ contains ! If running in MG, convert site % E to group if (.not. run_CE) then if (site % E <= energy_bins(1)) then - site % g = 1 + site % E = real(1, 8) else if (site % E > energy_bins(energy_groups + 1)) then - site % g = energy_groups + site % E = real(energy_groups, 8) else - site % g = binary_search(energy_bins, energy_groups + 1, site % E) + site % E = real(binary_search(energy_bins, energy_groups + 1, & + site % E), 8) end if end if diff --git a/src/tally.F90 b/src/tally.F90 index e127cf0378..f265bdb274 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -1601,7 +1601,7 @@ contains if (t % energyout_matches_groups) then ! determine outgoing energy from fission bank - gout = fission_bank(n_bank - p % n_bank + k) % g + gout = int(fission_bank(n_bank - p % n_bank + k) % E) ! change outgoing energy bin matching_bins(i) = gout diff --git a/src/tracking.F90 b/src/tracking.F90 index 17fc855591..e634112bc6 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -223,7 +223,7 @@ contains if (.not. p % alive) then if (p % n_secondary > 0) then call p % initialize_from_source(p % secondary_bank(p % n_secondary), & - run_CE) + run_CE, energy_bin_avg) p % n_secondary = p % n_secondary - 1 n_event = 0 From ee55476ff025380f6edadc3f1e53d7c49034b4e1 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 22 Feb 2016 20:20:25 -0500 Subject: [PATCH 138/149] Aaand environment variables did not match between my machine and travis. Oh travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efdc457a11..acec278ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ before_script: - git clone --branch=master git://github.com/bhermanmit/nndc_xs nndc_xs - cat nndc_xs/nndc.tar.gza* | tar xzvf - - rm -rf nndc_xs - - export CROSS_SECTIONS=$PWD/nndc/cross_sections.xml + - export OPENMC_CROSS_SECTIONS=$PWD/nndc/cross_sections.xml - cd .. script: From 4212a951d2c379affe82e368ef1f37564ef8e656 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 22 Feb 2016 21:07:51 -0500 Subject: [PATCH 139/149] Updated particle_restart file reversion number in particle_restart.py --- openmc/particle_restart.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmc/particle_restart.py b/openmc/particle_restart.py index 4aad111325..72bf3ac3de 100644 --- a/openmc/particle_restart.py +++ b/openmc/particle_restart.py @@ -43,11 +43,11 @@ class Particle(object): if 'filetype' not in self._f or self._f[ 'filetype'].value.decode() != 'particle restart': raise IOError('{} is not a particle restart file.'.format(filename)) - if self._f['revision'].value != 2: + if self._f['revision'].value != 1: raise IOError('Particle restart file has a file revision of {} ' 'which is not consistent with the revision this ' 'version of OpenMC expects ({}).'.format( - self._f['revision'].value, 2)) + self._f['revision'].value, 1)) @property def current_batch(self): From 095f3e05103575e0a6139ccdb9ffc338dd147ad5 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 22 Feb 2016 21:39:22 -0500 Subject: [PATCH 140/149] Think I fixed the mpi problems --- src/initialize.F90 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/initialize.F90 b/src/initialize.F90 index 68426d5686..5b7cc8c063 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -203,15 +203,15 @@ contains integer :: bank_blocks(6) ! Count for each datatype #ifdef MPIF08 - type(MPI_Datatype) :: bank_types(6) + type(MPI_Datatype) :: bank_types(5) type(MPI_Datatype) :: result_types(1) type(MPI_Datatype) :: temp_type #else - integer :: bank_types(6) ! Datatypes + integer :: bank_types(5) ! Datatypes integer :: result_types(1) ! Datatypes integer :: temp_type ! temporary derived type #endif - integer(MPI_ADDRESS_KIND) :: bank_disp(6) ! Displacements + integer(MPI_ADDRESS_KIND) :: bank_disp(5) ! Displacements integer :: result_blocks(1) ! Count for each datatype integer(MPI_ADDRESS_KIND) :: result_disp(1) ! Displacements integer(MPI_ADDRESS_KIND) :: result_base_disp ! Base displacement @@ -245,17 +245,15 @@ contains call MPI_GET_ADDRESS(b % xyz, bank_disp(2), mpi_err) call MPI_GET_ADDRESS(b % uvw, bank_disp(3), mpi_err) call MPI_GET_ADDRESS(b % E, bank_disp(4), mpi_err) - call MPI_GET_ADDRESS(b % g, bank_disp(5), mpi_err) - call MPI_GET_ADDRESS(b % delayed_group, bank_disp(6), mpi_err) + call MPI_GET_ADDRESS(b % delayed_group, bank_disp(5), mpi_err) ! Adjust displacements bank_disp = bank_disp - bank_disp(1) ! Define MPI_BANK for fission sites - bank_blocks = (/ 1, 3, 3, 1, 1, 1 /) - bank_types = (/ MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_REAL8, & - MPI_INTEGER, MPI_INTEGER /) - call MPI_TYPE_CREATE_STRUCT(6, bank_blocks, bank_disp, & + bank_blocks = (/ 1, 3, 3, 1, 1 /) + bank_types = (/ MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_INTEGER /) + call MPI_TYPE_CREATE_STRUCT(5, bank_blocks, bank_disp, & bank_types, MPI_BANK, mpi_err) call MPI_TYPE_COMMIT(MPI_BANK, mpi_err) From 3aa332e8d28452ebb8e8f41289a9222d563b7f68 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 22 Feb 2016 21:43:03 -0500 Subject: [PATCH 141/149] Think I fixed the mpi problems; #2 --- src/initialize.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initialize.F90 b/src/initialize.F90 index 5b7cc8c063..52853f72ff 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -201,7 +201,7 @@ contains subroutine initialize_mpi() - integer :: bank_blocks(6) ! Count for each datatype + integer :: bank_blocks(5) ! Count for each datatype #ifdef MPIF08 type(MPI_Datatype) :: bank_types(5) type(MPI_Datatype) :: result_types(1) From 76a99e44860593ffeb3970d3dcad44ca181ae34f Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Mon, 22 Feb 2016 22:13:17 -0500 Subject: [PATCH 142/149] Minor fixes for #589 --- src/state_point.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/state_point.F90 b/src/state_point.F90 index 82c53c80b8..bb674e2cdc 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -747,7 +747,7 @@ contains &file") end if - ! Read tallies to master. If we are using Parallel HDF5, all processors + ! Read tallies to master. If we are using Parallel HDF5, all processes ! need to be included in the HDF5 calls. #ifdef PHDF5 if (.true.) then @@ -777,7 +777,7 @@ contains trim(to_str(tally % id))) call read_dataset(tally_group, "results", tally % results) call read_dataset(tally_group, "n_realizations", & - &tally % n_realizations) + tally % n_realizations) call close_group(tally_group) end do TALLY_RESULTS end if From 713f6bf0fb6e207d315b42a485abed8bc66c8815 Mon Sep 17 00:00:00 2001 From: Derek Gaston Date: Mon, 22 Feb 2016 17:35:01 -0700 Subject: [PATCH 143/149] Add KappaFission capability to MGXS --- openmc/mgxs/mgxs.py | 139 ++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 76 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 875a82c468..09e0f95907 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -25,6 +25,7 @@ MGXS_TYPES = ['total', 'capture', 'fission', 'nu-fission', + 'kappa-fission', 'scatter', 'nu-scatter', 'scatter matrix', @@ -315,7 +316,7 @@ class MGXS(object): Parameters ---------- - mgxs_type : {'total', 'transport', 'absorption', 'capture', 'fission', 'nu-fission', 'scatter', 'nu-scatter', 'scatter matrix', 'nu-scatter matrix', 'chi'} + mgxs_type : {'total', 'transport', 'absorption', 'capture', 'fission', 'nu-fission', 'kappa-fission', 'scatter', 'nu-scatter', 'scatter matrix', 'nu-scatter matrix', 'chi'} The type of multi-group cross section object to return domain : Material or Cell or Universe The domain for spatial homogenization @@ -352,6 +353,8 @@ class MGXS(object): mgxs = FissionXS(domain, domain_type, energy_groups) elif mgxs_type == 'nu-fission': mgxs = NuFissionXS(domain, domain_type, energy_groups) + elif mgxs_type == 'kappa-fission': + mgxs = KappaFissionXS(domain, domain_type, energy_groups) elif mgxs_type == 'scatter': mgxs = ScatterXS(domain, domain_type, energy_groups) elif mgxs_type == 'nu-scatter': @@ -1484,96 +1487,80 @@ class CaptureXS(MGXS): self._rxn_rate_tally.sparse = self.sparse return self._rxn_rate_tally +class FissionXSBase(MGXS): + """A fission production multi-group cross section base class + for NuFission and KappaFission + """ -class FissionXS(MGXS): + # This is an abstract class which cannot be instantiated + __metaclass__ = abc.ABCMeta + + def __init__(self, rxn_type, domain=None, domain_type=None, + groups=None, by_nuclide=False, name=''): + super(FissionXSBase, self).__init__(domain, domain_type, + groups, by_nuclide, name) + self._rxn_type = rxn_type + + @property + def tallies(self): + """Construct the OpenMC tallies needed to compute this cross section. + + This method constructs two tracklength tallies to compute the 'flux' + and 'rxn_type' reaction rates in the spatial domain and energy + groups of interest. + + """ + + # Instantiate tallies if they do not exist + if self._tallies is None: + + # Create a list of scores for each Tally to be created + scores = ['flux', self._rxn_type] + estimator = 'tracklength' + keys = scores + + # Create the non-domain specific Filters for the Tallies + group_edges = self.energy_groups.group_edges + energy_filter = openmc.Filter('energy', group_edges) + filters = [[energy_filter], [energy_filter]] + + # Initialize the Tallies + self._create_tallies(scores, filters, keys, estimator) + + return self._tallies + + @property + def rxn_rate_tally(self): + if self._rxn_rate_tally is None: + self._rxn_rate_tally = self.tallies[self._rxn_type] + self._rxn_rate_tally.sparse = self.sparse + return self._rxn_rate_tally + + +class FissionXS(FissionXSBase): """A fission multi-group cross section.""" def __init__(self, domain=None, domain_type=None, groups=None, by_nuclide=False, name=''): - super(FissionXS, self).__init__(domain, domain_type, + super(FissionXS, self).__init__('fission', domain, domain_type, groups, by_nuclide, name) - self._rxn_type = 'fission' - - @property - def tallies(self): - """Construct the OpenMC tallies needed to compute this cross section. - - This method constructs two tracklength tallies to compute the 'flux' - and 'fission' reaction rates in the spatial domain and energy - groups of interest. - - """ - - # Instantiate tallies if they do not exist - if self._tallies is None: - - # Create a list of scores for each Tally to be created - scores = ['flux', 'fission'] - estimator = 'tracklength' - keys = scores - - # Create the non-domain specific Filters for the Tallies - group_edges = self.energy_groups.group_edges - energy_filter = openmc.Filter('energy', group_edges) - filters = [[energy_filter], [energy_filter]] - - # Initialize the Tallies - self._create_tallies(scores, filters, keys, estimator) - - return self._tallies - - @property - def rxn_rate_tally(self): - if self._rxn_rate_tally is None: - self._rxn_rate_tally = self.tallies['fission'] - self._rxn_rate_tally.sparse = self.sparse - return self._rxn_rate_tally -class NuFissionXS(MGXS): +class NuFissionXS(FissionXSBase): """A fission production multi-group cross section.""" def __init__(self, domain=None, domain_type=None, groups=None, by_nuclide=False, name=''): - super(NuFissionXS, self).__init__(domain, domain_type, + super(NuFissionXS, self).__init__('nu-fission', domain, domain_type, groups, by_nuclide, name) - self._rxn_type = 'nu-fission' - @property - def tallies(self): - """Construct the OpenMC tallies needed to compute this cross section. - - This method constructs two tracklength tallies to compute the 'flux' - and 'nu-fission' reaction rates in the spatial domain and energy - groups of interest. - - """ - - # Instantiate tallies if they do not exist - if self._tallies is None: - - # Create a list of scores for each Tally to be created - scores = ['flux', 'nu-fission'] - estimator = 'tracklength' - keys = scores - - # Create the non-domain specific Filters for the Tallies - group_edges = self.energy_groups.group_edges - energy_filter = openmc.Filter('energy', group_edges) - filters = [[energy_filter], [energy_filter]] - - # Initialize the Tallies - self._create_tallies(scores, filters, keys, estimator) - - return self._tallies - - @property - def rxn_rate_tally(self): - if self._rxn_rate_tally is None: - self._rxn_rate_tally = self.tallies['nu-fission'] - self._rxn_rate_tally.sparse = self.sparse - return self._rxn_rate_tally +class KappaFissionXS(FissionXSBase): + """A recoverable fission energy production rate multi-group cross section.""" + def __init__(self, domain=None, domain_type=None, + groups=None, by_nuclide=False, name=''): + super(KappaFissionXS, self).__init__('kappa-fission', domain, domain_type, + groups, by_nuclide, name) class ScatterXS(MGXS): """A scatter multi-group cross section.""" From da4de9c4df7216a776849dd581429a95f01e4a28 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 23 Feb 2016 20:43:47 -0500 Subject: [PATCH 144/149] Now check nu_fission data in mgxs_library python api when determining if dataset is fissionable or not. --- openmc/mgxs_library.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py index b6dd9f09fe..06b369c68a 100644 --- a/openmc/mgxs_library.py +++ b/openmc/mgxs_library.py @@ -487,6 +487,8 @@ class XSdata(object): # check we have a numpy list check_type("nu_fission", nu_fission, np.ndarray, expected_iter_type=Real) self._nu_fission = np.copy(nu_fission) + if np.sum(self._nu_fission) > 0.0: + self._fissionable = True def _get_xsdata_xml(self): element = ET.Element("xsdata") From da6f5d98a8d1c26b1383e958e252c91bb985d87c Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 24 Feb 2016 07:11:09 -0600 Subject: [PATCH 145/149] Use common naming scheme for all abstract interfaces --- src/distribution_multivariate.F90 | 12 ++++++------ src/distribution_univariate.F90 | 6 +++--- src/energy_distribution.F90 | 6 +++--- src/geometry_header.F90 | 22 ++++++++++------------ src/input_xml.F90 | 22 ++++++++++++++-------- src/nuclide_header.F90 | 8 +++----- src/particle_header.F90 | 2 +- src/scattdata_header.F90 | 20 ++++++++++---------- src/secondary_header.F90 | 7 ++++--- src/surface_header.F90 | 18 +++++++++--------- src/tally.F90 | 15 +++++++-------- 11 files changed, 70 insertions(+), 68 deletions(-) diff --git a/src/distribution_multivariate.F90 b/src/distribution_multivariate.F90 index 694fac3013..68b246df84 100644 --- a/src/distribution_multivariate.F90 +++ b/src/distribution_multivariate.F90 @@ -16,15 +16,15 @@ module distribution_multivariate type, abstract :: UnitSphereDistribution real(8) :: reference_uvw(3) contains - procedure(iSample), deferred :: sample + procedure(unitsphere_distribution_sample_), deferred :: sample end type UnitSphereDistribution abstract interface - function iSample(this) result(uvw) + function unitsphere_distribution_sample_(this) result(uvw) import UnitSphereDistribution class(UnitSphereDistribution), intent(in) :: this real(8) :: uvw(3) - end function iSample + end function unitsphere_distribution_sample_ end interface !=============================================================================== @@ -58,15 +58,15 @@ module distribution_multivariate type, abstract :: SpatialDistribution contains - procedure(iSampleSpatial), deferred :: sample + procedure(spatial_distribution_sample_), deferred :: sample end type SpatialDistribution abstract interface - function iSampleSpatial(this) result(xyz) + function spatial_distribution_sample_(this) result(xyz) import SpatialDistribution class(SpatialDistribution), intent(in) :: this real(8) :: xyz(3) - end function iSampleSpatial + end function spatial_distribution_sample_ end interface type, extends(SpatialDistribution) :: CartesianIndependent diff --git a/src/distribution_univariate.F90 b/src/distribution_univariate.F90 index f3e4fdee2e..6c053e5942 100644 --- a/src/distribution_univariate.F90 +++ b/src/distribution_univariate.F90 @@ -16,7 +16,7 @@ module distribution_univariate type, abstract :: Distribution contains - procedure(iSample), deferred :: sample + procedure(distribution_sample_), deferred :: sample end type Distribution type DistributionContainer @@ -24,11 +24,11 @@ module distribution_univariate end type DistributionContainer abstract interface - function iSample(this) result(x) + function distribution_sample_(this) result(x) import Distribution class(Distribution), intent(in) :: this real(8) :: x - end function iSample + end function distribution_sample_ end interface !=============================================================================== diff --git a/src/energy_distribution.F90 b/src/energy_distribution.F90 index 2cfc1b1841..8b2cc10c9c 100644 --- a/src/energy_distribution.F90 +++ b/src/energy_distribution.F90 @@ -16,16 +16,16 @@ module energy_distribution type, abstract :: EnergyDistribution contains - procedure(iSampleEnergy), deferred :: sample + procedure(energy_distribution_sample_), deferred :: sample end type EnergyDistribution abstract interface - function iSampleEnergy(this, E_in) result(E_out) + function energy_distribution_sample_(this, E_in) result(E_out) import EnergyDistribution class(EnergyDistribution), intent(in) :: this real(8), intent(in) :: E_in real(8) :: E_out - end function iSampleEnergy + end function energy_distribution_sample_ end interface type :: EnergyDistributionContainer diff --git a/src/geometry_header.F90 b/src/geometry_header.F90 index 519b15bff4..1adda3ea34 100644 --- a/src/geometry_header.F90 +++ b/src/geometry_header.F90 @@ -31,12 +31,10 @@ module geometry_header integer :: outer ! universe to tile outside the lat logical :: is_3d ! Lattice has cells on z axis integer, allocatable :: offset(:,:,:,:) ! Distribcell offsets - - contains - - procedure(are_valid_indices_), deferred :: are_valid_indices - procedure(get_indices_), deferred :: get_indices - procedure(get_local_xyz_), deferred :: get_local_xyz + contains + procedure(lattice_are_valid_indices_), deferred :: are_valid_indices + procedure(lattice_get_indices_), deferred :: get_indices + procedure(lattice_get_local_xyz_), deferred :: get_local_xyz end type Lattice abstract interface @@ -45,33 +43,33 @@ module geometry_header ! ARE_VALID_INDICES returns .true. if the given lattice indices fit within the ! bounds of the lattice. Returns false otherwise. - function are_valid_indices_(this, i_xyz) result(is_valid) + function lattice_are_valid_indices_(this, i_xyz) result(is_valid) import Lattice class(Lattice), intent(in) :: this integer, intent(in) :: i_xyz(3) logical :: is_valid - end function are_valid_indices_ + end function lattice_are_valid_indices_ !=============================================================================== ! GET_INDICES returns the indices in a lattice for the given global xyz. - function get_indices_(this, global_xyz) result(i_xyz) + function lattice_get_indices_(this, global_xyz) result(i_xyz) import Lattice class(Lattice), intent(in) :: this real(8), intent(in) :: global_xyz(3) integer :: i_xyz(3) - end function get_indices_ + end function lattice_get_indices_ !=============================================================================== ! GET_LOCAL_XYZ returns the translated local version of the given global xyz. - function get_local_xyz_(this, global_xyz, i_xyz) result(local_xyz) + function lattice_get_local_xyz_(this, global_xyz, i_xyz) result(local_xyz) import Lattice class(Lattice), intent(in) :: this real(8), intent(in) :: global_xyz(3) integer, intent(in) :: i_xyz(3) real(8) :: local_xyz(3) - end function get_local_xyz_ + end function lattice_get_local_xyz_ end interface !=============================================================================== diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 9ef439bb04..03ef8dcbc4 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -131,15 +131,21 @@ contains if (run_CE) then call get_environment_variable("OPENMC_CROSS_SECTIONS", env_variable) if (len_trim(env_variable) == 0) then - call fatal_error("No cross_sections.xml file was specified in & - &settings.xml or in the OPENMC_CROSS_SECTIONS environment & - &variable. OpenMC needs such a file to identify where to & - &find ACE cross section libraries. Please consult the user's & - &guide at http://mit-crpg.github.io/openmc for information on & - &how to set up ACE cross section libraries.") - else - path_cross_sections = trim(env_variable) + call get_environment_variable("CROSS_SECTIONS", env_variable) + if (len_trim(env_variable) == 0) then + call fatal_error("No cross_sections.xml file was specified in & + &settings.xml or in the OPENMC_CROSS_SECTIONS environment & + &variable. OpenMC needs such a file to identify where to & + &find ACE cross section libraries. Please consult the user's & + &guide at http://mit-crpg.github.io/openmc for information on & + &how to set up ACE cross section libraries.") + else + call warning("The CROSS_SECTIONS environment variable is & + &deprecated. Please update your environment to use & + &OPENMC_CROSS_SECTIONS instead.") + end if end if + path_cross_sections = trim(env_variable) else call get_environment_variable("OPENMC_MG_CROSS_SECTIONS", env_variable) if (len_trim(env_variable) == 0) then diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90 index 9bcce57a75..43fea77b65 100644 --- a/src/nuclide_header.F90 +++ b/src/nuclide_header.F90 @@ -33,17 +33,15 @@ module nuclide_header logical :: fissionable ! nuclide is fissionable? contains - procedure(print_nuclide_), deferred :: print ! Writes nuclide info + procedure(nuclide_print_), deferred :: print ! Writes nuclide info end type Nuclide abstract interface - - subroutine print_nuclide_(this, unit) + subroutine nuclide_print_(this, unit) import Nuclide class(Nuclide),intent(in) :: this integer, optional, intent(in) :: unit - end subroutine print_nuclide_ - + end subroutine nuclide_print_ end interface type, extends(Nuclide) :: NuclideCE diff --git a/src/particle_header.F90 b/src/particle_header.F90 index c1f02eca24..4ad4119b76 100644 --- a/src/particle_header.F90 +++ b/src/particle_header.F90 @@ -217,7 +217,7 @@ contains integer, intent(in) :: type logical, intent(in) :: run_CE - integer :: n + integer(8) :: n ! Check to make sure that the hard-limit on secondary particles is not ! exceeded. diff --git a/src/scattdata_header.F90 b/src/scattdata_header.F90 index b04115e570..f8fddbc6b3 100644 --- a/src/scattdata_header.F90 +++ b/src/scattdata_header.F90 @@ -20,22 +20,22 @@ module scattdata_header real(8), allocatable :: data(:,:,:) ! (Order/Nmu x Gout x Gin) contains - procedure(init_), deferred :: init ! Initializes ScattData - procedure(calc_f_), deferred :: calc_f ! Calculates f, given mu - procedure(sample_), deferred :: sample ! sample the scatter event + procedure(scattdata_init_), deferred :: init ! Initializes ScattData + procedure(scattdata_calc_f_), deferred :: calc_f ! Calculates f, given mu + procedure(scattdata_sample_), deferred :: sample ! sample the scatter event end type ScattData abstract interface - subroutine init_(this, order, energy, mult, coeffs) + subroutine scattdata_init_(this, order, energy, mult, coeffs) import ScattData class(ScattData), intent(inout) :: this ! Object to work on integer, intent(in) :: order ! Data Order real(8), intent(in) :: energy(:,:) ! Energy Transfer Matrix real(8), intent(in) :: mult(:,:) ! Scatter Prod'n Matrix real(8), intent(in) :: coeffs(:,:,:) ! Coefficients to use - end subroutine init_ + end subroutine scattdata_init_ - pure function calc_f_(this, gin, gout, mu) result(f) + pure function scattdata_calc_f_(this, gin, gout, mu) result(f) import ScattData class(ScattData), intent(in) :: this ! The ScattData to evaluate integer, intent(in) :: gin ! Incoming Energy Group @@ -43,16 +43,16 @@ module scattdata_header real(8), intent(in) :: mu ! Angle of interest real(8) :: f ! Return value of f(mu) - end function calc_f_ + end function scattdata_calc_f_ - subroutine sample_(this, gin, gout, mu, wgt) + subroutine scattdata_sample_(this, gin, gout, mu, wgt) import ScattData class(ScattData), intent(in) :: this ! Scattering Object to Use integer, intent(in) :: gin ! Incoming neutron group integer, intent(out) :: gout ! Sampled outgoin group real(8), intent(out) :: mu ! Sampled change in angle real(8), intent(inout) :: wgt ! Particle weight - end subroutine sample_ + end subroutine scattdata_sample_ end interface type, extends(ScattData) :: ScattDataLegendre @@ -486,4 +486,4 @@ contains end subroutine scattdatatabular_sample -end module scattdata_header \ No newline at end of file +end module scattdata_header diff --git a/src/secondary_header.F90 b/src/secondary_header.F90 index 7449a5793b..d9a18b6b15 100644 --- a/src/secondary_header.F90 +++ b/src/secondary_header.F90 @@ -14,17 +14,17 @@ module secondary_header type, abstract :: AngleEnergy contains - procedure(iSampleAngleEnergy), deferred :: sample + procedure(angleenergy_sample_), deferred :: sample end type AngleEnergy abstract interface - subroutine iSampleAngleEnergy(this, E_in, E_out, mu) + subroutine angleenergy_sample_(this, E_in, E_out, mu) import AngleEnergy class(AngleEnergy), intent(in) :: this real(8), intent(in) :: E_in real(8), intent(out) :: E_out real(8), intent(out) :: mu - end subroutine iSampleAngleEnergy + end subroutine angleenergy_sample_ end interface type :: AngleEnergyContainer @@ -54,6 +54,7 @@ contains real(8), intent(out) :: E_out ! sampled outgoing energy real(8), intent(out) :: mu ! sampled scattering cosine + integer :: i ! loop counter integer :: n ! number of angle-energy distributions real(8) :: prob ! cumulative probability real(8) :: c ! sampled cumulative probability diff --git a/src/surface_header.F90 b/src/surface_header.F90 index 76562f4937..4686552176 100644 --- a/src/surface_header.F90 +++ b/src/surface_header.F90 @@ -19,34 +19,34 @@ module surface_header contains procedure :: sense procedure :: reflect - procedure(iEvaluate), deferred :: evaluate - procedure(iDistance), deferred :: distance - procedure(iNormal), deferred :: normal + procedure(surface_evaluate_), deferred :: evaluate + procedure(surface_distance_), deferred :: distance + procedure(surface_normal_), deferred :: normal end type Surface abstract interface - pure function iEvaluate(this, xyz) result(f) + pure function surface_evaluate_(this, xyz) result(f) import Surface class(Surface), intent(in) :: this real(8), intent(in) :: xyz(3) real(8) :: f - end function iEvaluate + end function surface_evaluate_ - pure function iDistance(this, xyz, uvw, coincident) result(d) + pure function surface_distance_(this, xyz, uvw, coincident) result(d) import Surface class(Surface), intent(in) :: this real(8), intent(in) :: xyz(3) real(8), intent(in) :: uvw(3) logical, intent(in) :: coincident real(8) :: d - end function iDistance + end function surface_distance_ - pure function iNormal(this, xyz) result(uvw) + pure function surface_normal_(this, xyz) result(uvw) import Surface class(Surface), intent(in) :: this real(8), intent(in) :: xyz(3) real(8) :: uvw(3) - end function iNormal + end function surface_normal_ end interface !=============================================================================== diff --git a/src/tally.F90 b/src/tally.F90 index f265bdb274..5a54d9846e 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -28,12 +28,12 @@ module tally !$omp threadprivate(position) - procedure(score_general_intfc), pointer :: score_general => null() - procedure(get_scoring_bins_intfc), pointer :: get_scoring_bins => null() + procedure(score_general_), pointer :: score_general => null() + procedure(get_scoring_bins_), pointer :: get_scoring_bins => null() abstract interface - subroutine score_general_intfc(p, t, start_index, filter_index, i_nuclide, & - atom_density, flux) + subroutine score_general_(p, t, start_index, filter_index, i_nuclide, & + atom_density, flux) import Particle import TallyObject type(Particle), intent(in) :: p @@ -43,15 +43,14 @@ module tally integer, intent(in) :: filter_index ! for % results real(8), intent(in) :: flux ! flux estimate real(8), intent(in) :: atom_density ! atom/b-cm - end subroutine score_general_intfc + end subroutine score_general_ - subroutine get_scoring_bins_intfc(p, i_tally, found_bin) + subroutine get_scoring_bins_(p, i_tally, found_bin) import Particle type(Particle), intent(in) :: p integer, intent(in) :: i_tally logical, intent(out) :: found_bin - end subroutine get_scoring_bins_intfc - + end subroutine get_scoring_bins_ end interface contains From d66556a6375add6c855bae66af6f8a170482fe36 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 26 Feb 2016 19:44:03 -0500 Subject: [PATCH 146/149] Addressed comments by @samuelshaner --- openmc/arithmetic.py | 5 ----- openmc/filter.py | 2 ++ openmc/geometry.py | 10 +++++----- openmc/mgxs/mgxs.py | 30 ++++++++++++++++++------------ openmc/tallies.py | 4 ++-- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index 521d33e9f0..5271e49a61 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -927,11 +927,6 @@ class AggregateFilter(object): if bin in other.bins: return False - # None of the bins in the other filter should match in this filter - for bin in other.bins: - if bin in self.bins: - return False - # If all conditional checks passed then filters are mergeable return True diff --git a/openmc/filter.py b/openmc/filter.py index 0c45d67d9a..67e15605ba 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -86,6 +86,8 @@ class Filter(object): else: return False else: + # Compare largest/smallest energy bin edges in energy filters + # This logic is used when merging tallies with energy filters if 'energy' in self.type and 'energy' in other.type: return self.bins[0] >= other.bins[-1] else: diff --git a/openmc/geometry.py b/openmc/geometry.py index 807dcf7c66..ab3af872f6 100644 --- a/openmc/geometry.py +++ b/openmc/geometry.py @@ -253,7 +253,7 @@ class Geometry(object): """ - if case_sensitive: + if not case_sensitive: name = name.lower() all_materials = self.get_all_materials() @@ -293,7 +293,7 @@ class Geometry(object): """ - if case_sensitive: + if not case_sensitive: name = name.lower() all_cells = self.get_all_cells() @@ -333,7 +333,7 @@ class Geometry(object): """ - if case_sensitive: + if not case_sensitive: name = name.lower() all_cells = self.get_all_cells() @@ -373,7 +373,7 @@ class Geometry(object): """ - if case_sensitive: + if not case_sensitive: name = name.lower() all_universes = self.get_all_universes() @@ -413,7 +413,7 @@ class Geometry(object): """ - if case_sensitive: + if not case_sensitive: name = name.lower() all_lattices = self.get_all_lattices() diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 022acef5f4..ce02a4393d 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -241,8 +241,7 @@ class MGXS(object): @property def num_subdomains(self): - tally = list(self.tallies.values())[0] - domain_filter = tally.find_filter(self.domain_type) + domain_filter = self.xs_tally.find_filter(self.domain_type) return domain_filter.num_bins @property @@ -877,14 +876,19 @@ class MGXS(object): # Clone this MGXS to initialize the subdomain-averaged version avg_xs = copy.deepcopy(self) - avg_xs._rxn_rate_tally = None - avg_xs._xs_tally = None - # Average each of the tallies across subdomains - for tally_type, tally in avg_xs.tallies.items(): - tally_avg = tally.average(filter_type=self.domain_type, - filter_bins=subdomains) - avg_xs.tallies[tally_type] = tally_avg + if self.derived: + avg_xs._rxn_rate_tally = avg_xs.rxn_rate_tally.average( + filter_type=self.domain_type, filter_bins=subdomains) + else: + avg_xs._rxn_rate_tally = None + avg_xs._xs_tally = None + + # Average each of the tallies across subdomains + for tally_type, tally in avg_xs.tallies.items(): + tally_avg = tally.average(filter_type=self.domain_type, + filter_bins=subdomains) + avg_xs.tallies[tally_type] = tally_avg avg_xs._domain_type = 'avg({0})'.format(self.domain_type) avg_xs.sparse = self.sparse @@ -1002,8 +1006,10 @@ class MGXS(object): def merge(self, other): """Merge another MGXS with this one - If results have been loaded from a statepoint, then MGXS are only - mergeable along one and only one of energy groups or nuclides. + MGXS are only mergeable if their energy groups and nuclides are either + identical or mutually exclusive. If results have been loaded from a + statepoint, then MGXS are only mergeable along one and only one of + energy groups or nuclides. Parameters ---------- @@ -1510,7 +1516,7 @@ class TotalXS(MGXS): @property def rxn_rate_tally(self): - if self._rxn_rate_tally is None: + if self._rxn_rate_tally is None : self._rxn_rate_tally = self.tallies['total'] self._rxn_rate_tally.sparse = self.sparse return self._rxn_rate_tally diff --git a/openmc/tallies.py b/openmc/tallies.py index 60200a2012..cba7ff9276 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -881,7 +881,7 @@ class Tally(object): # Differentiate Tally with a new auto-generated Tally ID merged_tally.id = None - # If the two tallies are equal, simpy return copy + # If the two tallies are equal, simply return copy if self == other: return merged_tally @@ -936,7 +936,7 @@ class Tally(object): # If results have not been read, then return tally for input generation if self._results_read is None: return merged_tally - #Otherwise, this is a derived tally which needs merged results arrays + # Otherwise, this is a derived tally which needs merged results arrays else: self._derived = True From 3c2a38fa4ec3a38c0527838aa2e628d966076438 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 26 Feb 2016 20:38:42 -0500 Subject: [PATCH 147/149] Revised reporting of AggregateNuclides and AggregateScores in Pandas DataFrames --- openmc/arithmetic.py | 16 ++++++++++++++++ openmc/tallies.py | 19 ++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index 5271e49a61..e9ba378d52 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -562,6 +562,13 @@ class AggregateScore(object): def aggregate_op(self): return self._aggregate_op + @property + def name(self): + + # Append each score in the aggregate to the string + string = '(' + ', '.join(map(str, self.scores)) + ')' + return string + @scores.setter def scores(self, scores): cv.check_iterable_type('scores', scores, basestring) @@ -649,6 +656,15 @@ class AggregateNuclide(object): def aggregate_op(self): return self._aggregate_op + @property + def name(self): + + # Append each nuclide in the aggregate to the string + names = [nuclide.name if isinstance(nuclide, Nuclide) else str(nuclide) + for nuclide in self.nuclides] + string = '(' + ', '.join(map(str, names)) + ')' + return string + @nuclides.setter def nuclides(self, nuclides): cv.check_iterable_type('nuclides', nuclides, diff --git a/openmc/tallies.py b/openmc/tallies.py index cba7ff9276..fb66eb77f8 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -1571,23 +1571,36 @@ class Tally(object): # Include DataFrame column for nuclides if user requested it if nuclides: nuclides = [] + column_name = 'nuclide' for nuclide in self.nuclides: - # Write Nuclide name if Summary info was linked with StatePoint if isinstance(nuclide, Nuclide): nuclides.append(nuclide.name) + elif isinstance(nuclide, AggregateNuclide): + nuclides.append(nuclide.name) + column_name = '{0}(nuclide)'.format(nuclide.aggregate_op) else: nuclides.append(nuclide) # Tile the nuclide bins into a DataFrame column nuclides = np.repeat(nuclides, len(self.scores)) tile_factor = data_size / len(nuclides) - df['nuclide'] = np.tile(nuclides, int(tile_factor)) + df[column_name] = np.tile(nuclides, int(tile_factor)) # Include column for scores if user requested it if scores: + scores = [] + column_name = 'score' + + for score in self.scores: + if isinstance(score, (basestring, CrossScore)): + scores.append(score) + elif isinstance(score, AggregateScore): + scores.append(score.name) + column_name = '{0}(score)'.format(score.aggregate_op) + tile_factor = data_size / len(self.scores) - df['score'] = np.tile(self.scores, int(tile_factor)) + df[column_name] = np.tile(scores, int(tile_factor)) # Append columns with mean, std. dev. for each tally bin df['mean'] = self.mean.ravel() From 08176672a22c112f15bf75841dbfca377352f361 Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Fri, 26 Feb 2016 21:15:08 -0500 Subject: [PATCH 148/149] Fixed issue in MGXS.can_merge(...) method such that it now compares xs_tally and rxn_rate_tally attributes --- openmc/mgxs/mgxs.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index ce02a4393d..4b2ec5d3fb 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -992,13 +992,10 @@ class MGXS(object): return False elif 'distribcell' not in self.domain_type and self.domain != other.domain: return False - elif len(self.tallies) != len(other.tallies): + elif not self.xs_tally.can_merge(other.xs_tally): + return False + elif not self.rxn_rate_tally.can_merge(other.rxn_rate_tally): return False - - # See if each individual tally is mergeable - for tally_key in self.tallies: - if not self.tallies[tally_key].can_merge(other.tallies[tally_key]): - return False # If all conditionals pass then MGXS are mergeable return True From a4d20444f867d11018f2bae86ab129a97c3644be Mon Sep 17 00:00:00 2001 From: "wbinventor@gmail.com" Date: Wed, 2 Mar 2016 11:35:26 -0500 Subject: [PATCH 149/149] Fixed code per comments by @paulromano --- openmc/arithmetic.py | 4 ++-- openmc/filter.py | 4 ++-- openmc/geometry.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openmc/arithmetic.py b/openmc/arithmetic.py index e9ba378d52..5869cad802 100644 --- a/openmc/arithmetic.py +++ b/openmc/arithmetic.py @@ -566,7 +566,7 @@ class AggregateScore(object): def name(self): # Append each score in the aggregate to the string - string = '(' + ', '.join(map(str, self.scores)) + ')' + string = '(' + ', '.join(self.scores) + ')' return string @scores.setter @@ -742,7 +742,7 @@ class AggregateFilter(object): other.aggregate_filter.type in _FILTER_TYPES: delta = _FILTER_TYPES.index(self.aggregate_filter.type) - \ _FILTER_TYPES.index(other.aggregate_filter.type) - return True if delta > 0 else False + return delta > 0 else: return False else: diff --git a/openmc/filter.py b/openmc/filter.py index 67e15605ba..2ae8eeb626 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -82,7 +82,7 @@ class Filter(object): if self.type in _FILTER_TYPES and other.type in _FILTER_TYPES: delta = _FILTER_TYPES.index(self.type) - \ _FILTER_TYPES.index(other.type) - return True if delta > 0 else False + return delta > 0 else: return False else: @@ -327,7 +327,7 @@ class Filter(object): # Count bins in the merged filter if 'energy' in merged_filter.type: - merged_filter.num_bins = len(merged_bins) -1 + merged_filter.num_bins = len(merged_bins) - 1 else: merged_filter.num_bins = len(merged_bins) diff --git a/openmc/geometry.py b/openmc/geometry.py index ab3af872f6..dac0bd90f1 100644 --- a/openmc/geometry.py +++ b/openmc/geometry.py @@ -99,7 +99,7 @@ class Geometry(object): all_cells = self._root_universe.get_all_cells() cells = set() - for cell_id, cell in all_cells.items(): + for cell in all_cells.values(): if cell._type == 'normal': cells.add(cell) @@ -120,7 +120,7 @@ class Geometry(object): all_universes = self._root_universe.get_all_universes() universes = set() - for universe_id, universe in all_universes.items(): + for universe in all_universes.values(): universes.add(universe) universes = list(universes)