diff --git a/AP1000/PWR 2.1/problem/geometry.xml b/AP1000/PWR 2.1/problem/geometry.xml
deleted file mode 100644
index cb4a857..0000000
--- a/AP1000/PWR 2.1/problem/geometry.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
- |
- |
- |
- |
- |
-
- |
- |
- |
-
-
- 17 17
- -10.659 -10.659
- 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 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 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 2 1 1 2 1 1 2 1 1 2 1 1 2 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 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AP1000/PWR 2.1/problem/materials.xml b/AP1000/PWR 2.1/problem/materials.xml
deleted file mode 100644
index 3fd32de..0000000
--- a/AP1000/PWR 2.1/problem/materials.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
- /opt/xdata/endfb-vii.1-hdf5/cross_sections.xml
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AP1000/PWR 2.1/problem/plots.xml b/AP1000/PWR 2.1/problem/plots.xml
deleted file mode 100644
index 2d7c0c1..0000000
--- a/AP1000/PWR 2.1/problem/plots.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
- 0. 0. 0.
- 25.50 25.50
- 1000 1000
-
-
-
-
-
-
diff --git a/AP1000/PWR 2.1/problem/settings.xml b/AP1000/PWR 2.1/problem/settings.xml
deleted file mode 100644
index f5a528c..0000000
--- a/AP1000/PWR 2.1/problem/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- 600
- 50
- 10000
-
-
-
-
- box
-
- -10.659 -10.659 -182.9
- 10.659 10.659 182.9
-
-
-
-
-
diff --git a/AP1000/PWR 2.1/problem/tallies.xml b/AP1000/PWR 2.1/problem/tallies.xml
deleted file mode 100644
index 5711d9e..0000000
--- a/AP1000/PWR 2.1/problem/tallies.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1 2 3 4 5 6
-
-
-
- 1
- flux
-
-
-
- 2
- nu-fission
-
-
-
-
- 3
- delayed-nu-fission
-
-
-
- 4
- fission
-
-
-
- 5
- absorption
-
-
-
- 6
- scatter
-
-
-
- 7
- total
-
-
-
- 8
- delayed-nu-fission
-
-
-
diff --git a/AP1000/PWR 2.1/pwr_2-1.py b/AP1000/PWR 2.1/pwr_2-1.py
index f41442d..9eccc84 100644
--- a/AP1000/PWR 2.1/pwr_2-1.py
+++ b/AP1000/PWR 2.1/pwr_2-1.py
@@ -1,19 +1,22 @@
-
+#!/usr/bin/env python3
"""
====================================================
Description: AP1000 PWR Assembly 17*17
Case: Problem 2 (17*17 PWR Assembly)
Written By: Ahmed K Madani
- Date: 02/03/2017
+ Conversion: Adam Parler
+ Date: 12/03/2023
====================================================
"""
-
-
-
+import os
import openmc
+try:
+ os.mkdir(os.path.dirname(os.path.realpath(__file__)) + '/problem')
+except OSError: pass
+
################## MATERIALS ##################
fuel_21 = openmc.Material()
@@ -179,7 +182,7 @@ plot_file.export_to_xml(path="problem/plots.xml")
################## SETTINGS ##################
settings_file = openmc.Settings()
-settings_file.source = openmc.Source(space=openmc.stats.Box((-10.659, -10.659, -182.9),
+settings_file.source = openmc.IndependentSource(space=openmc.stats.Box((-10.659, -10.659, -182.9),
(10.659, 10.659, 182.9)))
settings_file.batches = 600
settings_file.inactive = 50
diff --git a/AP1000/PWR 2.6/problem/geometry.xml b/AP1000/PWR 2.6/problem/geometry.xml
deleted file mode 100644
index cb4a857..0000000
--- a/AP1000/PWR 2.6/problem/geometry.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
- |
- |
- |
- |
- |
-
- |
- |
- |
-
-
- 17 17
- -10.659 -10.659
- 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 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 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 2 1 1 2 1 1 2 1 1 2 1 1 2 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 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AP1000/PWR 2.6/problem/materials.xml b/AP1000/PWR 2.6/problem/materials.xml
deleted file mode 100644
index 0ea721a..0000000
--- a/AP1000/PWR 2.6/problem/materials.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
- /opt/xdata/endfb-vii.1-hdf5/cross_sections.xml
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AP1000/PWR 2.6/problem/plots.xml b/AP1000/PWR 2.6/problem/plots.xml
deleted file mode 100644
index 2d7c0c1..0000000
--- a/AP1000/PWR 2.6/problem/plots.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
- 0. 0. 0.
- 25.50 25.50
- 1000 1000
-
-
-
-
-
-
diff --git a/AP1000/PWR 2.6/problem/settings.xml b/AP1000/PWR 2.6/problem/settings.xml
deleted file mode 100644
index f5a528c..0000000
--- a/AP1000/PWR 2.6/problem/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- 600
- 50
- 10000
-
-
-
-
- box
-
- -10.659 -10.659 -182.9
- 10.659 10.659 182.9
-
-
-
-
-
diff --git a/AP1000/PWR 2.6/problem/tallies.xml b/AP1000/PWR 2.6/problem/tallies.xml
deleted file mode 100644
index 91bc7b1..0000000
--- a/AP1000/PWR 2.6/problem/tallies.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1 2 3 4 5 6
-
-
-
- 1
- flux
-
-
-
- 2
- nu-fission
-
-
-
-
- 3
- delayed-nu-fission
-
-
-
- 4
- fission
-
-
-
- 5
- absorption
-
-
-
- 6
- scatter
-
-
-
- 7
- total
-
-
-
- 8
- delayed-nu-fission
-
-
-
diff --git a/AP1000/PWR 2.6/pwr_2-6.py b/AP1000/PWR 2.6/pwr_2-6.py
index e99aec3..02c0c7e 100644
--- a/AP1000/PWR 2.6/pwr_2-6.py
+++ b/AP1000/PWR 2.6/pwr_2-6.py
@@ -1,5 +1,22 @@
+#!/usr/bin/env python3
+
+"""
+ ====================================================
+ Description: AP1000 PWR Assembly 17*17
+ Case: Problem 2 (17*17 PWR Assembly)
+ Written By: Ahmed K Madani
+ Conversion: Adam Parler
+ Date: 12/03/2023
+ ====================================================
+"""
+
+import os
import openmc
+try:
+ os.mkdir(os.path.dirname(os.path.realpath(__file__)) + '/problem')
+except OSError: pass
+
################## MATERIALS ##################
fuel_26 = openmc.Material()
@@ -165,7 +182,7 @@ plot_file.export_to_xml(path="problem/plots.xml")
################## SETTINGS ##################
settings_file = openmc.Settings()
-settings_file.source = openmc.Source(space=openmc.stats.Box((-10.659, -10.659, -182.9),
+settings_file.source = openmc.IndependentSource(space=openmc.stats.Box((-10.659, -10.659, -182.9),
(10.659, 10.659, 182.9)))
settings_file.batches = 600
settings_file.inactive = 50
diff --git a/AP1000/PWR 3.10/problem/geometry.xml b/AP1000/PWR 3.10/problem/geometry.xml
deleted file mode 100644
index cb4a857..0000000
--- a/AP1000/PWR 3.10/problem/geometry.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
- |
- |
- |
- |
- |
-
- |
- |
- |
-
-
- 17 17
- -10.659 -10.659
- 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 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 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 2 1 1 2 1 1 2 1 1 2 1 1 2 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 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AP1000/PWR 3.10/problem/materials.xml b/AP1000/PWR 3.10/problem/materials.xml
deleted file mode 100644
index 322b1a4..0000000
--- a/AP1000/PWR 3.10/problem/materials.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
- /opt/xdata/endfb-vii.1-hdf5/cross_sections.xml
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AP1000/PWR 3.10/problem/plots.xml b/AP1000/PWR 3.10/problem/plots.xml
deleted file mode 100644
index 2d7c0c1..0000000
--- a/AP1000/PWR 3.10/problem/plots.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
- 0. 0. 0.
- 25.50 25.50
- 1000 1000
-
-
-
-
-
-
diff --git a/AP1000/PWR 3.10/problem/settings.xml b/AP1000/PWR 3.10/problem/settings.xml
deleted file mode 100644
index f5a528c..0000000
--- a/AP1000/PWR 3.10/problem/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- 600
- 50
- 10000
-
-
-
-
- box
-
- -10.659 -10.659 -182.9
- 10.659 10.659 182.9
-
-
-
-
-
diff --git a/AP1000/PWR 3.10/problem/tallies.xml b/AP1000/PWR 3.10/problem/tallies.xml
deleted file mode 100644
index 15d635a..0000000
--- a/AP1000/PWR 3.10/problem/tallies.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1
-
-
-
- 1 2 3 4 5 6
-
-
-
- 1
- flux
-
-
-
- 2
- nu-fission
-
-
-
- 3
- delayed-nu-fission
-
-
-
- 4
- fission
-
-
-
- 5
- absorption
-
-
-
- 6
- scatter
-
-
-
- 7
- total
-
-
-
- 8
- delayed-nu-fission
-
-
-
diff --git a/AP1000/PWR 3.10/pwr_3-1.py b/AP1000/PWR 3.10/pwr_3-1.py
index 43c6b0a..b2c97ee 100644
--- a/AP1000/PWR 3.10/pwr_3-1.py
+++ b/AP1000/PWR 3.10/pwr_3-1.py
@@ -1,5 +1,22 @@
+#!/usr/bin/env python3
+
+"""
+ ====================================================
+ Description: AP1000 PWR Assembly 17*17
+ Case: Problem 2 (17*17 PWR Assembly)
+ Written By: Ahmed K Madani
+ Conversion: Adam Parler
+ Date: 12/03/2023
+ ====================================================
+"""
+
+import os
import openmc
+try:
+ os.mkdir(os.path.dirname(os.path.realpath(__file__)) + '/problem')
+except OSError: pass
+
################## MATERIALS ##################
fuel_31 = openmc.Material()
@@ -165,7 +182,7 @@ plot_file.export_to_xml(path="problem/plots.xml")
################## SETTINGS ##################
settings_file = openmc.Settings()
-settings_file.source = openmc.Source(space=openmc.stats.Box((-10.659, -10.659, -182.9),
+settings_file.source = openmc.IndependentSource(space=openmc.stats.Box((-10.659, -10.659, -182.9),
(10.659, 10.659, 182.9)))
settings_file.batches = 600
settings_file.inactive = 50