crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-29 06:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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"

Browse source 
This reverts commit b6a03949c8.
This commit is contained in:
stevendargaville 2020-02-13 14:41:40 +00:00
parent b6a03949c8
commit 8154eeed13
3 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/state_point.cpp
View file

@ -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);

2
tests/regression_tests/photon_source/results_true.dat
View file

@ -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

2
tests/regression_tests/photon_source/test.py
View file

@ -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