diff --git a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py index 55e4a2f..af2404a 100755 --- a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py +++ b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py @@ -137,6 +137,7 @@ sims = [ (SimParams41(9, 1, 400, "1e10"), None, 20000), (SimParams41(9, 1, 400, "8e9"), None, 20000), (SimParams41(9, 1, 400, "15000000512e0"), None, 20000), # 15e9, but badly formatted T_T + (SimParams41(9, 1, 400, "12e9"), None, 20000), (SimParams41(12, 2, 600, "5e9"), None, 20000), (SimParams41(12, 2, 600, "1e10"), None, 20000), (SimParams41(10, 3, 800, "2e10"), None, 20000), @@ -1490,8 +1491,11 @@ Piecewise( [ 8888, -9370 ], # 0.18 [ 10279, -7832 ], # 0.19 [ 11658, -6311 ], # 0.2 + [ 14345, -3304 ], # 0.22 [ 16512, -760 ], # 0.25 + [ 16917, -263 ], # 0.27 [ 17246, 128 ], # 0.3 + [ 17511, 420 ], # 0.4 [ 17569, 480 ], # 0.5 [ 17650, 573 ], # 0.8 [ 17687, 620 ], # 1.0 @@ -1565,6 +1569,7 @@ Piecewise( [ 17623, -2217 ], # 0.25 [ 17636, -2199 ], # 0.27 [ 17652, -2173 ], # 0.3 + [ 17708, -2095 ], # 0.4 [ 17752, -2034 ], # 0.5 [ 17836, -1920 ], # 0.8 [ 17871, -1870 ], # 1.0 @@ -1646,8 +1651,11 @@ Piecewise( [ 16515, -2120 ], # 0.18 [ 16668, -1965 ], # 0.19 [ 16783, -1850 ], # 0.2 + [ 16927, -1705 ], # 0.22 [ 16998, -1629 ], # 0.25 + [ 17021, -1604 ], # 0.27 [ 17042, -1577 ], # 0.3 + [ 17078, -1523 ], # 0.4 [ 17111, -1482 ], # 0.5 [ 17183, -1405 ], # 0.8 [ 17210, -1376 ], # 1.0 @@ -1681,8 +1689,11 @@ Piecewise( [ 14139, -4023 ], # 0.18 [ 15362, -2585 ], # 0.19 [ 15900, -1982 ], # 0.2 + [ 16428, -1406 ], # 0.22 [ 16775, -1056 ], # 0.25 + [ 16899, -930 ], # 0.27 [ 16974, -854 ], # 0.3 + [ 17040, -776 ], # 0.4 [ 17067, -739 ], # 0.5 [ 17139, -663 ], # 0.8 [ 17171, -627 ], # 1.0 @@ -1719,6 +1730,7 @@ Piecewise( [ 17088, -2569 ], # 0.25 [ 17099, -2555 ], # 0.27 [ 17114, -2534 ], # 0.3 + [ 17162, -2478 ], # 0.4 [ 17198, -2436 ], # 0.5 [ 17260, -2363 ], # 0.8 [ 17284, -2336 ], # 1.0 @@ -1726,6 +1738,48 @@ Piecewise( ) """) +set_meas("41-0.0004rad-9coupling-3_1_winding-12e9-drive", """ +Piecewise( + [ + [ -17026, -16808 ], # -2.0 + [ -16957, -16812 ], # -1.0 + [ -16928, -16813 ], # -0.8 + [ -16878, -16813 ], # -0.5 + [ -16816, -16814 ], # -0.3 + [ -16735, -16814 ], # -0.2 + [ -11301, -16801 ], # 0.0 + [ -10718, -16797 ], # 0.01 + [ -9875, -16793 ], # 0.02 + [ -8375, -16784 ], # 0.03 + [ -6008, -16763 ], # 0.04 + [ -3540, -16732 ], # 0.05 + [ -1019, -16516 ], # 0.06 + [ 1521, -16262 ], # 0.07 + [ 4067, -15678 ], # 0.08 + [ 6615, -13688 ], # 0.09 + [ 9157, -10970 ], # 0.1 + [ 11669, -8122 ], # 0.11 + [ 14111, -5332 ], # 0.12 + [ 15660, -3571 ], # 0.13 + [ 16228, -2955 ], # 0.14 + [ 16517, -2653 ], # 0.15 + [ 16697, -2474 ], # 0.16 + [ 16829, -2343 ], # 0.17 + [ 16914, -2258 ], # 0.18 + [ 16961, -2211 ], # 0.19 + [ 16989, -2181 ], # 0.2 + [ 17022, -2144 ], # 0.22 + [ 17050, -2109 ], # 0.25 + [ 17059, -2093 ], # 0.27 + [ 17072, -2073 ], # 0.3 + [ 17114, -2018 ], # 0.4 + [ 17150, -1974 ], # 0.5 + [ 17218, -1896 ], # 0.8 + [ 17243, -1869 ], # 1.0 + ] +) +""") + set_meas("41-0.00059999997rad-12coupling-5_1_winding-5e9-drive", """ Piecewise( [ @@ -1766,8 +1820,11 @@ Piecewise( [ 15823, -6330 ], # 0.18 [ 16337, -5661 ], # 0.19 [ 16625, -5291 ], # 0.2 + [ 16964, -4863 ], # 0.22 [ 17209, -4567 ], # 0.25 + [ 17270, -4494 ], # 0.27 [ 17325, -4428 ], # 0.3 + [ 17398, -4332 ], # 0.4 [ 17436, -4284 ], # 0.5 [ 17508, -4191 ], # 0.8 [ 17532, -4162 ], # 1.0 @@ -1806,8 +1863,11 @@ Piecewise( [ 16836, -5660 ], # 0.18 [ 16903, -5585 ], # 0.19 [ 16943, -5537 ], # 0.2 + [ 16990, -5480 ], # 0.22 [ 17032, -5427 ], # 0.25 + [ 17053, -5400 ], # 0.27 [ 17079, -5367 ], # 0.3 + [ 17140, -5288 ], # 0.4 [ 17178, -5240 ], # 0.5 [ 17242, -5162 ], # 0.8 [ 17262, -5136 ], # 1.0 @@ -1853,6 +1913,7 @@ Piecewise( [ 16075, -2930 ], # 0.25 [ 16407, -2583 ], # 0.27 [ 16671, -2335 ], # 0.3 + [ 16896, -2115 ], # 0.4 [ 16930, -2077 ], # 0.5 [ 16998, -2016 ], # 0.8 [ 17025, -1993 ], # 1.0 @@ -1910,8 +1971,11 @@ Piecewise( [ 17216, -7592 ], # 0.18 [ 17240, -7562 ], # 0.19 [ 17257, -7538 ], # 0.2 + [ 17283, -7500 ], # 0.22 [ 17316, -7453 ], # 0.25 + [ 17333, -7429 ], # 0.27 [ 17356, -7398 ], # 0.3 + [ 17409, -7323 ], # 0.4 [ 17445, -7270 ], # 0.5 [ 17518, -7168 ], # 0.8 [ 17554, -7118 ], # 1.0 @@ -2012,7 +2076,12 @@ Piecewise( set_meas("41-0.0008rad-24coupling-3_1_winding-5e9-drive", """ Piecewise( [ + [ -17239, -16835 ], # -2.0 [ -17135, -16838 ], # -1.0 + [ -17096, -16838 ], # -0.8 + [ -17001, -16839 ], # -0.5 + [ -16679, -16838 ], # -0.3 + [ -13843, -16820 ], # -0.2 [ -11603, -16793 ], # 0.0 [ -11435, -16791 ], # 0.01 [ -11219, -16786 ], # 0.02 @@ -2177,7 +2246,9 @@ Piecewise( [ 17010, -4842 ], # 0.21 [ 17111, -4706 ], # 0.22 [ 17258, -4514 ], # 0.25 + [ 17309, -4447 ], # 0.27 [ 17357, -4383 ], # 0.3 + [ 17437, -4280 ], # 0.4 [ 17482, -4221 ], # 0.5 [ 17553, -4130 ], # 0.8 [ 17582, -4093 ], # 1.0 @@ -2222,6 +2293,9 @@ set_meas("41-0.0011999999rad-36coupling-3_1_winding-5e9-drive", """ Piecewise( [ [ -17088, -16823 ], # -1.0 + [ -17053, -16823 ], # -0.8 + [ -16982, -16824 ], # -0.5 + [ -16705, -16824 ], # -0.3 [ -10940, -16779 ], # 0.0 [ -10565, -16771 ], # 0.01 [ -10120, -16759 ], # 0.02 @@ -2251,6 +2325,7 @@ Piecewise( [ 16921, -711 ], # 0.26 [ 17054, -528 ], # 0.27 [ 17323, -169 ], # 0.3 + [ 17549, 109 ], # 0.4 [ 17612, 182 ], # 0.5 [ 17698, 284 ], # 0.8 [ 17729, 327 ], # 1.0 diff --git a/crates/applications/stacked_cores/src/main.rs b/crates/applications/stacked_cores/src/main.rs index 95a9868..4e276e1 100644 --- a/crates/applications/stacked_cores/src/main.rs +++ b/crates/applications/stacked_cores/src/main.rs @@ -4079,19 +4079,18 @@ fn main() { ][..], ] { for (coupling_loops, s0_loops, s_major, cur_flt) in [ - // waiting for completion - (9, 1, um(400), 15e9), - // VIABLE INVERTERS (24, 1, um(800), 5e9), // VIABLE INVERTER (0.54, 0.90) (18, 1, um(600), 5e9), // VIABLE INVERTER (0.54, 0.90) (36, 1, um(1200), 5e9), // VIABLE INVERTER (0.56, 0.89) (9, 1, um(400), 1e10), // VIABLE INVERTER (0.57, 0.90) + (9, 1, um(400), 12e9), // VIABLE INVERTER (0.58, 0.90) (9, 1, um(400), 8e9), // VIABLE INVERTER (0.57, 0.88) (18, 1, um(600), 1e10), // VIABLE INVERTER (0.60, 0.90) (24, 2, um(1200), 1e10), // VIABLE INVERTER (0.64, 0.91) (12, 2, um(600), 1e10), // VIABLE INVERTER (0.65, 0.90) (16, 2, um(800), 1e10), // VIABLE INVERTER (0.66, 0.90) + (9, 1, um(400), 15e9), // VIABLE INVERTER (0.63, 0.86) (6, 2, um(400), 1e10), // VIABLE INVERTER (0.64, 0.84) (4, 3, um(400), 2e10), // VIABLE INVERTER (0.56, 0.87) (9, 3, um(600), 2e10), // VIABLE INVERTER (0.77, 0.87)