Skip to content
This repository has been archived by the owner on Jul 14, 2022. It is now read-only.

Streamlines from vtkm #197

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
81a90a0
Add shell code for particle advection filter.
Sep 21, 2018
4132adf
Initial code for doing distributed memory streamlines.
Nov 21, 2018
2b47c43
support for parallel particle advection.
Dec 28, 2018
68f2030
Adding particle advection test, adding float64 data to test data set.
jameskress Jan 31, 2019
a3b4d3c
Merge branch 'develop' into particleAdd
dpugmire Mar 21, 2019
c3e1487
Merge pull request #2 from jameskress/particleAdd
dpugmire Mar 21, 2019
feffc73
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into de…
dpugmire Jul 1, 2019
00d7f6f
Merge branch 'develop' of https://github.com/dpugmire/vtk-h into develop
dpugmire Jul 11, 2019
a37be9c
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into de…
dpugmire Nov 22, 2019
4cfb998
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into de…
dpugmire Nov 25, 2019
cbe49ea
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into de…
dpugmire Dec 4, 2020
c273abb
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into de…
dpugmire Dec 18, 2020
94b5a64
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into de…
dpugmire Feb 12, 2021
c66f7c7
Add streamline and particle advect filter.
dpugmire Feb 12, 2021
69284ab
toss the vtkm_filters goulash
dpugmire Feb 12, 2021
6abb50d
cleanup....
dpugmire Feb 12, 2021
c3c41b6
Setup communicator for vtkh / vtkm.
dpugmire Feb 17, 2021
66b82d5
Add compile time errors re: mpi
dpugmire Feb 17, 2021
7be4d43
Merge branch 'develop' of https://github.com/Alpine-DAV/vtk-h into st…
dpugmire Jun 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/vtkh/filters/ParticleAdvection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ void ParticleAdvection::PostExecute()
void ParticleAdvection::DoExecute()
{
this->m_output = new DataSet();

#ifndef VTKH_BYPASS_VTKM_BIH

#ifdef VTKH_PARALLEL
// Setup VTK-h and VTK-m comm.
MPI_Comm mpi_comm = MPI_Comm_f2c(vtkh::GetMPICommHandle());
dpugmire marked this conversation as resolved.
Show resolved Hide resolved
vtkm::cont::EnvironmentTracker::SetCommunicator(vtkmdiy::mpi::communicator(vtkmdiy::mpi::make_DIY_MPI_Comm(mpi_comm)));
#endif

const int num_domains = this->m_input->GetNumberOfDomains();

vtkm::cont::PartitionedDataSet inputs;
Expand Down
8 changes: 8 additions & 0 deletions src/vtkh/filters/Streamline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ void Streamline::PostExecute()
void Streamline::DoExecute()
{
this->m_output = new DataSet();

#ifndef VTKH_BYPASS_VTKM_BIH

#ifdef VTKH_PARALLEL
// Setup VTK-h and VTK-m comm.
MPI_Comm mpi_comm = MPI_Comm_f2c(vtkh::GetMPICommHandle());
vtkm::cont::EnvironmentTracker::SetCommunicator(vtkmdiy::mpi::communicator(vtkmdiy::mpi::make_DIY_MPI_Comm(mpi_comm)));
#endif

const int num_domains = this->m_input->GetNumberOfDomains();

vtkm::cont::PartitionedDataSet inputs;
Expand Down