From 71d31d6ea67dff85911cb7a8f82b31befbd9f33e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 21 Jun 2019 14:14:35 -0500 Subject: [PATCH] Update test_deplete_predictor to check depletion time Due to where the results are saved for the predictor routine, at the top of the for loop vs. the end, the positions are incremented by one in the depletion time. This causes a value of zero to be returned as the first item in the array from get_depletion_time. This save was moved in commit 87aed7a0b095b3902156e2a385bc46db2ba7f5ac of PR #1014 to make the restart feature easier. --- openmc/deplete/integrator/predictor.py | 2 +- tests/unit_tests/test_deplete_predictor.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openmc/deplete/integrator/predictor.py b/openmc/deplete/integrator/predictor.py index b30484c695..54a6258dc4 100644 --- a/openmc/deplete/integrator/predictor.py +++ b/openmc/deplete/integrator/predictor.py @@ -103,4 +103,4 @@ def predictor(operator, timesteps, power=None, power_density=None, op_results = [operator(x[0], power[-1])] # Create results, write to disk - Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps), proc_time) + Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps), None) diff --git a/tests/unit_tests/test_deplete_predictor.py b/tests/unit_tests/test_deplete_predictor.py index 0af320eb96..80b060cc9e 100644 --- a/tests/unit_tests/test_deplete_predictor.py +++ b/tests/unit_tests/test_deplete_predictor.py @@ -38,4 +38,6 @@ def test_predictor(run_in_tmpdir): # Test structure of depletion time dataset - assert res.get_depletion_time().shape == (len(dt), 1) + dep_time = res.get_depletion_time() + assert dep_time.shape == (len(dt), 1) + assert all(dep_time > 0)