diff --git a/src/jade/post/manipulate_tally.py b/src/jade/post/manipulate_tally.py index fcd5e756..5d2efd85 100644 --- a/src/jade/post/manipulate_tally.py +++ b/src/jade/post/manipulate_tally.py @@ -74,7 +74,7 @@ def condense_groups( tally[group_column] = tally["coarse_bin"].apply( lambda x: f"{x.left:g} - {x.right:g}" if pd.notna(x) else np.nan ) - ''' + """ labels = [f"{bins[i]:g} - {bins[i+1]:g}" for i in range(len(bins) - 1)] tally[group_column] = pd.cut( @@ -83,7 +83,7 @@ def condense_groups( right=False, labels=labels, ) - ''' + """ del tally["coarse_bin"] grouped = tally.groupby(group_column, observed=False).agg( {"Value": "sum", "abs err": lambda x: math.sqrt((x**2).sum())} @@ -510,7 +510,7 @@ def compare_data( for v1, v2, e1, e2 in zip(val1, val2, err1, err2): if v1 != v2: error.append( - np.sqrt((v1 * e1) ** 2 + (v2 * e2) ** 2) / (v1 - v2) + np.abs(np.sqrt((v1 * e1) ** 2 + (v2 * e2) ** 2) / (v1 - v2)) ) # relative error propagation for substraction else: error.append( @@ -521,7 +521,7 @@ def compare_data( for v1, v2, e1, e2 in zip(val1, val2, err1, err2): if v1 != v2: error.append( - np.sqrt((v1 * v2 * e1) ** 2 + (v2 * e2) ** 2) / (v1 - v2) + np.abs(np.sqrt((v2 * e1) ** 2 + (v2 * e2) ** 2) / (v1 - v2)) ) # relative error propagation for percentage else: error.append( diff --git a/src/jade/resources/default_cfg/benchmarks_pp/atlas/C-Model.yaml b/src/jade/resources/default_cfg/benchmarks_pp/atlas/C-Model.yaml index 2874e350..7ae58761 100644 --- a/src/jade/resources/default_cfg/benchmarks_pp/atlas/C-Model.yaml +++ b/src/jade/resources/default_cfg/benchmarks_pp/atlas/C-Model.yaml @@ -1,8 +1,8 @@ -Neutron current on plasma boundary 0: +Neutron current on plasma boundary (uncollided): results: - Neutron current on plasma boundary plot_type: barplot - title: Neutron current on plasma boundary + title: Neutron current on plasma boundary (uncollided) x_label: BLK n. # y_labels: "Neutron current $\\left[\\mathrm{cm}^{-2}\\cdot\\mathrm{s}^{-1}\\right]$" x: BLK n. @@ -10,17 +10,17 @@ Neutron current on plasma boundary 0: subsets: [ { - "result": "Neutron current on plasma boundary_0", + "result": "Neutron current on plasma boundary", "values": { "User": [0] }, }, ] plot_args: log: true -Neutron current on plasma boundary 1: +Neutron current on plasma boundary (collided): results: - Neutron current on plasma boundary plot_type: barplot - title: Neutron current on plasma boundary + title: Neutron current on plasma boundary (collided) x_label: BLK n. # y_labels: "Neutron current $\\left[\\mathrm{cm}^{-2}\\cdot\\mathrm{s}^{-1}\\right]$" x: BLK n. @@ -28,16 +28,16 @@ Neutron current on plasma boundary 1: subsets: [ { - "result": "Neutron current on plasma boundary_1", + "result": "Neutron current on plasma boundary", "values": { "User": [1] }, }, ] -Neutron flux on plasma boundary 0: +Neutron flux on plasma boundary (uncollided): results: - Neutron flux on plasma boundary plot_type: barplot - title: Neutron flux on plasma boundary + title: Neutron flux on plasma boundary (uncollided) x_label: BLK n. # y_labels: "Neutron flux $\\left[\\mathrm{cm}^{-2}\\cdot\\mathrm{s}^{-1}\\right]$" x: BLK n. @@ -45,18 +45,18 @@ Neutron flux on plasma boundary 0: subsets: [ { - "result": "Neutron flux on plasma boundary 0", + "result": "Neutron flux on plasma boundary", "values": { "User": [0] }, }, ] plot_args: log: true -Neutron flux on plasma boundary 1: +Neutron flux on plasma boundary (collided): results: - Neutron flux on plasma boundary plot_type: barplot - title: Neutron flux on plasma boundary + title: Neutron flux on plasma boundary (collided) x_label: BLK n. # y_labels: "Neutron flux $\\left[\\mathrm{cm}^{-2}\\cdot\\mathrm{s}^{-1}\\right]$" x: BLK n. @@ -64,7 +64,7 @@ Neutron flux on plasma boundary 1: subsets: [ { - "result": "Neutron flux on plasma boundary 1", + "result": "Neutron flux on plasma boundary", "values": { "User": [1] }, }, ] diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv new file mode 100644 index 00000000..39691d43 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv @@ -0,0 +1,58 @@ +Cells,Value,Error,Components +4,333399.0,0.0004,BM01_C03 +5,667384.0,0.0003,BM01_C02 +6,333787.0,0.0004,BM01_C01 +7,443924.0,0.0003,BM02_C03 +8,887347.0,0.0002,BM02_C02 +9,443758.0,0.0003,BM02_C01 +10,507546.0,0.0003,BM03_C03 +11,1015350.0,0.0002,BM03_C02 +12,507850.0,0.0003,BM03_C01 +13,505318.0,0.0003,BM04_C03 +14,1011800.0,0.0002,BM04_C02 +15,506171.0,0.0003,BM04_C01 +16,421456.0,0.0003,BM05_C03 +17,842847.0,0.0002,BM05_C02 +18,421320.0,0.0003,BM05_C01 +19,339154.0,0.0004,BM06_C03 +20,678453.0,0.0003,BM06_C02 +21,339225.0,0.0004,BM06_C01 +22,1065710.0,0.0002,7-8-9_-20deg +23,2134420.0,0.0002,7-8-9_cen +24,1067180.0,0.0002,7-8-9_+20deg +25,976525.0,0.0002,BM10_1 +26,976181.0,0.0002,BM10_2 +27,455274.0,0.0003,BM11_C01 +28,991367.0,0.0002,BM11_S02 +29,915660.0,0.0002,BM11_C02 +30,992722.0,0.0002,BM11_S01 +31,456304.0,0.0003,BM11_C01_2 +32,448297.0,0.0003,BM12_C03 +33,903202.0,0.0002,BM12_S02 +34,894814.0,0.0002,BM12_C02 +35,903392.0,0.0002,BM12_S01 +36,448078.0,0.0003,BM12_C01 +37,609970.0,0.0003,BM13_C03 +38,1043720.0,0.0002,BM13_S02 +39,1237290.0,0.0002,BM13_C02 +40,1034170.0,0.0002,BM13_S01 +41,609105.0,0.0003,BM13_C01 +42,1244270.0,0.0002,BM14_S02 +43,1250030.0,0.0002,BM14_S01 +44,1266010.0,0.0002,BM15_S02 +45,1260140.0,0.0002,BM15_S01 +46,691470.0,0.0003,BM16_C03 +47,1230740.0,0.0002,BM16_S02 +48,1367710.0,0.0002,BM16_C02 +49,1220840.0,0.0002,BM16_S01 +50,689160.0,0.0003,BM16_C01 +51,570059.0,0.0003,BM17_C03 +52,1141400.0,0.0002,BM17_S02 +53,1138590.0,0.0002,BM17_C02 +54,1142190.0,0.0002,BM17_S01 +55,569062.0,0.0003,BM17_C01 +56,530826.0,0.0003,BM18_C03 +57,1020500.0,0.0002,BM18_S02 +58,1049750.0,0.0002,BM18_C02 +59,1048020.0,0.0002,BM18_S01 +60,527756.0,0.0003,BM18_C01 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv new file mode 100644 index 00000000..ed3950af --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv @@ -0,0 +1,2 @@ +Cells,Dir,Segments,Value,Error +101,0,1,0.922358,0.1816 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv new file mode 100644 index 00000000..1fda7439 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv @@ -0,0 +1,2 @@ +Cells,Dir,Segments,Value,Error +Input 1,0,1,5.43506,0.0686 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv new file mode 100644 index 00000000..c52ac7a6 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv @@ -0,0 +1,2 @@ +Cells,Dir,Segments,Value,Error +Input 1,0,1,41.099,0.0257 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv new file mode 100644 index 00000000..93210066 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv @@ -0,0 +1,8 @@ +Cells,Value,Error,Cells n. +61,517652.0,0.0003,61 +62,1041960.0,0.0002,62 +63,1028480.0,0.0002,63 +64,1026290.0,0.0002,64 +65,1028530.0,0.0002,65 +66,1028990.0,0.0002,66 +67,512602.0,0.0003,67 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv new file mode 100644 index 00000000..46acf849 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv @@ -0,0 +1,8 @@ +Cells,Value,Error,Components +Input 1,3.94991,0.0804,PF1 +Input 2,15.4017,0.0469,PF2 +Input 3,6.5327,0.0778,PF3 +Input 4,6.34424,0.0704,PF4 +Input 5,7.23286,0.0659,PF5 +Input 6,6.05651,0.0749,PF6 +Input 7,1.50144,0.1367,PF3-4 SUPP diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv new file mode 100644 index 00000000..c7c065fa --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv @@ -0,0 +1,6 @@ +Cells,Value,Error,Components +Input 1,20809.4,0.0009,UP Port ENV +Input 2,709209.0,0.0003,UP PP+PI +Input 3,4865240.0,0.0001,EQ PP+PI +85,8376.41,0.002,LOW PP CEN +Input 5,26.7023,0.0272,LOW PP LAT diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv new file mode 100644 index 00000000..91ecee70 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv @@ -0,0 +1,8 @@ +Cells,Value,Error,Components +Input 1,1202.87,0.0055,IB STR +Input 2,192.255,0.0138,IB TOP +Input 3,292.326,0.0108,OB TOP +Input 4,94.9353,0.0184,OB EQ +Input 5,126.756,0.0149,OB BOT +Input 6,91.6025,0.0182,IB BOT +Input 7,12.1669,0.0514,G SUPP diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv new file mode 100644 index 00000000..4a30a2be --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv @@ -0,0 +1,2 @@ +Cells,Dir,Segments,Value,Error +Input 1,0,1,790.463,0.0038 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv new file mode 100644 index 00000000..7b5e8b52 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv @@ -0,0 +1,22 @@ +Cells,Value,Error,Components +75,158046.0,0.0005,PS1 +157,9792.74,0.0018,PS2 FJ Y+ +158,9083.3,0.0018,PS2 FJ Y- +159,281854.0,0.0004,PS2 Y+ +160,277880.0,0.0004,PS2 Y- +161,338297.0,0.0004,PS3 EQ Y+ +162,335649.0,0.0004,PS3 EQ Y- +163,8184.33,0.0019,PS4 FJ Y+ +164,8018.36,0.0019,PS4 FJ Y- +166,48277.4,0.0009,PS4 LOW Y+/- +167,78732.9,0.0007,PS4 UP Y+ +168,75124.9,0.0007,PS4 UP Y- +68,203911.0,0.0004,TRIANG SUPPORT +116,3.33167,0.0763,HOOK +134,1.68089,0.1287,G SUPPORT +135,3.77926,0.0756,GUSSETS +125,20.9621,0.0341,SHIELD EVEN +126,7.49144,0.0517,SHIELD Y+ +127,6.99199,0.051,SHIELD Y- +Input 20,1243.59,0.0051,UP Port ext and duct +Input 21,134.113,0.0151,EQ Port ext and duct diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model Neutron current on plasma boundary.csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model Neutron current on plasma boundary.csv new file mode 100644 index 00000000..dcd8e890 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model Neutron current on plasma boundary.csv @@ -0,0 +1,37 @@ +Segments,User,Value,Error,BLK n. +2,0.0,12535000000000.0,0.0002,1 +2,1.0,3027350000000.0,0.0005,1 +3,0.0,20090500000000.0,0.0002,2 +3,1.0,3373550000000.0,0.0005,2 +4,0.0,26244400000000.0,0.0002,3 +4,1.0,3674930000000.0,0.0004,3 +5,0.0,26034200000000.0,0.0002,4 +5,1.0,3645040000000.0,0.0004,4 +6,0.0,19664300000000.0,0.0002,5 +6,1.0,3279650000000.0,0.0005,5 +7,0.0,12223600000000.0,0.0002,6 +7,1.0,2858530000000.0,0.0005,6 +2,0.0,10640700000000.0,0.0003,7 +2,1.0,2684210000000.0,0.0006,7 +2,0.0,15085600000000.0,0.0002,8 +2,1.0,3088030000000.0,0.0005,8 +2,0.0,16865800000000.0,0.0002,9 +2,1.0,3125320000000.0,0.0005,9 +2,0.0,18754000000000.0,0.0001,10 +2,1.0,3190680000000.0,0.0004,10 +2,0.0,24153100000000.0,0.0001,11 +2,1.0,3621000000000.0,0.0003,11 +2,0.0,27712400000000.0,0.0001,12 +2,1.0,3892980000000.0,0.0003,12 +2,0.0,30419400000000.0,0.0001,13 +2,1.0,4078070000000.0,0.0003,13 +2,0.0,32414000000000.0,0.0001,14 +2,1.0,3949810000000.0,0.0003,14 +2,0.0,32955200000000.0,0.0001,15 +2,1.0,4003460000000.0,0.0003,15 +2,0.0,31481200000000.0,0.0001,16 +2,1.0,4123530000000.0,0.0003,16 +2,0.0,27905700000000.0,0.0001,17 +2,1.0,3868620000000.0,0.0003,17 +2,0.0,23123900000000.0,0.0001,18 +2,1.0,3523660000000.0,0.0003,18 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model Neutron flux on plasma boundary.csv b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model Neutron flux on plasma boundary.csv new file mode 100644 index 00000000..d1dae2f6 --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/C-Model Neutron flux on plasma boundary.csv @@ -0,0 +1,37 @@ +Segments,User,Value,Error,BLK n. +2,0.0,28869800000000.0,0.0007,1 +2,1.0,6909490000000.0,0.0012,1 +3,0.0,38887300000000.0,0.0005,2 +3,1.0,7480620000000.0,0.0012,2 +4,0.0,46272000000000.0,0.0005,3 +4,1.0,8020700000000.0,0.001,3 +5,0.0,46085800000000.0,0.0005,4 +5,1.0,7936810000000.0,0.0011,4 +6,0.0,38326600000000.0,0.0005,5 +6,1.0,7216130000000.0,0.0011,5 +7,0.0,28289600000000.0,0.0007,6 +7,1.0,6408790000000.0,0.0011,6 +2,0.0,22167400000000.0,0.0008,7 +2,1.0,6049710000000.0,0.0018,7 +2,0.0,21259600000000.0,0.0003,8 +2,1.0,6466880000000.0,0.0013,8 +2,0.0,22896900000000.0,0.0002,9 +2,1.0,6846650000000.0,0.0015,9 +2,0.0,27360700000000.0,0.0001,10 +2,1.0,7309080000000.0,0.0009,10 +2,0.0,33050100000000.0,0.0001,11 +2,1.0,8571560000000.0,0.0009,11 +2,0.0,37286700000000.0,0.0001,12 +2,1.0,9413360000000.0,0.0009,12 +2,0.0,40262300000000.0,0.0001,13 +2,1.0,9886640000000.0,0.0009,13 +2,0.0,43123400000000.0,0.0001,14 +2,1.0,9506120000000.0,0.0008,14 +2,0.0,43785600000000.0,0.0001,15 +2,1.0,9649380000000.0,0.0008,15 +2,0.0,41880600000000.0,0.0001,16 +2,1.0,10100200000000.0,0.0009,16 +2,0.0,38066300000000.0,0.0001,17 +2,1.0,9467720000000.0,0.0009,17 +2,0.0,32048300000000.0,0.0001,18 +2,1.0,8430640000000.0,0.0008,18 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/metadata.json b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/metadata.json new file mode 100644 index 00000000..1bc69f8b --- /dev/null +++ b/tests/dummy_structure/raw_data/_mcnp_-_ENDFB-VIII.0_/C-Model/metadata.json @@ -0,0 +1,9 @@ +{ + "benchmark_name": "C-Model", + "benchmark_version": "1.0", + "jade_run_version": "3.1.0", + "library": "FENDL 3.2c", + "code": "mcnp", + "jade_version": "3.1.0", + "code_version": "6.2" +} \ No newline at end of file diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv index 39691d43..985dda02 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN BLANKET [W].csv @@ -1,58 +1,58 @@ Cells,Value,Error,Components -4,333399.0,0.0004,BM01_C03 -5,667384.0,0.0003,BM01_C02 -6,333787.0,0.0004,BM01_C01 -7,443924.0,0.0003,BM02_C03 -8,887347.0,0.0002,BM02_C02 -9,443758.0,0.0003,BM02_C01 -10,507546.0,0.0003,BM03_C03 -11,1015350.0,0.0002,BM03_C02 -12,507850.0,0.0003,BM03_C01 -13,505318.0,0.0003,BM04_C03 -14,1011800.0,0.0002,BM04_C02 -15,506171.0,0.0003,BM04_C01 -16,421456.0,0.0003,BM05_C03 -17,842847.0,0.0002,BM05_C02 -18,421320.0,0.0003,BM05_C01 -19,339154.0,0.0004,BM06_C03 -20,678453.0,0.0003,BM06_C02 -21,339225.0,0.0004,BM06_C01 -22,1065710.0,0.0002,7-8-9_-20deg -23,2134420.0,0.0002,7-8-9_cen -24,1067180.0,0.0002,7-8-9_+20deg -25,976525.0,0.0002,BM10_1 -26,976181.0,0.0002,BM10_2 -27,455274.0,0.0003,BM11_C01 -28,991367.0,0.0002,BM11_S02 -29,915660.0,0.0002,BM11_C02 -30,992722.0,0.0002,BM11_S01 -31,456304.0,0.0003,BM11_C01_2 -32,448297.0,0.0003,BM12_C03 -33,903202.0,0.0002,BM12_S02 -34,894814.0,0.0002,BM12_C02 -35,903392.0,0.0002,BM12_S01 -36,448078.0,0.0003,BM12_C01 -37,609970.0,0.0003,BM13_C03 -38,1043720.0,0.0002,BM13_S02 -39,1237290.0,0.0002,BM13_C02 -40,1034170.0,0.0002,BM13_S01 -41,609105.0,0.0003,BM13_C01 -42,1244270.0,0.0002,BM14_S02 -43,1250030.0,0.0002,BM14_S01 -44,1266010.0,0.0002,BM15_S02 -45,1260140.0,0.0002,BM15_S01 -46,691470.0,0.0003,BM16_C03 -47,1230740.0,0.0002,BM16_S02 -48,1367710.0,0.0002,BM16_C02 -49,1220840.0,0.0002,BM16_S01 -50,689160.0,0.0003,BM16_C01 -51,570059.0,0.0003,BM17_C03 -52,1141400.0,0.0002,BM17_S02 -53,1138590.0,0.0002,BM17_C02 -54,1142190.0,0.0002,BM17_S01 -55,569062.0,0.0003,BM17_C01 -56,530826.0,0.0003,BM18_C03 -57,1020500.0,0.0002,BM18_S02 -58,1049750.0,0.0002,BM18_C02 -59,1048020.0,0.0002,BM18_S01 -60,527756.0,0.0003,BM18_C01 +4,329696.0,0.0004,BM01_C03 +5,660139.0,0.0003,BM01_C02 +6,330141.0,0.0004,BM01_C01 +7,438131.0,0.0003,BM02_C03 +8,876208.0,0.0002,BM02_C02 +9,438154.0,0.0003,BM02_C01 +10,501880.0,0.0003,BM03_C03 +11,1004570.0,0.0002,BM03_C02 +12,502376.0,0.0003,BM03_C01 +13,499902.0,0.0003,BM04_C03 +14,1000480.0,0.0002,BM04_C02 +15,500786.0,0.0003,BM04_C01 +16,417149.0,0.0003,BM05_C03 +17,834224.0,0.0002,BM05_C02 +18,416972.0,0.0003,BM05_C01 +19,335342.0,0.0004,BM06_C03 +20,671206.0,0.0003,BM06_C02 +21,335708.0,0.0004,BM06_C01 +22,1054740.0,0.0002,7-8-9_-20deg +23,2112720.0,0.0002,7-8-9_cen +24,1056440.0,0.0002,7-8-9_+20deg +25,966572.0,0.0002,BM10_1 +26,966427.0,0.0002,BM10_2 +27,449345.0,0.0003,BM11_C01 +28,979168.0,0.0002,BM11_S02 +29,904133.0,0.0002,BM11_C02 +30,980317.0,0.0002,BM11_S01 +31,450646.0,0.0003,BM11_C01_2 +32,442647.0,0.0003,BM12_C03 +33,891768.0,0.0002,BM12_S02 +34,883296.0,0.0002,BM12_C02 +35,892080.0,0.0002,BM12_S01 +36,442367.0,0.0003,BM12_C01 +37,602470.0,0.0003,BM13_C03 +38,1030970.0,0.0002,BM13_S02 +39,1221840.0,0.0002,BM13_C02 +40,1021840.0,0.0002,BM13_S01 +41,601516.0,0.0003,BM13_C01 +42,1229560.0,0.0002,BM14_S02 +43,1236190.0,0.0002,BM14_S01 +44,1251240.0,0.0002,BM15_S02 +45,1246120.0,0.0002,BM15_S01 +46,684044.0,0.0003,BM16_C03 +47,1216760.0,0.0002,BM16_S02 +48,1353510.0,0.0002,BM16_C02 +49,1207290.0,0.0002,BM16_S01 +50,682084.0,0.0003,BM16_C01 +51,563840.0,0.0003,BM17_C03 +52,1128770.0,0.0002,BM17_S02 +53,1126070.0,0.0002,BM17_C02 +54,1129930.0,0.0002,BM17_S01 +55,562944.0,0.0003,BM17_C01 +56,522736.0,0.0003,BM18_C03 +57,1006580.0,0.0002,BM18_S02 +58,1035760.0,0.0002,BM18_C02 +59,1034270.0,0.0002,BM18_S01 +60,521079.0,0.0003,BM18_C01 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv index ed3950af..40f67812 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CENTRAL SOLENOID [W].csv @@ -1,2 +1,2 @@ Cells,Dir,Segments,Value,Error -101,0,1,0.922358,0.1816 +101,0,1,0.935349,0.1652 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv index 1fda7439..677d30d4 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CORRECTION COILS [W].csv @@ -1,2 +1,2 @@ Cells,Dir,Segments,Value,Error -Input 1,0,1,5.43506,0.0686 +Input 1,0,1,4.3992,0.0744 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv index c52ac7a6..1c8868d9 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN CRYOSTAT [W].csv @@ -1,2 +1,2 @@ Cells,Dir,Segments,Value,Error -Input 1,0,1,41.099,0.0257 +Input 1,0,1,40.1064,0.0263 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv index 93210066..d1bb1924 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN DIVERTOR [W].csv @@ -1,8 +1,8 @@ Cells,Value,Error,Cells n. -61,517652.0,0.0003,61 -62,1041960.0,0.0002,62 -63,1028480.0,0.0002,63 -64,1026290.0,0.0002,64 -65,1028530.0,0.0002,65 -66,1028990.0,0.0002,66 -67,512602.0,0.0003,67 +61,512058.0,0.0003,61 +62,1030770.0,0.0002,62 +63,1017640.0,0.0002,63 +64,1015580.0,0.0002,64 +65,1017550.0,0.0002,65 +66,1017840.0,0.0002,66 +67,507013.0,0.0003,67 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv index 46acf849..18afa4dd 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PF COILS [W].csv @@ -1,8 +1,8 @@ Cells,Value,Error,Components -Input 1,3.94991,0.0804,PF1 -Input 2,15.4017,0.0469,PF2 -Input 3,6.5327,0.0778,PF3 -Input 4,6.34424,0.0704,PF4 -Input 5,7.23286,0.0659,PF5 -Input 6,6.05651,0.0749,PF6 -Input 7,1.50144,0.1367,PF3-4 SUPP +Input 1,3.76637,0.081,PF1 +Input 2,14.5235,0.0455,PF2 +Input 3,5.54347,0.0775,PF3 +Input 4,6.70655,0.0725,PF4 +Input 5,7.94455,0.067,PF5 +Input 6,6.74727,0.0814,PF6 +Input 7,1.55505,0.1237,PF3-4 SUPP diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv index c7c065fa..9fc1e2da 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN PORT PLUGS [W].csv @@ -1,6 +1,6 @@ Cells,Value,Error,Components -Input 1,20809.4,0.0009,UP Port ENV -Input 2,709209.0,0.0003,UP PP+PI -Input 3,4865240.0,0.0001,EQ PP+PI -85,8376.41,0.002,LOW PP CEN -Input 5,26.7023,0.0272,LOW PP LAT +Input 1,20398.4,0.0009,UP Port ENV +Input 2,701846.0,0.0003,UP PP+PI +Input 3,4781080.0,0.0001,EQ PP+PI +85,8365.56,0.002,LOW PP CEN +Input 5,27.8269,0.0277,LOW PP LAT diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv index 91ecee70..80a03068 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN TF COILS [W].csv @@ -1,8 +1,8 @@ Cells,Value,Error,Components -Input 1,1202.87,0.0055,IB STR -Input 2,192.255,0.0138,IB TOP -Input 3,292.326,0.0108,OB TOP -Input 4,94.9353,0.0184,OB EQ -Input 5,126.756,0.0149,OB BOT -Input 6,91.6025,0.0182,IB BOT -Input 7,12.1669,0.0514,G SUPP +Input 1,1222.73,0.0055,IB STR +Input 2,194.048,0.0136,IB TOP +Input 3,293.528,0.0106,OB TOP +Input 4,98.3754,0.0185,OB EQ +Input 5,124.84,0.0151,OB BOT +Input 6,89.5982,0.0182,IB BOT +Input 7,11.2346,0.055,G SUPP diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv index 4a30a2be..aa1ae02a 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN THERMAL SHIELDS [W].csv @@ -1,2 +1,2 @@ Cells,Dir,Segments,Value,Error -Input 1,0,1,790.463,0.0038 +Input 1,0,1,794.977,0.0038 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv index 7b5e8b52..79a43a9f 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model NUCLEAR HEAT IN VACUUM VESSEL, PORT EXTENSIONS, AND PORT DUCTS [W].csv @@ -1,22 +1,22 @@ Cells,Value,Error,Components -75,158046.0,0.0005,PS1 -157,9792.74,0.0018,PS2 FJ Y+ -158,9083.3,0.0018,PS2 FJ Y- -159,281854.0,0.0004,PS2 Y+ -160,277880.0,0.0004,PS2 Y- -161,338297.0,0.0004,PS3 EQ Y+ -162,335649.0,0.0004,PS3 EQ Y- -163,8184.33,0.0019,PS4 FJ Y+ -164,8018.36,0.0019,PS4 FJ Y- -166,48277.4,0.0009,PS4 LOW Y+/- -167,78732.9,0.0007,PS4 UP Y+ -168,75124.9,0.0007,PS4 UP Y- -68,203911.0,0.0004,TRIANG SUPPORT -116,3.33167,0.0763,HOOK -134,1.68089,0.1287,G SUPPORT -135,3.77926,0.0756,GUSSETS -125,20.9621,0.0341,SHIELD EVEN -126,7.49144,0.0517,SHIELD Y+ -127,6.99199,0.051,SHIELD Y- -Input 20,1243.59,0.0051,UP Port ext and duct -Input 21,134.113,0.0151,EQ Port ext and duct +75,158825.0,0.0005,PS1 +157,9754.76,0.0018,PS2 FJ Y+ +158,9078.35,0.0018,PS2 FJ Y- +159,281055.0,0.0004,PS2 Y+ +160,277233.0,0.0004,PS2 Y- +161,337332.0,0.0004,PS3 EQ Y+ +162,335100.0,0.0004,PS3 EQ Y- +163,8172.6,0.0019,PS4 FJ Y+ +164,7989.68,0.0019,PS4 FJ Y- +166,47946.5,0.0009,PS4 LOW Y+/- +167,78685.0,0.0007,PS4 UP Y+ +168,75132.6,0.0007,PS4 UP Y- +68,202628.0,0.0004,TRIANG SUPPORT +116,3.00417,0.0768,HOOK +134,1.56915,0.1651,G SUPPORT +135,3.88815,0.0709,GUSSETS +125,19.845,0.0365,SHIELD EVEN +126,8.52402,0.0509,SHIELD Y+ +127,7.25548,0.0498,SHIELD Y- +Input 20,1252.15,0.0051,UP Port ext and duct +Input 21,134.974,0.015,EQ Port ext and duct diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron current on plasma boundary.csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron current on plasma boundary.csv index dcd8e890..85355eaa 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron current on plasma boundary.csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron current on plasma boundary.csv @@ -1,37 +1,37 @@ Segments,User,Value,Error,BLK n. 2,0.0,12535000000000.0,0.0002,1 -2,1.0,3027350000000.0,0.0005,1 +2,1.0,3018210000000.0,0.0005,1 3,0.0,20090500000000.0,0.0002,2 -3,1.0,3373550000000.0,0.0005,2 +3,1.0,3360750000000.0,0.0005,2 4,0.0,26244400000000.0,0.0002,3 -4,1.0,3674930000000.0,0.0004,3 +4,1.0,3658880000000.0,0.0004,3 5,0.0,26034200000000.0,0.0002,4 -5,1.0,3645040000000.0,0.0004,4 +5,1.0,3628470000000.0,0.0004,4 6,0.0,19664300000000.0,0.0002,5 -6,1.0,3279650000000.0,0.0005,5 +6,1.0,3265740000000.0,0.0005,5 7,0.0,12223600000000.0,0.0002,6 -7,1.0,2858530000000.0,0.0005,6 +7,1.0,2849560000000.0,0.0005,6 2,0.0,10640700000000.0,0.0003,7 -2,1.0,2684210000000.0,0.0006,7 +2,1.0,2674210000000.0,0.0006,7 2,0.0,15085600000000.0,0.0002,8 -2,1.0,3088030000000.0,0.0005,8 +2,1.0,3078040000000.0,0.0005,8 2,0.0,16865800000000.0,0.0002,9 -2,1.0,3125320000000.0,0.0005,9 +2,1.0,3113380000000.0,0.0005,9 2,0.0,18754000000000.0,0.0001,10 -2,1.0,3190680000000.0,0.0004,10 -2,0.0,24153100000000.0,0.0001,11 -2,1.0,3621000000000.0,0.0003,11 +2,1.0,3180790000000.0,0.0004,10 +2,0.0,24153200000000.0,0.0001,11 +2,1.0,3610030000000.0,0.0003,11 2,0.0,27712400000000.0,0.0001,12 -2,1.0,3892980000000.0,0.0003,12 +2,1.0,3881930000000.0,0.0003,12 2,0.0,30419400000000.0,0.0001,13 -2,1.0,4078070000000.0,0.0003,13 +2,1.0,4065960000000.0,0.0003,13 2,0.0,32414000000000.0,0.0001,14 -2,1.0,3949810000000.0,0.0003,14 +2,1.0,3929810000000.0,0.0003,14 2,0.0,32955200000000.0,0.0001,15 -2,1.0,4003460000000.0,0.0003,15 +2,1.0,3983620000000.0,0.0003,15 2,0.0,31481200000000.0,0.0001,16 -2,1.0,4123530000000.0,0.0003,16 +2,1.0,4109140000000.0,0.0003,16 2,0.0,27905700000000.0,0.0001,17 -2,1.0,3868620000000.0,0.0003,17 +2,1.0,3855070000000.0,0.0003,17 2,0.0,23123900000000.0,0.0001,18 -2,1.0,3523660000000.0,0.0003,18 +2,1.0,3512570000000.0,0.0003,18 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron flux on plasma boundary.csv b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron flux on plasma boundary.csv index d1dae2f6..3639c274 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron flux on plasma boundary.csv +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/C-Model Neutron flux on plasma boundary.csv @@ -1,37 +1,37 @@ Segments,User,Value,Error,BLK n. 2,0.0,28869800000000.0,0.0007,1 -2,1.0,6909490000000.0,0.0012,1 +2,1.0,6895850000000.0,0.0013,1 3,0.0,38887300000000.0,0.0005,2 -3,1.0,7480620000000.0,0.0012,2 +3,1.0,7454330000000.0,0.0012,2 4,0.0,46272000000000.0,0.0005,3 -4,1.0,8020700000000.0,0.001,3 +4,1.0,7991130000000.0,0.001,3 5,0.0,46085800000000.0,0.0005,4 -5,1.0,7936810000000.0,0.0011,4 +5,1.0,7899290000000.0,0.001,4 6,0.0,38326600000000.0,0.0005,5 -6,1.0,7216130000000.0,0.0011,5 +6,1.0,7194040000000.0,0.0011,5 7,0.0,28289600000000.0,0.0007,6 -7,1.0,6408790000000.0,0.0011,6 +7,1.0,6388570000000.0,0.001,6 2,0.0,22167400000000.0,0.0008,7 -2,1.0,6049710000000.0,0.0018,7 +2,1.0,6028740000000.0,0.0018,7 2,0.0,21259600000000.0,0.0003,8 -2,1.0,6466880000000.0,0.0013,8 +2,1.0,6449530000000.0,0.0013,8 2,0.0,22896900000000.0,0.0002,9 -2,1.0,6846650000000.0,0.0015,9 +2,1.0,6822970000000.0,0.0015,9 2,0.0,27360700000000.0,0.0001,10 -2,1.0,7309080000000.0,0.0009,10 +2,1.0,7295380000000.0,0.001,10 2,0.0,33050100000000.0,0.0001,11 -2,1.0,8571560000000.0,0.0009,11 +2,1.0,8552670000000.0,0.0009,11 2,0.0,37286700000000.0,0.0001,12 -2,1.0,9413360000000.0,0.0009,12 +2,1.0,9389380000000.0,0.0009,12 2,0.0,40262300000000.0,0.0001,13 -2,1.0,9886640000000.0,0.0009,13 +2,1.0,9857240000000.0,0.0009,13 2,0.0,43123400000000.0,0.0001,14 -2,1.0,9506120000000.0,0.0008,14 +2,1.0,9469360000000.0,0.0008,14 2,0.0,43785600000000.0,0.0001,15 -2,1.0,9649380000000.0,0.0008,15 +2,1.0,9607980000000.0,0.0008,15 2,0.0,41880600000000.0,0.0001,16 -2,1.0,10100200000000.0,0.0009,16 +2,1.0,10076800000000.0,0.0009,16 2,0.0,38066300000000.0,0.0001,17 -2,1.0,9467720000000.0,0.0009,17 +2,1.0,9443850000000.0,0.0009,17 2,0.0,32048300000000.0,0.0001,18 -2,1.0,8430640000000.0,0.0008,18 +2,1.0,8409400000000.0,0.0008,18 diff --git a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/metadata.json b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/metadata.json index 1bc69f8b..fae34d43 100644 --- a/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/metadata.json +++ b/tests/dummy_structure/raw_data/_mcnp_-_FENDL 3.2c_/C-Model/metadata.json @@ -1,9 +1,9 @@ { - "benchmark_name": "C-Model", "benchmark_version": "1.0", - "jade_run_version": "3.1.0", + "jade_run_version": "3.0.1", + "benchmark_name": "C_Model", "library": "FENDL 3.2c", "code": "mcnp", - "jade_version": "3.1.0", - "code_version": "6.2" + "jade_version": "3.1.1.dev181+g8162787", + "code_version": "d1suned411" } \ No newline at end of file diff --git a/tests/post/test_atlas_processor.py b/tests/post/test_atlas_processor.py index 1ca3b25c..e7c26d43 100644 --- a/tests/post/test_atlas_processor.py +++ b/tests/post/test_atlas_processor.py @@ -287,7 +287,7 @@ def test_C_model(self, tmpdir): cfg = ConfigAtlasProcessor.from_yaml(file) word_template_path = files(resources).joinpath("atlas_template.docx") - codelibs = [("mcnp", "FENDL 3.2c"), ("mcnp", "FENDL 3.2c")] + codelibs = [("mcnp", "FENDL 3.2c"), ("mcnp", "ENDFB-VIII.0")] processor = AtlasProcessor(ROOT_RAW, tmpdir, cfg, codelibs, word_template_path) processor.process() diff --git a/tests/post/test_excel_processor.py b/tests/post/test_excel_processor.py index 69f1577c..a0dedbc5 100644 --- a/tests/post/test_excel_processor.py +++ b/tests/post/test_excel_processor.py @@ -295,7 +295,7 @@ def test_C_model(self, tmpdir): files(default_cfg).joinpath("benchmarks_pp/excel/C-Model.yaml") ) as file: cfg = ConfigExcelProcessor.from_yaml(file) - codelibs = [("mcnp", "FENDL 3.2c"), ("mcnp", "FENDL 3.2c")] + codelibs = [("mcnp", "FENDL 3.2c"), ("mcnp", "ENDFB-VIII.0")] processor = ExcelProcessor(ROOT_RAW, tmpdir, cfg, codelibs) processor.process() diff --git a/tests/post/test_excel_routines.py b/tests/post/test_excel_routines.py index 47c3f0fb..c92c806b 100644 --- a/tests/post/test_excel_routines.py +++ b/tests/post/test_excel_routines.py @@ -21,8 +21,8 @@ def test_compare(self): result = Table._compare(df1, df2, ComparisonType.PERCENTAGE) expected_values = [50, 25, 0] expected_errors = [ - np.sqrt((5 * 10 * 0.1) ** 2 + (5 * 0.15) ** 2) / 5, - np.sqrt((15 * 20 * 0.2) ** 2 + (15 * 0.25) ** 2) / 5, + np.sqrt((5 * 0.1) ** 2 + (5 * 0.15) ** 2) / 5, + np.sqrt((15 * 0.2) ** 2 + (15 * 0.25) ** 2) / 5, 0.65, ] assert pytest.approx(result["Value"].tolist()) == expected_values @@ -94,10 +94,10 @@ def test_sort_sphere_index_single(self): "Sphere_1002_H-2", ] df = pd.DataFrame(data, index=index) - + # Sort the dataframe sorted_df = SpherePivotTable._sort_sphere_index(df) - + # Expected order: isotopes by Z number, then materials alphabetically # Z=1 (H): 1001, 1002 # Z=26 (Fe): 26056 @@ -111,7 +111,7 @@ def test_sort_sphere_index_single(self): "Sphere_M101", "Sphere_M400", ] - + assert sorted_df.index.tolist() == expected_order def test_sort_sphere_index_multi(self): @@ -127,13 +127,15 @@ def test_sort_sphere_index_multi(self): ] energies = [1.0, 2.0, 1.0, 2.0, 1.0, 2.0] values = [10, 20, 30, 40, 50, 60] - + df = pd.DataFrame({"Value": values}) - df.index = pd.MultiIndex.from_arrays([cases, energies], names=["Case", "Energy"]) - + df.index = pd.MultiIndex.from_arrays( + [cases, energies], names=["Case", "Energy"] + ) + # Sort the dataframe sorted_df = SpherePivotTable._sort_sphere_index(df) - + # Expected order: H-1 first (Z=1), then Fe-56 (Z=26), then M400 expected_cases = [ "Sphere_1001_H-1", @@ -144,10 +146,10 @@ def test_sort_sphere_index_multi(self): "Sphere_M400", ] expected_energies = [1.0, 2.0, 1.0, 2.0, 1.0, 2.0] - + result_cases = sorted_df.index.get_level_values(0).tolist() result_energies = sorted_df.index.get_level_values(1).tolist() - + assert result_cases == expected_cases assert result_energies == expected_energies @@ -155,10 +157,10 @@ def test_sort_sphere_index_empty(self): """Test sorting with empty dataframe""" # Create an empty dataframe df = pd.DataFrame() - + # Sort the dataframe - should return empty df unchanged sorted_df = SpherePivotTable._sort_sphere_index(df) - + assert sorted_df.empty assert len(sorted_df) == 0 @@ -166,21 +168,22 @@ def test_get_sheet_integration(self): """Test the full _get_sheet method with sorting applied""" import tempfile from jade.config.excel_config import ComparisonType, TableConfig - + # Create test data data = { "Case": [ "Sphere_M400", "Sphere_1001_H-1", "Sphere_26056_Fe-56", - ] * 2, + ] + * 2, "Energy": [1.0, 1.0, 1.0, 2.0, 2.0, 2.0], "Value": [10.0, 20.0, 30.0, 15.0, 25.0, 35.0], "Error": [0.1, 0.2, 0.3, 0.15, 0.25, 0.35], } ref_df = pd.DataFrame(data) target_df = ref_df.copy() - + # Create a mock config class MockConfig: x = ["Case"] @@ -190,33 +193,27 @@ class MockConfig: comparison_type = ComparisonType.PERCENTAGE conditional_formatting = None change_col_names = None - + cfg = MockConfig() - + # Create a temporary Excel file - with tempfile.NamedTemporaryFile(suffix='.xlsx', delete=False) as f: - writer = pd.ExcelWriter(f.name, engine='xlsxwriter') - + with tempfile.NamedTemporaryFile(suffix=".xlsx", delete=False) as f: + writer = pd.ExcelWriter(f.name, engine="xlsxwriter") + # Create SpherePivotTable instance table = SpherePivotTable( - "Test", - writer, - ref_df, - target_df, - cfg, - "ref", - "target" + "Test", writer, ref_df, target_df, cfg, "ref", "target" ) - + # Get the sheets sheets = table._get_sheet() - + writer.close() - + # Verify the result is sorted assert len(sheets) == 1 result_df = sheets[0] - + # Check that cases are sorted: H-1 (Z=1), Fe-56 (Z=26), M400 (material) expected_order = ["Sphere_1001_H-1", "Sphere_26056_Fe-56", "Sphere_M400"] assert result_df.index.tolist() == expected_order @@ -228,32 +225,31 @@ def test_sort_sphere_index_edge_cases(self): "Value": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0], } index = [ - "Sphere_1001_H-1", # Normal 4-digit ZAID - "Sphere_26056_Fe-56", # Normal 5-digit ZAID - "Sphere_M400", # Normal material - "Sphere_123", # Unusual ZAID format (3 digits) - "Sphere_XYZ", # Non-numeric, non-M identifier - "UnknownFormat", # No underscore separator - "Sphere", # Only one part + "Sphere_1001_H-1", # Normal 4-digit ZAID + "Sphere_26056_Fe-56", # Normal 5-digit ZAID + "Sphere_M400", # Normal material + "Sphere_123", # Unusual ZAID format (3 digits) + "Sphere_XYZ", # Non-numeric, non-M identifier + "UnknownFormat", # No underscore separator + "Sphere", # Only one part ] df = pd.DataFrame(data, index=index) - + # Sort the dataframe - should handle edge cases gracefully sorted_df = SpherePivotTable._sort_sphere_index(df) - + # Verify the result is a DataFrame and has same length assert len(sorted_df) == len(df) assert isinstance(sorted_df, pd.DataFrame) - + # Check that known good formats are sorted correctly result_index = sorted_df.index.tolist() - + # H-1 should come before Fe-56 (both are isotopes with proper format) h_pos = result_index.index("Sphere_1001_H-1") fe_pos = result_index.index("Sphere_26056_Fe-56") assert h_pos < fe_pos, "H-1 should come before Fe-56" - + # Edge cases should be treated as materials and come after isotopes # M400 should be in materials section assert "Sphere_M400" in result_index -