fix remaining CI tests

yardasol · Jul 6, 2023 · 7e1e176 · 7e1e176
1 parent 96be7d6
commit 7e1e176
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 12 deletions.
diff --git a/tests/integration_tests/database_storage/test.py b/tests/integration_tests/database_storage/test.py
@@ -231,12 +231,12 @@ def test_store_depcode_metadata(simulation):
     """
 
     # read data
-    simulation.sim_depcode.read_step_metadata()
+    simulation.sim_depcode.read_depcode_metadata()
 
     file = simulation.sim_depcode.template_input_file_path
     file_lines = simulation.sim_depcode.read_plaintext_file(file)
     simulation.sim_depcode.get_neutron_settings(file_lines)
-    init_info = simulation.sim_depcode.step_metadata
+    init_info = simulation.sim_depcode.depcode_metadata
 
     # we want to keep the old path for other sims, but for this
     # test we'll want a fresh db

diff --git a/tests/integration_tests/file_interface_openmc/test.py b/tests/integration_tests/file_interface_openmc/test.py
@@ -173,7 +173,40 @@ def test_read_neutronics_parameters(setup, openmc_depcode):
     np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['keff_eds'], [1.05103269, 0.00466057])
     np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['fission_mass_bds'], 72564.3093712)
     np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['fission_mass_eds'], 72557.3124427)
-    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['breeding_ratio'], [0.97204677, 0.00752009])
+    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['breeding_ratio_bds'], [0.9521063, 0.0083894])
+    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['breeding_ratio_eds'], [0.97204677, 0.00752009])
+    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['beta_eff_bds'],
+                                   [[3.02722147e-03, 1.31653306e-05],
+                                    [2.56437016e-04, 2.34208212e-06],
+                                    [6.86216011e-04, 6.25698960e-06],
+                                    [5.37174557e-04, 4.87944274e-06],
+                                    [1.07088251e-03, 9.67739386e-06],
+                                    [3.49738100e-04, 3.15273093e-06],
+                                    [1.26773271e-04, 1.13579780e-06]])
+    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['beta_eff_eds'],
+                                   [[3.03212025e-03, 1.18380793e-05],
+                                    [2.56575834e-04, 2.09668680e-06],
+                                    [6.86750234e-04, 5.60655617e-06],
+                                    [5.37887361e-04, 4.38160078e-06],
+                                    [1.07311207e-03, 8.71598231e-06],
+                                    [3.50594025e-04, 2.84366514e-06],
+                                    [1.27200728e-04, 1.02827496e-06]])
+    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['delayed_neutrons_lambda_bds'],
+                                   [[3.73897612e+00, 2.28330678e-02],
+                                    [1.29055770e-02, 1.17473235e-04],
+                                    [3.47196633e-02, 3.15003298e-04],
+                                    [1.19315909e-01, 1.07374204e-03],
+                                    [2.87240700e-01, 2.55327461e-03],
+                                    [8.02702456e-01, 7.04572391e-03],
+                                    [2.48209181e+00, 2.15388393e-02]])
+    np.testing.assert_almost_equal(openmc_depcode.neutronics_parameters['delayed_neutrons_lambda_eds'],
+                                   [[3.74309570e+00, 2.09128562e-02],
+                                    [1.29051655e-02, 1.05244668e-04],
+                                    [3.47182736e-02, 2.82594073e-04],
+                                    [1.19318603e-01, 9.66662533e-04],
+                                    [2.87320044e-01, 2.31172530e-03],
+                                    [8.03807356e-01, 6.42367636e-03],
+                                    [2.48502626e+00, 1.97411877e-02]])
     assert openmc_depcode.neutronics_parameters['power_level'] == 2250000000.0
     assert openmc_depcode.neutronics_parameters['burn_days'] == 3.0
     openmc_depcode.output_path = old_output_path

diff --git a/tests/unit_tests/test_openmc_depcode.py b/tests/unit_tests/test_openmc_depcode.py
@@ -6,22 +6,29 @@
 
 import openmc
 
+
+def test_read_depcode_metadata(openmc_depcode):
+    old_output_path = openmc_depcode.output_path
+    openmc_depcode.output_path = Path(__file__).parents[1] / 'openmc_data/saltproc_runtime_ref'
+    openmc_depcode.read_depcode_metadata()
+    assert openmc_depcode.depcode_metadata['depcode_name'] == 'openmc'
+    assert openmc_depcode.depcode_metadata['depcode_version'] == '0.13.3'
+    assert openmc_depcode.depcode_metadata['title'] == ''
+    assert openmc_depcode.depcode_metadata['depcode_input_filename'] == ''
+    assert openmc_depcode.depcode_metadata['depcode_working_dir'] == \
+       str((Path(__file__).parents[1] / 'openmc_data/saltproc_runtime_ref').resolve())
+
+
 def test_read_step_metadata(openmc_depcode):
     old_output_path = openmc_depcode.output_path
     openmc_depcode.output_path = Path(__file__).parents[1] / 'openmc_data/saltproc_runtime_ref'
     openmc_depcode.read_step_metadata()
-    assert openmc_depcode.step_metadata['depcode_name'] == 'openmc'
-    assert openmc_depcode.step_metadata['depcode_version'] == '0.13.3'
-    assert openmc_depcode.step_metadata['title'] == ''
-    assert openmc_depcode.step_metadata['depcode_input_filename'] == ''
-    assert openmc_depcode.step_metadata['depcode_working_dir'] == \
-       str((Path(__file__).parents[1] / 'openmc_data/saltproc_runtime_ref').resolve())
     assert openmc_depcode.step_metadata['MPI_tasks'] == -1
     assert openmc_depcode.step_metadata['OMP_threads'] == -1
     assert openmc_depcode.step_metadata['memory_optimization_mode'] == -1
-    assert openmc_depcode.step_metadata['depletion_timestep'] == 259200.0
-    assert openmc_depcode.step_metadata['memory_usage'] == -1
-    np.testing.assert_almost_equal(openmc_depcode.step_metadata['execution_time'], 423.90163846)
+    assert openmc_depcode.step_metadata['depletion_timestep_size'] == 259200.0
+    assert openmc_depcode.step_metadata['step_memory_usage'] == -1
+    np.testing.assert_almost_equal(openmc_depcode.step_metadata['step_execution_time'], 423.90163846)
 
 
 def test_check_for_material_names(cwd, openmc_depcode):