MueLu: GeometricInterpolationPFactory, see issue trilinos#3179

adding the stokhos files, modifying the input parameters and modifying the structured poisson example in trilinosCouplings to test the new geometric interpolation factory. I mainly needed to provide us with coordinates for the piece-wise linear interpolation. This example can also be used to exert the hybrid aggregation capabilities now. Rewrite of parts of structured aggregation to use CrsGraph for piece-wise constant aggregation. This eventually allows to write a simplified version of the piece-wise constant interpolation prolongator as maps are transfered from aggregation to prolongator via the CrsGraph.
lucbv · Jul 27, 2018 · 9a0d65e · 9a0d65e
1 parent 8bb257b
commit 9a0d65e
Show file tree

Hide file tree

Showing 38 changed files with 1,691 additions and 137 deletions.
diff --git a/packages/muelu/doc/UsersGuide/masterList.xml b/packages/muelu/doc/UsersGuide/masterList.xml
@@ -781,6 +781,24 @@
       <name-ML>eigen-analysis: iterations</name-ML>
     </parameter>
 
+    <parameter>
+      <name>gmg: interpolation order</name>
+      <type>int</type>
+      <default>1</default>
+      <description>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.</description>
+      <visible></visible>
+      <comment-ML>parameter not existing in ML</comment-ML>
+    </parameter>
+
+    <parameter>
+      <name>gmg: build coarse coordinates</name>
+      <type>bool</type>
+      <default>true</default>
+      <description>If false, skip the calculation of coarse coordinates.</description>
+      <visible>false</visible>
+      <comment-ML>not supported by ML</comment-ML>
+    </parameter>
+
     <parameter>
       <name>transfer: params</name>
       <type>\parameterlist</type>
@@ -797,7 +815,6 @@
       <visible>false</visible>
     </parameter>
 
-
     <parameter>
       <name>pcoarsen: schedule</name>
       <type>string</type>

diff --git a/packages/muelu/doc/UsersGuide/paramlist_hidden.tex b/packages/muelu/doc/UsersGuide/paramlist_hidden.tex
@@ -154,6 +154,10 @@
 
 \cbb{sa: eigenvalue estimate num iterations}{int}{10}{Number of power iterations to use to estimate max eigenvalue. This has effect only if estimation occurs during prolongator smoothing.}
 
+\cbb{gmg: 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{gmg: build coarse coordinates}{bool}{true}{If false, skip the calculation of coarse coordinates.}
+
 \cba{transfer: params}{\parameterlist}{Sublist of options for use by transfer.}
 
 \cbb{pcoarsen: element}{string}{""}{Element class for IntrepidPCoarsening}

diff --git a/packages/muelu/src/CMakeLists.txt b/packages/muelu/src/CMakeLists.txt
@@ -472,3 +472,4 @@ TRIBITS_ADD_LIBRARY(
 # touch CMakeLists.txt because a new file was created in Utils/ExplicitInstantiation of Utils/ForwardDeclaration
 # touch CMakeLists.txt because a new file was created in Utils/ExplicitInstantiation of Utils/ForwardDeclaration
 # touch CMakeLists.txt because a new file was created in Utils/ExplicitInstantiation of Utils/ForwardDeclaration
+# touch CMakeLists.txt because a new file was created in Utils/ExplicitInstantiation of Utils/ForwardDeclaration
diff --git a/packages/muelu/src/Graph/MueLu_Aggregates_decl.hpp b/packages/muelu/src/Graph/MueLu_Aggregates_decl.hpp
@@ -136,7 +136,7 @@ namespace MueLu {
 
         This has to be done by the aggregation factory.
     */
-    RCP<IndexManager> & GetIndexManager() { return geoData_; }
+    RCP<IndexManager>& GetIndexManager() { return geoData_; }
 
     /*! @brief Get the index manager used by structured aggregation algorithms.
 

diff --git a/packages/muelu/src/Graph/StructuredAggregation/MueLu_AggregationStructuredAlgorithm_decl.hpp b/packages/muelu/src/Graph/StructuredAggregation/MueLu_AggregationStructuredAlgorithm_decl.hpp
@@ -100,17 +100,28 @@ namespace MueLu {
 
     /*! @brief Local aggregation. */
 
-    void BuildAggregates(const ParameterList& params, const GraphBase& graph, Aggregates& aggregates,
-                         std::vector<unsigned>& aggStat, LO& numNonAggregatedNodes) const;
+    void BuildAggregates(const Teuchos::ParameterList& params, const GraphBase& graph,
+                         Aggregates& aggregates, std::vector<unsigned>& aggStat,
+                         LO& numNonAggregatedNodes) const;
 
     /*! @brief Local aggregation. */
 
-    void BuildAggregates(const ParameterList& params, const GraphBase& graph,
-                         RCP<IndexManager>& geoData, RCP<CrsGraph>& myGraph) const;
+    void BuildAggregates(const GraphBase& graph, RCP<IndexManager>& geoData,
+                         RCP<CrsGraph>& myGraph) const;
     //@}
 
     std::string description() const { return "Aggretation: structured algorithm"; }
 
+  private:
+
+    void ComputeGraphDataConstant(const GraphBase& graph, RCP<IndexManager>& geoData,
+                                  const int numInterpolationPoints, ArrayRCP<size_t>& nnzOnRow,
+                                  Array<size_t>& rowPtr, Array<LO>& colIndex) const;
+
+    void ComputeGraphDataLinear(const GraphBase& graph, RCP<IndexManager>& geoData,
+                                const int numInterpolationPoints, ArrayRCP<size_t>& nnzOnRow,
+                                Array<size_t>& rowPtr, Array<LO>& colIndex) const;
+
   };
 
 } //namespace MueLu