Merge 'trilinos/Trilinos:develop' (3c8a941) into 'tcad-charon/Trilino…

…s:develop' (a4157fa).

* trilinos-develop:
  TrilinosCouplings: Adding coordinate dump option to Tpetra Poisson example
  MiniEM: Don't use kokkos refactor code path
  MiniEM: Update solver parameters
  Automatic snapshot commit from seacas at 7b9854a75
  anasazi:  removing unused test file.  trilinos#7015
  MueLu: read xml-file properly in parallel runs

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";