Skip to content

Commit

Permalink
Merge pull request #344 from JADE-V-V/alex-benchmarks
Browse files Browse the repository at this point in the history 
Adding Alex benchmarks (Issue #229)
  • Loading branch information
@alexvalentine94
alexvalentine94 authored Nov 6, 2024
2 parents c7d6aff + 1e505e9 commit d6fcd2c
Show file tree
Hide file tree
Showing 101 changed files with 1,970 additions and 27 deletions.
9 changes: 9 additions & 0 deletions jade/computational.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ def executeBenchmarksRoutines(session, lib: str, runoption: str, exp=False) -> N
"FNG Bulk Blanket and Shielding Experiment",
"FNG Tungsten",
"ASPIS Iron-88 benchmark",
"FNG SiC",
"FNG HCPB",
"ASPIS PCA Replica RR",
"FNG Stainless Steel",
]:
var = {"00c": lib, "34y": "34y"}
else:
Expand Down Expand Up @@ -153,6 +157,11 @@ def executeBenchmarksRoutines(session, lib: str, runoption: str, exp=False) -> N
"ASPIS-Fe88",
"TUD-Fe",
"TUD-W",
"FNG-SiC",
"FNG-HCPB",
"ASPIS-PCA-Replica_flux",
"ASPIS-PCA-Replica_RR",
"FNG-SS",
]:
test = testrun.MultipleTest(*args)

Expand Down
Binary file added jade/default_settings/Benchmarks_Configuration/ASPIS-PCA-Replica_flux.xlsx
View file
Binary file not shown.
Binary file modified jade/default_settings/Config.xlsx
View file
Binary file not shown.
429 changes: 407 additions & 22 deletions jade/expoutput.py
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions jade/plotter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def plot(self, plot_type):
plot_type : str
plot type. The current available ones are ['Binned graph',
'Ratio graph', 'Experimental points',
'Discreet Experimental points', 'Grouped bars', 'Waves'].
'Discrete Experimental points', 'Grouped bars', 'Waves'].
Raises
------
Expand Down Expand Up @@ -286,7 +286,7 @@ def plot(self, plot_type):
outp = self._exp_points_group_plot_CE(test_name=self.testname)

# --- Experimental Points Plot ---
elif plot_type == "Discreet Experimental points":
elif plot_type == "Discrete Experimental points":
outp = self._exp_points_discreet_plot()

# --- Grouped bars chart ---
Expand Down
18 changes: 16 additions & 2 deletions jade/postprocess.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def _get_output(action, code, testname, lib, session):
elif testname == "SphereSDDR":
out = spho.SphereSDDRoutput(lib, code, testname, session)

elif testname in ["Oktavian"]:
elif testname in ["Oktavian", "ASPIS-PCA-Replica_flux"]:
if action == "compare":
out = expo.SpectrumOutput(lib, code, testname, session, multiplerun=True)
elif action == "pp":
Expand Down Expand Up @@ -171,13 +171,27 @@ def _get_output(action, code, testname, lib, session):
print(exp_pp_message)
return False

elif testname in ["FNG-BKT", "FNG-W", "ASPIS-Fe88"]:
elif testname in [
"FNG-BKT",
"FNG-W",
"ASPIS-Fe88",
"FNG-SiC",
"ASPIS-PCA-Replica_RR",
"FNG-SS",
]:
if action == "compare":
out = expo.ShieldingOutput(lib, code, testname, session, multiplerun=True)
elif action == "pp":
print(exp_pp_message)
return False

elif testname == "FNG-HCPB":
if action == "compare":
out = expo.fnghcpboutput(lib, testname, session, multiplerun=True)
elif action == "pp":
print(exp_pp_message)
return False

elif testname == "FNG":
if action == "compare":
out = expo.FNGOutput(lib, code, testname, session, multiplerun=True)
Expand Down
5 changes: 5 additions & 0 deletions jade/status.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
"ASPIS-Fe88",
"TUD-Fe",
"TUD-W",
"FNG-SiC",
"FNG-HCPB",
"ASPIS-PCA-Replica_flux",
"ASPIS-PCA-Replica_RR",
"FNG-SS",
]
EXP_TAG = "Exp"
CODES = ["mcnp", "serpent", "openmc", "d1s"]
Expand Down
Binary file added tests/TestFiles/expoutput/Benchmarks_Configuration/ASPIS-PCA-Replica_flux.xlsx
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions ...stFiles/expoutput/ExperimentalResults/ASPIS-PCA-Replica_RR/In/ASPIS-PCA-Replica_RR_In.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Depth,Reaction Rate,Error
0,0,0.9
0,0,1.4
0,0,1.5
11 changes: 11 additions & 0 deletions ...stFiles/expoutput/ExperimentalResults/ASPIS-PCA-Replica_RR/Rh/ASPIS-PCA-Replica_RR_Rh.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Depth,Reaction Rate,Error
s,0,0.03
0,0,0.03
0,0,0.03
0,0,0.03
0,0,0.03
0,0,0.04
0,0,0.04
0,0,0.01
0,0,0.019
0,0,0.016
43 changes: 43 additions & 0 deletions ...ExperimentalResults/ASPIS-PCA-Replica_flux/spectra/ASPIS-PCA-Replica_flux_spectra_914.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Energy [MeV],flux per unit lethargy per NESTOR WATT [1/u/n/watt],Relative error [-]
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
0.2,0.1,0.04
43 changes: 43 additions & 0 deletions ...ExperimentalResults/ASPIS-PCA-Replica_flux/spectra/ASPIS-PCA-Replica_flux_spectra_924.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Energy [MeV],flux per unit lethargy per NESTOR WATT [1/u/n/watt],Relative error [-]
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
0.4,0.2,0.04
5 changes: 5 additions & 0 deletions tests/TestFiles/expoutput/ExperimentalResults/FNG-HCPB/Al/FNG-HCPB_Al.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Depth,Reaction Rate,Error
0,0,4.2
0,0,4.2
0,0,4.3
0,0,4.3
49 changes: 49 additions & 0 deletions tests/TestFiles/expoutput/ExperimentalResults/FNG-HCPB/H3/FNG-HCPB_H3.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Pellet,Activity,Error
"1, ENEA 2",2,2
"2, ENEA 2",2,2
"3, ENEA 2",2,2
"4, ENEA 2",2,2
"5, ENEA 2",2,2
"6, ENEA 2",2,2
"7, ENEA 2",2,2
"8, ENEA 2",2,2
"9, ENEA 2",2,2
"10, ENEA 2",2,2
"11, ENEA 2",2,2
"12, ENEA 2",2,2
"1, ENEA 4",2,2
"2, ENEA 4",2,2
"3, ENEA 4",2,2
"4, ENEA 4",2,2
"5, ENEA 4",2,2
"6, ENEA 4",2,2
"7, ENEA 4",2,2
"8, ENEA 4",2,2
"9, ENEA 4",2,2
"10, ENEA 4",2,2
"11, ENEA 4",2,2
"12, ENEA 4",2,2
"1, ENEA 6",2,2
"2, ENEA 6",2,2
"3, ENEA 6",2,2
"4, ENEA 6",2,2
"5, ENEA 6",2,2
"6, ENEA 6",2,2
"7, ENEA 6",2,2
"8, ENEA 6",2,2
"9, ENEA 6",2,2
"10, ENEA 6",2,2
"11, ENEA 6",2,2
"12, ENEA 6",2,2
"1, ENEA 8",2,2
"2, ENEA 8",2,2
"3, ENEA 8",2,2
"4, ENEA 8",2,2
"5, ENEA 8",2,2
"6, ENEA 8",2,2
"7, ENEA 8",2,2
"8, ENEA 8",2,2
"9, ENEA 8",2,2
"10, ENEA 8",2,2
"11, ENEA 8",2,2
"12, ENEA 8",2,2
8 changes: 8 additions & 0 deletions tests/TestFiles/expoutput/ExperimentalResults/FNG-SS/Al/FNG-SS_Al.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Depth,Reaction Rate,Error
1,1,5.6
1,1,5.6
1,1,5.8
1,1,5.8
1,1,5.8
1,1,6.4
1,1,10
8 changes: 8 additions & 0 deletions tests/TestFiles/expoutput/ExperimentalResults/FNG-SS/Au/FNG-SS_Au.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Depth,Reaction Rate,Error
2,1,4.8
2,1,5
2,1,5
2,1,5
2,1,5.5
2,1,5.5
2,1,5.5
5 changes: 5 additions & 0 deletions tests/TestFiles/expoutput/ExperimentalResults/FNG-SiC/Al/FNG-SiC_Al.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Depth,Reaction Rate,Error
1,1,3.6
1,1,3.7
1,1,3.8
1,1,4
5 changes: 5 additions & 0 deletions tests/TestFiles/expoutput/ExperimentalResults/FNG-SiC/TLD/FNG-SiC_TLD.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Depth,Reaction Rate,Error
14.99,2.71E-15,6.3
30.23,4.32E-16,6.3
45.47,1.11E-16,6
60.71,3.22E-17,7
1 change: 1 addition & 0 deletions ...utput/Simulations/00c/ASPIS-PCA-Replica_RR/ASPIS-PCA-Replica_In/mcnp/ASPIS-PCA-Replica_In
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mcnp
31 changes: 31 additions & 0 deletions ...tput/Simulations/00c/ASPIS-PCA-Replica_RR/ASPIS-PCA-Replica_In/mcnp/ASPIS-PCA-Replica_Inm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
mcnp 6.mpi 01/17/24 08:12:23 3 100000000 51950859883
PCA-Replica Benchmark
ntal 1
4
tally 4 -1 0 0
1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Rh103 Detectors
f 10
0 924 944 0 0 0 0 0 0 1078
d 1
u 0
s 0
m 1
c 0
e 0
t 0
vals
2 0.0107 7 0.0048 1 0.0048 21 0.0042
3 0.0039 7 0.0036 3 0.0040 90007 0.0025
3 0.0031 7 0.0112
tfc 10 1 1 1 1 1 1 1 1
10000000 1.88799E-20 1.53359E-02 5.71312E+01
20000000 1.90677E-20 1.07641E-02 5.78226E+01
30000000 1.89079E-20 8.79122E-03 5.76809E+01
40000000 1.87847E-20 7.64302E-03 5.71806E+01
50000000 1.87881E-20 6.85465E-03 5.67984E+01
60000000 1.87581E-20 6.24197E-03 5.70483E+01
70000000 1.87028E-20 5.78872E-03 5.68361E+01
80000000 1.87024E-20 5.40530E-03 5.70251E+01
90000000 1.88449E-20 1.17337E-02 1.07541E+01
100000000 1.87852E-20 1.06972E-02 1.16405E+01
1 change: 1 addition & 0 deletions ...tput/Simulations/00c/ASPIS-PCA-Replica_RR/ASPIS-PCA-Replica_In/mcnp/ASPIS-PCA-Replica_Ino
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mcnp
1 change: 1 addition & 0 deletions ...utput/Simulations/00c/ASPIS-PCA-Replica_RR/ASPIS-PCA-Replica_Rh/mcnp/ASPIS-PCA-Replica_Rh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mcnp
31 changes: 31 additions & 0 deletions ...tput/Simulations/00c/ASPIS-PCA-Replica_RR/ASPIS-PCA-Replica_Rh/mcnp/ASPIS-PCA-Replica_Rhm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
mcnp 6.mpi 01/17/24 08:12:23 3 100000000 51950859883
PCA-Replica Benchmark
ntal 1
4
tally 4 -1 0 0
1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Rh103 Detectors
f 10
0 924 944 0 0 0 0 0 0 1078
d 1
u 0
s 0
m 1
c 0
e 0
t 0
vals
2 0.0107 7 0.0048 1 0.0049 21 0.0042
3 0.0039 7 0.0036 3 0.0040 90007 0.0025
3 0.0031 7 0.0112
tfc 10 1 1 1 1 1 1 1 1
10000000 1.88799E-20 1.53359E-02 5.71312E+01
20000000 1.90677E-20 1.07641E-02 5.78226E+01
30000000 1.89079E-20 8.79122E-03 5.76809E+01
40000000 1.87847E-20 7.64302E-03 5.71806E+01
50000000 1.87881E-20 6.85465E-03 5.67984E+01
60000000 1.87581E-20 6.24197E-03 5.70483E+01
70000000 1.87028E-20 5.78872E-03 5.68361E+01
80000000 1.87024E-20 5.40530E-03 5.70251E+01
90000000 1.88449E-20 1.17337E-02 1.07541E+01
100000000 1.87852E-20 1.06972E-02 1.16405E+01
1 change: 1 addition & 0 deletions ...tput/Simulations/00c/ASPIS-PCA-Replica_RR/ASPIS-PCA-Replica_Rh/mcnp/ASPIS-PCA-Replica_Rho
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mcnp
1 change: 1 addition & 0 deletions ...iles/expoutput/Simulations/00c/ASPIS-PCA-Replica_flux/spectra/mcnp/ASPIS-PCA-Replica_flux
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mcnp
Loading

0 comments on commit d6fcd2c

Please sign in to comment.