Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Better error checking and logging.

Browse Source
This commit is contained in:
Dave Pugmire 2023-03-14 15:15:06 -04:00
parent 2a6220726d
commit c989550111
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vtkm/io/VTKVisItFileReader.cxx
View File

@ -10,6 +10,7 @@
#include <algorithm>
#include <fstream>
#include <vtkm/cont/Logging.h>
#include <vtkm/io/ErrorIO.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKVisItFileReader.h>
@ -52,13 +53,14 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
std::getline(stream, line);
if (line.size() == 0 || line[0] == '#')
continue;
else if (line.find("!NBLOCKS") != std::string::npos)
else if (line.rfind("!NBLOCKS", 0) != std::string::npos)
{
//!NBLOCKS is already set!!
if (numBlocks > 0)
throw vtkm::io::ErrorIO("Invalid file: " + this->FileName +
". Number of blocks already specified");
numBlocks = std::atoi(line.substr(8, line.size()).c_str());
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");
@ -68,16 +70,28 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
char char_to_remove = ' ';
line.erase(std::remove(line.begin(), line.end(), char_to_remove), line.end());
if (line.find(".vtk") != std::string::npos)
{
fileNames.push_back(baseDirPath + "/" + line);
}
else
std::cerr << "Skipping: " << line << std::endl;
{
VTKM_LOG_S(vtkm::cont::LogLevel::Info,
"Skipping: " << line << ". It does not appear to be a legacy VTK file.");
continue;
}
}
else
{
std::cerr << "Skipping line: " << line << std::endl;
VTKM_LOG_S(vtkm::cont::LogLevel::Info, "Skipping line: " << line);
continue;
}
}
if (numBlocks < 0)
{
throw vtkm::io::ErrorIO("`!NBLOCKS` line not provided in VisIt file: " + this->FileName);
}
if (static_cast<std::size_t>(numBlocks) != fileNames.size())
throw vtkm::io::ErrorIO("Wrong number of partitions in VisIt file: " + this->FileName);
@ -86,10 +100,6 @@ vtkm::cont::PartitionedDataSet VTKVisItFileReader::ReadPartitionedDataSet()
//Read all the files.
for (const auto fn : fileNames)
{
std::ifstream s(fn);
if (s.fail())
throw vtkm::io::ErrorIO("Failed to open file: " + fn);
vtkm::io::VTKDataSetReader reader(fn);
pds.AppendPartition(reader.ReadDataSet());
}

13
vtkm/io/VTKVisItFileReader.h
View File

@ -21,6 +21,19 @@ 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.
class VTKM_IO_EXPORT VTKVisItFileReader
{
public:

2
vtkm/io/testing/CMakeLists.txt
View File

@ -10,9 +10,9 @@
set(unit_tests
UnitTestBOVDataSetReader.cxx
UnitTestVisItFileDataSetReader.cxx
UnitTestFileUtils.cxx
UnitTestPixelTypes.cxx
UnitTestVisItFileDataSetReader.cxx
UnitTestVTKDataSetReader.cxx
UnitTestVTKDataSetWriter.cxx
)