From a7e924e545fda3773cc09be0c81b064599b5c29c Mon Sep 17 00:00:00 2001 From: alex-lyons Date: Wed, 4 Mar 2020 15:43:16 +0000 Subject: [PATCH] Fix typos and redundant line --- openmc/model/model.py | 1 - tests/regression_tests/trigger_statepoint_restart/test.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openmc/model/model.py b/openmc/model/model.py index cb9907331f..896e061194 100644 --- a/openmc/model/model.py +++ b/openmc/model/model.py @@ -52,7 +52,6 @@ class Model: self.settings = openmc.Settings() self.tallies = openmc.Tallies() self.plots = openmc.Plots() - self.statepoint = None if geometry is not None: self.geometry = geometry diff --git a/tests/regression_tests/trigger_statepoint_restart/test.py b/tests/regression_tests/trigger_statepoint_restart/test.py index 5f37383abd..eb0be0e191 100644 --- a/tests/regression_tests/trigger_statepoint_restart/test.py +++ b/tests/regression_tests/trigger_statepoint_restart/test.py @@ -90,7 +90,7 @@ class TriggerStatepointRestartTestHarness(PyAPITestHarness): # First non-restart run spfile = self._model.run(**args) sp_batchno_1 = 0 - assert sp_file + assert spfile with openmc.StatePoint(spfile) as sp: sp_batchno_1 = sp.current_batch k_combined_1 = sp.k_combined @@ -114,7 +114,8 @@ class TriggerStatepointRestartTestHarness(PyAPITestHarness): assert sp_batchno_2 > 10 assert sp_batchno_1 == sp_batchno_2, \ 'Different final batch number after restart' - assert k_combined_1 == k_combined_2, \ + # need str() here as uncertainties.ufloat instances are always different + assert str(k_combined_1) == str(k_combined_2), \ 'Different final k_combined after restart' self._write_inputs(self._get_inputs()) self._compare_inputs()