Merge pull request #2404 from eepeterson/export_model_xml_on_run

adding export_to_model_xml to model.run

Author: paulromano

openmc/model/model.py

@@ -596,7 +596,8 @@ def import_properties(self, filename):
 
     def run(self, particles=None, threads=None, geometry_debug=False,
             restart_file=None, tracks=False, output=True, cwd='.',
-            openmc_exec='openmc', mpi_args=None, event_based=None):
+            openmc_exec='openmc', mpi_args=None, event_based=None,
+            export_model_xml=True):
         """Runs OpenMC. If the C API has been initialized, then the C API is
         used, otherwise, this method creates the XML files and runs OpenMC via
         a system call. In both cases this method returns the path to the last
@@ -639,6 +640,9 @@ def run(self, particles=None, threads=None, geometry_debug=False,
         event_based : None or bool, optional
             Turns on event-based parallelism if True. If None, the value in
             the Settings will be used.
+        export_model_xml : bool, optional
+            Exports a single model.xml file rather than separate files.
+            Defaults to True.
 
         Returns
         -------
@@ -688,7 +692,10 @@ def run(self, particles=None, threads=None, geometry_debug=False,
 
             else:
                 # Then run via the command line
-                self.export_to_xml()
+                if export_model_xml:
+                    self.export_to_model_xml()
+                else:
+                    self.export_to_xml()
                 openmc.run(particles, threads, geometry_debug, restart_file,
                            tracks, output, Path('.'), openmc_exec, mpi_args,
                            event_based)

openmc/plots.py

@@ -683,11 +683,11 @@ def get_id(domain):
         if self._meshlines is not None:
             subelement = ET.SubElement(element, "meshlines")
             subelement.set("meshtype", self._meshlines['type'])
-            if self._meshlines['id'] is not None:
+            if 'id' in self._meshlines:
                 subelement.set("id", str(self._meshlines['id']))
-            if self._meshlines['linewidth'] is not None:
+            if 'linewidth' in self._meshlines:
                 subelement.set("linewidth", str(self._meshlines['linewidth']))
-            if self._meshlines['color'] is not None:
+            if 'color' in self._meshlines:
                 subelement.set("color", ' '.join(map(
                     str, self._meshlines['color'])))
 

src/cell.cpp

@@ -291,7 +291,7 @@ CSGCell::CSGCell(pugi::xml_node cell_node)
   if (fill_present) {
     fill_ = std::stoi(get_node_value(cell_node, "fill"));
     if (fill_ == universe_) {
-      fatal_error(fmt::format("Cell {} is filled with the same universe that"
+      fatal_error(fmt::format("Cell {} is filled with the same universe that "
                               "it is contained in.",
         id_));
     }

tests/regression_tests/adj_cell_rotation/inputs_true.dat

@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="2" region="1" universe="1" />
-  <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
-  <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
-  <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
-  <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
-  <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
-  <surface coeffs="7.5" id="8" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cc" value="0.1" />
-    <nuclide ao="0.1" name="H1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>10000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
-    </space>
-  </source>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cc" value="0.1" />
+      <nuclide ao="0.1" name="H1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1" universe="1" />
+    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
+    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
+    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
+    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
+    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
+    <surface coeffs="7.5" id="8" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>10000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>