fix #7374 use bounded_universe() if no graveyard

radiasoft · Feb 14, 2025 · bdf0d03 · bdf0d03
1 parent a95483b
commit bdf0d03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/sirepo/package_data/template/openmc/parameters.py.jinja b/sirepo/package_data/template/openmc/parameters.py.jinja
@@ -14,21 +14,16 @@ def create_geometry():
         auto_geom_ids=True,
     )
     {% if reflectivePlanes_useReflectivePlanes == '1' %}
-    # creates an edge of universe boundary surface
-    vac_surf = openmc.Sphere(r=10000, boundary_type="vacuum")
     {{ planes }}
     univ = openmc.Cell(
-        region=-vac_surf {{ region }},
-        fill=univ,
+        region={{ region }},
+        fill=univ.bounded_universe(),
     )
     openmc.Geometry([univ]).export_to_xml()
     {% elif hasGraveyard %}
     openmc.Geometry(univ).export_to_xml()
     {% else %}
-    graveyard = openmc.Sphere(r=10000, boundary_type="vacuum")
-    root = openmc.Universe()
-    root.add_cells([openmc.Cell(region=-graveyard, fill=univ)])
-    openmc.Geometry(root).export_to_xml()
+    openmc.Geometry(univ.bounded_universe()).export_to_xml()
     {% endif %}
 
 

diff --git a/sirepo/template/openmc.py b/sirepo/template/openmc.py
@@ -1126,10 +1126,12 @@ def _prep_standard_material_cache():
 def _region(data):
     res = ""
     for i, p in enumerate(data.models.reflectivePlanes.planesList):
+        if res:
+            res += " & "
         if p.inside == "1":
-            res += f"& +p{i + 1} "
+            res += f"+p{i + 1}"
         else:
-            res += f"& -p{i + 1} "
+            res += f"-p{i + 1}"
     return res