From b4df08ac336c3a26c5a94a55ecba2ef006e7cb36 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Fri, 7 Oct 2016 20:54:57 -0400 Subject: [PATCH] Sort the output of temperature dictionary --- openmc/settings.py | 2 +- tests/test_multipole/inputs_true.dat | 2 +- tests/test_multipole/test_multipole.py | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/openmc/settings.py b/openmc/settings.py index 84fe20485..335de839a 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -1053,7 +1053,7 @@ class Settings(object): def _create_temperature_subelements(self): if self.temperature: - for key, value in self.temperature.items(): + for key, value in sorted(self.temperature.items()): element = ET.SubElement(self._settings_file, "temperature_{}".format(key)) element.text = str(value) diff --git a/tests/test_multipole/inputs_true.dat b/tests/test_multipole/inputs_true.dat index 83e9fc6fd..3b2b43ec7 100644 --- a/tests/test_multipole/inputs_true.dat +++ b/tests/test_multipole/inputs_true.dat @@ -1 +1 @@ -28e3b5cba12061ff7c410585117d40425d830a53fa2e7324d8f96deee28a57fb4cc4de393aa600f44816e72a0f66f22f5f4c65d52977d99f6a0d53275d263067 \ No newline at end of file +2be927608035759f52a2ac88b2c84e28c06e0f7905187bfd4695fecd80f417e727d8879c52fe03253938f7aa0301061f72dce9b5ae46b8675049b5bc4d9525a0 \ No newline at end of file diff --git a/tests/test_multipole/test_multipole.py b/tests/test_multipole/test_multipole.py index 035a6c894..32b38dd76 100644 --- a/tests/test_multipole/test_multipole.py +++ b/tests/test_multipole/test_multipole.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from collections import OrderedDict import os import sys sys.path.insert(0, os.pardir) @@ -69,9 +68,7 @@ class MultipoleTestHarness(PyAPITestHarness): sets_file.particles = 1000 sets_file.source = Source(space=Box([-1, -1, -1], [1, 1, 1])) sets_file.output = {'summary': True} - sets_file.temperature = OrderedDict() - sets_file.temperature['tolerance'] = 1000 - sets_file.temperature['multipole'] = True + sets_file.temperature = {'tolerance': 1000, 'multipole': True} sets_file.export_to_xml() ####################