Merge Pull Request #10003 from trilinos/Trilinos/rstumin-de77634

Automatically Merged using Trilinos Pull Request AutoTester PR Title: MueLu: fixed parameter bug with rotation option PR Author: rstumin
trilinos · Dec 10, 2021 · 29759e1 · 29759e1
2 parents d63b7e5 + 2f49f35
commit 29759e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp
@@ -1771,7 +1771,7 @@ namespace MueLu {
  // =====================================================================================================
  template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
  void ParameterListInterpreter<Scalar, LocalOrdinal, GlobalOrdinal, Node>::
- UpdateFactoryManager_Nullspace(ParameterList& paramList, const ParameterList& /* defaultList */, FactoryManager& manager,
+ UpdateFactoryManager_Nullspace(ParameterList& paramList, const ParameterList& defaultList, FactoryManager& manager,
  int /* levelID */, std::vector<keep_pair>& /* keeps */, RCP<Factory> & nullSpaceFactory) const
  {
  // Nullspace
@@ -1782,6 +1782,9 @@ namespace MueLu {
  have_userNS = true;
 
  if (!have_userNS) {
+ ParameterList newNullparams;
+ MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "nullspace: calculate rotations", bool, newNullparams);
+ nullSpace->SetParameterList(newNullparams);
  nullSpace->SetFactory("Nullspace", manager.GetFactory("Ptent"));
  manager.SetFactory("Nullspace", nullSpace);
  }

diff --git a/packages/muelu/test/scaling/comp_rotations.xml b/packages/muelu/test/scaling/comp_rotations.xml
@@ -32,20 +32,6 @@
  <Parameter name="relaxation: damping factor" type="double" value="0.7"/>
  </ParameterList>
 
- <!-- =========== REPARTITIONING =========== -->
- <Parameter name="repartition: enable" type="bool" value="true"/>
- <Parameter name="repartition: partitioner" type="string" value="zoltan2"/>
- <Parameter name="repartition: start level" type="int" value="3"/>
- <Parameter name="repartition: min rows per proc" type="int" value="800"/>
- <Parameter name="repartition: max imbalance" type="double" value="1.1"/>
- <Parameter name="repartition: remap parts" type="bool" value="false"/>
- <!-- start of default values for repartitioning (can be omitted) -->
- <Parameter name="repartition: remap parts" type="bool" value="true"/>
- <Parameter name="repartition: rebalance P and R" type="bool" value="false"/>
- <ParameterList name="repartition: params">
- <Parameter name="algorithm" type="string" value="multijagged"/>
- </ParameterList>
-
  <ParameterList name="matrixmatrix: kernel params">
  <Parameter name="compute global constants: temporaries" type="bool" value="false"/>
  <Parameter name="compute global constants" type="bool" value="false"/>