From 8154eeed13db2a663464e9a204749a6d0bb67c10 Mon Sep 17 00:00:00 2001 From: stevendargaville Date: Thu, 13 Feb 2020 14:41:40 +0000 Subject: [PATCH] Revert "Modified the StatePoint output to include the new max_lost_particles and relative version. Further modified an existing regression test to check the StatePoint write-out of these variables" This reverts commit b6a03949c82aee90824b9daf60d3d74a587b5b19. --- src/state_point.cpp | 4 ---- tests/regression_tests/photon_source/results_true.dat | 2 -- tests/regression_tests/photon_source/test.py | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/state_point.cpp b/src/state_point.cpp index a9213bcb4e..60fd3826de 100644 --- a/src/state_point.cpp +++ b/src/state_point.cpp @@ -93,8 +93,6 @@ openmc_statepoint_write(const char* filename, bool* write_source) write_attribute(file_id, "photon_transport", settings::photon_transport); write_dataset(file_id, "n_particles", settings::n_particles); write_dataset(file_id, "n_batches", settings::n_batches); - write_dataset(file_id, "n_max_lost_particles", settings::n_max_lost_particles); - write_dataset(file_id, "relative_max_lost_particles", settings::relative_max_lost_particles); // Write out current batch number write_dataset(file_id, "current_batch", simulation::current_batch); @@ -375,8 +373,6 @@ void load_state_point() read_dataset(file_id, "n_particles", settings::n_particles); int temp; read_dataset(file_id, "n_batches", temp); - read_dataset(file_id, "n_max_lost_particles", settings::n_max_lost_particles); - read_dataset(file_id, "relative_max_lost_particles", settings::relative_max_lost_particles); // Take maximum of statepoint n_batches and input n_batches settings::n_batches = std::max(settings::n_batches, temp); diff --git a/tests/regression_tests/photon_source/results_true.dat b/tests/regression_tests/photon_source/results_true.dat index ab6ac9ff83..1448ad6db8 100644 --- a/tests/regression_tests/photon_source/results_true.dat +++ b/tests/regression_tests/photon_source/results_true.dat @@ -1,5 +1,3 @@ tally 1: sum = 2.275713E+02 sum_sq = 5.178870E+04 -max_lost = 5.000000E+00 -rel_max_lost = 1.000000E-01 diff --git a/tests/regression_tests/photon_source/test.py b/tests/regression_tests/photon_source/test.py index c5c42d680e..09a0b4a2d0 100644 --- a/tests/regression_tests/photon_source/test.py +++ b/tests/regression_tests/photon_source/test.py @@ -54,8 +54,6 @@ class SourceTestHarness(PyAPITestHarness): outstr += 'tally {}:\n'.format(t.id) outstr += 'sum = {:12.6E}\n'.format(t.sum[0, 0, 0]) outstr += 'sum_sq = {:12.6E}\n'.format(t.sum_sq[0, 0, 0]) - outstr += 'max_lost = {:12.6E}\n'.format(sp.n_max_lost_particles) - outstr += 'rel_max_lost = {:12.6E}\n'.format(sp.relative_max_lost_particles) return outstr