Skip to content

Commit

Permalink
Merge Pull Request #3298 from rppawlo/Trilinos/global-indexer-access
Browse files Browse the repository at this point in the history
Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Panzer: added global indexer accessor to L2 projection class
PR Author: rppawlo
  • Loading branch information
trilinos-autotester authored Aug 15, 2018
2 parents d54888e + bf9ccce commit cbef2e0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions packages/panzer/adapters-stk/test/projection/projection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ TEUCHOS_UNIT_TEST(L2Projection, ToNodal)
projectionFactory.setup(hgradBD,integrationDescriptor,comm,connManager,eBlockNames,worksetContainer);
timer->stop("projectionFactory.setup()");

TEST_ASSERT(nonnull(projectionFactory.getTargetGlobalIndexer()));

// Build mass matrix
timer->start("projectionFactory.buildMassMatrix()");
auto massMatrix = projectionFactory.buildMassMatrix();
Expand Down
3 changes: 3 additions & 0 deletions packages/panzer/disc-fe/src/Panzer_L2Projection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ namespace panzer {
const std::vector<std::string>& elementBlockNames,
const Teuchos::RCP<panzer::WorksetContainer> worksetContainer = Teuchos::null);

/// Returns the target global indexer. Will be null if setup() has not been called.
Teuchos::RCP<panzer::UniqueGlobalIndexer<LO,GO>> getTargetGlobalIndexer() const;

/** \brief Allocates, fills and returns a mass matrix for L2
projection onto a target basis.
Expand Down
5 changes: 5 additions & 0 deletions packages/panzer/disc-fe/src/Panzer_L2Projection_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ namespace panzer {
// Check workset needs are correct
}

template<typename LO, typename GO>
Teuchos::RCP<panzer::UniqueGlobalIndexer<LO,GO>>
panzer::L2Projection<LO,GO>::getTargetGlobalIndexer() const
{return targetGlobalIndexer_;}

template<typename LO, typename GO>
Teuchos::RCP<Tpetra::CrsMatrix<double,LO,GO,Kokkos::Compat::KokkosDeviceWrapperNode<PHX::Device>>>
panzer::L2Projection<LO,GO>::buildMassMatrix()
Expand Down

0 comments on commit cbef2e0

Please sign in to comment.