Unverified Commit 3424879f authored by trilinos-autotester's avatar trilinos-autotester Committed by GitHub
Browse files

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
parents 28e4bb4a 7b030c68
...@@ -87,8 +87,6 @@ namespace Xpetra { ...@@ -87,8 +87,6 @@ namespace Xpetra {
: public virtual Vector<Scalar,LocalOrdinal,GlobalOrdinal,Node>, : public virtual Vector<Scalar,LocalOrdinal,GlobalOrdinal,Node>,
public TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node> public TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>
{ {
#undef XPETRA_TPETRAMULTIVECTOR_SHORT
#include "Xpetra_UseShortNames.hpp"
public: public:
...@@ -106,10 +104,10 @@ namespace Xpetra { ...@@ -106,10 +104,10 @@ namespace Xpetra {
//@{ //@{
//! Sets all vector entries to zero. //! 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) //! 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. //! Destructor.
virtual ~TpetraVector(); virtual ~TpetraVector();
...@@ -162,10 +160,10 @@ namespace Xpetra { ...@@ -162,10 +160,10 @@ namespace Xpetra {
//@} //@}
//! Computes dot product of this Vector against input Vector x. //! 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. //! 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 //! @name Xpetra specific
......
...@@ -60,12 +60,12 @@ ...@@ -60,12 +60,12 @@
namespace Xpetra { namespace Xpetra {
template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node> 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) : TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node> (map,1,zeroOut)
{ } { }
template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node> 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) : TpetraMultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node> (map,A,map->getNodeNumElements(),1)
{ } { }
...@@ -115,11 +115,11 @@ void TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::describe(Teuchos::Fan ...@@ -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); } { XPETRA_MONITOR("TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::describe"); getTpetra_Vector()->describe(out, verbLevel); }
template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node> 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)); } { XPETRA_MONITOR("TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::dot"); return getTpetra_Vector()->dot(*toTpetra(a)); }
template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node> 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)); } { XPETRA_MONITOR("TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::normWeighted"); return getTpetra_Vector()->normWeighted(*toTpetra(weights)); }
template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node> template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment