diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
index 8e3d2f0f7a6611cbf28504525767d42231feaa16..e46b809381559ab1db200f0f5fddca7fe9127484 100644
--- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
+++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
@@ -21,6 +21,7 @@
#include "MeshLib/Elements/Elements.h"
#include "MeshLib/Properties.h"
+#include "MeshLib/IO/MPI_IO/PropertyVectorMetaData.h"
// Check if the value can by converted to given type without overflow.
template <typename VALUE, typename TYPE>
@@ -184,8 +185,45 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::readBinary(
setElements(mesh_nodes, ghost_elem_data, mesh_elems, process_ghost);
//----------------------------------------------------------------------------------
- return newMesh(BaseLib::extractBaseName(file_name_base),
- mesh_nodes, glb_node_ids, mesh_elems);
+ // read the properties
+ readPropertiesConfigDataBinary(file_name_base);
+
+ MeshLib::Properties p;
+
+ return newMesh(BaseLib::extractBaseName(file_name_base), mesh_nodes,
+ glb_node_ids, mesh_elems, p);
+}
+
+void NodePartitionedMeshReader::readPropertiesConfigDataBinary(
+ const std::string& file_name_base) const
+{
+ const std::string fname = file_name_base + "_partitioned_properties_cfg"
+ + std::to_string(_mpi_comm_size) + ".bin";
+ std::ifstream is(fname.c_str(), std::ios::binary | std::ios::in);
+ if (!is)
+ {
+ ERR("Could not open file '%s' in binary mode.", fname.c_str());
+ }
+ std::size_t number_of_properties = 0;
+ is.read(reinterpret_cast<char*>(&number_of_properties), sizeof(std::size_t));
+ for (std::size_t i(0); i < number_of_properties; ++i)
+ {
+ boost::optional<MeshLib::IO::PropertyVectorMetaData> pvmd(
+ MeshLib::IO::readPropertyVectorMetaData(is));
+ if (pvmd) {
+ INFO("readPropertiesConfigMetaDataBinary:");
+ MeshLib::IO::writePropertyVectorMetaData(std::cout, *pvmd);
+ }
+ }
+ auto pos = is.tellg();
+ auto offset =
+ pos +
+ static_cast<long>(_mpi_rank *
+ sizeof(MeshLib::IO::PropertyVectorPartitionMetaData));
+ is.seekg(offset);
+ unsigned long number_of_tuples = 0;
+ is.read(reinterpret_cast<char*>(&number_of_tuples), sizeof(unsigned long));
+ INFO("%u tuples in partition %u.", number_of_tuples, _mpi_rank);
}
bool NodePartitionedMeshReader::openASCIIFiles(std::string const& file_name_base,
@@ -369,28 +407,31 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::readASCII(
MPI_Bcast(_mesh_info.data(), static_cast<int>(_mesh_info.size()),
MPI_LONG, 0, _mpi_comm);
- //----------------------------------------------------------------------------------
+ //---------------------------------------------------------------------
// Read Nodes
if (!readCastNodesASCII(is_node, i, mesh_nodes, glb_node_ids))
break;
- //----------------------------------------------------------------------------------
+ //---------------------------------------------------------------------
// Read elements
if (!readCastElemsASCII(is_elem, i,
_mesh_info.regular_elements + _mesh_info.offset[0],
false, mesh_nodes, mesh_elems))
break;
- //-------------------------------------------------------------------------
+ //---------------------------------------------------------------------
// Ghost elements
if (!readCastElemsASCII(is_elem, i,
_mesh_info.ghost_elements + _mesh_info.offset[1],
true, mesh_nodes, mesh_elems))
break;
- if(_mpi_rank == i)
+ if(_mpi_rank == i) {
+ // reading ascii properties is not implemented
+ MeshLib::Properties properties;
np_mesh = newMesh(BaseLib::extractBaseName(file_name_base),
- mesh_nodes, glb_node_ids, mesh_elems);
+ mesh_nodes, glb_node_ids, mesh_elems, properties);
+ }
}
if(_mpi_rank == 0)
@@ -405,17 +446,17 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::readASCII(
return np_mesh;
}
-MeshLib::NodePartitionedMesh*
-NodePartitionedMeshReader::newMesh(
+MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::newMesh(
std::string const& mesh_name,
std::vector<MeshLib::Node*> const& mesh_nodes,
std::vector<unsigned long> const& glb_node_ids,
- std::vector<MeshLib::Element*> const& mesh_elems) const
+ std::vector<MeshLib::Element*> const& mesh_elems,
+ MeshLib::Properties const& properties) const
{
return new MeshLib::NodePartitionedMesh(
mesh_name + std::to_string(_mpi_comm_size),
mesh_nodes, glb_node_ids, mesh_elems,
- MeshLib::Properties(),
+ properties,
_mesh_info.global_base_nodes,
_mesh_info.global_nodes,
_mesh_info.base_nodes,
diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h
index 26e4a9f2488938d08d69b2813271c446b294499b..bfe83c7a75f5c2166054213bc083852882d5ed53 100644
--- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h
+++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h
@@ -100,17 +100,21 @@ private:
} _mesh_info;
/*!
- \brief Create a new mesh of NodePartitionedMesh after reading and processing the data.
+ \brief Create a new mesh of NodePartitionedMesh after reading and
+ processing the data.
\param mesh_name Name assigned to the new mesh.
\param mesh_nodes Node data.
\param glb_node_ids Global IDs of nodes.
\param mesh_elems Element data.
- \return True on success and false otherwise.
+ \param properties Collection of PropertyVector's assigned to the mesh.
+ \return Returns a pointer to a NodePartitionedMesh
*/
- MeshLib::NodePartitionedMesh* newMesh(std::string const& mesh_name,
+ MeshLib::NodePartitionedMesh* newMesh(
+ std::string const& mesh_name,
std::vector<MeshLib::Node*> const& mesh_nodes,
std::vector<unsigned long> const& glb_node_ids,
- std::vector<MeshLib::Element*> const& mesh_elems) const;
+ std::vector<MeshLib::Element*> const& mesh_elems,
+ MeshLib::Properties const& properties) const;
/*!
\brief Parallel reading of a binary file via MPI_File_read, and it is called by readBinary
@@ -158,18 +162,24 @@ private:
*/
MeshLib::NodePartitionedMesh* readBinary(const std::string &file_name_base);
+ void readPropertiesConfigDataBinary(const std::string& file_name_base) const;
+
/*!
\brief Open ASCII files of node partitioned mesh data.
- \param file_name_base Name of file to be read, which must be a name with the
+ \param file_name_base Name of file to be read, which must be a name
+ with the
path to the file and without file extension.
- \param is_cfg Input stream for the file contains configuration data.
+ \param is_cfg Input stream for the file contains
+ configuration data.
\param is_node Input stream for the file contains node data.
- \param is_elem Input stream for the file contains element data.
+ \param is_elem Input stream for the file contains element
+ data.
\return Return true if all files are good.
*/
- bool openASCIIFiles(std::string const& file_name_base,std::ifstream& is_cfg,
- std::ifstream& is_node, std::ifstream& is_elem) const;
+ bool openASCIIFiles(std::string const& file_name_base,
+ std::ifstream& is_cfg, std::ifstream& is_node,
+ std::ifstream& is_elem) const;
/*!
\brief Read mesh nodes from an ASCII file and cast to the corresponding rank.