Merge Pull Request #6007 from trilinos/Trilinos/master_merge_20191001…

…_000620 Automatically Merged using Trilinos Master Merge AutoTester PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20191001_000620 branch to master PR Author: trilinos-autotester
trilinos · Oct 1, 2019 · 759d4c9 · 759d4c9
2 parents ad4826a + 3f56e2d
commit 759d4c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/build_docs.pl b/doc/build_docs.pl
@@ -37,7 +37,7 @@
 print "\n";
 if(!$skipBuild) {
   print "\nGenerating package documentation ...\n";
-  find (\&buildDocs, $trilinosDir);
+  find ({wanted=>\&buildDocs, preprocess => sub {sort {$a cmp $b} @_}}, $trilinosDir);
   if($build_dir) {
     find (\&copyXML, $trilinosDir);
   }

diff --git a/packages/muelu/src/Smoothers/MueLu_Amesos2Smoother_def.hpp b/packages/muelu/src/Smoothers/MueLu_Amesos2Smoother_def.hpp
@@ -201,7 +201,7 @@ namespace MueLu {
         ArrayView<GO> elements = elements_RCP();
         for (size_t k = 0; k<M; k++)
           elements[k] = Teuchos::as<GO>(k);
-        colMap = MapFactory::Build(rowMap->lib(),M,elements,Teuchos::ScalarTraits<GO>::zero(),rowMap->getComm());
+        colMap = MapFactory::Build(rowMap->lib(),M*rowMap->getComm()->getSize(),elements,Teuchos::ScalarTraits<GO>::zero(),rowMap->getComm());
         importer = ImportFactory::Build(rowMap,colMap);
         NullspaceImp = MultiVectorFactory::Build(colMap, Nullspace->getNumVectors());
         NullspaceImp->doImport(*Nullspace,*importer,Xpetra::INSERT);