Fixes

Author: brownbaerchen

pySDC/helpers/transfer_helper.py

@@ -27,7 +27,7 @@ def next_neighbors_periodic(p, ps, k):
 
     # zip it
     value_index = []
-    for d, i in zip(distance_to_p, range(distance_to_p.size, strict=True)):
+    for d, i in zip(distance_to_p, range(distance_to_p.size), strict=True):
         value_index.append((d, i))
     # sort by distance
     value_index_sorted = sorted(value_index, key=lambda s: s[0])
@@ -53,7 +53,7 @@ def next_neighbors(p, ps, k):
     distance_to_p = np.abs(ps - p)
     # zip it
     value_index = []
-    for d, i in zip(distance_to_p, range(distance_to_p.size, strict=True)):
+    for d, i in zip(distance_to_p, range(distance_to_p.size), strict=True):
         value_index.append((d, i))
     # sort by distance
     value_index_sorted = sorted(value_index, key=lambda s: s[0])

pySDC/projects/GPU/analysis_scripts/plot_RBC_matrix.py

@@ -15,7 +15,7 @@ def plot_preconditioners():  # pragma: no cover
 
     fig, axs = plt.subplots(1, 4, figsize=figsize_by_journal('TUHH_thesis', 1, 0.4), sharex=True, sharey=True)
 
-    for M, ax in zip([A, A_b, A_r, A_l], axs):
+    for M, ax in zip([A, A_b, A_r, A_l], axs, strict=True):
         ax.imshow((M / abs(M)).real + (M / abs(M)).imag, rasterized=False, cmap='Spectral')
 
     for ax in axs:

pySDC/projects/PinTSimE/battery_model.py

@@ -578,7 +578,7 @@ def getDataDict(stats, prob_cls_name, use_adaptivity, use_detection, recomputed,
         if not all(t is None for t in t_switch_exact):
             event_err = [
                 abs(num_item - ex_item)
-                for (num_item, ex_item) in zip(res['t_switches'], res['t_switch_exact'], strict=True)
+                for (num_item, ex_item) in zip(res['t_switches'], res['t_switch_exact'], strict=False)
             ]
             res['e_event'] = event_err
 

pySDC/projects/parallelSDC_reloaded/convergence.py

@@ -46,7 +46,7 @@ def getError(uNum, uRef):
 # Script execution
 # -----------------------------------------------------------------------------
 plt.figure()
-for (qDelta, nSweeps), style in zip(schemes, styles, strict=True):
+for (qDelta, nSweeps), style in zip(schemes, styles, strict=False):
     if nSweeps is None:
         params = getParamsRK(qDelta)
         label = None

pySDC/projects/parallelSDC_reloaded/scripts/fig01_conv.py

@@ -66,7 +66,7 @@ def getError(uNum, uRef):
     # Figure generation
     figName = f"{sweepType}_{quadType}"
     plt.figure(f"{sweepType}_{quadType}")
-    for (qDelta, nSweeps), style in zip(schemes, styles, strict=True):
+    for (qDelta, nSweeps), style in zip(schemes, styles, strict=False):
         params = getParamsSDC(quadType, nNodes, qDelta, nSweeps, nodeType)
         label = f"$K={nSweeps}$"
         errors = []

pySDC/projects/parallelSDC_reloaded/scripts/fig03_lorenz.py

@@ -69,7 +69,7 @@ def getError(uNum, uRef):
 
 
 config = ["PIC", "MIN-SR-NS"]
-for qDelta, sym in zip(config, symList, strict=True):
+for qDelta, sym in zip(config, symList, strict=False):
     figName = f"{SCRIPT}_conv_{qDelta}"
     plt.figure(figName)
 
@@ -132,7 +132,7 @@ def getCost(counters):
     i += 1
     plt.figure(figName)
 
-    for qDelta, sym in zip(qDeltaList, symList, strict=True):
+    for qDelta, sym in zip(qDeltaList, symList, strict=False):
         try:
             params = getParamsRK(qDelta)
         except KeyError:

pySDC/projects/parallelSDC_reloaded/scripts/fig04_protheroRobinson.py

@@ -60,7 +60,7 @@ def getCost(counters):
     figNameCost = f"{SCRIPT}_cost_{i}"
     i += 1
 
-    for qDelta, sym in zip(qDeltaList, symList, strict=True):
+    for qDelta, sym in zip(qDeltaList, symList, strict=False):
         try:
             params = getParamsRK(qDelta)
         except KeyError:

pySDC/projects/parallelSDC_reloaded/scripts/fig05_allenCahn.py

@@ -84,7 +84,7 @@ def getCost(counters):
     figNameCost = f"{SCRIPT}_cost_{i}"
     i += 1
 
-    for qDelta, sym in zip(qDeltaList, symList, strict=True):
+    for qDelta, sym in zip(qDeltaList, symList, strict=False):
         try:
             params = getParamsRK(qDelta)
         except KeyError:

pySDC/projects/parallelSDC_reloaded/scripts/fig06_allenCahnMPI_plot.py

@@ -36,7 +36,7 @@
     figNameConv = f"{SCRIPT}_conv_1"
     figNameCost = f"{SCRIPT}_cost_1"
 
-    for qDelta, sym in zip(qDeltaList, symList, strict=True):
+    for qDelta, sym in zip(qDeltaList, symList, strict=False):
         if qDelta == "MIN-SR-NS":
             res = timings["MIN-SR-S_MPI"].copy()
             res["errors"] = [np.nan for _ in res["errors"]]