diff --git a/smr/materials.py b/smr/materials.py index bb08cb9..b7c18c4 100644 --- a/smr/materials.py +++ b/smr/materials.py @@ -192,7 +192,7 @@ mats['UO2 1.6'] = openmc.Material(name='1.6\% Enr. UO2 Fuel') mats['UO2 1.6'].temperature = 300 mats['UO2 1.6'].set_density('g/cc', 10.31341) mats['UO2 1.6'].add_element('O', a_O, 'ao') -mats['UO2 1.6'].add_element('U', a_U, 'ao', enrichment=0.0161006) +mats['UO2 1.6'].add_element('U', a_U, 'ao', enrichment=1.61006) # Create 2.4% enriched UO2 fuel material a_U234, a_U235, a_U238, a_U, a_O = get_fuel_aos(0.0239993) @@ -200,7 +200,7 @@ mats['UO2 2.4'] = openmc.Material(name='2.4\% Enr. UO2 Fuel') mats['UO2 2.4'].temperature = 300 mats['UO2 2.4'].set_density('g/cc', 10.29748) mats['UO2 2.4'].add_element('O', a_O, 'ao') -mats['UO2 2.4'].add_element('U', a_U, 'ao', enrichment=0.0239993) +mats['UO2 2.4'].add_element('U', a_U, 'ao', enrichment=2.39993) # Create 3.1% enriched UO2 fuel material a_U234, a_U235, a_U238, a_U, a_O = get_fuel_aos(0.0310221) @@ -208,7 +208,7 @@ mats['UO2 3.1'] = openmc.Material(name='3.1\% Enr. UO2 Fuel') mats['UO2 3.1'].temperature = 300 mats['UO2 3.1'].set_density('g/cc', 10.30166) mats['UO2 3.1'].add_element('O', a_O, 'ao') -mats['UO2 3.1'].add_element('U', a_U, 'ao', enrichment=0.0310221) +mats['UO2 3.1'].add_element('U', a_U, 'ao', enrichment=3.10221) # Construct a collection of Materials to export to XML diff --git a/smr/materials.xml b/smr/materials.xml index d392417..2bbeb05 100644 --- a/smr/materials.xml +++ b/smr/materials.xml @@ -178,26 +178,26 @@ - - - + + + 300 - - - + + + 300 - - - + + + diff --git a/smr/plots.py b/smr/plots.py index 7236abb..8c48857 100644 --- a/smr/plots.py +++ b/smr/plots.py @@ -25,7 +25,7 @@ plots = openmc.Plots() plot = openmc.Plot(name='radial core map ') plot.basis = 'xy' plot.color = 'mat' -plot.origin = [0., 0., 200.] #(highest_extent-lowest_extent)/2.] +plot.origin = [0., 0., (highest_extent-lowest_extent)/2.] plot.width = [25*lattice_pitch/2, 25*lattice_pitch/2.] plot.filename = 'radial_core_map' plot.col_spec = col_spec diff --git a/smr/plots.xml b/smr/plots.xml index 191b2ea..4b8cabf 100644 --- a/smr/plots.xml +++ b/smr/plots.xml @@ -2,7 +2,7 @@ - 0.0 0.0 200.0 + 0.0 0.0 127.722 268.7955 268.7955 1000 1000 255 255 255 diff --git a/smr/settings.xml b/smr/settings.xml index 15b370e..48b2727 100644 --- a/smr/settings.xml +++ b/smr/settings.xml @@ -14,4 +14,6 @@ false true + True + 1000