diff --git a/examples/xml/c5g7/2d/cmfd.xml b/examples/xml/c5g7/2d/cmfd.xml
deleted file mode 100644
index 8e8d77490c..0000000000
--- a/examples/xml/c5g7/2d/cmfd.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- 10
- true
-
- 0.0 0.0 -100.0
- 64.26 64.26 100.0
- 6 6 1
- 1 0 0 1 1 1
-
-
diff --git a/examples/xml/c5g7/2d/geometry.xml b/examples/xml/c5g7/2d/geometry.xml
deleted file mode 100644
index 3b43562f37..0000000000
--- a/examples/xml/c5g7/2d/geometry.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
-
- 0
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1
- 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 6 1 1 6 1 1 5 1 1 6 1 1 6 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1
- 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-
-
-
-
- 0
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
- 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2
- 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2
- 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2
- 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2
- 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 6 4 4 6 4 4 5 4 4 6 4 4 6 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2
- 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2
- 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2
- 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2
- 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2
- 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-
-
-
-
- |
-
-
- |
-
-
- |
-
-
-
- 0
- 3 3
- 0.0 0.0
- 21.42 21.42
-
- 10 11 12
- 11 10 12
- 12 12 12
-
-
-
-
- |
-
-
diff --git a/examples/xml/c5g7/2d/materials.xml b/examples/xml/c5g7/2d/materials.xml
deleted file mode 120000
index c3825cffc5..0000000000
--- a/examples/xml/c5g7/2d/materials.xml
+++ /dev/null
@@ -1 +0,0 @@
-/home/nelsonag/cases/c5g7/materials.xml
\ No newline at end of file
diff --git a/examples/xml/c5g7/2d/plots.xml b/examples/xml/c5g7/2d/plots.xml
deleted file mode 100644
index a38f73f4e3..0000000000
--- a/examples/xml/c5g7/2d/plots.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- 1
- mat
- material
- 32.13 32.13 0
- 64.26 64.26
- slice
- 1000 1000
-
-
-
-
- 2
- cell
- cell
- 32.13 32.13 0
- 64.26 64.26
- slice
- 1000 1000
-
-
-
diff --git a/examples/xml/c5g7/2d/settings.xml b/examples/xml/c5g7/2d/settings.xml
deleted file mode 100644
index 038c80c303..0000000000
--- a/examples/xml/c5g7/2d/settings.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
- multi-group
-
-
- 2000
- 500
- 10000
-
-
-
-
-
-
- 0.0 21.42 -100
- 42.84 64.26 100
-
-
-
-
-
-
- 2000
- true
-
-
-
-
- true
-
- ../data.xml
-
-
diff --git a/examples/xml/c5g7/2d/tallies.xml b/examples/xml/c5g7/2d/tallies.xml
deleted file mode 100644
index 8b21bf524a..0000000000
--- a/examples/xml/c5g7/2d/tallies.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
- flux
-
-
-
-
- fission
-
-
-
- 1
- regular
- 0.0 0.0 -100.0
- 64.26 64.26 100.0
- 51 51 1
-
-
- false
-
-
diff --git a/examples/xml/c5g7/3d/geometry.xml b/examples/xml/c5g7/3d/geometry.xml
deleted file mode 100644
index b7766b32a0..0000000000
--- a/examples/xml/c5g7/3d/geometry.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
-
- 0
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1
- 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 6 1 1 6 1 1 5 1 1 6 1 1 6 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 6 1 1 6 1 1 6 1 1 6 1 1 6 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 6 1 1 1 1 1 1 1 1 1 6 1 1 1
- 1 1 1 1 1 6 1 1 6 1 1 6 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-
-
-
-
- 0
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
- 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2
- 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2
- 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2
- 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2
- 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 6 4 4 6 4 4 5 4 4 6 4 4 6 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 3 4 4 4 4 4 4 4 4 4 4 4 3 3 2
- 2 3 6 4 4 6 4 4 6 4 4 6 4 4 6 3 2
- 2 3 3 3 4 4 4 4 4 4 4 4 4 3 3 3 2
- 2 3 3 6 3 4 4 4 4 4 4 4 3 6 3 3 2
- 2 3 3 3 3 6 3 3 6 3 3 6 3 3 3 3 2
- 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2
- 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-
-
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
- 3 3
- 0.0 0.0
- 21.42 21.42
-
- 10 11 12
- 11 10 12
- 12 12 12
-
-
-
- |
-
-
-
- |
-
-
-
- 3 3
- 0.0 0.0
- 21.42 21.42
-
- 13 13 13
- 13 13 13
- 13 13 13
-
-
-
- |
-
-
-
- | |
\ No newline at end of file
diff --git a/examples/xml/c5g7/3d/materials.xml b/examples/xml/c5g7/3d/materials.xml
deleted file mode 120000
index c344223b66..0000000000
--- a/examples/xml/c5g7/3d/materials.xml
+++ /dev/null
@@ -1 +0,0 @@
-../materials.xml
\ No newline at end of file
diff --git a/examples/xml/c5g7/3d/plots.xml b/examples/xml/c5g7/3d/plots.xml
deleted file mode 100644
index caab977866..0000000000
--- a/examples/xml/c5g7/3d/plots.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- 1
- mat
- material
- 32.13 32.13 107.1
- 64.26 214.2
- slice
- 1000 1000
-
- xz
-
-
-
- 2
- cell
- cell
- 32.13 32.13 107.1
- 64.26 214.2
- slice
- 1000 1000
- xz
-
-
-
- 3
- mat_xy
- material
- 32.13 32.13 107.1
- 64.26 64.26
- slice
- 1000 1000
- xy
-
-
-
diff --git a/examples/xml/c5g7/3d/settings.xml b/examples/xml/c5g7/3d/settings.xml
deleted file mode 100644
index 51241492d5..0000000000
--- a/examples/xml/c5g7/3d/settings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- multi-group
-
-
- 2000
- 500
- 1000
-
-
-
- 0.0 21.42 0.0
- 42.84 64.26 192.78
- 34 34 54
-
-
-
-
-
-
- 0.0 21.42 0.0
- 42.84 64.26 192.78
-
-
-
-
-
-
- 2000
-
-
-
-
- ../data.xml
-
-
diff --git a/examples/xml/c5g7/3d/tallies.xml b/examples/xml/c5g7/3d/tallies.xml
deleted file mode 100644
index e3826ccb63..0000000000
--- a/examples/xml/c5g7/3d/tallies.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
- flux
-
-
-
-
- fission
-
-
-
- 1
- rectangular
- 0.0 0.0 0.0
- 64.26 64.26 214.2
- 51 51 60
-
-
-
- 2
- rectangular
- 0.0 21.42 0.0
- 42.84 64.26 192.78
- 34 34 54
-
-
- false
-
-
diff --git a/examples/xml/c5g7/pin/materials.xml b/examples/xml/c5g7/pin/materials.xml
deleted file mode 120000
index c3825cffc5..0000000000
--- a/examples/xml/c5g7/pin/materials.xml
+++ /dev/null
@@ -1 +0,0 @@
-/home/nelsonag/cases/c5g7/materials.xml
\ No newline at end of file
diff --git a/examples/xml/c5g7/pin/tallies.xml b/examples/xml/c5g7/pin/tallies.xml
deleted file mode 100644
index 727584a627..0000000000
--- a/examples/xml/c5g7/pin/tallies.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
- flux
-
-
-
-
-
- scatter
-
-
-
diff --git a/examples/xml/c5g7/pin/geometry.xml b/examples/xml/pincell_multigroup/geometry.xml
similarity index 100%
rename from examples/xml/c5g7/pin/geometry.xml
rename to examples/xml/pincell_multigroup/geometry.xml
diff --git a/examples/xml/c5g7/materials.xml b/examples/xml/pincell_multigroup/materials.xml
similarity index 100%
rename from examples/xml/c5g7/materials.xml
rename to examples/xml/pincell_multigroup/materials.xml
diff --git a/examples/xml/c5g7/data.xml b/examples/xml/pincell_multigroup/mg_cross_sections.xml
similarity index 100%
rename from examples/xml/c5g7/data.xml
rename to examples/xml/pincell_multigroup/mg_cross_sections.xml
diff --git a/examples/xml/c5g7/pin/plots.xml b/examples/xml/pincell_multigroup/plots.xml
similarity index 100%
rename from examples/xml/c5g7/pin/plots.xml
rename to examples/xml/pincell_multigroup/plots.xml
diff --git a/examples/xml/c5g7/pin/settings.xml b/examples/xml/pincell_multigroup/settings.xml
similarity index 94%
rename from examples/xml/c5g7/pin/settings.xml
rename to examples/xml/pincell_multigroup/settings.xml
index b11c328e5a..6bd27df3dd 100644
--- a/examples/xml/c5g7/pin/settings.xml
+++ b/examples/xml/pincell_multigroup/settings.xml
@@ -41,6 +41,6 @@
false
- ../data.xml
+ ./mg_cross_sections.xml
diff --git a/examples/xml/pincell_multigroup/tallies.xml b/examples/xml/pincell_multigroup/tallies.xml
new file mode 100644
index 0000000000..ed9763be52
--- /dev/null
+++ b/examples/xml/pincell_multigroup/tallies.xml
@@ -0,0 +1,13 @@
+
+
+
+ 100 100 1
+ -0.63 -0.63 -1e+50
+ 0.63 0.63 1e+50
+
+
+
+
+ flux fission nu-fission
+
+
diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py
index 282997983b..d1c1f4e05f 100644
--- a/openmc/mgxs_library.py
+++ b/openmc/mgxs_library.py
@@ -24,37 +24,49 @@ def ndarray_to_string(arr):
shape = arr.shape
ndim = arr.ndim
- text = ''
+ tab = ' '
+ indent = '\n' + tab + tab
+ text = indent
if ndim == 1:
- text += ' '.join(map(str, arr[:]))
+ text += tab
+ for i in range(shape[0]):
+ text += '{:.7E} '.format(arr[i])
+ text += indent
elif ndim == 2:
- for i in xrange(shape[0]):
- text += ' '.join(map(str, arr[i,:]))
- text += '\n'
+ for i in range(shape[0]):
+ text += tab
+ for j in range(shape[1]):
+ text += '{:.7E} '.format(arr[i,j])
+ text += indent
elif ndim == 3:
- for i in xrange(shape[0]):
- for j in xrange(shape[1]):
- text += ' '.join(map(str, arr[i,j,:]))
- text += '\n'
+ for i in range(shape[0]):
+ for j in range(shape[1]):
+ text += tab
+ for k in range(shape[2]):
+ text += '{:.7E} '.format(arr[i,j,k])
+ text += indent
elif ndim == 4:
- for i in xrange(shape[0]):
- for j in xrange(shape[1]):
- for k in xrange(shape[2]):
- text += ' '.join(map(str, arr[i,j,k,:]))
- text += '\n'
+ for i in range(shape[0]):
+ for j in range(shape[1]):
+ for k in range(shape[2]):
+ text += tab
+ for l in range(shape[3]):
+ text += '{:.7E} '.format(arr[i,j,k,l])
+ text += indent
elif ndim == 5:
- for i in xrange(shape[0]):
- for j in xrange(shape[1]):
- for k in xrange(shape[2]):
- for l in xrange(shape[3]):
- text += ' '.join(map(str, arr[i,j,k,l,:]))
- text += '\n'
+ for i in range(shape[0]):
+ for j in range(shape[1]):
+ for k in range(shape[2]):
+ for l in range(shape[3]):
+ text += tab
+ for m in range(shape[4]):
+ text += '{:.7E} '.format(arr[i,j,k,l,m])
+ text += indent
return text
-
class Xsdata(object):
"""A multi-group cross section data set (xsdata) providing all the
multi-group data necessary for a multi-group OpenMC calculation.