From d638f178280116803425c675a7943bbe2ae95895 Mon Sep 17 00:00:00 2001 From: ilhamv Date: Fri, 26 Apr 2024 13:51:56 -0700 Subject: [PATCH] back in black --- mcdc/kernel.py | 7 +++---- mcdc/main.py | 10 +++++++--- mcdc/type_.py | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mcdc/kernel.py b/mcdc/kernel.py index 03162f1c..d07ee729 100644 --- a/mcdc/kernel.py +++ b/mcdc/kernel.py @@ -772,7 +772,7 @@ def source_particle(seed, mcdc): # Energy and time if mcdc["setting"]["mode_MG"]: xi = rng(P) - g = 1 + binary_search(xi, source['group']) + g = 1 + binary_search(xi, source["group"]) E = 0.0 else: g = 0 @@ -1895,7 +1895,7 @@ def score_tracklength(P, distance, data, mcdc): # Easily identified tally bin indices s = P["sensitivity_ID"] mu, azi = mesh_get_angular_index(P, mesh) - g, outside_energy = mesh_get_energy_index(P, mesh, mcdc['setting']['mode_MG']) + g, outside_energy = mesh_get_energy_index(P, mesh, mcdc["setting"]["mode_MG"]) # Return if outside the domain of interest if ( @@ -1956,7 +1956,6 @@ def score_tracklength(P, distance, data, mcdc): flux = distance_scored * P["w"] tally[TALLY_SCORE, idx] += flux - # Accumulate distance swept distance_swept += distance_scored @@ -2025,7 +2024,7 @@ def tally_reduce(data, mcdc): @njit def tally_accumulate(data, mcdc): tally = data[TALLY] - N_bin = mcdc['tally']['N_bin'] + N_bin = mcdc["tally"]["N_bin"] for i in range(N_bin): # Accumulate score and square of score into sum and sum_sq diff --git a/mcdc/main.py b/mcdc/main.py index 5d426432..cb00298f 100644 --- a/mcdc/main.py +++ b/mcdc/main.py @@ -523,7 +523,7 @@ def prepare(): if Ns > 1: mcdc["tally"]["stride"]["sensitivity"] = stride N_bin = Ns * Nmu * N_azi * Ng * Nt * Nx * Ny * Nz - mcdc['tally']['N_bin'] = N_bin + mcdc["tally"]["N_bin"] = N_bin # Set tally data tally = np.zeros((3, N_bin), dtype=type_.float64) @@ -937,8 +937,12 @@ def generate_hdf5(data, mcdc): N_sensitivity = input_deck.setting["N_sensitivity"] Ns = 1 + N_sensitivity if input_deck.technique["dsm_order"] == 2: - Ns = 1 + 2 * N_sensitivity + int(0.5 * N_sensitivity * (N_sensitivity - 1)) - card = input_deck.tally['mesh'] + Ns = ( + 1 + + 2 * N_sensitivity + + int(0.5 * N_sensitivity * (N_sensitivity - 1)) + ) + card = input_deck.tally["mesh"] Nmu = len(card["mu"]) - 1 N_azi = len(card["azi"]) - 1 Ng = len(card["g"]) - 1 diff --git a/mcdc/type_.py b/mcdc/type_.py index c5257bc2..3344ee87 100644 --- a/mcdc/type_.py +++ b/mcdc/type_.py @@ -867,7 +867,7 @@ def make_type_uq_tally(input_deck): mesh, Nx, Ny, Nz, Nt, Nmu, N_azi, Ng = make_type_mesh(tally_card["mesh"]) # Tally shape and bins - if input_deck.technique['uq']: + if input_deck.technique["uq"]: N_bin = Ns * Nmu * N_azi * Ng * Nt * Nx * Ny * Nz else: N_bin = 0