Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-07-11 01:28:57 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix issues.......

Browse Source
This commit is contained in:
Dave Pugmire 2023-03-15 12:45:45 -04:00
parent 6db8c316ad
commit 97b460110f
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtkm/io/VTKVisItFileReader.cxx
View File

@ -38,7 +38,7 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
//Get the base dir name
auto pos = this->FileName.rfind("/");
if (pos != std::string::npos)
baseDirPath = baseDirPath.substr(0, pos);
baseDirPath = this->FileName.substr(0, pos);
//Open up the file of filenames.
std::ifstream stream(this->FileName);
@ -58,12 +58,12 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
//!NBLOCKS is already set!!
if (numBlocks > 0)
throw vtkm::io::ErrorIO("Invalid file: " + this->FileName +
". Number of blocks already specified");
". `!NBLOCKS` specified more than once.");
numBlocks = std::atoi(line.substr(8, line.size()).c_str());
if (numBlocks <= 0)
throw vtkm::io::ErrorIO("Invalid file: " + this->FileName +
". Number of blocks must be > 0");
". Number of blocks (!NBLOCKS) must be > 0.");
}
else if (numBlocks > 0)
{
@ -82,7 +82,8 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
}
else
{
VTKM_LOG_S(vtkm::cont::LogLevel::Info, "Skipping line: " << line);
VTKM_LOG_S(vtkm::cont::LogLevel::Info,
"Skipping line that occurs before `!NBLOCKS`: " << line);
continue;
}
}
@ -98,7 +99,7 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
vtkm::cont::PartitionedDataSet pds;
//Read all the files.
for (const auto fn : fileNames)
for (auto&& fn : fileNames)
{
vtkm::io::VTKDataSetReader reader(fn);
pds.AppendPartition(reader.ReadDataSet());

27
vtkm/io/VTKVisItFileReader.h
View File

@ -21,19 +21,20 @@ namespace vtkm
namespace io
{
//
// Reader for ".visit" files, a simple file format for partioned data sets.
// The file format consists of the keyword "!NBLOCKS <N>", where N is the number of
// partitions, followed by a list of the N files. For example:
//
/*
!NBLOCKS 2
file1.vtk
file2.vtk
*/
//
// Note: .visit files support time varying partitione data, but it is not supported
// in this reader.
/// Reader for ".visit" files, a simple file format for partioned data sets.
/// The file format consists of the keyword "!NBLOCKS <N>", where N is the number of
/// partitions, followed by a list of the N files. For example:
///
/// ```
/// # This is a comment
/// !NBLOCKS 2
/// file1.vtk
/// file2.vtk
/// ```
///
/// Note: .visit files support time varying partitioned data, but it is not supported
/// in this reader.
///
class VTKM_IO_EXPORT VTKVisItFileReader
{