diff --git a/2x2-periodic/build-xml.py b/2x2-periodic/build-xml.py
index 90873e5..3049a04 100644
--- a/2x2-periodic/build-xml.py
+++ b/2x2-periodic/build-xml.py
@@ -181,9 +181,9 @@ source = openmc.source.Source(space=openmc.stats.Box(lower_left, upper_right))
source.space.only_fissionable = True
settings_file = openmc.Settings()
-settings_file.batches = 50
-settings_file.inactive = 10
-settings_file.particles = 30000
+settings_file.batches = 10
+settings_file.inactive = 5
+settings_file.particles = 10000
settings_file.ptables = True
settings_file.output = {'tallies': False}
settings_file.source = source
diff --git a/2x2-periodic/geometry.xml b/2x2-periodic/geometry.xml
index 1542126..471f5d0 100644
--- a/2x2-periodic/geometry.xml
+++ b/2x2-periodic/geometry.xml
@@ -1,245 +1,245 @@
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
1.25984 1.25984 1000.0
17 17 1
-10.70864 -10.70864 -500.0
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 14 14 14 7 14 14 7 14 14 7 14 14 14 14 14
-14 14 14 7 14 14 14 14 14 14 14 14 14 7 14 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 7 14 14 7 14 14 7 14 14 7 14 14 7 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 7 14 14 7 14 14 16 14 14 7 14 14 7 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 7 14 14 7 14 14 7 14 14 7 14 14 7 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 14 7 14 14 14 14 14 14 14 14 14 7 14 14 14
-14 14 14 14 14 7 14 14 7 14 14 7 14 14 14 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 24 24 24 15 24 24 15 24 24 15 24 24 24 24 24
+24 24 24 15 24 24 24 24 24 24 24 24 24 15 24 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 15 24 24 15 24 24 15 24 24 15 24 24 15 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 15 24 24 15 24 24 34 24 24 15 24 24 15 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 15 24 24 15 24 24 15 24 24 15 24 24 15 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 24 15 24 24 24 24 24 24 24 24 24 15 24 24 24
+24 24 24 24 24 15 24 24 15 24 24 15 24 24 24 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
-
+
+ 1.25984 1.25984 1000.0
+ 17 17 1
+ -10.70864 -10.70864 -500.0
+
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 38 35 35 38 35 35 38 35 35 35 35 35
+35 35 35 38 35 35 35 35 35 35 35 35 35 38 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 38 35 35 38 35 35 15 35 35 38 35 35 38 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 38 35 35 15 35 35 34 35 35 15 35 35 38 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 38 35 35 38 35 35 15 35 35 38 35 35 38 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 35 38 35 35 35 35 35 35 35 35 35 38 35 35 35
+35 35 35 35 35 38 35 35 38 35 35 38 35 35 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+
+
21.41728 21.41728 1000.0
2 2 1
-21.41728 -21.41728 -500.0
-134 135
-135 134
+97 95
+95 97
-
- 1.25984 1.25984 1000.0
- 17 17 1
- -10.70864 -10.70864 -500.0
-
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 36 36 36 37 36 36 37 36 36 37 36 36 36 36 36
-36 36 36 37 36 36 36 36 36 36 36 36 36 37 36 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 37 36 36 37 36 36 7 36 36 37 36 36 37 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 37 36 36 7 36 36 16 36 36 7 36 36 37 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 37 36 36 37 36 36 7 36 36 37 36 36 37 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 36 37 36 36 36 36 36 36 36 36 36 37 36 36 36
-36 36 36 36 36 37 36 36 37 36 36 37 36 36 36 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/2x2-periodic/plots.xml b/2x2-periodic/plots.xml
index ffff0e5..3106879 100644
--- a/2x2-periodic/plots.xml
+++ b/2x2-periodic/plots.xml
@@ -1,6 +1,6 @@
-
+
0.0 0.0 195.0
42.83456 42.83456
1000 1000
diff --git a/2x2-periodic/settings.xml b/2x2-periodic/settings.xml
index 503de41..fb53bbc 100644
--- a/2x2-periodic/settings.xml
+++ b/2x2-periodic/settings.xml
@@ -1,9 +1,9 @@
- 100000
- 100
- 10
+ 10000
+ 10
+ 5
diff --git a/2x2-periodic/tallies.xml b/2x2-periodic/tallies.xml
index bafc3cf..e9ebe17 100644
--- a/2x2-periodic/tallies.xml
+++ b/2x2-periodic/tallies.xml
@@ -16,28 +16,28 @@
absorption fission
-
+
total
flux
tracklength
-
+
O16 O17 U234 U235 U238
total nu-fission
tracklength
-
+
total
flux
analog
-
+
O16 O17 U234 U235 U238
@@ -45,42 +45,42 @@
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
total
flux
tracklength
-
+
O16 O17 U234 U235 U238
total nu-fission
tracklength
-
+
total
flux
analog
-
+
O16 O17 U234 U235 U238
@@ -88,14 +88,14 @@
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
O16 O17 U234 U235 U238
nu-fission
diff --git a/2x2-reflector/build-xml.py b/2x2-reflector/build-xml.py
index e79daab..5094c72 100644
--- a/2x2-reflector/build-xml.py
+++ b/2x2-reflector/build-xml.py
@@ -193,9 +193,9 @@ source = openmc.source.Source(space=openmc.stats.Box(lower_left, upper_right))
source.space.only_fissionable = True
settings_file = openmc.Settings()
-settings_file.batches = 50
-settings_file.inactive = 10
-settings_file.particles = 30000
+settings_file.batches = 10
+settings_file.inactive = 5
+settings_file.particles = 10000
settings_file.ptables = True
settings_file.output = {'tallies': False}
settings_file.source = source
diff --git a/2x2-reflector/geometry.xml b/2x2-reflector/geometry.xml
index 33c0d52..189734c 100644
--- a/2x2-reflector/geometry.xml
+++ b/2x2-reflector/geometry.xml
@@ -1,247 +1,247 @@
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
1.25984 1.25984 1000.0
17 17 1
-10.70864 -10.70864 -500.0
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 32 32 32 41 32 32 41 32 32 41 32 32 32 32 32
-32 32 32 41 32 32 32 32 32 32 32 32 32 41 32 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 41 32 32 41 32 32 6 32 32 41 32 32 41 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 41 32 32 6 32 32 27 32 32 6 32 32 41 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 41 32 32 41 32 32 6 32 32 41 32 32 41 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 32 41 32 32 32 32 32 32 32 32 32 41 32 32 32
-32 32 32 32 32 41 32 32 41 32 32 41 32 32 32 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
-32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 28 28 28 31 28 28 31 28 28 31 28 28 28 28 28
+28 28 28 31 28 28 28 28 28 28 28 28 28 31 28 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 31 28 28 31 28 28 26 28 28 31 28 28 31 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 31 28 28 26 28 28 38 28 28 26 28 28 31 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 31 28 28 31 28 28 26 28 28 31 28 28 31 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 28 31 28 28 28 28 28 28 28 28 28 31 28 28 28
+28 28 28 28 28 31 28 28 31 28 28 31 28 28 28 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
+28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
-
+
1.25984 1.25984 1000.0
17 17 1
-10.70864 -10.70864 -500.0
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 6 35 35 6 35 35 6 35 35 35 35 35
-35 35 35 6 35 35 35 35 35 35 35 35 35 6 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 6 35 35 6 35 35 6 35 35 6 35 35 6 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 6 35 35 6 35 35 27 35 35 6 35 35 6 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 6 35 35 6 35 35 6 35 35 6 35 35 6 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 6 35 35 35 35 35 35 35 35 35 6 35 35 35
-35 35 35 35 35 6 35 35 6 35 35 6 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 26 43 43 26 43 43 26 43 43 43 43 43
+43 43 43 26 43 43 43 43 43 43 43 43 43 26 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 26 43 43 26 43 43 26 43 43 26 43 43 26 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 26 43 43 26 43 43 38 43 43 26 43 43 26 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 26 43 43 26 43 43 26 43 43 26 43 43 26 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 26 43 43 43 43 43 43 43 43 43 26 43 43 43
+43 43 43 43 43 26 43 43 26 43 43 26 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
-
+
21.41728 21.41728 1000.0
3 3 1
-32.12592 -32.12592 -500.0
-75 73 72
-73 75 72
-72 72 72
+77 78 75
+78 77 75
+75 75 75
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/2x2-reflector/settings.xml b/2x2-reflector/settings.xml
index 0326802..a80647c 100644
--- a/2x2-reflector/settings.xml
+++ b/2x2-reflector/settings.xml
@@ -1,9 +1,9 @@
- 100000
- 100
- 10
+ 10000
+ 10
+ 5
diff --git a/2x2-reflector/tallies.xml b/2x2-reflector/tallies.xml
index a72efab..89dd97c 100644
--- a/2x2-reflector/tallies.xml
+++ b/2x2-reflector/tallies.xml
@@ -16,28 +16,28 @@
absorption fission
-
+
total
flux
tracklength
-
+
O16 O17 U234 U235 U238
total nu-fission
tracklength
-
+
total
flux
analog
-
+
O16 O17 U234 U235 U238
@@ -45,42 +45,42 @@
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
total
flux
tracklength
-
+
O16 O17 U234 U235 U238
total nu-fission
tracklength
-
+
total
flux
analog
-
+
O16 O17 U234 U235 U238
@@ -88,14 +88,14 @@
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
O16 O17 U234 U235 U238
nu-fission
diff --git a/assembly/build-xml.py b/assembly/build-xml.py
index 98e05b2..1ffe87a 100644
--- a/assembly/build-xml.py
+++ b/assembly/build-xml.py
@@ -101,9 +101,9 @@ source = openmc.source.Source(space=openmc.stats.Box(lower_left, upper_right))
source.space.only_fissionable = True
settings_file = openmc.Settings()
-settings_file.batches = 50
-settings_file.inactive = 10
-settings_file.particles = 30000
+settings_file.batches = 10
+settings_file.inactive = 5
+settings_file.particles = 10000
settings_file.ptables = True
settings_file.output = {'tallies': False}
settings_file.source = source
diff --git a/assembly/geometry.xml b/assembly/geometry.xml
index 675bc59..d2ec328 100644
--- a/assembly/geometry.xml
+++ b/assembly/geometry.xml
@@ -1,162 +1,162 @@
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
1.25984 1.25984 1000.0
17 17 1
-10.70864 -10.70864 -500.0
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 26 26 26 11 26 26 11 26 26 11 26 26 26 26 26
-26 26 26 11 26 26 26 26 26 26 26 26 26 11 26 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 11 26 26 11 26 26 11 26 26 11 26 26 11 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 11 26 26 11 26 26 27 26 26 11 26 26 11 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 11 26 26 11 26 26 11 26 26 11 26 26 11 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 26 11 26 26 26 26 26 26 26 26 26 11 26 26 26
-26 26 26 26 26 11 26 26 11 26 26 11 26 26 26 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
-26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 39 39 39 9 39 39 9 39 39 9 39 39 39 39 39
+39 39 39 9 39 39 39 39 39 39 39 39 39 9 39 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 9 39 39 9 39 39 9 39 39 9 39 39 9 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 9 39 39 9 39 39 14 39 39 9 39 39 9 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 9 39 39 9 39 39 9 39 39 9 39 39 9 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 39 9 39 39 39 39 39 39 39 39 39 9 39 39 39
+39 39 39 39 39 9 39 39 9 39 39 9 39 39 39 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assembly/settings.xml b/assembly/settings.xml
index 45d4d8a..74439b3 100644
--- a/assembly/settings.xml
+++ b/assembly/settings.xml
@@ -1,9 +1,9 @@
- 100000
- 100
- 10
+ 10000
+ 10
+ 5
diff --git a/assembly/tallies.xml b/assembly/tallies.xml
index dec4dcb..560da1d 100644
--- a/assembly/tallies.xml
+++ b/assembly/tallies.xml
@@ -16,28 +16,28 @@
absorption fission
-
+
total
flux
tracklength
-
+
O16 O17 U234 U235 U238
total nu-fission
tracklength
-
+
total
flux
analog
-
+
O16 O17 U234 U235 U238
@@ -45,14 +45,14 @@
analog
-
+
O16 O17 U234 U235 U238
nu-fission
analog
-
+
O16 O17 U234 U235 U238
nu-fission
diff --git a/pin-cell/build-xml.py b/pin-cell/build-xml.py
index 8f31fbb..337b3a5 100644
--- a/pin-cell/build-xml.py
+++ b/pin-cell/build-xml.py
@@ -101,9 +101,9 @@ source = openmc.source.Source(space=openmc.stats.Box(lower_left, upper_right))
source.space.only_fissionable = True
settings_file = openmc.Settings()
-settings_file.batches = 50
+settings_file.batches = 10
settings_file.inactive = 5
-settings_file.particles = 30000
+settings_file.particles = 10000
settings_file.ptables = True
settings_file.output = {'tallies': False}
settings_file.source = source
diff --git a/pin-cell/geometry.xml b/pin-cell/geometry.xml
index 02ef97a..76b7a94 100644
--- a/pin-cell/geometry.xml
+++ b/pin-cell/geometry.xml
@@ -1,15 +1,15 @@
- |
- |
- |
- |
- |
-
-
-
-
-
-
-
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
diff --git a/pin-cell/settings.xml b/pin-cell/settings.xml
index 0c74f45..43e6a1e 100644
--- a/pin-cell/settings.xml
+++ b/pin-cell/settings.xml
@@ -1,8 +1,8 @@
- 100000
- 100
+ 10000
+ 10
5
@@ -17,4 +17,6 @@
false
true
+ True
+ 1000
diff --git a/profile.py b/profile.py
index 34240b7..a9c5c32 100644
--- a/profile.py
+++ b/profile.py
@@ -10,46 +10,76 @@ benchmark = input('Benchmark: ')
os.chdir(benchmark)
# Query user for hardware platform to consider
-platform = input('Hardware platform (Haswell / Phi): ')
+platform = os.environ['HOSTNAME']
-# Default MPI+OMP runtime parameters for HASWELL/Phi
-if platform.lower() == 'haswell':
+# Default MPI+OMP runtime parameters for Phi/Haswell
+if 'thing' in platform:
+ platform = 'haswell'
mpi_procs = [1, 2, 4, 8, 36, 72]
omp_threads = [72, 36, 18, 9, 2, 1]
-elif platform.lower() == 'phi':
- mpi_procs = [4, 64, 64, 64]
- omp_threads = [64, 1, 2, 4]
else:
- exit('Unknown hardware platform {}'.format(platform))
+ platform = 'phi'
+ mpi_procs = [4, 4, 4, 64, 64, 64]
+ omp_threads = [16, 32, 64, 1, 2, 4]
-# Allocate NumPy arrays for timing data
-inactive_times = np.zeros(len(mpi_procs), dtype=np.int)
-active_times = np.zeros(len(mpi_procs), dtype=np.int)
+# Allocate arrays for timing data for inactive and active cycles
+times = np.zeros((len(mpi_procs),2), dtype=np.int)
-for i, (procs, threads) in enumerate(zip(mpi_procs, omp_threads)):
+# Instantiate a Summary object to retrieve the geometry
+su = openmc.Summary('summary.h5')
- # Run OpenMC
- openmc.run(threads=threads, mpi_procs=procs)
+for i, xs in enumerate(['ace', 'multipole']):
- # Glob the names of all statepoints in the directory
- sp_filenames = glob.glob('statepoint.*.h5')
+ # Construct uniform initial source distribution over fissionable zones
+ lower_left = su.opencg_geometry.bounds[:2] + [-10.]
+ upper_right = su.opencg_geometry.bounds[3:5] + [10.]
+ source = openmc.source.Source(space=openmc.stats.Box(lower_left, upper_right))
+ source.space.only_fissionable = True
- # Load the final statepoint
- sp = openmc.StatePoint(sp_filenames[0])
+ settings_file = openmc.Settings()
+ settings_file.batches = 10
+ settings_file.inactive = 5
+ settings_file.particles = 10000
+ settings_file.ptables = True
+ settings_file.output = {'tallies': False}
+ settings_file.source = source
+ settings_file.sourcepoint_write = False
- # Extract cumulative time spent in (in)active cycles in seconds
- inactive_time = sp.runtime['inactive batches']
- active_time = sp.runtime['active batches']
+ if xs == 'multipole':
+ settings_file.temperature = {'multipole': True, 'tolerance': 1000}
- # Convert times to neutrons / second
- inactive_times[i] = int((sp.n_inactive * sp.n_particles) / inactive_time)
- active_times[i] = int((sp.n_realizations * sp.n_particles) / active_time)
+ settings_file.export_to_xml()
- print('inactive time (n / sec): {}'.format(inactive_times[i]))
- print('active time (n / sec): {}'.format(active_times[i]))
+ for j, (procs, threads) in enumerate(zip(mpi_procs, omp_threads)):
-# Save timing data to CSV files
-np.savetxt('{}-{}-inactive.csv'.format(benchmark, platform),
- inactive_times, delimiter=',')
-np.savetxt('{}-{}-active.csv'.format(benchmark, platform),
- active_times, delimiter=',')
+ # Run OpenMC - works for both flat and cache memory modes
+ #openmc.run(threads=threads, mpi_procs=procs,
+ # mpi_exec='HYDRA_TOPO_DEBUG=1 mpiexec -bind-to numa')
+
+ # Run OpenMC - works for both flat mode with MCDRAM only
+ #openmc.run(threads=threads, mpi_procs=procs,
+ # mpi_exec='HYDRA_TOPO_DEBUG=1 mpiexec -bind-to core:16 numactl --preferred 4,5,6,7')
+
+ # Run OpenMC - works for both flat and cache memory modes
+ openmc.run(threads=threads, mpi_procs=procs,
+ mpi_exec='HYDRA_TOPO_DEBUG=1 mpiexec -bind-to core:16')
+
+ # Glob the names of all statepoints in the directory
+ sp_filenames = glob.glob('statepoint.*.h5')
+
+ # Load the final statepoint
+ sp = openmc.StatePoint(sp_filenames[0])
+
+ # Extract cumulative time spent in (in)active cycles in seconds
+ inactive = sp.runtime['inactive batches']
+ active = sp.runtime['active batches']
+
+ # Convert times to neutrons / second
+ times[j,0] = int((sp.n_inactive * sp.n_particles) / inactive)
+ times[j,1] = int((sp.n_realizations * sp.n_particles) / active)
+
+ print('inactive time (n / sec): {}'.format(times[j,0]))
+ print('active time (n / sec): {}'.format(times[j,1]))
+
+ # Save timing data to CSV files
+ np.savetxt('{}-{}.csv'.format(platform, xs), times, delimiter=',', fmt='%d')