ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-09-23 02:02:49 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_warnings_override' into 'master'

Browse Source 
fix override warnings

See merge request jschoeberl/netgen!380
This commit is contained in:
Christopher Lackner 2021-04-17 16:22:58 +00:00
commit e860cf188b
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libsrc/csg/extrusion.hpp
View File

@ -56,7 +56,7 @@ namespace netgen
~ExtrusionFace(); ~ExtrusionFace();
virtual void DoArchive(Archive& ar) void DoArchive(Archive& ar) override
{ {
Surface::DoArchive(ar); Surface::DoArchive(ar);
ar & profile & path & glob_z_direction & deletable & spline3_path & line_path & ar & profile & path & glob_z_direction & deletable & spline3_path & line_path &
@ -64,25 +64,25 @@ namespace netgen
profile_spline_coeff & latest_seg & latest_t & latest_point2d & latest_point3d; profile_spline_coeff & latest_seg & latest_t & latest_point2d & latest_point3d;
} }
virtual int IsIdentic (const Surface & s2, int & inv, double eps) const; int IsIdentic (const Surface & s2, int & inv, double eps) const override;
virtual double CalcFunctionValue (const Point<3> & point) const; double CalcFunctionValue (const Point<3> & point) const override;
virtual void CalcGradient (const Point<3> & point, Vec<3> & grad) const; void CalcGradient (const Point<3> & point, Vec<3> & grad) const override;
virtual void CalcHesse (const Point<3> & point, Mat<3> & hesse) const; void CalcHesse (const Point<3> & point, Mat<3> & hesse) const override;
virtual double HesseNorm () const; double HesseNorm () const override;
virtual double MaxCurvature () const; double MaxCurvature () const override;
//virtual double MaxCurvatureLoc (const Point<3> & /* c */ , //virtual double MaxCurvatureLoc (const Point<3> & /* c */ ,
// double /* rad */) const; // double /* rad */) const;
virtual void Project (Point<3> & p) const; void Project (Point<3> & p) const override;
virtual Point<3> GetSurfacePoint () const; Point<3> GetSurfacePoint () const override;
virtual void Print (ostream & str) const; void Print (ostream & str) const override;
virtual void GetTriangleApproximation (TriangleApproximation & tas, void GetTriangleApproximation (TriangleApproximation & tas,
const Box<3> & boundingbox, const Box<3> & boundingbox,
double facets) const; double facets) const override;
const SplineGeometry<3> & GetPath(void) const {return *path;} const SplineGeometry<3> & GetPath(void) const {return *path;}
const SplineSeg<2> & GetProfile(void) const {return *profile;} const SplineSeg<2> & GetProfile(void) const {return *profile;}
@ -145,40 +145,39 @@ namespace netgen
Extrusion() {} Extrusion() {}
~Extrusion(); ~Extrusion();
virtual void DoArchive(Archive& ar) void DoArchive(Archive& ar) override
{ {
Primitive::DoArchive(ar); Primitive::DoArchive(ar);
ar & path & profile & z_direction & faces & latestfacenum; ar & path & profile & z_direction & faces & latestfacenum;
} }
virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const; INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const override;
virtual INSOLID_TYPE PointInSolid (const Point<3> & p, INSOLID_TYPE PointInSolid (const Point<3> & p,
double eps) const; double eps) const override;
INSOLID_TYPE PointInSolid (const Point<3> & p, INSOLID_TYPE PointInSolid (const Point<3> & p,
double eps, double eps,
NgArray<int> * const facenums) const; NgArray<int> * const facenums) const;
virtual void GetTangentialSurfaceIndices (const Point<3> & p, void GetTangentialSurfaceIndices (const Point<3> & p,
NgArray<int> & surfind, double eps) const; NgArray<int> & surfind, double eps) const override;
virtual INSOLID_TYPE VecInSolid (const Point<3> & p, INSOLID_TYPE VecInSolid (const Point<3> & p,
const Vec<3> & v, const Vec<3> & v,
double eps) const; double eps) const override;
// checks if lim s->0 lim t->0 p + t(v1 + s v2) in solid // checks if lim s->0 lim t->0 p + t(v1 + s v2) in solid
virtual INSOLID_TYPE VecInSolid2 (const Point<3> & p, INSOLID_TYPE VecInSolid2 (const Point<3> & p,
const Vec<3> & v1, const Vec<3> & v1,
const Vec<3> & v2, const Vec<3> & v2,
double eps) const; double eps) const override;
virtual int GetNSurfaces() const; int GetNSurfaces() const override;
virtual Surface & GetSurface (int i = 0); Surface & GetSurface (int i = 0) override;
virtual const Surface & GetSurface (int i = 0) const; const Surface & GetSurface (int i = 0) const override;
virtual void Reduce (const BoxSphere<3> & box); void Reduce (const BoxSphere<3> & box) override;
virtual void UnReduce (); void UnReduce () override;
}; };
} }