From 5312504b1d71a4fa325ffbf696ff60787af60547 Mon Sep 17 00:00:00 2001 From: Sam Pasmann Date: Thu, 21 Mar 2024 12:21:19 -0600 Subject: [PATCH 1/3] Buf fix: remove __pycache__ from names list in regresss tests if present --- test/regression/run.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/regression/run.py b/test/regression/run.py index eac007ba..bcd217ef 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -34,6 +34,10 @@ for name in skips: names.remove(name) +# Skip cache if any +if "__pycache__" in names: + names.remove("__pycache__") + # Data for each test printouts = [] runtimes = [] @@ -44,10 +48,6 @@ # Run all tests for i, name in enumerate(names): - # Skip cache if any - if name == "__pycache__": - continue - print("\n[%i/%i] " % (i + 1, len(names)) + name) error_msgs.append([]) crashes.append(False) From 8df1e9699929ba4287df8ad53d8f12fad9a8aafb Mon Sep 17 00:00:00 2001 From: spasmann <46267220+spasmann@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:42:12 -0600 Subject: [PATCH 2/3] black reformat --- mcdc/main.py | 42 +++++++++++++++++++++--------------------- mcdc/visualizer.py | 4 +++- test/regression/run.py | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/mcdc/main.py b/mcdc/main.py index cfe5eead..17934cb7 100644 --- a/mcdc/main.py +++ b/mcdc/main.py @@ -270,9 +270,9 @@ def prepare(): for i in range(N_material): for name in type_.material.names: if name in ["nuclide_IDs", "nuclide_densities"]: - mcdc["materials"][i][name][: mcdc["materials"][i]["N_nuclide"]] = ( - input_deck.materials[i][name] - ) + mcdc["materials"][i][name][ + : mcdc["materials"][i]["N_nuclide"] + ] = input_deck.materials[i][name] else: mcdc["materials"][i][name] = input_deck.materials[i][name] @@ -535,14 +535,14 @@ def prepare(): for i in range(M): idm = input_deck.uq_deltas["materials"][i]["ID"] mcdc["technique"]["uq_"]["materials"][i]["info"]["ID"] = idm - mcdc["technique"]["uq_"]["materials"][i]["info"]["distribution"] = ( - input_deck.uq_deltas["materials"][i]["distribution"] - ) + mcdc["technique"]["uq_"]["materials"][i]["info"][ + "distribution" + ] = input_deck.uq_deltas["materials"][i]["distribution"] for name in input_deck.uq_deltas["materials"][i]["flags"]: mcdc["technique"]["uq_"]["materials"][i]["flags"][name] = True - mcdc["technique"]["uq_"]["materials"][i]["delta"][name] = ( - input_deck.uq_deltas["materials"][i][name] - ) + mcdc["technique"]["uq_"]["materials"][i]["delta"][ + name + ] = input_deck.uq_deltas["materials"][i][name] flags = mcdc["technique"]["uq_"]["materials"][i]["flags"] if flags["capture"] or flags["scatter"] or flags["fission"]: flags["total"] = True @@ -551,26 +551,26 @@ def prepare(): flags["nu_f"] = True if mcdc["materials"][idm]["N_nuclide"] > 1: for name in type_.uq_mat.names: - mcdc["technique"]["uq_"]["materials"][i]["mean"][name] = ( - input_deck.materials[idm][name] - ) + mcdc["technique"]["uq_"]["materials"][i]["mean"][ + name + ] = input_deck.materials[idm][name] N = len(input_deck.uq_deltas["nuclides"]) for i in range(N): - mcdc["technique"]["uq_"]["nuclides"][i]["info"]["distribution"] = ( - input_deck.uq_deltas["nuclides"][i]["distribution"] - ) + mcdc["technique"]["uq_"]["nuclides"][i]["info"][ + "distribution" + ] = input_deck.uq_deltas["nuclides"][i]["distribution"] idn = input_deck.uq_deltas["nuclides"][i]["ID"] mcdc["technique"]["uq_"]["nuclides"][i]["info"]["ID"] = idn for name in type_.uq_nuc.names: - mcdc["technique"]["uq_"]["nuclides"][i]["mean"][name] = ( - input_deck.nuclides[idn][name] - ) + mcdc["technique"]["uq_"]["nuclides"][i]["mean"][ + name + ] = input_deck.nuclides[idn][name] for name in input_deck.uq_deltas["nuclides"][i]["flags"]: mcdc["technique"]["uq_"]["nuclides"][i]["flags"][name] = True - mcdc["technique"]["uq_"]["nuclides"][i]["delta"][name] = ( - input_deck.uq_deltas["nuclides"][i][name] - ) + mcdc["technique"]["uq_"]["nuclides"][i]["delta"][ + name + ] = input_deck.uq_deltas["nuclides"][i][name] flags = mcdc["technique"]["uq_"]["nuclides"][i]["flags"] if flags["capture"] or flags["scatter"] or flags["fission"]: flags["total"] = True diff --git a/mcdc/visualizer.py b/mcdc/visualizer.py index 3504ae30..77099ee8 100644 --- a/mcdc/visualizer.py +++ b/mcdc/visualizer.py @@ -161,7 +161,9 @@ def create_cell_geometry(cell, current_time, surface_list, start_time, end_time) # get radius from the surface card radius = float( - math.sqrt(abs(surface_list[surface_ID]["J"][0, 0] - x**2 - y**2 - z**2)) + math.sqrt( + abs(surface_list[surface_ID]["J"][0, 0] - x**2 - y**2 - z**2) + ) ) # Add or subtract the sphere based on the CSG input diff --git a/test/regression/run.py b/test/regression/run.py index bcd217ef..057809c9 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -37,7 +37,7 @@ # Skip cache if any if "__pycache__" in names: names.remove("__pycache__") - + # Data for each test printouts = [] runtimes = [] From 95f20f1632ae183513307a44131d3edceeaeec16 Mon Sep 17 00:00:00 2001 From: spasmann <46267220+spasmann@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:50:11 -0600 Subject: [PATCH 3/3] updated black format --- mcdc/main.py | 42 +++++++++++++++++++++--------------------- mcdc/visualizer.py | 4 +--- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/mcdc/main.py b/mcdc/main.py index 17934cb7..cfe5eead 100644 --- a/mcdc/main.py +++ b/mcdc/main.py @@ -270,9 +270,9 @@ def prepare(): for i in range(N_material): for name in type_.material.names: if name in ["nuclide_IDs", "nuclide_densities"]: - mcdc["materials"][i][name][ - : mcdc["materials"][i]["N_nuclide"] - ] = input_deck.materials[i][name] + mcdc["materials"][i][name][: mcdc["materials"][i]["N_nuclide"]] = ( + input_deck.materials[i][name] + ) else: mcdc["materials"][i][name] = input_deck.materials[i][name] @@ -535,14 +535,14 @@ def prepare(): for i in range(M): idm = input_deck.uq_deltas["materials"][i]["ID"] mcdc["technique"]["uq_"]["materials"][i]["info"]["ID"] = idm - mcdc["technique"]["uq_"]["materials"][i]["info"][ - "distribution" - ] = input_deck.uq_deltas["materials"][i]["distribution"] + mcdc["technique"]["uq_"]["materials"][i]["info"]["distribution"] = ( + input_deck.uq_deltas["materials"][i]["distribution"] + ) for name in input_deck.uq_deltas["materials"][i]["flags"]: mcdc["technique"]["uq_"]["materials"][i]["flags"][name] = True - mcdc["technique"]["uq_"]["materials"][i]["delta"][ - name - ] = input_deck.uq_deltas["materials"][i][name] + mcdc["technique"]["uq_"]["materials"][i]["delta"][name] = ( + input_deck.uq_deltas["materials"][i][name] + ) flags = mcdc["technique"]["uq_"]["materials"][i]["flags"] if flags["capture"] or flags["scatter"] or flags["fission"]: flags["total"] = True @@ -551,26 +551,26 @@ def prepare(): flags["nu_f"] = True if mcdc["materials"][idm]["N_nuclide"] > 1: for name in type_.uq_mat.names: - mcdc["technique"]["uq_"]["materials"][i]["mean"][ - name - ] = input_deck.materials[idm][name] + mcdc["technique"]["uq_"]["materials"][i]["mean"][name] = ( + input_deck.materials[idm][name] + ) N = len(input_deck.uq_deltas["nuclides"]) for i in range(N): - mcdc["technique"]["uq_"]["nuclides"][i]["info"][ - "distribution" - ] = input_deck.uq_deltas["nuclides"][i]["distribution"] + mcdc["technique"]["uq_"]["nuclides"][i]["info"]["distribution"] = ( + input_deck.uq_deltas["nuclides"][i]["distribution"] + ) idn = input_deck.uq_deltas["nuclides"][i]["ID"] mcdc["technique"]["uq_"]["nuclides"][i]["info"]["ID"] = idn for name in type_.uq_nuc.names: - mcdc["technique"]["uq_"]["nuclides"][i]["mean"][ - name - ] = input_deck.nuclides[idn][name] + mcdc["technique"]["uq_"]["nuclides"][i]["mean"][name] = ( + input_deck.nuclides[idn][name] + ) for name in input_deck.uq_deltas["nuclides"][i]["flags"]: mcdc["technique"]["uq_"]["nuclides"][i]["flags"][name] = True - mcdc["technique"]["uq_"]["nuclides"][i]["delta"][ - name - ] = input_deck.uq_deltas["nuclides"][i][name] + mcdc["technique"]["uq_"]["nuclides"][i]["delta"][name] = ( + input_deck.uq_deltas["nuclides"][i][name] + ) flags = mcdc["technique"]["uq_"]["nuclides"][i]["flags"] if flags["capture"] or flags["scatter"] or flags["fission"]: flags["total"] = True diff --git a/mcdc/visualizer.py b/mcdc/visualizer.py index 77099ee8..3504ae30 100644 --- a/mcdc/visualizer.py +++ b/mcdc/visualizer.py @@ -161,9 +161,7 @@ def create_cell_geometry(cell, current_time, surface_list, start_time, end_time) # get radius from the surface card radius = float( - math.sqrt( - abs(surface_list[surface_ID]["J"][0, 0] - x**2 - y**2 - z**2) - ) + math.sqrt(abs(surface_list[surface_ID]["J"][0, 0] - x**2 - y**2 - z**2)) ) # Add or subtract the sphere based on the CSG input