From 8d47e88551d2ab495d2d88cc2f6c6da8e14d524a Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 27 Jul 2016 15:44:58 +0200
Subject: [PATCH] [MeL/ME] Introducing name that will be used later to access
PV.
---
.../MeshEditing/Mesh2MeshPropertyInterpolation.cpp | 8 ++++++--
.../MeshEditing/Mesh2MeshPropertyInterpolation.h | 13 +++++++------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
index 0c55f83b022..0d37e5998c1 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
@@ -30,8 +30,12 @@
namespace MeshLib {
-Mesh2MeshPropertyInterpolation::Mesh2MeshPropertyInterpolation(Mesh const*const src_mesh, std::vector<double> const*const src_properties) :
- _src_mesh(src_mesh), _src_properties(src_properties)
+Mesh2MeshPropertyInterpolation::Mesh2MeshPropertyInterpolation(
+ Mesh const*const src_mesh,
+ std::string const& property_name,
+ std::vector<double> const*const src_properties)
+ : _src_mesh(src_mesh), _property_name(property_name),
+ _src_properties(src_properties)
{}
bool Mesh2MeshPropertyInterpolation::setPropertiesForMesh(Mesh *dest_mesh, std::vector<double>& dest_properties) const
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.h b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.h
index 3d4a5525778..63b6565386a 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.h
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.h
@@ -31,13 +31,13 @@ public:
* Constructor taking the source or input mesh and properties.
* @param source_mesh the mesh the given property information is
* assigned to.
- * @param source_properties a vector containing property information
- * assigned to the mesh. The number of entries in the property vector
- * must be at least the number of different properties stored in mesh.
- * For instance if mesh has \f$n\f$ (pairwise) different property
- * indices the vector of properties must have \f$\ge n\f$ entries.
+ * @param property_name is the name of a PropertyVector in the \c
+ * source_mesh
*/
- Mesh2MeshPropertyInterpolation(Mesh const*const source_mesh, std::vector<double> const*const source_properties);
+ Mesh2MeshPropertyInterpolation(
+ Mesh const* const source_mesh,
+ std::string const& property_name,
+ std::vector<double> const* const source_properties);
/**
* Calculates entries for the property vector and sets appropriate indices in the
@@ -65,6 +65,7 @@ private:
void interpolateElementPropertiesToNodeProperties(std::vector<double> &interpolated_node_properties) const;
Mesh const*const _src_mesh;
+ std::string const& _property_name;
std::vector<double> const*const _src_properties;
};
--
GitLab