From 23152393708f3982dbf79e2619eaac87df6c1ec5 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Mon, 30 Sep 2024 12:38:27 -0500 Subject: [PATCH] Add sphere to capabilities. Correct error message formatting --- src/openmc_cad_adapter/to_cubit_journal.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openmc_cad_adapter/to_cubit_journal.py b/src/openmc_cad_adapter/to_cubit_journal.py index 79ff89e..03935d2 100644 --- a/src/openmc_cad_adapter/to_cubit_journal.py +++ b/src/openmc_cad_adapter/to_cubit_journal.py @@ -22,7 +22,8 @@ from .geom_util import rotate, move from .surfaces import (CADPlane, CADXPlane, CADYPlane, CADZPlane, - CADCylinder, CADXCylinder, CADYCylinder, CADZCylinder) + CADCylinder, CADXCylinder, CADYCylinder, CADZCylinder, + CADSphere) _SURFACE_DICTIONARY = { 'plane': CADPlane, @@ -33,6 +34,7 @@ 'x-cylinder': CADXCylinder, 'y-cylinder': CADYCylinder, 'z-cylinder': CADZCylinder, + 'sphere': CADSphere } def flatten(S): @@ -91,7 +93,7 @@ def to_cubit_journal(geometry : openmc.Geometry, world : Iterable[Real] = None, bbox = geometry.bounding_box if not all(np.isfinite(bbox[0])) or not all(np.isfinite(bbox[1])): raise RuntimeError('Model bounds were not provided and the bounding box determined by OpenMC is not finite.' - 'Please provide a world size argument to proceed') + ' Please provide a world size argument to proceed') # to ensure that the box box_max = np.max(np.abs(bbox[0], bbox[1]).T) world_size = (2 * box_max, 2 * box_max, 2 * box_max)