Fix failing tests

This commit is contained in:
Paul Romano 2020-02-11 10:12:34 -06:00
parent 85264aa38c
commit 70e914d245
2 changed files with 5 additions and 6 deletions

View file

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

View file

@ -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"):