Merge Pull Request #13362 from cgcgcg/Trilinos/mueluFixShuffle

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'MueLu: Silence warnings' PR Author: cgcgcg
trilinos · Aug 19, 2024 · ada2829 · ada2829
2 parents ec9e57a + 282b669
commit ada2829
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/muelu/src/Misc/MueLu_FilteredAFactory_def.hpp b/packages/muelu/src/Misc/MueLu_FilteredAFactory_def.hpp
@@ -31,7 +31,8 @@ namespace MueLu {
 template <class T>
 void sort_and_unique(T& array) {
   std::sort(array.begin(), array.end());
-  std::unique(array.begin(), array.end());
+  auto last = std::unique(array.begin(), array.end());
+  array.erase(last, array.end());
 }
 
 template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>

diff --git a/packages/muelu/test/unit_tests/Repartition.cpp b/packages/muelu/test/unit_tests/Repartition.cpp
@@ -942,13 +942,13 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Repartition, CoordinateMap, Scalar, LocalOrdin
 
   // build a map that is a "randomly" permuted version of the correct
   // coordinate map.  This map will be used to build the "bad" coordinates.
-  RCP<const Map> coordMap = coordinates->getMap();
-  std::srand(Teuchos::as<unsigned int>(comm->getRank() * 31415));
+  RCP<const Map> coordMap                                  = coordinates->getMap();
   Teuchos::ArrayView<const GlobalOrdinal> correctLocalElts = coordMap->getLocalElementList();
   std::vector<GlobalOrdinal> eltsToShuffle;
   for (size_t i = 0; i < Teuchos::as<size_t>(correctLocalElts.size()); ++i)
     eltsToShuffle.push_back(correctLocalElts[i]);
-  std::random_shuffle(eltsToShuffle.begin(), eltsToShuffle.end(), [](GlobalOrdinal i) { return std::rand() % i; });
+  std::mt19937 g(Teuchos::as<unsigned int>(comm->getRank() * 31415));
+  std::shuffle(eltsToShuffle.begin(), eltsToShuffle.end(), g);
   Teuchos::Array<GlobalOrdinal> eltList(eltsToShuffle);
   RCP<const Map> badMap = MapFactory::Build(TestHelpers::Parameters::getLib(), coordMap->getGlobalNumElements(), eltList(), coordMap->getIndexBase(), comm);