From 0639ba3c81a85f98c674534f74e057ed2f3d1371 Mon Sep 17 00:00:00 2001 From: samuel shaner Date: Wed, 26 Oct 2016 01:44:14 +0000 Subject: [PATCH] changed triso test to use elements --- tests/test_triso/inputs_true.dat | 2 +- tests/test_triso/results_true.dat | 2 +- tests/test_triso/test_triso.py | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/test_triso/inputs_true.dat b/tests/test_triso/inputs_true.dat index 47837fc7c4..856581fdef 100644 --- a/tests/test_triso/inputs_true.dat +++ b/tests/test_triso/inputs_true.dat @@ -1 +1 @@ -3fdba48bb553aa75723e9ab226aeb873d4ebfc5934081263cf27063645e63036ec1088f1977fa38f45a95ed793bdb7b2a0e7a1f948b2a5b5b366110df72e8f0d \ No newline at end of file +5859cd73807c74cce612275817d3e1c6a2b55a347b31925115dbda2d83df60345ea4617cbc3b057a2fcfef4242f0e53d66d569ecffaeed35975ca28307b354c4 \ No newline at end of file diff --git a/tests/test_triso/results_true.dat b/tests/test_triso/results_true.dat index 15107e8c84..1716b67f53 100644 --- a/tests/test_triso/results_true.dat +++ b/tests/test_triso/results_true.dat @@ -1,2 +1,2 @@ k-combined: -1.636336E+00 1.154000E-01 +1.643727E+00 5.233644E-02 diff --git a/tests/test_triso/test_triso.py b/tests/test_triso/test_triso.py index 685034491f..e79b9fa8c8 100644 --- a/tests/test_triso/test_triso.py +++ b/tests/test_triso/test_triso.py @@ -19,34 +19,33 @@ class TRISOTestHarness(PyAPITestHarness): # Define TRISO matrials fuel = openmc.Material() fuel.set_density('g/cm3', 10.5) - fuel.add_nuclide('U235', 0.14154) - fuel.add_nuclide('U238', 0.85846) - fuel.add_nuclide('C0', 0.5) - fuel.add_nuclide('O16', 1.5) + fuel.add_element('U', 0.14154, 'ao', 14.0) + fuel.add_element('C', 0.5) + fuel.add_element('O', 1.5) porous_carbon = openmc.Material() porous_carbon.set_density('g/cm3', 1.0) - porous_carbon.add_nuclide('C0', 1.0) + porous_carbon.add_element('C', 1.0) porous_carbon.add_s_alpha_beta('c_Graphite') ipyc = openmc.Material() ipyc.set_density('g/cm3', 1.90) - ipyc.add_nuclide('C0', 1.0) + ipyc.add_element('C', 1.0) ipyc.add_s_alpha_beta('c_Graphite') sic = openmc.Material() sic.set_density('g/cm3', 3.20) sic.add_element('Si', 1.0) - sic.add_nuclide('C0', 1.0) + sic.add_element('C', 1.0) opyc = openmc.Material() opyc.set_density('g/cm3', 1.87) - opyc.add_nuclide('C0', 1.0) + opyc.add_element('C', 1.0) opyc.add_s_alpha_beta('c_Graphite') graphite = openmc.Material() graphite.set_density('g/cm3', 1.1995) - graphite.add_nuclide('C0', 1.0) + graphite.add_element('C', 1.0) graphite.add_s_alpha_beta('c_Graphite') # Create TRISO particles