ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-02-11 12:53:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix range index, Index-operators

Browse Source
This commit is contained in:
Joachim Schoeberl 2025-01-06 18:05:13 +01:00
parent c0b33db5c0
commit 6af9b48bda
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsrc/meshing/meshtype.hpp
View File

@ -182,7 +182,15 @@ namespace netgen
TIndex operator-- (int) { TIndex hi(*this); i--; return hi; } TIndex operator-- (int) { TIndex hi(*this); i--; return hi; }
TIndex & operator++ () { i++; return static_cast<TIndex&>(*this); } TIndex & operator++ () { i++; return static_cast<TIndex&>(*this); }
TIndex & operator-- () { i--; return static_cast<TIndex&>(*this); } TIndex & operator-- () { i--; return static_cast<TIndex&>(*this); }
constexpr TIndex operator+= (T add) { i += add; return TIndex{*this}; } constexpr TIndex operator+= (int add) { i += add; return TIndex{*this}; }
constexpr TIndex operator+= (size_t add) { i += add; return TIndex{*this}; }
constexpr TIndex operator-= (int add) { i -= add; return TIndex{*this}; }
constexpr TIndex operator-= (size_t add) { i -= add; return TIndex{*this}; }
auto operator- (Index i2) const { return i-i2.i; }
// bool operator== (Index i2) const { return i==i2.i; }
// bool operator!= (Index i2) const { return i!=i2.i; }
void Invalidate() { i = long(TIndex::BASE)-1; } void Invalidate() { i = long(TIndex::BASE)-1; }
bool IsValid() const { return i+1 != TIndex::BASE; } bool IsValid() const { return i+1 != TIndex::BASE; }
// operator bool() const { return IsValid(); } // operator bool() const { return IsValid(); }
@ -192,17 +200,19 @@ namespace netgen
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
constexpr auto operator+ (Index<T,TIndex,Base> ind, int i) { return TIndex(ind.i+i); } constexpr auto operator+ (Index<T,TIndex,Base> ind, int i) { TIndex res(ind); res += i; return res; }
template <typename T, typename TIndex, int Base>
constexpr auto operator+ (Index<T,TIndex,Base> ind, size_t i) { TIndex res(ind); res += i; return res; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
constexpr TIndex operator+ (Index<T,TIndex,Base> pi, size_t i) { return TIndex(pi.i+i); } constexpr TIndex operator+ (int i, Index<T,TIndex,Base> ind) { TIndex res(ind); res += i; return res; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
constexpr TIndex operator+ (int i, Index<T,TIndex,Base> pi) { return TIndex(pi.i+i); } inline TIndex operator+ (size_t i, Index<T,TIndex,Base> ind) { TIndex res(ind); res += i; return res; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
inline TIndex operator+ (size_t i, Index<T,TIndex,Base> pi) { return TIndex(pi.i+i); } constexpr inline auto operator- (Index<T,TIndex,Base> ind, int i) { TIndex res(ind); res -= i; return res; }
template <typename T, typename TIndex, int Base> // template <typename T, typename TIndex, int Base>
constexpr inline auto operator- (Index<T,TIndex,Base> pi, int i) -> TIndex { return TIndex(pi.i-i); } // constexpr inline auto operator- (Index<T,TIndex,Base> pa, Index<T,TIndex,Base> pb) { return pa.i-pb.i; }
template <typename T, typename TIndex, int Base>
constexpr inline auto operator- (Index<T,TIndex,Base> pa, Index<T,TIndex,Base> pb) { return pa.i-pb.i; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
inline bool operator< (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a-b < 0; } inline bool operator< (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a-b < 0; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
@ -211,11 +221,11 @@ namespace netgen
inline bool operator>= (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a-b >= 0; } inline bool operator>= (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a-b >= 0; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
inline bool operator<= (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a-b <= 0; } inline bool operator<= (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a-b <= 0; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
inline bool operator== (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a.i == b.i; } inline bool operator== (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a.i == b.i; }
template <typename T, typename TIndex, int Base> template <typename T, typename TIndex, int Base>
inline bool operator!= (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a.i != b.i; } inline bool operator!= (Index<T,TIndex,Base> a, Index<T,TIndex,Base> b) { return a.i != b.i; }
class PointIndex : public Index<int,PointIndex,1> class PointIndex : public Index<int,PointIndex,1>

3
libsrc/meshing/topology.cpp
View File

@ -2403,8 +2403,7 @@ namespace netgen
return; return;
} }
} }
SurfaceElementIndex surfel = GetFace2SurfaceElement(fnr-1);
SurfaceElementIndex surfel = GetFace2SurfaceElement(fnr);
if (!surfel.IsValid()) if (!surfel.IsValid())
{ {
// GetSurfaceElementEdges (surfel, fedges); // GetSurfaceElementEdges (surfel, fedges);