Merge pull request #331 from germasch/pr/arm64

arm64 updates
psc-code · Jul 10, 2024 · 968a634 · 968a634
2 parents 50a7a69 + d7e1cd7
commit 968a634
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,9 +69,7 @@ if (BUILD_TESTING)
   CPMAddPackage(
     NAME GTest
     GITHUB_REPOSITORY google/googletest
-    # post 1.10.0 with cmake_minimum_required updated
-    GIT_TAG 32f4f52d95dc99c35f51deed552a6ba700567f94
-    VERSION 1.10.0
+    VERSION 1.14.0
     OPTIONS
         "INSTALL_GTEST OFF"
         "gtest_force_shared_crt ON"

diff --git a/src/libpsc/psc_collision/psc_collision_impl.hxx b/src/libpsc/psc_collision/psc_collision_impl.hxx
@@ -8,6 +8,7 @@
 
 #include <cmath>
 #include <numeric>
+#include <random>
 
 extern void* global_collision; // FIXME
 
@@ -164,11 +165,11 @@ struct CollisionHost
   // ----------------------------------------------------------------------
   // randomize_in_cell
 
-  static std::vector<int> randomize_in_cell(int n_start, int n_end)
+  std::vector<int> randomize_in_cell(int n_start, int n_end)
   {
     std::vector<int> permute(n_end - n_start);
     std::iota(permute.begin(), permute.end(), n_start);
-    std::random_shuffle(permute.begin(), permute.end());
+    std::shuffle(permute.begin(), permute.end(), rng_);
     return permute;
   }
 
@@ -265,6 +266,8 @@ private:
   double nu_;
   int interval_;
 
+  std::mt19937 rng_;
+
 public: // FIXME
   // for output
   Mfields mflds_stats_;