mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 02:25:42 +00:00
Merge branch 'master' into marching_cell_wedge
This commit is contained in:
commit
97094cfb88
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user