From a6324292676feba591ca58e52d2809a6f864607a Mon Sep 17 00:00:00 2001 From: Lewis Gross <43077972+lewisgross1296@users.noreply.github.com> Date: Fri, 6 Feb 2026 11:32:32 -0600 Subject: [PATCH] Move distrib (mat, temp, dens) from XML attribute to subelement for better compatibility with very large instance lists (#3774) --- openmc/cell.py | 14 +++++++++----- tests/regression_tests/distribmat/inputs_true.dat | 4 +++- .../lattice_distribmat/True/inputs_true.dat | 8 ++++++-- .../lattice_distribrho/inputs_true.dat | 4 +++- tests/regression_tests/multipole/inputs_true.dat | 4 +++- .../random_ray_cell_density/eigen/inputs_true.dat | 12 +++++++++--- 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/openmc/cell.py b/openmc/cell.py index 82a034b1c8..945dff0dbd 100644 --- a/openmc/cell.py +++ b/openmc/cell.py @@ -636,8 +636,11 @@ class Cell(IDManagerMixin): element.set("material", str(self.fill.id)) elif self.fill_type == 'distribmat': - element.set("material", ' '.join(['void' if m is None else str(m.id) - for m in self.fill])) + material_subelement= ET.SubElement(element, "material") + matlist_str = " ".join( + ["void" if m is None else str(m.id) for m in self.fill] + ) + material_subelement.text = matlist_str elif self.fill_type in ('universe', 'lattice'): element.set("fill", str(self.fill.id)) @@ -677,14 +680,15 @@ class Cell(IDManagerMixin): if self.temperature is not None: if isinstance(self.temperature, Iterable): - element.set("temperature", ' '.join( - str(t) for t in self.temperature)) + temperature_subelement= ET.SubElement(element, "temperature") + temperature_subelement.text = ' '.join(str(t) for t in self.temperature) else: element.set("temperature", str(self.temperature)) if self.density is not None: if isinstance(self.density, Iterable): - element.set("density", ' '.join(str(t) for t in self.density)) + density_subelement= ET.SubElement(element, "density") + density_subelement.text = ' '.join(str(d) for d in self.density) else: element.set("density", str(self.density)) diff --git a/tests/regression_tests/distribmat/inputs_true.dat b/tests/regression_tests/distribmat/inputs_true.dat index 35b3b5b9fb..8087d75649 100644 --- a/tests/regression_tests/distribmat/inputs_true.dat +++ b/tests/regression_tests/distribmat/inputs_true.dat @@ -17,7 +17,9 @@ - + + 2 void 3 2 + diff --git a/tests/regression_tests/lattice_distribmat/True/inputs_true.dat b/tests/regression_tests/lattice_distribmat/True/inputs_true.dat index aec3a54008..ab827dfdee 100644 --- a/tests/regression_tests/lattice_distribmat/True/inputs_true.dat +++ b/tests/regression_tests/lattice_distribmat/True/inputs_true.dat @@ -47,8 +47,12 @@ - - + + 1 2 3 4 + + + 5 6 7 8 + diff --git a/tests/regression_tests/lattice_distribrho/inputs_true.dat b/tests/regression_tests/lattice_distribrho/inputs_true.dat index 5031bea6e2..99994af3d6 100644 --- a/tests/regression_tests/lattice_distribrho/inputs_true.dat +++ b/tests/regression_tests/lattice_distribrho/inputs_true.dat @@ -14,7 +14,9 @@ - + + 10.0 20.0 10.0 20.0 + diff --git a/tests/regression_tests/multipole/inputs_true.dat b/tests/regression_tests/multipole/inputs_true.dat index 22a351240c..3b78db77b7 100644 --- a/tests/regression_tests/multipole/inputs_true.dat +++ b/tests/regression_tests/multipole/inputs_true.dat @@ -14,7 +14,9 @@ - + + 500 700 0 800 + diff --git a/tests/regression_tests/random_ray_cell_density/eigen/inputs_true.dat b/tests/regression_tests/random_ray_cell_density/eigen/inputs_true.dat index 0dd354cf02..bcf4d0d90c 100644 --- a/tests/regression_tests/random_ray_cell_density/eigen/inputs_true.dat +++ b/tests/regression_tests/random_ray_cell_density/eigen/inputs_true.dat @@ -12,9 +12,15 @@ - - - + + 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 + + + 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 +