From d3f4efde4631e0c1c5dcb5e22d1837f9a96716e9 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Tue, 1 Jul 2014 14:14:31 +0200 Subject: [PATCH 01/11] Added particle restart case for fixed_source runs --- src/fixed_source.F90 | 1 - src/global.F90 | 3 +++ src/particle_restart_write.F90 | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/fixed_source.F90 b/src/fixed_source.F90 index 54c0a26979..0aee9bddb6 100644 --- a/src/fixed_source.F90 +++ b/src/fixed_source.F90 @@ -11,7 +11,6 @@ module fixed_source use tally, only: synchronize_tallies, setup_active_usertallies use tracking, only: transport - type(Bank), pointer :: source_site => null() !$omp threadprivate(source_site) contains diff --git a/src/global.F90 b/src/global.F90 index 02b99bfc89..159c7065db 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -256,6 +256,9 @@ module global ! Mode to run in (fixed source, eigenvalue, plotting, etc) integer :: run_mode = NONE + ! Fixed source particle bank + type(Bank), pointer :: source_site => null() + ! Restart run logical :: restart_run = .false. integer :: restart_batch diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index ba22d19d0e..90675d6343 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -42,7 +42,12 @@ contains call pr % file_create(filename) ! Get information about source particle - src => source_bank(current_work) + select case (run_mode) + case (MODE_EIGENVALUE) + src => source_bank(current_work) + case (MODE_FIXEDSOURCE) + src => source_site + end select ! Write data to file call pr % write_data(FILETYPE_PARTICLE_RESTART, 'filetype') From 0bd1394f871777dec10ed8418cf82135a3979575 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Tue, 1 Jul 2014 17:33:02 +0200 Subject: [PATCH 02/11] Fixed the fixed_source seed and updated the tests --- src/fixed_source.F90 | 5 +++++ src/particle_restart.F90 | 19 ++++++++++++++----- src/particle_restart_write.F90 | 1 + src/utils/particle_restart.py | 1 + tests/test_fixed_source/results_true.dat | 4 ++-- tests/test_particle_restart/results.py | 4 +++- tests/test_particle_restart/results_true.dat | 10 ++++++---- .../test_particle_restart.py | 6 +++--- 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/fixed_source.F90 b/src/fixed_source.F90 index 0aee9bddb6..bb26d671fe 100644 --- a/src/fixed_source.F90 +++ b/src/fixed_source.F90 @@ -68,6 +68,11 @@ contains ! grab source particle from bank call sample_source_particle(p) + ! Reset random number seed (it was changed during source sampling and + ! it should be set before transport is called to make it consistent + ! with eigenvalue and particle_restart). + call set_particle_seed(p % id) + ! transport particle call transport(p) diff --git a/src/particle_restart.F90 b/src/particle_restart.F90 index c524170a69..723d162495 100644 --- a/src/particle_restart.F90 +++ b/src/particle_restart.F90 @@ -9,7 +9,7 @@ module particle_restart use output, only: write_message, print_particle use output_interface, only: BinaryOutput use particle_header, only: Particle - use random_lcg, only: set_particle_seed + use random_lcg, only: set_particle_seed, prn use tracking, only: transport implicit none @@ -28,6 +28,7 @@ contains subroutine run_particle_restart() integer(8) :: particle_seed + integer :: previous_run_mode type(Particle) :: p ! Set verbosity high @@ -37,14 +38,20 @@ contains call p % initialize() ! Read in the restart information - call read_particle_restart(p) + call read_particle_restart(p, previous_run_mode) ! Set all tallies to 0 for now (just tracking errors) n_tallies = 0 ! Compute random number seed - particle_seed = ((current_batch - 1)*gen_per_batch + & - current_gen - 1)*n_particles + p % id + select case (previous_run_mode) + case (MODE_EIGENVALUE) + particle_seed = ((current_batch - 1)*gen_per_batch + & + current_gen - 1)*n_particles + p % id + case (MODE_FIXEDSOURCE) + particle_seed = p % id + end select + call set_particle_seed(particle_seed) ! Transport neutron @@ -59,9 +66,10 @@ contains ! READ_PARTICLE_RESTART reads the particle restart file !=============================================================================== - subroutine read_particle_restart(p) + subroutine read_particle_restart(p, previous_run_mode) integer :: int_scalar + integer, intent(inout) :: previous_run_mode type(Particle), intent(inout) :: p ! Write meessage @@ -79,6 +87,7 @@ contains call pr % read_data(gen_per_batch, 'gen_per_batch') call pr % read_data(current_gen, 'current_gen') call pr % read_data(n_particles, 'n_particles') + call pr % read_data(previous_run_mode, 'run_mode') call pr % read_data(p % id, 'id') call pr % read_data(p % wgt, 'weight') call pr % read_data(p % E, 'energy') diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90 index 90675d6343..9fcabe9229 100644 --- a/src/particle_restart_write.F90 +++ b/src/particle_restart_write.F90 @@ -56,6 +56,7 @@ contains call pr % write_data(gen_per_batch, 'gen_per_batch') call pr % write_data(current_gen, 'current_gen') call pr % write_data(n_particles, 'n_particles') + call pr % write_data(run_mode, 'run_mode') call pr % write_data(p % id, 'id') call pr % write_data(src % wgt, 'weight') call pr % write_data(src % E, 'energy') diff --git a/src/utils/particle_restart.py b/src/utils/particle_restart.py index 92d28910c6..87b039e4a6 100644 --- a/src/utils/particle_restart.py +++ b/src/utils/particle_restart.py @@ -30,6 +30,7 @@ class Particle(object): self.gen_per_batch = self._get_int(path='gen_per_batch')[0] self.current_gen = self._get_int(path='current_gen')[0] self.n_particles = self._get_long(path='n_particles')[0] + self.run_mode = self._get_int(path='run_mode')[0] # Read particle properties self.id = self._get_long(path='id')[0] diff --git a/tests/test_fixed_source/results_true.dat b/tests/test_fixed_source/results_true.dat index 64dff1821c..e25333acf3 100644 --- a/tests/test_fixed_source/results_true.dat +++ b/tests/test_fixed_source/results_true.dat @@ -1,3 +1,3 @@ tallies: -4.538492E+02 -2.066738E+04 +4.339791E+02 +1.898784E+04 diff --git a/tests/test_particle_restart/results.py b/tests/test_particle_restart/results.py index 515274f1ee..7c10762449 100644 --- a/tests/test_particle_restart/results.py +++ b/tests/test_particle_restart/results.py @@ -10,7 +10,7 @@ import particle_restart as pr if len(sys.argv) > 1: p = pr.Particle(sys.argv[1]) else: - p = pr.Particle('particle_12_192.binary') + p = pr.Particle('particle_12_556.binary') # set up output string outstr = '' @@ -22,6 +22,8 @@ outstr += 'current gen:\n' outstr += "{0:12.6E}\n".format(p.current_gen) outstr += 'particle id:\n' outstr += "{0:12.6E}\n".format(p.id) +outstr += 'run mode:\n' +outstr += "{0:12.6E}\n".format(p.run_mode) outstr += 'particle weight:\n' outstr += "{0:12.6E}\n".format(p.weight) outstr += 'particle energy:\n' diff --git a/tests/test_particle_restart/results_true.dat b/tests/test_particle_restart/results_true.dat index a59e626ce8..7139ec8450 100644 --- a/tests/test_particle_restart/results_true.dat +++ b/tests/test_particle_restart/results_true.dat @@ -3,12 +3,14 @@ current batch: current gen: 1.000000E+00 particle id: -1.920000E+02 +5.560000E+02 +run mode: +2.000000E+00 particle weight: 1.000000E+00 particle energy: -3.643953E+00 +1.691175E+00 particle xyz: --4.855597E+01 5.269521E+01 3.202196E+01 +-3.806864E+01 6.026401E+01 1.932278E+01 particle uvw: --8.742346E-01 4.493061E-01 -1.839506E-01 +4.129564E-01 -8.535159E-01 3.177696E-01 diff --git a/tests/test_particle_restart/test_particle_restart.py b/tests/test_particle_restart/test_particle_restart.py index 3342c0af10..fdb2b6ba55 100644 --- a/tests/test_particle_restart/test_particle_restart.py +++ b/tests/test_particle_restart/test_particle_restart.py @@ -24,13 +24,13 @@ def test_run(): assert returncode == 0, 'OpenMC did not exit successfully.' def test_created_restart(): - particle = glob.glob(os.path.join(cwd, 'particle_12_192.*')) + particle = glob.glob(os.path.join(cwd, 'particle_12_556.*')) assert len(particle) == 1, 'Either multiple or no particle restart files exist.' assert particle[0].endswith('binary') or \ particle[0].endswith('h5'), 'Particle restart file not a binary or hdf5 file.' def test_results(): - particle = glob.glob(os.path.join(cwd, 'particle_12_192.*')) + particle = glob.glob(os.path.join(cwd, 'particle_12_556.*')) call(['python', 'results.py', particle[0]]) compare = filecmp.cmp('results_test.dat', 'results_true.dat') if not compare: @@ -38,7 +38,7 @@ def test_results(): assert compare, 'Results do not agree.' def test_run_restart(): - particle = glob.glob(os.path.join(cwd, 'particle_12_192.*')) + particle = glob.glob(os.path.join(cwd, 'particle_12_556.*')) proc = Popen([opts.exe, '-r', particle[0], cwd], stderr=STDOUT, stdout=PIPE) print(proc.communicate()[0]) returncode = proc.returncode From 884fcac8465d04609a113a7e25b28c3b9aa39b92 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Wed, 16 Jul 2014 20:47:15 +0200 Subject: [PATCH 03/11] Corrected tests for fixed_source particle restarts --- tests/test_particle_restart/results.py | 2 +- tests/test_particle_restart/results_true.dat | 8 ++++---- tests/test_particle_restart/test_particle_restart.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test_particle_restart/results.py b/tests/test_particle_restart/results.py index 7c10762449..b8ff2f5f0a 100644 --- a/tests/test_particle_restart/results.py +++ b/tests/test_particle_restart/results.py @@ -10,7 +10,7 @@ import particle_restart as pr if len(sys.argv) > 1: p = pr.Particle(sys.argv[1]) else: - p = pr.Particle('particle_12_556.binary') + p = pr.Particle('particle_12_192.binary') # set up output string outstr = '' diff --git a/tests/test_particle_restart/results_true.dat b/tests/test_particle_restart/results_true.dat index 7139ec8450..7f7b6912a5 100644 --- a/tests/test_particle_restart/results_true.dat +++ b/tests/test_particle_restart/results_true.dat @@ -3,14 +3,14 @@ current batch: current gen: 1.000000E+00 particle id: -5.560000E+02 +1.920000E+02 run mode: 2.000000E+00 particle weight: 1.000000E+00 particle energy: -1.691175E+00 +3.643953E+00 particle xyz: --3.806864E+01 6.026401E+01 1.932278E+01 +-4.855597E+01 5.269521E+01 3.202196E+01 particle uvw: -4.129564E-01 -8.535159E-01 3.177696E-01 +-8.742346E-01 4.493061E-01 -1.839506E-01 diff --git a/tests/test_particle_restart/test_particle_restart.py b/tests/test_particle_restart/test_particle_restart.py index fdb2b6ba55..3342c0af10 100644 --- a/tests/test_particle_restart/test_particle_restart.py +++ b/tests/test_particle_restart/test_particle_restart.py @@ -24,13 +24,13 @@ def test_run(): assert returncode == 0, 'OpenMC did not exit successfully.' def test_created_restart(): - particle = glob.glob(os.path.join(cwd, 'particle_12_556.*')) + particle = glob.glob(os.path.join(cwd, 'particle_12_192.*')) assert len(particle) == 1, 'Either multiple or no particle restart files exist.' assert particle[0].endswith('binary') or \ particle[0].endswith('h5'), 'Particle restart file not a binary or hdf5 file.' def test_results(): - particle = glob.glob(os.path.join(cwd, 'particle_12_556.*')) + particle = glob.glob(os.path.join(cwd, 'particle_12_192.*')) call(['python', 'results.py', particle[0]]) compare = filecmp.cmp('results_test.dat', 'results_true.dat') if not compare: @@ -38,7 +38,7 @@ def test_results(): assert compare, 'Results do not agree.' def test_run_restart(): - particle = glob.glob(os.path.join(cwd, 'particle_12_556.*')) + particle = glob.glob(os.path.join(cwd, 'particle_12_192.*')) proc = Popen([opts.exe, '-r', particle[0], cwd], stderr=STDOUT, stdout=PIPE) print(proc.communicate()[0]) returncode = proc.returncode From f1fc8c7f5e19dc0777706de465cd722e95143f59 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Wed, 6 Aug 2014 10:56:52 +0200 Subject: [PATCH 04/11] Use different stream for source sampling This commit makes it easier for eigenvalue and fixed source runs to use the same seeds when sampling sources. --- src/constants.F90 | 8 ++++++++ src/fixed_source.F90 | 7 ------- src/global.F90 | 2 ++ src/particle_restart.F90 | 2 +- src/random_lcg.F90 | 7 ++----- src/source.F90 | 8 +++++++- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/constants.F90 b/src/constants.F90 index 94edd9d2a2..f83f7bd2c1 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -348,6 +348,14 @@ module constants K_TRACKLENGTH = 3, & LEAKAGE = 4 + ! ============================================================================ + ! RANDOM NUMBER STREAM CONSTANTS + + integer, parameter :: N_STREAMS = 3 + integer, parameter :: STREAM_TRACKING = 1 + integer, parameter :: STREAM_TALLIES = 2 + integer, parameter :: STREAM_SOURCE = 3 + ! ============================================================================ ! EXTERNAL SOURCE PARAMETERS diff --git a/src/fixed_source.F90 b/src/fixed_source.F90 index bb26d671fe..11290db538 100644 --- a/src/fixed_source.F90 +++ b/src/fixed_source.F90 @@ -11,8 +11,6 @@ module fixed_source use tally, only: synchronize_tallies, setup_active_usertallies use tracking, only: transport -!$omp threadprivate(source_site) - contains subroutine run_fixedsource() @@ -68,11 +66,6 @@ contains ! grab source particle from bank call sample_source_particle(p) - ! Reset random number seed (it was changed during source sampling and - ! it should be set before transport is called to make it consistent - ! with eigenvalue and particle_restart). - call set_particle_seed(p % id) - ! transport particle call transport(p) diff --git a/src/global.F90 b/src/global.F90 index 1f4fba2c50..41052afe4c 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -258,6 +258,8 @@ module global ! Fixed source particle bank type(Bank), pointer :: source_site => null() +!$omp threadprivate(source_site) + ! Restart run logical :: restart_run = .false. diff --git a/src/particle_restart.F90 b/src/particle_restart.F90 index e1480e141c..db2490dd2a 100644 --- a/src/particle_restart.F90 +++ b/src/particle_restart.F90 @@ -9,7 +9,7 @@ module particle_restart use output, only: write_message, print_particle use output_interface, only: BinaryOutput use particle_header, only: Particle - use random_lcg, only: set_particle_seed, prn + use random_lcg, only: set_particle_seed use tracking, only: transport implicit none diff --git a/src/random_lcg.F90 b/src/random_lcg.F90 index e3a9885af1..a29d1aa9a0 100644 --- a/src/random_lcg.F90 +++ b/src/random_lcg.F90 @@ -1,15 +1,12 @@ module random_lcg + use constants + implicit none private save - ! Random number streams - integer, parameter :: N_STREAMS = 2 - integer, parameter :: STREAM_TRACKING = 1 - integer, parameter :: STREAM_TALLIES = 2 - integer(8) :: prn_seed0 ! original seed integer(8) :: prn_seed(N_STREAMS) ! current seed integer(8) :: prn_mult ! multiplication factor, g diff --git a/src/source.F90 b/src/source.F90 index 79bc49fd57..9dcfd01445 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -10,7 +10,7 @@ module source use output, only: write_message use output_interface, only: BinaryOutput use particle_header, only: Particle - use random_lcg, only: prn, set_particle_seed + use random_lcg, only: prn, set_particle_seed, prn_set_stream use string, only: to_str #ifdef MPI @@ -101,6 +101,9 @@ contains ! Set weight to one by default site % wgt = ONE + ! Set the random number generator to the source stream. + call prn_set_stream(STREAM_SOURCE) + ! Sample position select case (external_source % type_space) case (SRC_SPACE_BOX) @@ -189,6 +192,9 @@ contains call fatal_error() end select + ! Set the random number generator back to the tracking stream. + call prn_set_stream(STREAM_TRACKING) + end subroutine sample_external_source !=============================================================================== From 9ab2b0d8607714e0782e2a8798d021e98a1d6b03 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Wed, 6 Aug 2014 15:20:22 +0200 Subject: [PATCH 05/11] Added test for particle restart with fixed source --- src/CMakeLists.txt | 12 ++-- .../geometry.xml | 0 .../materials.xml | 0 .../results.py | 0 .../results_true.dat | 0 .../settings.xml | 0 .../test_part_restart_eigval.py} | 0 tests/test_part_restart_fixed/geometry.xml | 9 +++ tests/test_part_restart_fixed/materials.xml | 9 +++ tests/test_part_restart_fixed/results.py | 38 +++++++++++ .../test_part_restart_fixed/results_true.dat | 16 +++++ tests/test_part_restart_fixed/settings.xml | 15 ++++ .../test_part_restart_fixed.py | 68 +++++++++++++++++++ 13 files changed, 163 insertions(+), 4 deletions(-) rename tests/{test_particle_restart => test_part_restart_eigval}/geometry.xml (100%) rename tests/{test_particle_restart => test_part_restart_eigval}/materials.xml (100%) rename tests/{test_particle_restart => test_part_restart_eigval}/results.py (100%) rename tests/{test_particle_restart => test_part_restart_eigval}/results_true.dat (100%) rename tests/{test_particle_restart => test_part_restart_eigval}/settings.xml (100%) rename tests/{test_particle_restart/test_particle_restart.py => test_part_restart_eigval/test_part_restart_eigval.py} (100%) create mode 100644 tests/test_part_restart_fixed/geometry.xml create mode 100644 tests/test_part_restart_fixed/materials.xml create mode 100644 tests/test_part_restart_fixed/results.py create mode 100644 tests/test_part_restart_fixed/results_true.dat create mode 100644 tests/test_part_restart_fixed/settings.xml create mode 100644 tests/test_part_restart_fixed/test_part_restart_fixed.py diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee5f882b7e..9ce433731f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -345,8 +345,10 @@ foreach(test ${TESTS}) set(RESTART_FILE statepoint.7.h5) elseif(${test} MATCHES "test_sourcepoint_restart") set(RESTART_FILE statepoint.7.h5 source.7.h5) - elseif(${test} MATCHES "test_particle_restart") - set(RESTART_FILE particle_12_192.h5) + elseif(${test} MATCHES "test_part_restart_eigval") + set(RESTART_FILE particle_12_842.h5) + elseif(${test} MATCHES "test_part_restart_fixed") + set(RESTART_FILE particle_7_6144.h5) else(${test} MATCHES "test_statepoint_restart") message(FATAL_ERROR "Restart test ${test} not recognized") endif(${test} MATCHES "test_statepoint_restart") @@ -358,8 +360,10 @@ foreach(test ${TESTS}) set(RESTART_FILE statepoint.7.binary) elseif(${test} MATCHES "test_sourcepoint_restart") set(RESTART_FILE statepoint.7.binary source.7.binary) - elseif(${test} MATCHES "test_particle_restart") - set(RESTART_FILE particle_12_192.binary) + elseif(${test} MATCHES "test_part_restart_eigval") + set(RESTART_FILE particle_12_842.binary) + elseif(${test} MATCHES "test_part_restart_fixed") + set(RESTART_FILE particle_7_6144.binary) else(${test} MATCHES "test_statepoint_restart") message(FATAL_ERROR "Restart test ${test} not recognized") endif(${test} MATCHES "test_statepoint_restart") diff --git a/tests/test_particle_restart/geometry.xml b/tests/test_part_restart_eigval/geometry.xml similarity index 100% rename from tests/test_particle_restart/geometry.xml rename to tests/test_part_restart_eigval/geometry.xml diff --git a/tests/test_particle_restart/materials.xml b/tests/test_part_restart_eigval/materials.xml similarity index 100% rename from tests/test_particle_restart/materials.xml rename to tests/test_part_restart_eigval/materials.xml diff --git a/tests/test_particle_restart/results.py b/tests/test_part_restart_eigval/results.py similarity index 100% rename from tests/test_particle_restart/results.py rename to tests/test_part_restart_eigval/results.py diff --git a/tests/test_particle_restart/results_true.dat b/tests/test_part_restart_eigval/results_true.dat similarity index 100% rename from tests/test_particle_restart/results_true.dat rename to tests/test_part_restart_eigval/results_true.dat diff --git a/tests/test_particle_restart/settings.xml b/tests/test_part_restart_eigval/settings.xml similarity index 100% rename from tests/test_particle_restart/settings.xml rename to tests/test_part_restart_eigval/settings.xml diff --git a/tests/test_particle_restart/test_particle_restart.py b/tests/test_part_restart_eigval/test_part_restart_eigval.py similarity index 100% rename from tests/test_particle_restart/test_particle_restart.py rename to tests/test_part_restart_eigval/test_part_restart_eigval.py diff --git a/tests/test_part_restart_fixed/geometry.xml b/tests/test_part_restart_fixed/geometry.xml new file mode 100644 index 0000000000..52fea4df64 --- /dev/null +++ b/tests/test_part_restart_fixed/geometry.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/test_part_restart_fixed/materials.xml b/tests/test_part_restart_fixed/materials.xml new file mode 100644 index 0000000000..deddaef97f --- /dev/null +++ b/tests/test_part_restart_fixed/materials.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/test_part_restart_fixed/results.py b/tests/test_part_restart_fixed/results.py new file mode 100644 index 0000000000..e84cb88cff --- /dev/null +++ b/tests/test_part_restart_fixed/results.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python + +import sys + +# import particle restart +sys.path.append('../../src/utils') +import particle_restart as pr + +# read in particle restart file +if len(sys.argv) > 1: + p = pr.Particle(sys.argv[1]) +else: + p = pr.Particle('particle_7_6144.binary') + +# set up output string +outstr = '' + +# write out properties +outstr += 'current batch:\n' +outstr += "{0:12.6E}\n".format(p.current_batch) +outstr += 'current gen:\n' +outstr += "{0:12.6E}\n".format(p.current_gen) +outstr += 'particle id:\n' +outstr += "{0:12.6E}\n".format(p.id) +outstr += 'run mode:\n' +outstr += "{0:12.6E}\n".format(p.run_mode) +outstr += 'particle weight:\n' +outstr += "{0:12.6E}\n".format(p.weight) +outstr += 'particle energy:\n' +outstr += "{0:12.6E}\n".format(p.energy) +outstr += 'particle xyz:\n' +outstr += "{0:12.6E} {1:12.6E} {2:12.6E}\n".format(p.xyz[0],p.xyz[1],p.xyz[2]) +outstr += 'particle uvw:\n' +outstr += "{0:12.6E} {1:12.6E} {2:12.6E}\n".format(p.uvw[0],p.uvw[1],p.uvw[2]) + +# write results to file +with open('results_test.dat','w') as fh: + fh.write(outstr) diff --git a/tests/test_part_restart_fixed/results_true.dat b/tests/test_part_restart_fixed/results_true.dat new file mode 100644 index 0000000000..ffe7d2cae5 --- /dev/null +++ b/tests/test_part_restart_fixed/results_true.dat @@ -0,0 +1,16 @@ +current batch: +7.000000E+00 +current gen: +0.000000E+00 +particle id: +6.144000E+03 +run mode: +1.000000E+00 +particle weight: +1.000000E+00 +particle energy: +5.749729E+00 +particle xyz: +8.754675E+00 2.551620E+00 4.394350E-01 +particle uvw: +-5.971721E-01 -4.845709E-01 6.391999E-01 diff --git a/tests/test_part_restart_fixed/settings.xml b/tests/test_part_restart_fixed/settings.xml new file mode 100644 index 0000000000..1d8193f8f6 --- /dev/null +++ b/tests/test_part_restart_fixed/settings.xml @@ -0,0 +1,15 @@ + + + + + 12 + 1000 + + + + + -10 -10 -5 10 10 5 + + + + diff --git a/tests/test_part_restart_fixed/test_part_restart_fixed.py b/tests/test_part_restart_fixed/test_part_restart_fixed.py new file mode 100644 index 0000000000..11ee1fad0c --- /dev/null +++ b/tests/test_part_restart_fixed/test_part_restart_fixed.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python + +import os +from subprocess import Popen, STDOUT, PIPE, call +import filecmp +import glob +from optparse import OptionParser + +parser = OptionParser() +parser.add_option('--mpi_exec', dest='mpi_exec', default='') +parser.add_option('--mpi_np', dest='mpi_np', default='3') +parser.add_option('--exe', dest='exe') +(opts, args) = parser.parse_args() +cwd = os.getcwd() + +def test_run(): + if opts.mpi_exec != '': + proc = Popen([opts.mpi_exec, '-np', opts.mpi_np, opts.exe, cwd], + stderr=STDOUT, stdout=PIPE) + else: + proc = Popen([opts.exe, cwd], stderr=STDOUT, stdout=PIPE) + print(proc.communicate()[0]) + returncode = proc.returncode + assert returncode == 0, 'OpenMC did not exit successfully.' + +def test_created_restart(): + particle = glob.glob(os.path.join(cwd, 'particle_7_6144.*')) + assert len(particle) == 1, 'Either multiple or no particle restart files exist.' + assert particle[0].endswith('binary') or \ + particle[0].endswith('h5'), 'Particle restart file not a binary or hdf5 file.' + +def test_results(): + particle = glob.glob(os.path.join(cwd, 'particle_7_6144.*')) + call(['python', 'results.py', particle[0]]) + compare = filecmp.cmp('results_test.dat', 'results_true.dat') + if not compare: + os.rename('results_test.dat', 'results_error.dat') + assert compare, 'Results do not agree.' + +def test_run_restart(): + particle = glob.glob(os.path.join(cwd, 'particle_7_6144.*')) + proc = Popen([opts.exe, '-r', particle[0], cwd], stderr=STDOUT, stdout=PIPE) + print(proc.communicate()[0]) + returncode = proc.returncode + assert returncode == 0, 'Particle restart not successful.' + +def teardown(): + output = glob.glob(os.path.join(cwd, 'statepoint.*')) + \ + glob.glob(os.path.join(cwd, 'particle_*')) + \ + [os.path.join(cwd, 'results_test.dat')] + for f in output: + if os.path.exists(f): + os.remove(f) + +if __name__ == '__main__': + + # test for openmc executable + if opts.exe is None: + raise Exception('Must specify OpenMC executable from command line with --exe.') + + # run tests + try: + test_run() + test_created_restart() + test_results() + test_run_restart() + finally: + teardown() From 592944fa7a653953ef70c096ba375872df80dc6f Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Thu, 7 Aug 2014 15:04:17 +0200 Subject: [PATCH 06/11] Updated CMFD tests for restart_fixed --- tests/test_cmfd_feed/results_true.dat | 502 ++++++++++++------------ tests/test_cmfd_jfnk/results_true.dat | 470 +++++++++++----------- tests/test_cmfd_nofeed/results_true.dat | 500 +++++++++++------------ 3 files changed, 736 insertions(+), 736 deletions(-) diff --git a/tests/test_cmfd_feed/results_true.dat b/tests/test_cmfd_feed/results_true.dat index 4766a9e1d9..95dec91dd4 100644 --- a/tests/test_cmfd_feed/results_true.dat +++ b/tests/test_cmfd_feed/results_true.dat @@ -1,128 +1,128 @@ k-combined: -1.166352E+00 1.167615E-02 +1.177396E+00 4.883437E-03 tally 1: -1.181633E+01 -1.411075E+01 -2.225993E+01 -4.989263E+01 -3.022366E+01 -9.163058E+01 -3.521719E+01 -1.243119E+02 -3.683278E+01 -1.359014E+02 -3.644881E+01 -1.330874E+02 -3.368020E+01 -1.137856E+02 -2.800504E+01 -7.862785E+01 -2.099989E+01 -4.427213E+01 -1.109715E+01 -1.242693E+01 +1.107335E+01 +1.235221E+01 +2.002676E+01 +4.017045E+01 +2.844184E+01 +8.111731E+01 +3.428492E+01 +1.177848E+02 +3.735839E+01 +1.397523E+02 +3.894180E+01 +1.517824E+02 +3.528006E+01 +1.246309E+02 +2.863448E+01 +8.222321E+01 +2.125384E+01 +4.535192E+01 +1.112124E+01 +1.241089E+01 tally 2: -2.375435E+01 -2.844812E+01 -1.663749E+01 -1.396549E+01 -2.263679E+00 -2.636946E-01 -4.382531E+01 -9.669964E+01 -3.095313E+01 -4.829350E+01 -4.053211E+00 -8.354098E-01 -5.911795E+01 -1.754446E+02 -4.206165E+01 -8.884145E+01 -5.555905E+00 -1.564759E+00 -6.868764E+01 -2.367084E+02 -4.888499E+01 -1.199267E+02 -6.294307E+00 -2.009790E+00 -7.235623E+01 -2.628007E+02 -5.139839E+01 -1.326712E+02 -6.686118E+00 -2.268764E+00 -7.135408E+01 -2.557589E+02 -5.083886E+01 -1.298291E+02 -6.771083E+00 -2.317293E+00 -6.696601E+01 -2.250860E+02 -4.748258E+01 -1.132403E+02 -6.327041E+00 -2.026095E+00 -5.564372E+01 -1.553574E+02 -3.953729E+01 -7.844444E+01 -5.289683E+00 -1.415775E+00 -4.092756E+01 -8.408073E+01 -2.889867E+01 -4.193356E+01 -3.727944E+00 -7.053359E-01 -2.263358E+01 -2.604194E+01 -1.584561E+01 -1.273998E+01 -2.024017E+00 -2.141218E-01 +2.243113E+01 +2.535057E+01 +1.557550E+01 +1.222813E+01 +2.164704E+00 +2.389690E-01 +4.049814E+01 +8.218116E+01 +2.854669E+01 +4.085264E+01 +3.934452E+00 +7.833208E-01 +5.706024E+01 +1.633739E+02 +4.049737E+01 +8.234850E+01 +5.231368E+00 +1.386110E+00 +6.798682E+01 +2.320807E+02 +4.819178E+01 +1.166820E+02 +6.247056E+00 +1.968990E+00 +7.449317E+01 +2.782374E+02 +5.315156E+01 +1.417287E+02 +6.667584E+00 +2.250879E+00 +7.530107E+01 +2.849330E+02 +5.378916E+01 +1.454619E+02 +7.071012E+00 +2.522919E+00 +6.820303E+01 +2.335083E+02 +4.850330E+01 +1.181013E+02 +6.241747E+00 +1.973368E+00 +5.831373E+01 +1.704779E+02 +4.149124E+01 +8.633656E+01 +5.385636E+00 +1.468642E+00 +4.184350E+01 +8.792430E+01 +2.971699E+01 +4.435896E+01 +3.784806E+00 +7.343249E-01 +2.202673E+01 +2.444732E+01 +1.531988E+01 +1.183160E+01 +2.073873E+00 +2.272561E-01 tally 3: -1.602499E+01 -1.295630E+01 -1.060542E+00 -5.920587E-02 -2.980673E+01 -4.480492E+01 -1.936250E+00 -1.905077E-01 -4.051926E+01 -8.246657E+01 -2.606639E+00 -3.437220E-01 -4.705779E+01 -1.111431E+02 -3.028454E+00 -4.619883E-01 -4.957304E+01 -1.234274E+02 -3.176475E+00 -5.108616E-01 -4.897053E+01 -1.204739E+02 -3.080782E+00 -4.792314E-01 -4.569001E+01 -1.048762E+02 -2.913485E+00 -4.283033E-01 -3.800244E+01 -7.248583E+01 -2.465881E+00 -3.073302E-01 -2.784859E+01 -3.895822E+01 -1.770793E+00 -1.579009E-01 -1.528645E+01 -1.186641E+01 -1.015624E+00 -5.285299E-02 +1.500439E+01 +1.135466E+01 +9.942586E-01 +5.051831E-02 +2.744453E+01 +3.776958E+01 +1.781992E+00 +1.612021E-01 +3.901013E+01 +7.642401E+01 +2.472924E+00 +3.077607E-01 +4.642527E+01 +1.082730E+02 +2.924369E+00 +4.335819E-01 +5.109083E+01 +1.309660E+02 +3.325865E+00 +5.592642E-01 +5.182512E+01 +1.350762E+02 +3.259912E+00 +5.350517E-01 +4.672480E+01 +1.095974E+02 +3.097309E+00 +4.854729E-01 +3.997405E+01 +8.014326E+01 +2.589176E+00 +3.374615E-01 +2.861624E+01 +4.114210E+01 +1.806237E+00 +1.656944E-01 +1.474531E+01 +1.096355E+01 +9.807860E-01 +4.934364E-02 tally 4: 0.000000E+00 0.000000E+00 @@ -160,8 +160,8 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -3.198289E+00 -5.148488E-01 +3.050887E+00 +4.698799E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -208,10 +208,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -5.696337E+00 -1.628487E+00 -2.860206E+00 -4.137254E-01 +5.388951E+00 +1.456464E+00 +2.664528E+00 +3.577345E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -256,10 +256,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -7.588948E+00 -2.895325E+00 -5.292314E+00 -1.413583E+00 +7.165280E+00 +2.573230E+00 +4.930263E+00 +1.218988E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -304,10 +304,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.876155E+00 -3.953353E+00 -7.255925E+00 -2.639713E+00 +8.550278E+00 +3.668687E+00 +6.985934E+00 +2.450395E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -352,10 +352,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -9.354049E+00 -4.393658E+00 -8.482819E+00 -3.610891E+00 +9.236725E+00 +4.281659E+00 +8.429932E+00 +3.565265E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -400,10 +400,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.943279E+00 -4.014844E+00 -8.979641E+00 -4.049912E+00 +9.396613E+00 +4.431004E+00 +9.307625E+00 +4.351276E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -448,10 +448,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.300834E+00 -3.459191E+00 -9.090369E+00 -4.158129E+00 +8.721885E+00 +3.821463E+00 +9.438995E+00 +4.479948E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -496,10 +496,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -6.804280E+00 -2.322582E+00 -8.354155E+00 -3.514646E+00 +7.096946E+00 +2.525113E+00 +8.605114E+00 +3.710134E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -544,10 +544,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -5.046905E+00 -1.278109E+00 -7.174660E+00 -2.586803E+00 +5.222832E+00 +1.373166E+00 +7.480684E+00 +2.804650E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -592,10 +592,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -2.662185E+00 -3.600983E-01 -5.306922E+00 -1.415937E+00 +2.726690E+00 +3.773397E-01 +5.470375E+00 +1.504111E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -642,8 +642,8 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -3.042882E+00 -4.659100E-01 +3.026290E+00 +4.597502E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -662,114 +662,114 @@ k cmfd 0.000000E+00 0.000000E+00 0.000000E+00 -1.155207E+00 -1.161934E+00 -1.162573E+00 -1.155825E+00 -1.156010E+00 -1.155352E+00 -1.149838E+00 -1.160768E+00 -1.160453E+00 -1.169217E+00 -1.162716E+00 -1.161432E+00 -1.163968E+00 -1.165559E+00 -1.164094E+00 -1.159570E+00 +1.150583E+00 +1.159578E+00 +1.162798E+00 +1.171003E+00 +1.162732E+00 +1.165591E+00 +1.166032E+00 +1.165387E+00 +1.165451E+00 +1.170726E+00 +1.170820E+00 +1.167945E+00 +1.166050E+00 +1.165757E+00 +1.167631E+00 +1.168366E+00 cmfd entropy 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.220491E+00 -3.222825E+00 -3.218323E+00 -3.219037E+00 -3.218088E+00 -3.218982E+00 -3.223440E+00 -3.219003E+00 -3.219661E+00 -3.222534E+00 -3.226366E+00 -3.225935E+00 -3.225693E+00 -3.225236E+00 -3.226171E+00 -3.227775E+00 +3.215201E+00 +3.212850E+00 +3.214094E+00 +3.208054E+00 +3.212891E+00 +3.213349E+00 +3.208290E+00 +3.206895E+00 +3.208786E+00 +3.209630E+00 +3.212321E+00 +3.211750E+00 +3.212453E+00 +3.213370E+00 +3.211791E+00 +3.212685E+00 cmfd balance 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -7.152541E-03 -7.231826E-03 -5.207222E-03 -4.847674E-03 -4.190622E-03 -3.646931E-03 -3.246272E-03 -4.268558E-03 -3.666841E-03 -3.201934E-03 -2.607402E-03 -2.522363E-03 -2.503931E-03 -2.357463E-03 -2.164466E-03 -1.815207E-03 +6.348026E-03 +5.102747E-03 +4.043947E-03 +3.952742E-03 +2.533934E-03 +2.215030E-03 +2.945032E-03 +2.597862E-03 +2.300873E-03 +1.991974E-03 +1.679430E-03 +1.636923E-03 +1.581336E-03 +1.431472E-03 +1.419168E-03 +1.256242E-03 cmfd dominance ratio 0.000E+00 0.000E+00 0.000E+00 0.000E+00 - 5.433E-01 - 5.463E-01 - 5.421E-01 - 5.439E-01 - 5.435E-01 - 5.456E-01 - 5.482E-01 - 5.458E-01 - 5.458E-01 - 5.462E-01 - 5.494E-01 - 5.486E-01 - 5.492E-01 - 5.482E-01 - 5.482E-01 - 5.492E-01 + 5.524E-01 + 5.476E-01 + 5.474E-01 + 5.419E-01 + 5.443E-01 + 5.448E-01 + 5.408E-01 + 5.391E-01 + 5.400E-01 + 5.396E-01 + 5.408E-01 + 5.398E-01 + 5.398E-01 + 5.399E-01 + 5.388E-01 + 5.389E-01 cmfd openmc source comparison 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.520219E-02 -1.051769E-02 -9.811647E-03 -8.544887E-03 -7.860220E-03 -6.949328E-03 -5.032373E-03 -5.022939E-03 -4.521643E-03 -4.306799E-03 -4.227082E-03 -4.166664E-03 -4.553703E-03 -3.834049E-03 -3.649749E-03 -3.258051E-03 +8.388554E-03 +7.868057E-03 +6.387209E-03 +6.979018E-03 +5.634468E-03 +5.579466E-03 +5.647779E-03 +5.289856E-03 +4.550547E-03 +4.373716E-03 +4.042350E-03 +3.813510E-03 +3.749151E-03 +3.358126E-03 +3.562360E-03 +3.904942E-03 cmfd source -4.575620E-02 -8.436685E-02 -1.142434E-01 -1.327994E-01 -1.388492E-01 -1.341762E-01 -1.258878E-01 -1.060199E-01 -7.531612E-02 -4.258493E-02 +4.142294E-02 +7.484382E-02 +1.050784E-01 +1.256771E-01 +1.444717E-01 +1.420230E-01 +1.350735E-01 +1.118744E-01 +7.755343E-02 +4.198177E-02 diff --git a/tests/test_cmfd_jfnk/results_true.dat b/tests/test_cmfd_jfnk/results_true.dat index cabaabd348..dd9c727d37 100644 --- a/tests/test_cmfd_jfnk/results_true.dat +++ b/tests/test_cmfd_jfnk/results_true.dat @@ -1,128 +1,128 @@ k-combined: -1.166352E+00 1.167615E-02 +1.177396E+00 4.883437E-03 tally 1: -1.181633E+01 -1.411075E+01 -2.225993E+01 -4.989263E+01 -3.022366E+01 -9.163058E+01 -3.521719E+01 -1.243119E+02 -3.683278E+01 -1.359014E+02 -3.644881E+01 -1.330874E+02 -3.368020E+01 -1.137856E+02 -2.800504E+01 -7.862785E+01 -2.099989E+01 -4.427213E+01 -1.109715E+01 -1.242693E+01 +1.107335E+01 +1.235221E+01 +2.002676E+01 +4.017045E+01 +2.844184E+01 +8.111731E+01 +3.428492E+01 +1.177848E+02 +3.735839E+01 +1.397523E+02 +3.894180E+01 +1.517824E+02 +3.528006E+01 +1.246309E+02 +2.863448E+01 +8.222321E+01 +2.125384E+01 +4.535192E+01 +1.112124E+01 +1.241089E+01 tally 2: -2.375435E+01 -2.844812E+01 -1.663749E+01 -1.396549E+01 -2.263679E+00 -2.636946E-01 -4.382531E+01 -9.669964E+01 -3.095313E+01 -4.829350E+01 -4.053211E+00 -8.354098E-01 -5.911795E+01 -1.754446E+02 -4.206165E+01 -8.884145E+01 -5.555905E+00 -1.564759E+00 -6.868764E+01 -2.367084E+02 -4.888499E+01 -1.199267E+02 -6.294307E+00 -2.009790E+00 -7.235623E+01 -2.628007E+02 -5.139839E+01 -1.326712E+02 -6.686118E+00 -2.268764E+00 -7.135408E+01 -2.557589E+02 -5.083886E+01 -1.298291E+02 -6.771083E+00 -2.317293E+00 -6.696601E+01 -2.250860E+02 -4.748258E+01 -1.132403E+02 -6.327041E+00 -2.026095E+00 -5.564372E+01 -1.553574E+02 -3.953729E+01 -7.844444E+01 -5.289683E+00 -1.415775E+00 -4.092756E+01 -8.408073E+01 -2.889867E+01 -4.193356E+01 -3.727944E+00 -7.053359E-01 -2.263358E+01 -2.604194E+01 -1.584561E+01 -1.273998E+01 -2.024017E+00 -2.141218E-01 +2.243113E+01 +2.535057E+01 +1.557550E+01 +1.222813E+01 +2.164704E+00 +2.389690E-01 +4.049814E+01 +8.218116E+01 +2.854669E+01 +4.085264E+01 +3.934452E+00 +7.833208E-01 +5.706024E+01 +1.633739E+02 +4.049737E+01 +8.234850E+01 +5.231368E+00 +1.386110E+00 +6.798682E+01 +2.320807E+02 +4.819178E+01 +1.166820E+02 +6.247056E+00 +1.968990E+00 +7.449317E+01 +2.782374E+02 +5.315156E+01 +1.417287E+02 +6.667584E+00 +2.250879E+00 +7.530107E+01 +2.849330E+02 +5.378916E+01 +1.454619E+02 +7.071012E+00 +2.522919E+00 +6.820303E+01 +2.335083E+02 +4.850330E+01 +1.181013E+02 +6.241747E+00 +1.973368E+00 +5.831373E+01 +1.704779E+02 +4.149124E+01 +8.633656E+01 +5.385636E+00 +1.468642E+00 +4.184350E+01 +8.792430E+01 +2.971699E+01 +4.435896E+01 +3.784806E+00 +7.343249E-01 +2.202673E+01 +2.444732E+01 +1.531988E+01 +1.183160E+01 +2.073873E+00 +2.272561E-01 tally 3: -1.602499E+01 -1.295630E+01 -1.060542E+00 -5.920587E-02 -2.980673E+01 -4.480492E+01 -1.936250E+00 -1.905077E-01 -4.051926E+01 -8.246657E+01 -2.606639E+00 -3.437220E-01 -4.705779E+01 -1.111431E+02 -3.028454E+00 -4.619883E-01 -4.957304E+01 -1.234274E+02 -3.176475E+00 -5.108616E-01 -4.897053E+01 -1.204739E+02 -3.080782E+00 -4.792314E-01 -4.569001E+01 -1.048762E+02 -2.913485E+00 -4.283033E-01 -3.800244E+01 -7.248583E+01 -2.465881E+00 -3.073302E-01 -2.784859E+01 -3.895822E+01 -1.770793E+00 -1.579009E-01 -1.528645E+01 -1.186641E+01 -1.015624E+00 -5.285299E-02 +1.500439E+01 +1.135466E+01 +9.942586E-01 +5.051831E-02 +2.744453E+01 +3.776958E+01 +1.781992E+00 +1.612021E-01 +3.901013E+01 +7.642401E+01 +2.472924E+00 +3.077607E-01 +4.642527E+01 +1.082730E+02 +2.924369E+00 +4.335819E-01 +5.109083E+01 +1.309660E+02 +3.325865E+00 +5.592642E-01 +5.182512E+01 +1.350762E+02 +3.259912E+00 +5.350517E-01 +4.672480E+01 +1.095974E+02 +3.097309E+00 +4.854729E-01 +3.997405E+01 +8.014326E+01 +2.589176E+00 +3.374615E-01 +2.861624E+01 +4.114210E+01 +1.806237E+00 +1.656944E-01 +1.474531E+01 +1.096355E+01 +9.807860E-01 +4.934364E-02 tally 4: 0.000000E+00 0.000000E+00 @@ -160,8 +160,8 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -3.198289E+00 -5.148488E-01 +3.050887E+00 +4.698799E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -208,10 +208,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -5.696337E+00 -1.628487E+00 -2.860206E+00 -4.137254E-01 +5.388951E+00 +1.456464E+00 +2.664528E+00 +3.577345E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -256,10 +256,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -7.588948E+00 -2.895325E+00 -5.292314E+00 -1.413583E+00 +7.165280E+00 +2.573230E+00 +4.930263E+00 +1.218988E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -304,10 +304,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.876155E+00 -3.953353E+00 -7.255925E+00 -2.639713E+00 +8.550278E+00 +3.668687E+00 +6.985934E+00 +2.450395E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -352,10 +352,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -9.354049E+00 -4.393658E+00 -8.482819E+00 -3.610891E+00 +9.236725E+00 +4.281659E+00 +8.429932E+00 +3.565264E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -400,10 +400,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.943279E+00 -4.014844E+00 -8.979641E+00 -4.049912E+00 +9.396613E+00 +4.431004E+00 +9.307625E+00 +4.351276E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -448,10 +448,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.300834E+00 -3.459191E+00 -9.090369E+00 -4.158129E+00 +8.721885E+00 +3.821463E+00 +9.438995E+00 +4.479948E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -496,10 +496,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -6.804280E+00 -2.322582E+00 -8.354155E+00 -3.514646E+00 +7.096946E+00 +2.525113E+00 +8.605114E+00 +3.710134E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -544,10 +544,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -5.046905E+00 -1.278109E+00 -7.174660E+00 -2.586803E+00 +5.222832E+00 +1.373166E+00 +7.480684E+00 +2.804650E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -592,10 +592,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -2.662185E+00 -3.600983E-01 -5.306922E+00 -1.415937E+00 +2.726690E+00 +3.773397E-01 +5.470375E+00 +1.504111E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -642,8 +642,8 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -3.042882E+00 -4.659100E-01 +3.026290E+00 +4.597502E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -662,64 +662,64 @@ k cmfd 0.000000E+00 0.000000E+00 0.000000E+00 -1.155207E+00 -1.161934E+00 -1.162573E+00 -1.155825E+00 -1.156010E+00 -1.155352E+00 -1.149838E+00 -1.160768E+00 -1.160453E+00 -1.169217E+00 -1.162716E+00 -1.161432E+00 -1.163968E+00 -1.165559E+00 -1.164094E+00 -1.159570E+00 +1.150583E+00 +1.159578E+00 +1.162798E+00 +1.171003E+00 +1.162732E+00 +1.165591E+00 +1.166032E+00 +1.165387E+00 +1.165451E+00 +1.170726E+00 +1.170820E+00 +1.167945E+00 +1.166050E+00 +1.165757E+00 +1.167631E+00 +1.168366E+00 cmfd entropy 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.220491E+00 -3.222825E+00 -3.218323E+00 -3.219037E+00 -3.218088E+00 -3.218982E+00 -3.223440E+00 -3.219003E+00 -3.219661E+00 -3.222534E+00 -3.226366E+00 -3.225935E+00 -3.225693E+00 -3.225236E+00 -3.226171E+00 -3.227775E+00 +3.215201E+00 +3.212850E+00 +3.214094E+00 +3.208054E+00 +3.212891E+00 +3.213349E+00 +3.208290E+00 +3.206895E+00 +3.208786E+00 +3.209630E+00 +3.212321E+00 +3.211750E+00 +3.212453E+00 +3.213370E+00 +3.211791E+00 +3.212685E+00 cmfd balance 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -7.152541E-03 -7.231826E-03 -5.207222E-03 -4.847674E-03 -4.190622E-03 -3.646931E-03 -3.246272E-03 -4.268558E-03 -3.666841E-03 -3.201934E-03 -2.607402E-03 -2.522363E-03 -2.503931E-03 -2.357463E-03 -2.164466E-03 -1.815206E-03 +6.348026E-03 +5.102747E-03 +4.043947E-03 +3.952742E-03 +2.533934E-03 +2.215030E-03 +2.945032E-03 +2.597862E-03 +2.300873E-03 +1.991974E-03 +1.679430E-03 +1.636923E-03 +1.581336E-03 +1.431472E-03 +1.419168E-03 +1.256242E-03 cmfd dominance ratio 0.000E+00 0.000E+00 @@ -746,30 +746,30 @@ cmfd openmc source comparison 0.000000E+00 0.000000E+00 0.000000E+00 -1.520220E-02 -1.051769E-02 -9.811648E-03 -8.544888E-03 -7.860220E-03 -6.949329E-03 -5.032373E-03 -5.022939E-03 -4.521643E-03 -4.306800E-03 -4.227084E-03 -4.166665E-03 -4.553705E-03 -3.834051E-03 -3.649750E-03 -3.258053E-03 +8.388554E-03 +7.868057E-03 +6.387210E-03 +6.979018E-03 +5.634468E-03 +5.579467E-03 +5.647780E-03 +5.289856E-03 +4.550548E-03 +4.373716E-03 +4.042349E-03 +3.813510E-03 +3.749150E-03 +3.358125E-03 +3.562360E-03 +3.904943E-03 cmfd source -4.575620E-02 -8.436685E-02 -1.142434E-01 -1.327994E-01 -1.388492E-01 -1.341762E-01 -1.258878E-01 -1.060199E-01 -7.531612E-02 -4.258493E-02 +4.142294E-02 +7.484381E-02 +1.050784E-01 +1.256771E-01 +1.444717E-01 +1.420230E-01 +1.350735E-01 +1.118744E-01 +7.755343E-02 +4.198177E-02 diff --git a/tests/test_cmfd_nofeed/results_true.dat b/tests/test_cmfd_nofeed/results_true.dat index 426bdb7cd2..761a4749da 100644 --- a/tests/test_cmfd_nofeed/results_true.dat +++ b/tests/test_cmfd_nofeed/results_true.dat @@ -1,128 +1,128 @@ k-combined: -1.172791E+00 6.252959E-03 +1.170519E+00 8.422959E-03 tally 1: -1.163448E+01 -1.363980E+01 -2.145286E+01 -4.616529E+01 -2.888253E+01 -8.376909E+01 -3.373143E+01 -1.141757E+02 -3.746579E+01 -1.406721E+02 -3.777515E+01 -1.428729E+02 -3.386238E+01 -1.147938E+02 -2.897188E+01 -8.420449E+01 -2.136315E+01 -4.582748E+01 -1.108879E+01 -1.236048E+01 +1.078122E+01 +1.170828E+01 +1.999878E+01 +4.018561E+01 +2.812898E+01 +7.936860E+01 +3.362276E+01 +1.133841E+02 +3.714459E+01 +1.382628E+02 +3.828125E+01 +1.470408E+02 +3.599263E+01 +1.299451E+02 +3.090749E+01 +9.596105E+01 +2.144103E+01 +4.630323E+01 +1.143002E+01 +1.314355E+01 tally 2: -2.372805E+01 -2.837972E+01 -1.658800E+01 -1.388151E+01 -2.247323E+00 -2.582582E-01 -4.299776E+01 -9.287131E+01 -3.043200E+01 -4.657631E+01 -3.934057E+00 -7.973541E-01 -5.684445E+01 -1.623153E+02 -4.034800E+01 -8.179073E+01 -5.379322E+00 -1.465670E+00 -6.606709E+01 -2.191486E+02 -4.692300E+01 -1.106126E+02 -5.750728E+00 -1.674662E+00 -7.255562E+01 -2.645381E+02 -5.158400E+01 -1.337742E+02 -6.636809E+00 -2.234026E+00 -7.201624E+01 -2.607904E+02 -5.120900E+01 -1.318401E+02 -6.679637E+00 -2.260160E+00 -6.713101E+01 -2.261599E+02 -4.758700E+01 -1.136620E+02 -6.543521E+00 -2.167610E+00 -5.662017E+01 -1.608249E+02 -4.020700E+01 -8.115173E+01 -5.470801E+00 -1.508646E+00 -4.250475E+01 -9.067511E+01 -3.008800E+01 -4.543510E+01 -3.893346E+00 -7.757374E-01 -2.346776E+01 -2.789085E+01 -1.631500E+01 -1.346917E+01 -2.248911E+00 -2.635335E-01 +2.247115E+01 +2.548076E+01 +1.574700E+01 +1.251937E+01 +2.119907E+00 +2.284737E-01 +4.160187E+01 +8.733627E+01 +2.945600E+01 +4.383448E+01 +4.027136E+00 +8.279807E-01 +5.722117E+01 +1.643758E+02 +4.057100E+01 +8.267151E+01 +5.388803E+00 +1.465180E+00 +6.769175E+01 +2.300722E+02 +4.800300E+01 +1.157663E+02 +6.213554E+00 +1.946061E+00 +7.376629E+01 +2.729167E+02 +5.253400E+01 +1.385018E+02 +6.438590E+00 +2.103693E+00 +7.454128E+01 +2.790080E+02 +5.311800E+01 +1.417584E+02 +6.784745E+00 +2.328936E+00 +6.907125E+01 +2.397912E+02 +4.912000E+01 +1.213330E+02 +6.405754E+00 +2.075535E+00 +6.012056E+01 +1.815248E+02 +4.280600E+01 +9.207864E+01 +5.534450E+00 +1.555396E+00 +4.229808E+01 +8.999380E+01 +3.003200E+01 +4.541718E+01 +3.844618E+00 +7.537006E-01 +2.272774E+01 +2.597695E+01 +1.577800E+01 +1.252728E+01 +2.221451E+00 +2.528223E-01 tally 3: -1.601100E+01 -1.293342E+01 -1.062007E+00 -5.868554E-02 -2.927700E+01 -4.312144E+01 -1.921709E+00 -1.866340E-01 -3.887000E+01 -7.592933E+01 -2.578823E+00 -3.377406E-01 -4.523100E+01 -1.028071E+02 -2.905782E+00 -4.248071E-01 -4.966300E+01 -1.240308E+02 -3.172094E+00 -5.080457E-01 -4.933600E+01 -1.223712E+02 -3.077790E+00 -4.818212E-01 -4.581400E+01 -1.053633E+02 -2.952966E+00 -4.398204E-01 -3.859900E+01 -7.480105E+01 -2.487981E+00 -3.120526E-01 -2.904800E+01 -4.235413E+01 -1.830501E+00 -1.695713E-01 -1.571800E+01 -1.251318E+01 -1.042785E+00 -5.535596E-02 +1.517200E+01 +1.162361E+01 +9.172562E-01 +4.342120E-02 +2.835000E+01 +4.061736E+01 +1.868192E+00 +1.761390E-01 +3.911800E+01 +7.686442E+01 +2.478956E+00 +3.088180E-01 +4.617600E+01 +1.071239E+02 +2.980518E+00 +4.488545E-01 +5.059100E+01 +1.284662E+02 +3.257651E+00 +5.341674E-01 +5.115000E+01 +1.314866E+02 +3.365441E+00 +5.729274E-01 +4.732100E+01 +1.126317E+02 +3.051596E+00 +4.705140E-01 +4.120700E+01 +8.535705E+01 +2.704451E+00 +3.705800E-01 +2.900900E+01 +4.238065E+01 +1.872660E+00 +1.780668E-01 +1.520000E+01 +1.162785E+01 +1.007084E+00 +5.171907E-02 tally 4: 0.000000E+00 0.000000E+00 @@ -160,8 +160,8 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -3.203000E+00 -5.158630E-01 +3.017000E+00 +4.575810E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -208,10 +208,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -5.609000E+00 -1.577889E+00 -2.821000E+00 -4.027670E-01 +5.447000E+00 +1.491865E+00 +2.697000E+00 +3.709330E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -256,10 +256,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -7.388000E+00 -2.743104E+00 -5.132000E+00 -1.326058E+00 +7.403000E+00 +2.751813E+00 +5.151000E+00 +1.334701E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -304,10 +304,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.546000E+00 -3.663882E+00 -7.038000E+00 -2.485210E+00 +8.635000E+00 +3.741143E+00 +7.048000E+00 +2.495310E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -352,10 +352,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -9.133000E+00 -4.188925E+00 -8.421000E+00 -3.562213E+00 +9.381000E+00 +4.415619E+00 +8.456000E+00 +3.587840E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -400,10 +400,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -9.030000E+00 -4.099006E+00 -9.130000E+00 -4.191968E+00 +9.297000E+00 +4.334551E+00 +9.198000E+00 +4.240540E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -448,10 +448,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -8.215000E+00 -3.386667E+00 -9.060000E+00 -4.129934E+00 +8.737000E+00 +3.843559E+00 +9.508000E+00 +4.553256E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -496,10 +496,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -6.879000E+00 -2.379269E+00 -8.481000E+00 -3.624165E+00 +7.338000E+00 +2.709162E+00 +8.888000E+00 +3.969398E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -544,10 +544,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -5.201000E+00 -1.360099E+00 -7.317000E+00 -2.690989E+00 +5.354000E+00 +1.442386E+00 +7.584000E+00 +2.887298E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -592,10 +592,10 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -2.794000E+00 -3.955460E-01 -5.480000E+00 -1.507540E+00 +2.707000E+00 +3.709270E-01 +5.507000E+00 +1.522587E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -642,8 +642,8 @@ tally 4: 0.000000E+00 0.000000E+00 0.000000E+00 -3.083000E+00 -4.785830E-01 +3.112000E+00 +4.868600E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -662,114 +662,114 @@ k cmfd 0.000000E+00 0.000000E+00 0.000000E+00 -1.155207E+00 -1.158935E+00 -1.155638E+00 -1.156869E+00 -1.149254E+00 -1.142535E+00 -1.147154E+00 -1.149307E+00 -1.155432E+00 -1.154360E+00 -1.158046E+00 -1.161285E+00 -1.162239E+00 -1.159876E+00 -1.160788E+00 -1.159887E+00 +1.150583E+00 +1.160876E+00 +1.160893E+00 +1.157393E+00 +1.157826E+00 +1.163206E+00 +1.169286E+00 +1.169322E+00 +1.169866E+00 +1.177576E+00 +1.183172E+00 +1.184784E+00 +1.186581E+00 +1.183233E+00 +1.181032E+00 +1.180107E+00 cmfd entropy 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.220491E+00 -3.220661E+00 -3.229936E+00 -3.229924E+00 -3.231123E+00 -3.231398E+00 -3.229138E+00 -3.230592E+00 -3.228648E+00 -3.229301E+00 -3.227132E+00 -3.229052E+00 -3.228856E+00 -3.230663E+00 -3.230136E+00 -3.231025E+00 +3.215201E+00 +3.214833E+00 +3.211409E+00 +3.218241E+00 +3.220068E+00 +3.217667E+00 +3.214425E+00 +3.215427E+00 +3.214339E+00 +3.212343E+00 +3.211075E+00 +3.211281E+00 +3.209704E+00 +3.210597E+00 +3.213481E+00 +3.213943E+00 cmfd balance 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -7.152541E-03 -7.104497E-03 -3.644474E-03 -4.530563E-03 -3.122133E-03 -2.665224E-03 -3.131292E-03 -3.095093E-03 -3.182336E-03 -2.914286E-03 -2.668155E-03 -2.322013E-03 -2.261088E-03 -2.100433E-03 -2.068427E-03 -1.991522E-03 +6.348026E-03 +4.651411E-03 +3.551519E-03 +2.893286E-03 +2.930836E-03 +2.342081E-03 +2.443793E-03 +2.380658E-03 +2.091259E-03 +2.144887E-03 +2.055334E-03 +1.907704E-03 +1.879350E-03 +1.598308E-03 +1.247988E-03 +1.179680E-03 cmfd dominance ratio 0.000E+00 0.000E+00 0.000E+00 0.000E+00 + 5.524E-01 + 5.492E-01 + 5.459E-01 + 5.486E-01 + 5.475E-01 + 5.455E-01 5.433E-01 - 5.438E-01 - 5.499E-01 - 5.527E-01 - 5.556E-01 - 5.556E-01 - 5.540E-01 - 5.545E-01 - 5.521E-01 - 5.530E-01 - 5.510E-01 - 5.515E-01 - 5.500E-01 - 5.514E-01 - 5.506E-01 - 5.515E-01 + 5.425E-01 + 5.412E-01 + 5.404E-01 + 5.399E-01 + 5.400E-01 + 5.401E-01 + 5.414E-01 + 5.433E-01 + 5.437E-01 cmfd openmc source comparison 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.520219E-02 -1.064239E-02 -7.165390E-03 -6.348371E-03 -6.195458E-03 -5.926990E-03 -5.851775E-03 -4.374979E-03 -4.719631E-03 -4.419781E-03 -4.364431E-03 -3.551498E-03 -3.772091E-03 -2.907247E-03 -3.421922E-03 -2.616239E-03 +8.388554E-03 +6.525044E-03 +5.810856E-03 +3.651620E-03 +3.448625E-03 +3.805838E-03 +4.064235E-03 +3.244723E-03 +3.963513E-03 +4.186768E-03 +3.785555E-03 +2.732731E-03 +2.308430E-03 +2.074797E-03 +1.581512E-03 +1.729988E-03 cmfd source -4.503063E-02 -8.252550E-02 -1.117300E-01 -1.266280E-01 -1.386100E-01 -1.348011E-01 -1.291490E-01 -1.083842E-01 -7.890593E-02 -4.423568E-02 +3.816410E-02 +7.860013E-02 +1.050204E-01 +1.270331E-01 +1.389768E-01 +1.438216E-01 +1.304530E-01 +1.155470E-01 +7.975741E-02 +4.262650E-02 From 94b3f90321f2eb0bb2e1d6cdbd88ed4524a3615b Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Fri, 8 Aug 2014 11:13:34 +0200 Subject: [PATCH 07/11] Removed unnecessary whitespace --- src/global.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/global.F90 b/src/global.F90 index 41052afe4c..20a26dce3b 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -260,7 +260,6 @@ module global type(Bank), pointer :: source_site => null() !$omp threadprivate(source_site) - ! Restart run logical :: restart_run = .false. integer :: restart_batch From 5e445ae8aa95f4eb56bfee9d8756adac8db51bbe Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Fri, 8 Aug 2014 12:40:28 +0200 Subject: [PATCH 08/11] Renamed tests part_restart to particle_restart --- src/CMakeLists.txt | 4 ++-- .../geometry.xml | 0 .../materials.xml | 0 .../results.py | 0 .../results_true.dat | 0 .../settings.xml | 0 .../test_particle_restart_eigval.py} | 0 .../geometry.xml | 0 .../materials.xml | 0 .../results.py | 0 .../results_true.dat | 0 .../settings.xml | 0 .../test_particle_restart_fixed.py} | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename tests/{test_part_restart_eigval => test_particle_restart_eigval}/geometry.xml (100%) rename tests/{test_part_restart_eigval => test_particle_restart_eigval}/materials.xml (100%) rename tests/{test_part_restart_eigval => test_particle_restart_eigval}/results.py (100%) rename tests/{test_part_restart_eigval => test_particle_restart_eigval}/results_true.dat (100%) rename tests/{test_part_restart_eigval => test_particle_restart_eigval}/settings.xml (100%) rename tests/{test_part_restart_eigval/test_part_restart_eigval.py => test_particle_restart_eigval/test_particle_restart_eigval.py} (100%) rename tests/{test_part_restart_fixed => test_particle_restart_fixed}/geometry.xml (100%) rename tests/{test_part_restart_fixed => test_particle_restart_fixed}/materials.xml (100%) rename tests/{test_part_restart_fixed => test_particle_restart_fixed}/results.py (100%) rename tests/{test_part_restart_fixed => test_particle_restart_fixed}/results_true.dat (100%) rename tests/{test_part_restart_fixed => test_particle_restart_fixed}/settings.xml (100%) rename tests/{test_part_restart_fixed/test_part_restart_fixed.py => test_particle_restart_fixed/test_particle_restart_fixed.py} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9ce433731f..8133d0c9e3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -345,9 +345,9 @@ foreach(test ${TESTS}) set(RESTART_FILE statepoint.7.h5) elseif(${test} MATCHES "test_sourcepoint_restart") set(RESTART_FILE statepoint.7.h5 source.7.h5) - elseif(${test} MATCHES "test_part_restart_eigval") + elseif(${test} MATCHES "test_particle_restart_eigval") set(RESTART_FILE particle_12_842.h5) - elseif(${test} MATCHES "test_part_restart_fixed") + elseif(${test} MATCHES "test_particle_restart_fixed") set(RESTART_FILE particle_7_6144.h5) else(${test} MATCHES "test_statepoint_restart") message(FATAL_ERROR "Restart test ${test} not recognized") diff --git a/tests/test_part_restart_eigval/geometry.xml b/tests/test_particle_restart_eigval/geometry.xml similarity index 100% rename from tests/test_part_restart_eigval/geometry.xml rename to tests/test_particle_restart_eigval/geometry.xml diff --git a/tests/test_part_restart_eigval/materials.xml b/tests/test_particle_restart_eigval/materials.xml similarity index 100% rename from tests/test_part_restart_eigval/materials.xml rename to tests/test_particle_restart_eigval/materials.xml diff --git a/tests/test_part_restart_eigval/results.py b/tests/test_particle_restart_eigval/results.py similarity index 100% rename from tests/test_part_restart_eigval/results.py rename to tests/test_particle_restart_eigval/results.py diff --git a/tests/test_part_restart_eigval/results_true.dat b/tests/test_particle_restart_eigval/results_true.dat similarity index 100% rename from tests/test_part_restart_eigval/results_true.dat rename to tests/test_particle_restart_eigval/results_true.dat diff --git a/tests/test_part_restart_eigval/settings.xml b/tests/test_particle_restart_eigval/settings.xml similarity index 100% rename from tests/test_part_restart_eigval/settings.xml rename to tests/test_particle_restart_eigval/settings.xml diff --git a/tests/test_part_restart_eigval/test_part_restart_eigval.py b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py similarity index 100% rename from tests/test_part_restart_eigval/test_part_restart_eigval.py rename to tests/test_particle_restart_eigval/test_particle_restart_eigval.py diff --git a/tests/test_part_restart_fixed/geometry.xml b/tests/test_particle_restart_fixed/geometry.xml similarity index 100% rename from tests/test_part_restart_fixed/geometry.xml rename to tests/test_particle_restart_fixed/geometry.xml diff --git a/tests/test_part_restart_fixed/materials.xml b/tests/test_particle_restart_fixed/materials.xml similarity index 100% rename from tests/test_part_restart_fixed/materials.xml rename to tests/test_particle_restart_fixed/materials.xml diff --git a/tests/test_part_restart_fixed/results.py b/tests/test_particle_restart_fixed/results.py similarity index 100% rename from tests/test_part_restart_fixed/results.py rename to tests/test_particle_restart_fixed/results.py diff --git a/tests/test_part_restart_fixed/results_true.dat b/tests/test_particle_restart_fixed/results_true.dat similarity index 100% rename from tests/test_part_restart_fixed/results_true.dat rename to tests/test_particle_restart_fixed/results_true.dat diff --git a/tests/test_part_restart_fixed/settings.xml b/tests/test_particle_restart_fixed/settings.xml similarity index 100% rename from tests/test_part_restart_fixed/settings.xml rename to tests/test_particle_restart_fixed/settings.xml diff --git a/tests/test_part_restart_fixed/test_part_restart_fixed.py b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py similarity index 100% rename from tests/test_part_restart_fixed/test_part_restart_fixed.py rename to tests/test_particle_restart_fixed/test_particle_restart_fixed.py From 909913e250f19deb0d08b09ddaab0d67ccb2c25b Mon Sep 17 00:00:00 2001 From: Will Boyd Date: Thu, 21 Aug 2014 01:09:59 -0400 Subject: [PATCH 09/11] Fixed small bug in test_tally_assumesep --- tests/test_tally_assumesep/results.py | 2 +- tests/test_tally_assumesep/results_true.dat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_tally_assumesep/results.py b/tests/test_tally_assumesep/results.py index 4890ea4951..3cba794205 100644 --- a/tests/test_tally_assumesep/results.py +++ b/tests/test_tally_assumesep/results.py @@ -23,7 +23,7 @@ results2 = sp.tallies[1].results shape2 = results2.shape size2 = (np.product(shape2)) results2 = np.reshape(results2, size2) -results3 = sp.tallies[1].results +results3 = sp.tallies[2].results shape3 = results3.shape size3 = (np.product(shape3)) results3 = np.reshape(results3, size3) diff --git a/tests/test_tally_assumesep/results_true.dat b/tests/test_tally_assumesep/results_true.dat index eb3c57a421..5fae2a1eb9 100644 --- a/tests/test_tally_assumesep/results_true.dat +++ b/tests/test_tally_assumesep/results_true.dat @@ -7,5 +7,5 @@ tally 2: 3.372300E+00 2.331937E+00 tally 3: -3.372300E+00 -2.331937E+00 +4.802737E+01 +4.730991E+02 From 80ce7cc2f829ad4326ab44e83e03f5af5551b0a7 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 28 Aug 2014 09:21:17 -0400 Subject: [PATCH 10/11] Fix typos in get_nndc_data.py --- data/get_nndc_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/get_nndc_data.py b/data/get_nndc_data.py index aaaacd4dfa..7e964bff88 100755 --- a/data/get_nndc_data.py +++ b/data/get_nndc_data.py @@ -129,14 +129,14 @@ if not response or response.lower().startswith('y'): # loop around ace directories for d in ace_dirs: - print('Coverting {0}...'.format(d)) + print('Converting {0}...'.format(d)) # get a list of files to convert ace_files = glob.glob(os.path.join(d, '*.ace*')) # convert files for f in ace_files: - print(' Coverting {0}...'.format(os.path.split(f)[1])) + print(' Converting {0}...'.format(os.path.split(f)[1])) ascii_to_binary(f, f) # Change cross_sections.xml file From 0ec7844864bd8972ab3a0478a46e00f4bf853718 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 28 Aug 2014 10:55:04 -0400 Subject: [PATCH 11/11] Fix initialization issues for pseudorandom number streams. The `stream` variable is now threadprivate and both `stream` and `prn_seed` are initialized inside an OpenMP parallel region so that all threads have appropriate values. --- src/random_lcg.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/random_lcg.F90 b/src/random_lcg.F90 index a29d1aa9a0..e6a28587df 100644 --- a/src/random_lcg.F90 +++ b/src/random_lcg.F90 @@ -18,7 +18,7 @@ module random_lcg real(8) :: prn_norm ! 2^(-M) integer :: stream ! current RNG stream -!$omp threadprivate(prn_seed) +!$omp threadprivate(prn_seed, stream) public :: prn public :: initialize_prng @@ -60,11 +60,13 @@ contains integer :: i - stream = STREAM_TRACKING prn_seed0 = seed +!$omp parallel do i = 1, N_STREAMS prn_seed(i) = prn_seed0 + i - 1 end do + stream = STREAM_TRACKING +!$omp end parallel prn_mult = 2806196910506780709_8 prn_add = 1_8 prn_bits = 63