Only modify lattice_pitch in build-core-short/long.py scripts

smr/build-core-long.py

@@ -6,17 +6,17 @@ from pathlib import Path
 
 import openmc
 from smr.materials import materials
-from smr.surfaces import lattice_pitch, bottom_fuel_stack, top_active_core, \
+from smr.surfaces import bottom_fuel_stack, top_active_core, \
     pellet_OR, pin_pitch, clad_IR, clad_OR, active_fuel_length
 from smr.core import core_geometry
 from smr import inlet_temperature
-
+import smr.surfaces
 
 # Define command-line options
 parser = argparse.ArgumentParser()
 parser.add_argument('--multipole', action='store_true',
                     help='Use multipole cross sections')
-parser.add_argument('--no-multipole', action='store_false',
+parser.add_argument('--no-multipole', dest='multipole', action='store_false',
                     help='Do not use multipole cross sections')
 parser.add_argument('-a', '--axial', type=int, default=100,
                     help='Number of axial subdivisions in fuel')
@@ -36,6 +36,9 @@ else:
     directory = args.output_dir
 directory.mkdir(exist_ok=True)
 
+# Modify lattice pitch
+smr.surfaces.lattice_pitch = lattice_pitch = 17*smr.surfaces.pin_pitch
+
 ring_radii = [0.1*pin_pitch, 0.2*pin_pitch]
 
 geometry = core_geometry(ring_radii, args.axial, args.depleted)

smr/build-core-short.py

@@ -1,25 +1,18 @@
 #!/usr/bin/env python3
 
-import os
-import shutil
-import copy
 import argparse
 from math import pi, isclose
 from pathlib import Path
 
-import numpy as np
-
 import openmc
 from smr.materials import materials
-from smr.plots import core_plots
-from smr.surfaces import lattice_pitch, bottom_fuel_stack, top_active_core, \
+from smr.surfaces import bottom_fuel_stack, top_active_core, \
     pellet_OR, surfs, pin_pitch, clad_IR, clad_OR
 import smr.surfaces
 import smr.pins
 from smr.core import core_geometry
 from smr import inlet_temperature
 
-
 # Define command-line options
 parser = argparse.ArgumentParser()
 parser.add_argument('--multipole', action='store_true',
@@ -44,6 +37,9 @@ else:
     directory = args.output_dir
 directory.mkdir(exist_ok=True)
 
+# Modify lattice pitch
+smr.surfaces.lattice_pitch = lattice_pitch = 17*smr.surfaces.pin_pitch
+
 # Modify fuel length
 length = 3. * pin_pitch
 smr.surfaces.active_fuel_length = length

smr/smr/core.py

@@ -5,9 +5,9 @@ import numpy as np
 import openmc
 
 from .materials import mats
-from .surfaces import surfs, lattice_pitch
 from .reflector import reflector_universes
 from .assemblies import assembly_universes
+from smr import surfaces
 
 
 def core_geometry(ring_radii, num_axial, depleted):
@@ -34,6 +34,7 @@ def core_geometry(ring_radii, num_axial, depleted):
 
     # Construct main core lattice
     core = openmc.RectLattice(name='Main core')
+    lattice_pitch = surfaces.lattice_pitch
     core.lower_left = (-9*lattice_pitch/2, -9*lattice_pitch/2)
     core.pitch = (lattice_pitch, lattice_pitch)
     universes = np.tile(reflector['solid'], (9, 9))
@@ -119,6 +120,7 @@ def core_geometry(ring_radii, num_axial, depleted):
     core.universes = universes
 
     root_univ = openmc.Universe(universe_id=0, name='root universe')
+    surfs = surfaces.surfs
 
     # Cylinder filled with core lattice
     cell = openmc.Cell(name='Main core')

smr/smr/reflector.py

@@ -12,7 +12,7 @@ converted to actual dimensions by scaling according to the width of an assembly.
 import openmc
 
 from .materials import mats
-from .surfaces import lattice_pitch
+from smr import surfaces
 
 
 def make_reflector(name, parameters):
@@ -91,6 +91,7 @@ def reflector_universes():
 
     # All pixel widths are scaled according to the actual width of an assembly
     # divided by the width of an assembly in pixels
+    lattice_pitch = surfaces.lattice_pitch
     scale = lattice_pitch/width
 
     # Physical positions

smr/smr/surfaces.py

@@ -69,8 +69,7 @@ spacer_height = 1.750*INCHES  # ML17013A274, Figure 4.2-7
 # assembly parameters
 assembly_length   = 95.89*INCHES  # ML17013A274, Table 4.1-2
 pin_pitch         = 0.496*INCHES  # ML17013A274, Table 4.1-2
-#lattice_pitch     = 8.466*INCHES  # ML17013A274, Table 4.1-2
-lattice_pitch     = 17*pin_pitch
+lattice_pitch     = 8.466*INCHES  # ML17013A274, Table 4.1-2
 grid_strap_side   = 21.47270
 top_nozzle_height = 3.551*INCHES  # ML17013A274, Figure 4.2-2
 top_nozzle_width  = 8.406*INCHES  # ML17013A274, Figure 4.2-2