Merge Pull Request #6142 from trilinos/Trilinos/master_merge_20191023…

…_111521 Automatically Merged using Trilinos Master Merge AutoTester PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20191023_111521 branch to master PR Author: trilinos-autotester
trilinos · Oct 23, 2019 · c45b818 · c45b818
2 parents 6605279 + ade2a2a
commit c45b818
Show file tree

Hide file tree

Showing 294 changed files with 2,773 additions and 9,615 deletions.
diff --git a/doc/DocumentingParameterLists/webfiles/js/jquery.js b/doc/DocumentingParameterLists/webfiles/js/jquery.js
diff --git a/packages/muelu/doc/UsersGuide/masterList.xml b/packages/muelu/doc/UsersGuide/masterList.xml
@@ -1017,6 +1017,14 @@
       <visible>false</visible>
     </parameter>
 
+    <parameter>
+      <name>tentative: constant column sums</name>
+      <type>bool</type>
+      <default>false</default>
+      <description>If true, scale the column sums to one (before applying nullspace).</description>
+      <visible>false</visible>
+    </parameter>
+
     <parameter>
       <name>tentative: build coarse coordinates</name>
       <type>bool</type>

diff --git a/packages/muelu/doc/UsersGuide/paramlist_hidden.tex b/packages/muelu/doc/UsersGuide/paramlist_hidden.tex
@@ -215,6 +215,8 @@
 
 \cbb{tentative: calculate qr}{bool}{true}{If false, skip local QR decomposition phase of smoothed aggregation.}
 
+\cbb{tentative: constant column sums}{bool}{false}{If true, scale the column sums to one (before applying nullspace).}
+
 \cbb{tentative: build coarse coordinates}{bool}{true}{If false, skip the calculation of coarse coordinates.}
 
 \cbb{repartition: enable}{bool}{false}{Rebalancing on/off switch.}

diff --git a/packages/muelu/src/MueCentral/MueLu_MasterList.cpp b/packages/muelu/src/MueCentral/MueLu_MasterList.cpp
@@ -136,6 +136,7 @@ namespace MueLu {
     if (name == "pcoarsen: lo basis") { ss << "<Parameter name=\"pcoarsen: lo basis\" type=\"string\" value=" << value << "/>"; return ss.str(); }      
     if (name == "smoother: neighborhood type") { ss << "<Parameter name=\"smoother: neighborhood type\" type=\"string\" value=" << value << "/>"; return ss.str(); }      
     if (name == "tentative: calculate qr") { ss << "<Parameter name=\"tentative: calculate qr\" type=\"bool\" value=" << value << "/>"; return ss.str(); }      
+    if (name == "tentative: constant column sums") { ss << "<Parameter name=\"tentative: constant column sums\" type=\"bool\" value=" << value << "/>"; return ss.str(); }      
     if (name == "repartition: enable") { ss << "<Parameter name=\"repartition: enable\" type=\"bool\" value=" << value << "/>"; return ss.str(); }      
     if (name == "repartition: start level") { ss << "<Parameter name=\"repartition: start level\" type=\"int\" value=" << value << "/>"; return ss.str(); }      
     if (name == "repartition: node repartition level") { ss << "<Parameter name=\"repartition: node repartition level\" type=\"int\" value=" << value << "/>"; return ss.str(); }      
@@ -257,6 +258,7 @@ namespace MueLu {
   "<Parameter name=\"emin: pattern\" type=\"string\" value=\"AkPtent\"/>"
   "<Parameter name=\"emin: pattern order\" type=\"int\" value=\"1\"/>"
   "<Parameter name=\"tentative: calculate qr\" type=\"bool\" value=\"true\"/>"
+  "<Parameter name=\"tentative: constant column sums\" type=\"bool\" value=\"false\"/>"
   "<Parameter name=\"tentative: build coarse coordinates\" type=\"bool\" value=\"true\"/>"
   "<Parameter name=\"repartition: enable\" type=\"bool\" value=\"false\"/>"
   "<Parameter name=\"repartition: partitioner\" type=\"string\" value=\"zoltan2\"/>"
@@ -682,6 +684,8 @@ namespace MueLu {
 
          ("tentative: calculate qr","tentative: calculate qr")
 
+         ("tentative: constant column sums","tentative: constant column sums")
+
          ("tentative: build coarse coordinates","tentative: build coarse coordinates")
 
          ("repartition: enable","repartition: enable")

diff --git a/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_TentativePFactory_def.hpp b/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_TentativePFactory_def.hpp
@@ -80,6 +80,7 @@ namespace MueLu {
 #define SET_VALID_ENTRY(name) validParamList->setEntry(name, MasterList::getEntry(name))
     SET_VALID_ENTRY("tentative: calculate qr");
     SET_VALID_ENTRY("tentative: build coarse coordinates");
+    SET_VALID_ENTRY("tentative: constant column sums");
 #undef  SET_VALID_ENTRY
     validParamList->set< std::string >("Nullspace name", "Nullspace", "Name for the input nullspace");
 
@@ -272,6 +273,16 @@ namespace MueLu {
 
     const GO     numAggs   = aggregates->GetNumAggregates();
     const size_t NSDim     = fineNullspace->getNumVectors();
+    ArrayRCP<LO> aggSizes  = aggregates->ComputeAggregateSizes();
+
+
+    // Sanity checking
+    const ParameterList& pL = GetParameterList();
+    const bool &doQRStep = pL.get<bool>("tentative: calculate qr");
+    const bool &constantColSums = pL.get<bool>("tentative: constant column sums");    
+
+    TEUCHOS_TEST_FOR_EXCEPTION(doQRStep && constantColSums,Exceptions::RuntimeError,
+                               "MueLu::TentativePFactory::MakeTentative: cannot use 'constant column sums' and 'calculate qr' at the same time");
 
     // Aggregates map is based on the amalgamated column map
     // We can skip global-to-local conversion if LIDs in row map are
@@ -297,9 +308,6 @@ namespace MueLu {
 
     coarseNullspace = MultiVectorFactory::Build(coarseMap, NSDim);
 
-    const ParameterList& pL = GetParameterList();
-    const bool &doQRStep = pL.get<bool>("tentative: calculate qr");
-
     // Pull out the nullspace vectors so that we can have random access.
     ArrayRCP<ArrayRCP<const SC> > fineNS  (NSDim);
     ArrayRCP<ArrayRCP<SC> >       coarseNS(NSDim);
@@ -469,7 +477,7 @@ namespace MueLu {
     } else {
       GetOStream(Runtime1) << "TentativePFactory : bypassing local QR phase" << std::endl;
       if (NSDim>1)
-        GetOStream(Warnings0) << "TentativePFactor : for nontrivial nullspace, this may degrade performance" << std::endl;
+        GetOStream(Warnings0) << "TentativePFactory : for nontrivial nullspace, this may degrade performance" << std::endl;
       /////////////////////////////
       //      "no-QR" option     //
       /////////////////////////////
@@ -496,7 +504,8 @@ namespace MueLu {
 
             for (size_t k = 0, lnnz = 0; k < NSDim; k++) {
               // Skip zeros (there may be plenty of them, i.e., NSDim > 1 or boundary conditions)
-              const SC qr_jk = fineNS[k][aggToRowMapLO[aggStart[agg]+j]];
+              SC qr_jk = fineNS[k][aggToRowMapLO[aggStart[agg]+j]];
+              if(constantColSums) qr_jk = qr_jk / (double)aggSizes[agg];
               if (qr_jk != zero) {
                 ja [rowStart+lnnz] = offset + k;
                 val[rowStart+lnnz] = qr_jk;
@@ -520,7 +529,8 @@ namespace MueLu {
 
             for (size_t k = 0, lnnz = 0; k < NSDim; k++) {
               // Skip zeros (there may be plenty of them, i.e., NSDim > 1 or boundary conditions)
-              const SC qr_jk = fineNS[k][rowMap->getLocalElement(aggToRowMapGO[aggStart[agg]+j])];
+              SC qr_jk = fineNS[k][rowMap->getLocalElement(aggToRowMapGO[aggStart[agg]+j])];
+              if(constantColSums) qr_jk = qr_jk / (double)aggSizes[agg];
               if (qr_jk != zero) {
                 ja [rowStart+lnnz] = offset + k;
                 val[rowStart+lnnz] = qr_jk;

diff --git a/packages/muelu/test/interface/complex/Output/MLcoarse1_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLcoarse1_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLcoarse2_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLcoarse2_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -337,6 +340,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -428,6 +432,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLcoarse3_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLcoarse3_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -337,6 +340,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLcoarse5_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLcoarse5_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLpgamg1_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLpgamg1_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -157,6 +158,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -250,6 +252,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -343,6 +346,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLsmoother1_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLsmoother1_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -337,6 +340,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLsmoother2_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLsmoother2_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -337,6 +340,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLsmoother3_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLsmoother3_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -337,6 +340,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]

diff --git a/packages/muelu/test/interface/complex/Output/MLsmoother4_tpetra.gold b/packages/muelu/test/interface/complex/Output/MLsmoother4_tpetra.gold
@@ -64,6 +64,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -155,6 +156,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -246,6 +248,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]
@@ -337,6 +340,7 @@ Domain GID offsets = {0}   [default]
 
 tentative: calculate qr = 1   [default]
 tentative: build coarse coordinates = 1   [default]
+tentative: constant column sums = 0   [default]
 Nullspace name = Nullspace   [default]
 matrixmatrix: kernel params -> 
  [empty list]