From 822075deaaaa2629beab10adba5e0c5fa97565b0 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 14 Mar 2017 10:39:51 +0100
Subject: [PATCH] [A/U/MP] Use fillPropertyVectorMetaDataTypeInfo.
---
.../PartitionMesh/NodeWiseMeshPartitioner.cpp | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
index b35d09c38ff..e41e0c7e791 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
@@ -359,14 +359,11 @@ void NodeWiseMeshPartitioner::writePropertiesBinary(
{
MeshLib::IO::PropertyVectorMetaData pvmd;
pvmd.property_name = name;
- pvmd.is_int_type = false;
{
if (properties.existsPropertyVector<double>(name))
{
auto* pv = properties.getPropertyVector<double>(name);
- pvmd.is_int_type = false;
- pvmd.is_data_type_signed = false;
- pvmd.data_type_size_in_bytes = sizeof(double);
+ MeshLib::IO::fillPropertyVectorMetaDataTypeInfo<double>(pvmd);
pvmd.number_of_components = pv->getNumberOfComponents();
pvmd.number_of_tuples = pv->getNumberOfTuples();
writePropertyVectorValuesBinary(out_val, *pv);
@@ -376,9 +373,7 @@ void NodeWiseMeshPartitioner::writePropertiesBinary(
if (properties.existsPropertyVector<float>(name))
{
auto* pv = properties.getPropertyVector<float>(name);
- pvmd.is_int_type = false;
- pvmd.is_data_type_signed = false;
- pvmd.data_type_size_in_bytes = sizeof(float);
+ MeshLib::IO::fillPropertyVectorMetaDataTypeInfo<float>(pvmd);
pvmd.number_of_components = pv->getNumberOfComponents();
pvmd.number_of_tuples = pv->getNumberOfTuples();
writePropertyVectorValuesBinary(out_val, *pv);
@@ -388,9 +383,7 @@ void NodeWiseMeshPartitioner::writePropertiesBinary(
if (properties.existsPropertyVector<int>(name))
{
auto* pv = properties.getPropertyVector<int>(name);
- pvmd.is_int_type = true;
- pvmd.is_data_type_signed = true;
- pvmd.data_type_size_in_bytes = sizeof(int);
+ MeshLib::IO::fillPropertyVectorMetaDataTypeInfo<int>(pvmd);
pvmd.number_of_components = pv->getNumberOfComponents();
pvmd.number_of_tuples = pv->getNumberOfTuples();
writePropertyVectorValuesBinary(out_val, *pv);
@@ -400,9 +393,7 @@ void NodeWiseMeshPartitioner::writePropertiesBinary(
if (properties.existsPropertyVector<unsigned>(name))
{
auto* pv = properties.getPropertyVector<unsigned>(name);
- pvmd.is_int_type = true;
- pvmd.is_data_type_signed = false;
- pvmd.data_type_size_in_bytes = sizeof(unsigned);
+ MeshLib::IO::fillPropertyVectorMetaDataTypeInfo<unsigned>(pvmd);
pvmd.number_of_components = pv->getNumberOfComponents();
pvmd.number_of_tuples = pv->getNumberOfTuples();
writePropertyVectorValuesBinary(out_val, *pv);
--
GitLab