Skip to content

Commit

Permalink
back in black
Browse files Browse the repository at this point in the history
  • Loading branch information
ilhamv committed Apr 26, 2024
1 parent 331feae commit d638f17
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
7 changes: 3 additions & 4 deletions mcdc/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions mcdc/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mcdc/type_.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d638f17

Please sign in to comment.