Skip to content
Snippets Groups Projects
Commit 09783de9 authored by Tom Fischer's avatar Tom Fischer
Browse files

[ParameterLib/SpatialPosition] Use MaL::Point3d instead MaL::TemplatePoint.

parent 3cdeb4ea
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <optional> #include <optional>
#include "MathLib/TemplatePoint.h" #include "MathLib/Point3d.h"
namespace ParameterLib namespace ParameterLib
{ {
...@@ -28,11 +28,10 @@ class SpatialPosition ...@@ -28,11 +28,10 @@ class SpatialPosition
public: public:
SpatialPosition() = default; SpatialPosition() = default;
SpatialPosition( SpatialPosition(std::optional<std::size_t> const& node_id,
std::optional<std::size_t> const& node_id, std::optional<std::size_t> const& element_id,
std::optional<std::size_t> const& element_id, std::optional<unsigned> const& integration_point,
std::optional<unsigned> const& integration_point, std::optional<MathLib::Point3d> const& coordinates)
std::optional<MathLib::TemplatePoint<double>> const& coordinates)
: _node_id(node_id), : _node_id(node_id),
_element_id(element_id), _element_id(element_id),
_integration_point(integration_point), _integration_point(integration_point),
...@@ -46,7 +45,7 @@ public: ...@@ -46,7 +45,7 @@ public:
{ {
return _integration_point; return _integration_point;
} }
std::optional<MathLib::TemplatePoint<double>> const& getCoordinates() const std::optional<MathLib::Point3d> const& getCoordinates() const
{ {
return _coordinates; return _coordinates;
} }
...@@ -69,16 +68,15 @@ public: ...@@ -69,16 +68,15 @@ public:
_integration_point = integration_point; _integration_point = integration_point;
} }
void setCoordinates(MathLib::TemplatePoint<double> const& coordinates) void setCoordinates(MathLib::Point3d const& coordinates)
{ {
_coordinates = coordinates; _coordinates = coordinates;
} }
void setAll( void setAll(std::optional<std::size_t> const& node_id,
std::optional<std::size_t> const& node_id, std::optional<std::size_t> const& element_id,
std::optional<std::size_t> const& element_id, std::optional<unsigned> const& integration_point,
std::optional<unsigned> const& integration_point, std::optional<MathLib::Point3d> const& coordinates)
std::optional<MathLib::TemplatePoint<double>> const& coordinates)
{ {
_node_id = node_id; _node_id = node_id;
_element_id = element_id; _element_id = element_id;
...@@ -98,7 +96,7 @@ private: ...@@ -98,7 +96,7 @@ private:
std::optional<std::size_t> _node_id; std::optional<std::size_t> _node_id;
std::optional<std::size_t> _element_id; std::optional<std::size_t> _element_id;
std::optional<unsigned> _integration_point; std::optional<unsigned> _integration_point;
std::optional<MathLib::TemplatePoint<double>> _coordinates; std::optional<MathLib::Point3d> _coordinates;
}; };
} // namespace ParameterLib } // namespace ParameterLib
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