Skip to content
Snippets Groups Projects
Commit 1b4847a6 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Merge branch 'ConvertToLinearMeshBugFix' into 'master'

Correct setting Node properties in linear mesh based on Node properties of quadratic mesh

See merge request ogs/ogs!4635
parents 97a4491a fa1d4a9c
No related branches found
No related tags found
No related merge requests found
...@@ -120,7 +120,6 @@ std::unique_ptr<MeshLib::Mesh> convertToLinearMesh( ...@@ -120,7 +120,6 @@ std::unique_ptr<MeshLib::Mesh> convertToLinearMesh(
MeshLib::MeshItemType::Node))); MeshLib::MeshItemType::Node)));
// copy property vectors for nodes // copy property vectors for nodes
auto const number_of_base_nodes = org_mesh.computeNumberOfBaseNodes();
for (auto [name, property] : org_mesh.getProperties()) for (auto [name, property] : org_mesh.getProperties())
{ {
if (property->getMeshItemType() != MeshLib::MeshItemType::Node) if (property->getMeshItemType() != MeshLib::MeshItemType::Node)
...@@ -139,17 +138,17 @@ std::unique_ptr<MeshLib::Mesh> convertToLinearMesh( ...@@ -139,17 +138,17 @@ std::unique_ptr<MeshLib::Mesh> convertToLinearMesh(
name, MeshLib::MeshItemType::Node, n_src_comp); name, MeshLib::MeshItemType::Node, n_src_comp);
new_prop->resize(new_mesh->getNumberOfNodes() * n_src_comp); new_prop->resize(new_mesh->getNumberOfNodes() * n_src_comp);
// copy only base node values for (std::size_t k = 0; k < org_nodes.size(); ++k)
for (unsigned i = 0; i < number_of_base_nodes; i++)
{ {
for (int j = 0; j < n_src_comp; j++) if (!marked_base_nodes[k])
{ {
(*new_prop)[i * n_src_comp + j] = continue;
(*double_property)[i * n_src_comp + j];
} }
std::copy_n(double_property->begin() + k * n_src_comp,
n_src_comp,
new_prop->begin() + base_node_map[k] * n_src_comp);
} }
} }
return new_mesh; return new_mesh;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment