From 6d1b6fc23074f2a7b189d7e3a2afd94ab1d48e4a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 5 Jul 2019 13:45:26 -0500 Subject: [PATCH] Return vector from ResultsList.get_depletion_time --- openmc/deplete/integrator/epc_rk4.py | 2 +- openmc/deplete/integrator/leqi.py | 2 +- openmc/deplete/results_list.py | 9 ++++++++- tests/unit_tests/test_deplete_cecm.py | 2 +- tests/unit_tests/test_deplete_celi.py | 2 +- tests/unit_tests/test_deplete_cf4.py | 2 +- tests/unit_tests/test_deplete_epc_rk4.py | 2 +- tests/unit_tests/test_deplete_integrator.py | 4 ++-- tests/unit_tests/test_deplete_leqi.py | 2 +- tests/unit_tests/test_deplete_predictor.py | 2 +- tests/unit_tests/test_deplete_si_celi.py | 8 +------- tests/unit_tests/test_deplete_si_leqi.py | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/openmc/deplete/integrator/epc_rk4.py b/openmc/deplete/integrator/epc_rk4.py index 1f0fbe2a84..373c323e42 100644 --- a/openmc/deplete/integrator/epc_rk4.py +++ b/openmc/deplete/integrator/epc_rk4.py @@ -133,7 +133,7 @@ def epc_rk4(operator, timesteps, power=None, power_density=None, print_out=True) # Create results, write to disk Results.save( operator, x, op_results, [t, t + dt], p, i_res + i, - sum((time_1, time_2, time_3, time_4))) + time_1 + time_2 + time_3 + time_4) # Advance time, update vector t += dt diff --git a/openmc/deplete/integrator/leqi.py b/openmc/deplete/integrator/leqi.py index 465139abf4..19b1025e5c 100644 --- a/openmc/deplete/integrator/leqi.py +++ b/openmc/deplete/integrator/leqi.py @@ -154,7 +154,7 @@ def leqi(operator, timesteps, power=None, power_density=None, print_out=True): # Create results, write to disk Results.save( operator, x, op_results, [t, t+dt], p, i_res+i, - sum((time_1, time_2, time_3, time_4))) + time_1 + time_2 + time_3 + time_4) # update results op_res_last = copy.deepcopy(op_results[0]) diff --git a/openmc/deplete/results_list.py b/openmc/deplete/results_list.py index 9f256eb3db..79203a6318 100644 --- a/openmc/deplete/results_list.py +++ b/openmc/deplete/results_list.py @@ -115,8 +115,15 @@ class ResultsList(list): like :meth:`get_eigenvalues`, because no depletion is performed at the final transport stage + Returns + ------- + + times : :class:`numpy.ndarray` + Vector of average time to deplete a single material + across all processes and materials. + """ - times = np.empty((len(self) - 1, 1)) + times = np.empty(len(self) - 1) # Need special logic because the predictor # writes EOS values for step i as BOS values # for step i+1 diff --git a/tests/unit_tests/test_deplete_cecm.py b/tests/unit_tests/test_deplete_cecm.py index d143658af3..dd8b769fe6 100644 --- a/tests/unit_tests/test_deplete_cecm.py +++ b/tests/unit_tests/test_deplete_cecm.py @@ -39,5 +39,5 @@ def test_cecm(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_celi.py b/tests/unit_tests/test_deplete_celi.py index bb479f6cc2..47d3319fdb 100644 --- a/tests/unit_tests/test_deplete_celi.py +++ b/tests/unit_tests/test_deplete_celi.py @@ -39,5 +39,5 @@ def test_celi(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_cf4.py b/tests/unit_tests/test_deplete_cf4.py index 5b7d08c229..0c6199c3e5 100644 --- a/tests/unit_tests/test_deplete_cf4.py +++ b/tests/unit_tests/test_deplete_cf4.py @@ -39,5 +39,5 @@ def test_cf4(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_epc_rk4.py b/tests/unit_tests/test_deplete_epc_rk4.py index 0623f9e6e8..ea687bfd5d 100644 --- a/tests/unit_tests/test_deplete_epc_rk4.py +++ b/tests/unit_tests/test_deplete_epc_rk4.py @@ -39,5 +39,5 @@ def test_epc_rk4(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_integrator.py b/tests/unit_tests/test_deplete_integrator.py index 451b703a30..40090264ae 100644 --- a/tests/unit_tests/test_deplete_integrator.py +++ b/tests/unit_tests/test_deplete_integrator.py @@ -76,8 +76,8 @@ def test_results_save(run_in_tmpdir): op_result1 = [OperatorResult(k, rates) for k, rates in zip(eigvl1, rate1)] op_result2 = [OperatorResult(k, rates) for k, rates in zip(eigvl2, rate2)] - Results.save(op, x1, op_result1, t1, 0, 0, None) - Results.save(op, x2, op_result2, t2, 0, 1, None) + Results.save(op, x1, op_result1, t1, 0, 0) + Results.save(op, x2, op_result2, t2, 0, 1) # Load the files res = ResultsList("depletion_results.h5") diff --git a/tests/unit_tests/test_deplete_leqi.py b/tests/unit_tests/test_deplete_leqi.py index 97a841f6ce..a26329cf4a 100644 --- a/tests/unit_tests/test_deplete_leqi.py +++ b/tests/unit_tests/test_deplete_leqi.py @@ -39,5 +39,5 @@ def test_leqi(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_predictor.py b/tests/unit_tests/test_deplete_predictor.py index 80b060cc9e..6af6f8bca4 100644 --- a/tests/unit_tests/test_deplete_predictor.py +++ b/tests/unit_tests/test_deplete_predictor.py @@ -39,5 +39,5 @@ def test_predictor(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_si_celi.py b/tests/unit_tests/test_deplete_si_celi.py index c064172976..71679439c5 100644 --- a/tests/unit_tests/test_deplete_si_celi.py +++ b/tests/unit_tests/test_deplete_si_celi.py @@ -39,11 +39,5 @@ def test_si_celi(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) - assert all(dep_time > 0) - - # Test structure of depletion time dataset - - dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0) diff --git a/tests/unit_tests/test_deplete_si_leqi.py b/tests/unit_tests/test_deplete_si_leqi.py index 1003a73161..1396065c0f 100644 --- a/tests/unit_tests/test_deplete_si_leqi.py +++ b/tests/unit_tests/test_deplete_si_leqi.py @@ -39,5 +39,5 @@ def test_si_leqi(run_in_tmpdir): # Test structure of depletion time dataset dep_time = res.get_depletion_time() - assert dep_time.shape == (len(dt), 1) + assert dep_time.shape == (len(dt), ) assert all(dep_time > 0)