Merge Pull Request #4618 from bartgol/Trilinos/Fix-4616

Automatically Merged using Trilinos Pull Request AutoTester PR Title: ThyraTpetraAdapters: Added getter for Tpetra::Map in Thyra::TpetraVectorSpace PR Author: bartgol
trilinos · Mar 19, 2019 · a85d2a7 · a85d2a7
2 parents 1e72ab5 + 756a6be
commit a85d2a7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers_decl.hpp b/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers_decl.hpp
@@ -176,7 +176,10 @@ template <class Scalar = Tpetra::Vector<>::scalar_type,
 class TpetraOperatorVectorExtraction {
 public:
 
-  // ToDo: Get a Tpetra::Map from a Thyra::VectorSpaceBase?
+  /** \brief Get a const Tpetra::Map from a const Thyra::VectorSpaceBase object.
+   */
+  static RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >
+  getTpetraMap(const RCP<const VectorSpaceBase<Scalar> > &vs);
 
   /** \brief Get a non-const Tpetra::Vector from a non-const
    * Thyra::VectorBase object.

diff --git a/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers_def.hpp b/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers_def.hpp
@@ -214,6 +214,15 @@ Thyra::createConstLinearOp(
 
 namespace Thyra {
 
+template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
+RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >
+TpetraOperatorVectorExtraction<Scalar,LocalOrdinal,GlobalOrdinal,Node>::
+getTpetraMap(const RCP<const VectorSpaceBase<Scalar> > &vs)
+{
+  typedef TpetraVectorSpace<Scalar, LocalOrdinal, GlobalOrdinal, Node> TpetraVectorSpace_t;
+  return Teuchos::rcp_dynamic_cast<const TpetraVectorSpace_t>(vs, true)->getTpetraMap();
+}
+
 
 template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
 RCP<Tpetra::Vector<Scalar,LocalOrdinal,GlobalOrdinal,Node> >

diff --git a/packages/thyra/adapters/tpetra/src/Thyra_TpetraVectorSpace_decl.hpp b/packages/thyra/adapters/tpetra/src/Thyra_TpetraVectorSpace_decl.hpp
@@ -86,6 +86,11 @@ class TpetraVectorSpace : public SpmdVectorSpaceDefaultBase<Scalar>
     ) const;
   /** \brief . */
   RCP< const VectorSpaceBase<Scalar> > clone() const;
+
+  /** \brief Get the embedded Tpetra::Map. */
+  RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >
+  getTpetraMap() const;
+
   //@}
 
 protected:

diff --git a/packages/thyra/adapters/tpetra/src/Thyra_TpetraVectorSpace_def.hpp b/packages/thyra/adapters/tpetra/src/Thyra_TpetraVectorSpace_def.hpp
@@ -136,6 +136,12 @@ TpetraVectorSpace<Scalar,LocalOrdinal,GlobalOrdinal,Node>::clone() const
   return tpetraVectorSpace<Scalar>(tpetraMap_);
 }
 
+template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
+RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >
+TpetraVectorSpace<Scalar,LocalOrdinal,GlobalOrdinal,Node>::getTpetraMap() const
+{
+  return tpetraMap_;
+}
 
 // Overridden from SpmdVectorSpaceDefaultBase
 

diff --git a/packages/thyra/adapters/tpetra/test/TpetraThyraWrappers_UnitTests.cpp b/packages/thyra/adapters/tpetra/test/TpetraThyraWrappers_UnitTests.cpp
@@ -229,6 +229,10 @@ TEUCHOS_UNIT_TEST_TEMPLATE_1_DECL( TpetraThyraWrappers, createVectorSpace,
     rcp_dynamic_cast<const SpmdVectorSpaceBase<Scalar> >(vs, true);
   TEST_EQUALITY(vs_spmd->localSubDim(), g_localDim);
   TEST_EQUALITY(vs->dim(), as<Ordinal>(tpetraMap->getGlobalNumElements()));
+
+  typedef Thyra::TpetraOperatorVectorExtraction<Scalar> ConverterT;
+  RCP<const TpetraMap_t> tpetraMap2 = ConverterT::getTpetraMap(vs);
+  TEST_EQUALITY(tpetraMap2, tpetraMap);
 }