Commit 8a982a04 authored by Hsing-Yin Chang's avatar Hsing-Yin Chang
Browse files

match autocorrelation.py to development mpi version

parent c575722f
...@@ -110,9 +110,10 @@ def right_hand_ADb_task(slices, uregion, nonuniform_v, ac, weights, M, ...@@ -110,9 +110,10 @@ def right_hand_ADb_task(slices, uregion, nonuniform_v, ac, weights, M,
nonuniform_v.H, nonuniform_v.H,
nonuniform_v.K, nonuniform_v.K,
nonuniform_v.L, nonuniform_v.L,
ac.support, M, M,
reciprocal_extent, use_reciprocal_symmetry support=ac.support,
) use_recip_sym=use_reciprocal_symmetry)
if settings.verbosity > 0: if settings.verbosity > 0:
print(f"{socket.gethostname()} computed ADb.", flush=True) print(f"{socket.gethostname()} computed ADb.", flush=True)
...@@ -143,9 +144,8 @@ def prep_Fconv_task(uregion_ups, nonuniform_v, ac, weights, M_ups, Mtot, N, ...@@ -143,9 +144,8 @@ def prep_Fconv_task(uregion_ups, nonuniform_v, ac, weights, M_ups, Mtot, N,
nonuniform_v.H, nonuniform_v.H,
nonuniform_v.K, nonuniform_v.K,
nonuniform_v.L, nonuniform_v.L,
1, M_ups, M_ups,
reciprocal_extent, use_reciprocal_symmetry use_reciprocal_symmetry, support=None)
)
uregion_ups.F_conv_[:] += np.fft.fftn(np.fft.ifftshift(conv_ups)) / Mtot uregion_ups.F_conv_[:] += np.fft.fftn(np.fft.ifftshift(conv_ups)) / Mtot
if settings.verbosity > 0: if settings.verbosity > 0:
print(f"{socket.gethostname()} computed Fconv.", flush=True) print(f"{socket.gethostname()} computed Fconv.", flush=True)
...@@ -387,3 +387,4 @@ def solve_ac(generation, ...@@ -387,3 +387,4 @@ def solve_ac(generation,
# I tried to have `results` as a partition and copy into a region, # I tried to have `results` as a partition and copy into a region,
# but I couldn't get it to work. # but I couldn't get it to work.
return results_p[iref.get()] return results_p[iref.get()]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment