Skip to content

Commit d746c9e

Browse files
finalized interpolation tabular mechanism - tested
1 parent db8ea8d commit d746c9e

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

openmc/material.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -580,16 +580,11 @@ def get_photon_contact_dose_rate(self, by_nuclide: bool = False) -> float | dic
580580
e_vals = np.array(photon_source_per_atom.x)
581581
p_vals = np.array(photon_source_per_atom.p)
582582

583-
# remove initial zero value
584-
if p_vals[0] == 0.0:
585-
p_vals = p_vals[1:]
586-
e_vals = e_vals[1:]
587-
588583
e_lists = [e_vals, mu_en_air.x]
589584
e_lists.extend(mass_attenuation_e_lists)
590585

591586
# clip distributions for values outside the tabulated values
592-
left_bound = max(a.min() for a in e_lists) # 10
587+
left_bound = max(a.min() for a in e_lists)
593588
right_bound = min(a.max() for a in e_lists)
594589

595590
mask = (e_vals >= left_bound) & (e_vals <= right_bound)
@@ -614,9 +609,6 @@ def get_photon_contact_dose_rate(self, by_nuclide: bool = False) -> float | dic
614609

615610
elif isinstance(photon_source_per_atom, Tabular):
616611

617-
# fix zero p values in last tabular value - histogram formalism
618-
p_vals[-1] = p_vals[-2] if p_vals[-1] == 0.0 else p_vals[-1]
619-
620612
# generate the tabulated1D functions
621613
e_p_dist = Tabulated1D(
622614
e_vals, p_vals, breakpoints=[len(e_vals)], interpolation=[1]
@@ -648,7 +640,7 @@ def get_photon_contact_dose_rate(self, by_nuclide: bool = False) -> float | dic
648640
y_evaluated = integrand_operator(e_union)
649641

650642
integrand_function = Tabulated1D(
651-
e_union, y_evaluated, breakpoints=[len(e_union)], interpolation=[5]
643+
e_union, y_evaluated, breakpoints=[len(e_union)], interpolation=[2]
652644
)
653645

654646
cdr_nuc += integrand_function.integral()[-1]

0 commit comments

Comments
 (0)