Merge remote-tracking branch 'origin/develop' into atdm-nightly

trilinos · Apr 1, 2020 · bf753cc · bf753cc
2 parents 6a02536 + 978ca11
commit bf753cc
Show file tree

Hide file tree

Showing 18 changed files with 357 additions and 507 deletions.
diff --git a/packages/anasazi/tpetra/src/TsqrTpetraTest.hpp b/packages/anasazi/tpetra/src/TsqrTpetraTest.hpp
diff --git a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionHierarchy_def.hpp b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionHierarchy_def.hpp
@@ -407,7 +407,10 @@ MakeCompositeAMGHierarchy(RCP<Xpetra::Matrix<Scalar, LocalOrdinal, GlobalOrdinal
   *fos << "Attempting to setup AMG hierarchy for the composite coarse grid problem" << std::endl;
 
   // Get parameter list for AMG hierarchy
-  RCP<ParameterList> mueluParams = Teuchos::getParametersFromXmlFile(xmlFileName);
+  RCP<ParameterList> mueluParams = Teuchos::rcp(new ParameterList());
+  Teuchos::updateParametersFromXmlFileAndBroadcast(xmlFileName, mueluParams.ptr(),
+      *compOp->getRowMap()->getComm());
+
 
   // Get the user data sublist
   const std::string userName = "user data";
@@ -614,7 +617,8 @@ void createRegionHierarchy(const int maxRegPerProc,
      */
 
     // Read MueLu parameter list form xml file
-    RCP<ParameterList> mueluParams = Teuchos::getParametersFromXmlFile(xmlFileName);
+    RCP<ParameterList> mueluParams = Teuchos::rcp(new ParameterList());
+    Teuchos::updateParametersFromXmlFileAndBroadcast(xmlFileName, mueluParams.ptr(), *mapComp->getComm());
 
     // Insert region-specific data into parameter list
     const std::string userName = "user data";