From 70e914d2458f6c35ef46f25b93f221f056dac813 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 11 Feb 2020 10:12:34 -0600 Subject: [PATCH] Fix failing tests --- openmc/deplete/abc.py | 7 +++---- tests/unit_tests/test_deplete_integrator.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py index d75833a6f1..912c0b1fb4 100644 --- a/openmc/deplete/abc.py +++ b/openmc/deplete/abc.py @@ -652,14 +652,13 @@ class Integrator(ABC): self.chain = operator.chain # Determine power and normalize units to W - mass = operator.heavy_metal if power is None: if power_density is None: raise ValueError("Either power or power density must be set") if not isinstance(power_density, Iterable): - power = power_density * mass + power = power_density * operator.heavy_metal else: - power = [p*mass for p in power_density] + power = [p*operator.heavy_metal for p in power_density] if not isinstance(power, Iterable): # Ensure that power is single value if that is the case power = [power] * len(timesteps) @@ -689,7 +688,7 @@ class Integrator(ABC): seconds.append(time*_SECONDS_PER_DAY) elif unit.lower() == 'mwd/kg': watt_days_per_kg = 1e6*time - kilograms = 1e-3*mass + kilograms = 1e-3*operator.heavy_metal days = watt_days_per_kg * kilograms / watts seconds.append(days*_SECONDS_PER_DAY) else: diff --git a/tests/unit_tests/test_deplete_integrator.py b/tests/unit_tests/test_deplete_integrator.py index 110894cdad..6c09b3feac 100644 --- a/tests/unit_tests/test_deplete_integrator.py +++ b/tests/unit_tests/test_deplete_integrator.py @@ -119,14 +119,14 @@ def test_results_save(run_in_tmpdir): np.testing.assert_array_equal(res[1].time, t2) -@pytest.mark.parametrize("timesteps", (1, [1])) -def test_bad_integrator_inputs(timesteps): +def test_bad_integrator_inputs(): """Test failure modes for Integrator inputs""" op = MagicMock() op.prev_res = None op.chain = None op.heavy_metal = 1.0 + timesteps = [1] # No power nor power density given with pytest.raises(ValueError, match="Either power or power density"):