Changed: Put PointValue[s] definition in Vec3.h for reuse

while replacing typedef with using
This commit is contained in:
Knut Morten Okstad 2023-10-17 11:39:59 +02:00
parent 67a22decb0
commit 04776d05b0
2 changed files with 8 additions and 7 deletions

View File

@ -20,9 +20,6 @@
class ElementBlock;
class VTF;
typedef std::pair<Vec3,double> PointValue; //!< Convenience type
typedef std::vector<PointValue> PointValues; //!< Convenience type
/*!
\brief Sub-class with additional functionality for result output.
@ -335,8 +332,10 @@ protected:
ResultPoint() : npar(0), patch(1), inod(0) { u[0] = u[1] = u[2] = 0.0; }
};
typedef std::vector<ResultPoint> ResPointVec; //!< Result point container
typedef std::pair<std::string,ResPointVec> ResPtPair; //!< Result point group
//! \brief Result point container.
using ResPointVec = std::vector<ResultPoint>;
//! \brief File name to result point group mapping.
using ResPtPair = std::pair<std::string,ResPointVec>;
//! \brief Preprocesses the result sampling points.
virtual void preprocessResultPoints();

View File

@ -290,7 +290,9 @@ public:
};
typedef std::pair<Vec3,Vec3> Vec3Pair; //!< A pair of two point vectors
typedef std::vector<Vec3> Vec3Vec; //!< An array of point vectors
using Vec3Pair = std::pair<Vec3,Vec3>; //!< A pair of two point vectors
using PointValue = std::pair<Vec3,double>; //!< A point with associated value
using Vec3Vec = std::vector<Vec3>; //!< An array of point vectors
using PointValues = std::vector<PointValue>; //!< An array of point values
#endif