From 337d4cff69aeb9e5293c428f4528aca4bb5ce594 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 22 Nov 2017 12:22:17 -0600 Subject: [PATCH] Make sure sleeve appears on fifth grid spacer --- smr/fresh/geometry.xml | 274 +++++++++++++++++++++------------------- smr/fresh/materials.xml | 4 +- smr/smr/assemblies.py | 20 ++- 3 files changed, 159 insertions(+), 139 deletions(-) diff --git a/smr/fresh/geometry.xml b/smr/fresh/geometry.xml index a8263bf..2c0d448 100644 --- a/smr/fresh/geometry.xml +++ b/smr/fresh/geometry.xml @@ -6250,139 +6250,147 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.25984 1.25984 17 17 diff --git a/smr/fresh/materials.xml b/smr/fresh/materials.xml index ec69120..bbc246d 100644 --- a/smr/fresh/materials.xml +++ b/smr/fresh/materials.xml @@ -172,14 +172,14 @@ 300 - - + + 300 diff --git a/smr/smr/assemblies.py b/smr/smr/assemblies.py index eeb19f2..58d0f8b 100644 --- a/smr/smr/assemblies.py +++ b/smr/smr/assemblies.py @@ -59,7 +59,7 @@ def make_assembly(name, universes): # Make axial cell for outside of assembly (with sleeve) cell = openmc.Cell(name=univ_name + ' axial (1)') - cell.fill = mats['SS'] + cell.fill = mats['In'] cell.region = lat_grid_box & +surfs['grid1bot'] & -surfs['grid1top'] universe.add_cell(cell) @@ -95,14 +95,26 @@ def make_assembly(name, universes): # Make axial cell for outside of assembly (with sleeve) cell = openmc.Cell(name=univ_name + ' axial (7)') - cell.fill = mats['SS'] + cell.fill = mats['Zr'] cell.region = lat_grid_box & +surfs['grid4bot'] & -surfs['grid4top'] universe.add_cell(cell) + # Make top axial cell for outside of assembly (without sleeve) + cell = openmc.Cell(name=univ_name + ' axial (8)') + cell.fill = mats['H2O'] + cell.region = lat_grid_box & +surfs['grid4top'] & -surfs['grid5bot'] + universe.add_cell(cell) + + # Make axial cell for outside of assembly (with sleeve) + cell = openmc.Cell(name=univ_name + ' axial (9)') + cell.fill = mats['Zr'] + cell.region = lat_grid_box & +surfs['grid5bot'] & -surfs['grid5top'] + universe.add_cell(cell) + # Make top axial cell for outside of assembly (without sleeve) cell = openmc.Cell(name=univ_name + ' axial (last)') cell.fill = mats['H2O'] - cell.region = lat_grid_box & +surfs['grid4top'] + cell.region = lat_grid_box & +surfs['grid5top'] universe.add_cell(cell) return universe @@ -381,4 +393,4 @@ for cent, comment in [(gti, ''), (ins, ' instr')]: bas, gtu, bas, gtu, gtu ] univs['Assembly (3.1%) 6BAE' + comment] = \ - make_assembly('Assembly (3.1%) 6BAE' + comment, universes) \ No newline at end of file + make_assembly('Assembly (3.1%) 6BAE' + comment, universes)