Merge Pull Request #8479 from trilinos/Trilinos/muelu-diagonal-mod

Automatically Merged using Trilinos Pull Request AutoTester PR Title: MueLu: diagonal modifications for Chebyshev and prolongator smoothing PR Author: jhux2
trilinos · Jan 26, 2021 · 2e2b449 · 2e2b449
2 parents e76f001 + 19a772d
commit 2e2b449
Show file tree

Hide file tree

Showing 182 changed files with 1,337 additions and 260 deletions.
diff --git a/packages/muelu/doc/UsersGuide/masterList.xml b/packages/muelu/doc/UsersGuide/masterList.xml
@@ -1105,6 +1105,24 @@ Only used when tentative: calculate qr is set to false.</description>
       <name-ML>not supported by ML</name-ML>
     </parameter>
 
+    <parameter>
+      <name>sa: rowsumabs diagonal replacement tolerance</name>
+      <type>double</type>
+      <default>-1.0</default>
+      <description>If not -1, use this value for deciding whether a diagonal value in prolongator smoothing is too small and should be replaced.</description>
+      <visible>false</visible>
+      <name-ML>not supported by ML</name-ML>
+    </parameter>
+
+    <parameter>
+      <name>sa: rowsumabs diagonal replacement value</name>
+      <type>double</type>
+      <default>0.0</default>
+      <description>If it's determined that a diagonal entry in prolongator smoothing is too small, replace that entry with this value.</description>
+      <visible>false</visible>
+      <name-ML>not supported by ML</name-ML>
+    </parameter>
+
     <parameter>
       <name>interp: interpolation order</name>
       <type>int</type>

diff --git a/packages/muelu/doc/UsersGuide/paramlist_hidden.tex b/packages/muelu/doc/UsersGuide/paramlist_hidden.tex
@@ -241,6 +241,10 @@
 
 \cbb{sa: max eigenvalue}{double}{-1.0}{If not -1, use this value for lambdaMax(Dinv A) in prolongator smoothing instead of calculating it.}
 
+\cbb{sa: rowsumabs diagonal replacement tolerance}{double}{-1.0}{If not -1, use this value for deciding whether a diagonal value in prolongator smoothing is too small and should be replaced.}
+
+\cbb{sa: rowsumabs diagonal replacement value}{double}{0.0}{If it's determined that a diagonal entry in prolongator smoothing is too small, replace that entry with this value.}
+
 \cbb{interp: interpolation order}{int}{1}{Interpolation order used to interpolate values from coarse points to fine points. Possible values are 0 for piece-wise constant interpolation and 1 for piece-wise linear interpolation. This parameter is set to 1 by default.}
 
 \cbb{interp: build coarse coordinates}{bool}{true}{If false, skip the calculation of coarse coordinates.}

diff --git a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp
@@ -664,6 +664,9 @@ namespace MueLu {
     bool useMaxAbsDiagonalScaling = false;
     if (defaultList.isParameter("sa: use rowsumabs diagonal scaling"))
       useMaxAbsDiagonalScaling = defaultList.get<bool>("sa: use rowsumabs diagonal scaling");
+    double chebyReplaceTol = -Teuchos::ScalarTraits<double>::one();
+    if (defaultList.isParameter("sa: rowsumabs diagonal replacement tolerance"))
+      chebyReplaceTol = defaultList.get<double>("sa: rowsumabs diagonal replacement tolerance");
 
     // === Smoothing ===
     // FIXME: should custom smoother check default list too?
@@ -735,6 +738,10 @@ namespace MueLu {
 
         if (preSmootherType == "CHEBYSHEV" && useMaxAbsDiagonalScaling)
           preSmootherParams.set("chebyshev: use rowsumabs diagonal scaling",true);
+        if (preSmootherType == "CHEBYSHEV" && chebyReplaceTol != -Teuchos::ScalarTraits<double>::one())
+          preSmootherParams.set("chebyshev: rowsumabs diagonal replacement tolerance",chebyReplaceTol);
+        if (preSmootherType == "CHEBYSHEV" && defaultList.isParameter("sa: rowsumabs diagonal replacement value"))
+          preSmootherParams.set("chebyshev: rowsumabs diagonal replacement value", defaultList.get<double>("sa: rowsumabs diagonal replacement value"));
 
 #ifdef HAVE_MUELU_INTREPID2
       // Propagate P-coarsening for Topo smoothing
@@ -1694,6 +1701,8 @@ namespace MueLu {
     MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "sa: max eigenvalue", double, Pparams);
     MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "sa: eigenvalue estimate num iterations", int, Pparams);
     MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "sa: use rowsumabs diagonal scaling", bool, Pparams);
+    MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "sa: rowsumabs diagonal replacement tolerance", double, Pparams);
+    MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "sa: rowsumabs diagonal replacement value", double, Pparams);
     MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "sa: enforce constraints", bool, Pparams);
     MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "tentative: calculate qr", bool, Pparams);