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

Merge branch 'master' into marching_cell_wedge

Browse Source
This commit is contained in:
Li-Ta Lo 2020-05-08 09:45:52 -06:00
commit 97094cfb88
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
examples/contour_tree_augmented/ContourTreeApp.cxx
View File

@ -343,35 +343,24 @@ int main(int argc, char* argv[])
if (rank == 0)
{
VTKM_LOG_S(vtkm::cont::LogLevel::Info,
std::endl
<< " ------------ Settings -----------"
<< std::endl
<< " filename="
<< filename
<< std::endl
<< " device="
<< device.GetName()
<< std::endl
<< " mc="
<< useMarchingCubes
<< std::endl
<< " augmentTree="
<< computeRegularStructure
<< std::endl
<< " branchDecomp="
<< computeBranchDecomposition
<< std::endl
<<
std::stringstream logmessage;
logmessage << " ------------ Settings -----------" << std::endl
<< " filename=" << filename << std::endl
<< " device=" << device.GetName() << std::endl
<< " mc=" << useMarchingCubes << std::endl
<< " augmentTree=" << computeRegularStructure << std::endl
<< " branchDecomp=" << computeBranchDecomposition << std::endl
<<
#ifdef WITH_MPI
" nblocks=" << numBlocks << std::endl
<<
" nblocks=" << numBlocks << std::endl
<<
#endif
#ifdef ENABLE_SET_NUM_THREADS
" numThreads=" << numThreads << std::endl
<<
" numThreads=" << numThreads << std::endl
<<
#endif
" computeIsovalues=" << (numLevels > 0));
" computeIsovalues=" << (numLevels > 0);
VTKM_LOG_S(vtkm::cont::LogLevel::Info, std::endl << logmessage.str());
VTKM_LOG_IF_S(vtkm::cont::LogLevel::Info,
numLevels > 0,
std::endl

15
vtkm/cont/Field.h
View File

@ -262,6 +262,15 @@ struct SerializableField
vtkm::cont::Field Field;
};
// Cannot directly serialize fields with a vtkm::ListUniversal type list since there has to
// be a finite number of types to serialize. Do the best possible by serializing all basic
// VTK-m types.
template <>
struct SerializableField<vtkm::ListUniversal> : SerializableField<vtkm::TypeListAll>
{
using SerializableField<vtkm::TypeListAll>::SerializableField;
};
} // namespace cont
} // namespace vtkm
@ -300,6 +309,12 @@ public:
}
};
template <>
struct Serialization<vtkm::cont::SerializableField<vtkm::ListUniversal>>
: Serialization<vtkm::cont::SerializableField<vtkm::TypeListAll>>
{
};
} // diy
/// @endcond SERIALIZATION