Merge Pull Request #5088 from trilinos/Trilinos/csiefer-7b030c68

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Xpetra: Fixes to Xpetra::TpetraVector
PR Author: csiefer2

packages/xpetra/src/Vector/Xpetra_TpetraVector_decl.hpp

@@ -87,8 +87,6 @@ namespace Xpetra {
     : public virtual Vector<Scalar,LocalOrdinal,GlobalOrdinal,Node>,
       public TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>
   {
-#undef XPETRA_TPETRAMULTIVECTOR_SHORT
-#include "Xpetra_UseShortNames.hpp"
 
   public:
 
@@ -106,10 +104,10 @@ namespace Xpetra {
     //@{
 
     //! Sets all vector entries to zero.
-    TpetraVector(const Teuchos::RCP<const Map> &map, bool zeroOut=true);
+    TpetraVector(const Teuchos::RCP<const Map< LocalOrdinal, GlobalOrdinal, Node > >&map, bool zeroOut=true);
 
     //! Set multi-vector values from an array using Teuchos memory management classes. (copy)
-    TpetraVector(const Teuchos::RCP<const Map> &map, const Teuchos::ArrayView< const Scalar > &A);
+    TpetraVector(const Teuchos::RCP<const Map< LocalOrdinal, GlobalOrdinal, Node > >&map, const Teuchos::ArrayView< const Scalar > &A);
 
     //! Destructor.
     virtual ~TpetraVector();
@@ -162,10 +160,10 @@ namespace Xpetra {
     //@}
 
     //! Computes dot product of this Vector against input Vector x.
-    Scalar dot(const Vector &a) const;
+    Scalar dot(const Vector<Scalar,LocalOrdinal, GlobalOrdinal, Node > &a) const;
 
     //! Compute Weighted 2-norm (RMS Norm) of this Vector.
-    typename Teuchos::ScalarTraits< Scalar >::magnitudeType normWeighted(const Vector &weights) const;
+    typename Teuchos::ScalarTraits< Scalar >::magnitudeType normWeighted(const Vector<Scalar,LocalOrdinal, GlobalOrdinal, Node > &weights) const;
 
 
     //! @name Xpetra specific

packages/xpetra/src/Vector/Xpetra_TpetraVector_def.hpp

@@ -60,12 +60,12 @@
 namespace Xpetra {
 
 template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
-TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::TpetraVector(const Teuchos::RCP<const Map> &map, bool zeroOut)
+TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::TpetraVector(const Teuchos::RCP<const Map< LocalOrdinal, GlobalOrdinal, Node > >&map, bool zeroOut)
 : TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node> (map,1,zeroOut)
 { }
 
 template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
-TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::TpetraVector(const Teuchos::RCP<const Map> &map, const Teuchos::ArrayView< const Scalar > &A)
+TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::TpetraVector(const Teuchos::RCP<const Map< LocalOrdinal, GlobalOrdinal, Node > >&map, const Teuchos::ArrayView< const Scalar > &A)
 : TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node> (map,A,map->getNodeNumElements(),1)
 { }
 
@@ -115,11 +115,11 @@ void TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::describe(Teuchos::Fan
 { XPETRA_MONITOR("TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::describe"); getTpetra_Vector()->describe(out, verbLevel); }
 
 template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
-Scalar TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::dot(const Vector &a) const
+Scalar TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::dot(const Vector<Scalar,LocalOrdinal, GlobalOrdinal, Node > &a) const
 { XPETRA_MONITOR("TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::dot"); return getTpetra_Vector()->dot(*toTpetra(a)); }
 
 template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
-typename Teuchos::ScalarTraits< Scalar >::magnitudeType TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::normWeighted(const Vector &weights) const
+typename Teuchos::ScalarTraits< Scalar >::magnitudeType TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::normWeighted(const Vector<Scalar,LocalOrdinal, GlobalOrdinal, Node > &weights) const
 { XPETRA_MONITOR("TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::normWeighted"); return getTpetra_Vector()->normWeighted(*toTpetra(weights)); }
 
 template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>