Updated geometry to reference new materials

1 files changed, 6 insertions, 6 deletions

diff --git a/hpmr.py b/hpmr.py
index e31b56e..2b69a69 100755
--- a/hpmr.py
+++ b/hpmr.py
@@ -129,7 +129,7 @@ mat_mod_ss316.add_nuclide('Mo96', 2.4191e-3)
 mat_mod_ss316.add_nuclide('Mo97', 1.3903e-3)
 mat_mod_ss316.add_nuclide('Mo98', 3.5249e-3)
 mat_mod_ss316.add_nuclide('Mo100',1.4135e-3)
-mat_mod_ss316.set_density("g/cc",7.67)
+mat_mod_ss316.set_density("g/cc",7.9)
 mat_list.append(mat_mod_ss316)
 
 # Official Serpent smeared composition
@@ -218,7 +218,7 @@ mat_pipe_ss316.add_nuclide('Mo96',2.4191e-3)
 mat_pipe_ss316.add_nuclide('Mo97',1.3903e-3)
 mat_pipe_ss316.add_nuclide('Mo98',3.5249e-3)
 mat_pipe_ss316.add_nuclide('Mo100',1.4135e-3)
-mat_pipe_ss316.set_density("g/cc",7.67)
+mat_pipe_ss316.set_density("g/cc",7.9)
 mat_list.append(mat_pipe_ss316)
 
 mat_pipe_k_liquid = openmc.Material(402,name="Heat Pipe Potassium (Liquid)")
@@ -570,10 +570,10 @@ geo_dyn_universe = geo_homo_map[cli_args.technique]
 ## Heat Pipe ##
 geo_pipe_cylinders = [openmc.ZCylinder(r=rad, x0=0.0, y0=0.0) for rad in [0.80, 0.90, 0.97, 1.05, 1.07]]
 geo_pipe_cells = [openmc.Cell(name="Heat Pipe K Gas",fill=mat_pipe_k_gas,region=-geo_pipe_cylinders[0]),
-                  openmc.Cell(name="Heat Pipe Wick",fill=mat_pipe_wick,region=+geo_pipe_cylinders[0]&-geo_pipe_cylinders[1]),
+                  openmc.Cell(name="Heat Pipe Wick",fill=mat_pipe_wick_smear,region=+geo_pipe_cylinders[0]&-geo_pipe_cylinders[1]),
                   openmc.Cell(name="Heat Pipe K Layer",fill=mat_pipe_k_liquid,region=+geo_pipe_cylinders[1]&-geo_pipe_cylinders[2]),
                   openmc.Cell(name="Heat Pipe SS316 Envelope",fill=mat_pipe_ss316,region=+geo_pipe_cylinders[2]&-geo_pipe_cylinders[3]),
-                  openmc.Cell(name="Heat Pipe Helium Gap",fill=mat_pipe_helium,region=+geo_pipe_cylinders[3]&-geo_pipe_cylinders[4]),
+                  openmc.Cell(name="Heat Pipe Helium Gap",fill=mat_pipe_he_gap_smear,region=+geo_pipe_cylinders[3]&-geo_pipe_cylinders[4]),
                   openmc.Cell(name="Heat Pipe Graphite Matrix",fill=mat_graphite_matrix,region=+geo_pipe_cylinders[4])]
 geo_pipe_universe = openmc.Universe(name="Heat Pipe Universe",cells=geo_pipe_cells)
 
@@ -581,9 +581,9 @@ geo_pipe_universe = openmc.Universe(name="Heat Pipe Universe",cells=geo_pipe_cel
 ## Moderator Pin ##
 geo_mod_cylinders = [openmc.ZCylinder(r=rad, x0=0.0, y0=0.0) for rad in [0.825, 0.875, 0.900, 0.920]]
 geo_mod_cells = [openmc.Cell(name="Moderator Pin YH2",fill=mat_mod_yh2,region=-geo_mod_cylinders[0]),
-                 openmc.Cell(name="Moderator Pin Inner Helium Gap",fill=mat_mod_helium,region=+geo_mod_cylinders[0]&-geo_mod_cylinders[1]),
+                 openmc.Cell(name="Moderator Pin Inner Helium Gap",fill=mat_mod_ss316_he_smear,region=+geo_mod_cylinders[0]&-geo_mod_cylinders[1]),
                  openmc.Cell(name="Moderator Pin SS316 Envelope",fill=mat_mod_ss316,region=+geo_mod_cylinders[1]&-geo_mod_cylinders[2]),
-                 openmc.Cell(name="Moderator Pin Outer Helium Gap",fill=mat_mod_helium,region=+geo_mod_cylinders[2]&-geo_mod_cylinders[3]),
+                 openmc.Cell(name="Moderator Pin Outer Helium Gap",fill=mat_mod_ss316_he_smear,region=+geo_mod_cylinders[2]&-geo_mod_cylinders[3]),
                  openmc.Cell(name="Moderator Pin Graphite Matrix",fill=mat_graphite_matrix,region=+geo_mod_cylinders[3])]
 geo_mod_universe = openmc.Universe(name="Moderator Pin Universe",cells=geo_mod_cells)