Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'langrangian_cleanup'

Browse Source 
9cd6cd85d Lagrangian now doesn't output to std::cout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !1823
This commit is contained in:
Robert Maynard 2019-09-03 18:44:39 +00:00 committed by Kitware Robot
commit 95c8c2180a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/Lagrangian.h
View File

@ -63,7 +63,7 @@ public:
void UpdateSeedResolution(vtkm::cont::DataSet input);
VTKM_CONT
void WriteDataSet(vtkm::Id cycle, std::string filename, vtkm::cont::DataSet dataset);
void WriteDataSet(vtkm::Id cycle, const std::string& filename, vtkm::cont::DataSet dataset);
VTKM_CONT
void InitializeUniformSeeds(const vtkm::cont::DataSet& input);

15
vtkm/filter/Lagrangian.hxx
View File

@ -25,7 +25,6 @@
#include <vtkm/worklet/particleadvection/Particles.h>
#include <cstring>
#include <iostream>
#include <sstream>
#include <string.h>
@ -101,14 +100,13 @@ inline VTKM_CONT Lagrangian::Lagrangian()
//-----------------------------------------------------------------------------
inline void Lagrangian::WriteDataSet(vtkm::Id cycle,
std::string filename,
const std::string& filename,
vtkm::cont::DataSet dataset)
{
std::stringstream file;
file << filename << cycle << ".vtk";
vtkm::io::writer::VTKDataSetWriter writer(file.str().c_str());
std::stringstream file_stream;
file_stream << filename << cycle << ".vtk";
vtkm::io::writer::VTKDataSetWriter writer(file_stream.str());
writer.WriteDataSet(dataset);
std::cout << "Number of flows in writedataset is : " << dataset.GetNumberOfCells() << std::endl;
}
//-----------------------------------------------------------------------------
@ -226,7 +224,6 @@ inline VTKM_CONT vtkm::cont::DataSet Lagrangian::DoExecute(
vtkm::cont::ArrayCopy(BasisParticles, basisParticleArray);
cycle += 1;
std::cout << "Cycle : " << cycle << std::endl;
const vtkm::cont::DynamicCellSet& cells = input.GetCellSet();
const vtkm::cont::CoordinateSystem& coords =
input.GetCoordinateSystem(this->GetActiveCoordinateSystemIndex());
@ -298,8 +295,8 @@ inline VTKM_CONT vtkm::cont::DataSet Lagrangian::DoExecute(
outputData = dataSetBuilder.Create(pointCoordinates, shapes, numIndices, connectivity);
std::stringstream file_path;
file_path << "output/basisflows_" << this->rank << "_";
std::cout << "Writing basis flows to output/" << std::endl;
WriteDataSet(cycle, file_path.str().c_str(), outputData);
auto f_path = file_path.str();
WriteDataSet(cycle, f_path, outputData);
if (this->resetParticles)
{
InitializeUniformSeeds(input);