Merge pull request #62 from issp-center-dev/fix.resample

fix resampling in pamc

Author: aoymt

src/py2dmat/algorithm/pamc.py

@@ -422,23 +422,29 @@ def _resample_fixed(self, weights: np.ndarray) -> None:
                 ancestors = np.array(
                     self.mpicomm.allgather(self.walker_ancestors)
                 ).flatten()
+                fxs = np.array(self.mpicomm.allgather(self.fx)).flatten()
             else:
                 xs = self.x
                 ancestors = self.walker_ancestors
+                fxs = self.fx
             self.x = xs[new_index, :]
             self.walker_ancestors = ancestors[new_index]
+            self.fx = fxs[new_index]
         else:
             if self.mpisize > 1:
                 inodes = np.array(self.mpicomm.allgather(self.inode)).flatten()
                 ancestors = np.array(
                     self.mpicomm.allgather(self.walker_ancestors)
                 ).flatten()
+                fxs = np.array(self.mpicomm.allgather(self.fx)).flatten()
             else:
                 inodes = self.inode
                 ancestors = self.walker_ancestors
+                fxs = self.fx
             self.inode = inodes[new_index]
             self.walker_ancestors = ancestors[new_index]
             self.x = self.node_coordinates[self.inode, :]
+            self.fx = fxs[new_index]
 
     def _prepare(self) -> None:
         self.timer["run"]["submit"] = 0.0

tests/pamc/ref.txt

@@ -1,6 +1,6 @@
 nprocs = 2
 rank = 1
-step = 864
-walker = 88
-fx = 2.408215141110511e-14
-x1 = 1.5518424988092416e-07
+step = 526
+walker = 81
+fx = 4.917964222861798e-13
+x1 = -7.0128198485786e-07