mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-24 21:10:33 +05:00
no warnings
This commit is contained in:
parent
227b269b5c
commit
a8e41734cf
@ -1001,8 +1001,10 @@ namespace ngcore
|
|||||||
data[i] = a2.data[i];
|
data[i] = a2.data[i];
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
#ifndef __CUDA_ARCH__
|
||||||
else
|
else
|
||||||
throw Exception(std::string("cannot copy Array of type ") + typeid(T).name());
|
throw Exception(std::string("cannot copy Array of type ") + typeid(T).name());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1780,6 +1780,17 @@ namespace netgen
|
|||||||
eledges[i] = edges.Get(elnr)[i]+1;
|
eledges[i] = edges.Get(elnr)[i]+1;
|
||||||
// eledges[i] = abs (edges.Get(elnr)[i]);
|
// eledges[i] = abs (edges.Get(elnr)[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MeshTopology :: GetElementFaces (int elnr, NgArray<int> & elfaces) const
|
||||||
|
{
|
||||||
|
int nfa = GetNFaces (mesh->VolumeElement(elnr).GetType());
|
||||||
|
elfaces.SetSize (nfa);
|
||||||
|
|
||||||
|
for (auto i : Range(nfa))
|
||||||
|
elfaces[i] = faces.Get(elnr)[i]+1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void MeshTopology :: GetElementFaces (int elnr, NgArray<int> & elfaces, bool withorientation) const
|
void MeshTopology :: GetElementFaces (int elnr, NgArray<int> & elfaces, bool withorientation) const
|
||||||
{
|
{
|
||||||
int nfa = GetNFaces (mesh->VolumeElement(elnr).GetType());
|
int nfa = GetNFaces (mesh->VolumeElement(elnr).GetType());
|
||||||
|
@ -105,7 +105,8 @@ public:
|
|||||||
[[deprecated("use GetEdges (ElementIndex) -> FlatArray")]]
|
[[deprecated("use GetEdges (ElementIndex) -> FlatArray")]]
|
||||||
void GetElementEdges (int elnr, NgArray<int> & edges) const;
|
void GetElementEdges (int elnr, NgArray<int> & edges) const;
|
||||||
[[deprecated("use GetFaces (ElementIndex) -> FlatArray")]]
|
[[deprecated("use GetFaces (ElementIndex) -> FlatArray")]]
|
||||||
void GetElementFaces (int elnr, NgArray<int> & faces, bool withorientation = false) const;
|
void GetElementFaces (int elnr, NgArray<int> & faces) const;
|
||||||
|
void GetElementFaces (int elnr, NgArray<int> & faces, bool withorientation) const;
|
||||||
|
|
||||||
// definition in meshclass.hpp
|
// definition in meshclass.hpp
|
||||||
inline FlatArray<T_EDGE> GetEdges (ElementIndex elnr) const;
|
inline FlatArray<T_EDGE> GetEdges (ElementIndex elnr) const;
|
||||||
@ -134,7 +135,6 @@ public:
|
|||||||
// [[deprecated("use GetElementEdge instead")]]
|
// [[deprecated("use GetElementEdge instead")]]
|
||||||
int GetSegmentEdgeOrientation (int elnr) const; // old style
|
int GetSegmentEdgeOrientation (int elnr) const; // old style
|
||||||
|
|
||||||
|
|
||||||
DLL_HEADER void GetFaceVertices (int fnr, NgArray<int> & vertices) const;
|
DLL_HEADER void GetFaceVertices (int fnr, NgArray<int> & vertices) const;
|
||||||
DLL_HEADER void GetFaceVertices (int fnr, int * vertices) const;
|
DLL_HEADER void GetFaceVertices (int fnr, int * vertices) const;
|
||||||
[[deprecated("use GetEdgeVertices -> tupe(v0,v1) instead")]]
|
[[deprecated("use GetEdgeVertices -> tupe(v0,v1) instead")]]
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <BRepGProp.hxx>
|
#include <BRepGProp.hxx>
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "occ_edge.hpp"
|
#include "occ_edge.hpp"
|
||||||
#include "occgeom.hpp"
|
#include "occgeom.hpp"
|
||||||
|
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
#ifndef FILE_OCC_EDGE_INCLUDED
|
#ifndef FILE_OCC_EDGE_INCLUDED
|
||||||
#define FILE_OCC_EDGE_INCLUDED
|
#define FILE_OCC_EDGE_INCLUDED
|
||||||
|
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <GProp_GProps.hxx>
|
#include <GProp_GProps.hxx>
|
||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
#include <TopoDS_Edge.hxx>
|
#include <TopoDS_Edge.hxx>
|
||||||
@ -8,6 +12,8 @@
|
|||||||
#include <BRep_TEdge.hxx>
|
#include <BRep_TEdge.hxx>
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "occ_vertex.hpp"
|
#include "occ_vertex.hpp"
|
||||||
#include "meshing.hpp"
|
#include "meshing.hpp"
|
||||||
|
|
||||||
|
@ -1,8 +1,13 @@
|
|||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <BRepGProp.hxx>
|
#include <BRepGProp.hxx>
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||||
#include <BRepLProp_SLProps.hxx>
|
#include <BRepLProp_SLProps.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "occ_edge.hpp"
|
#include "occ_edge.hpp"
|
||||||
#include "occ_face.hpp"
|
#include "occ_face.hpp"
|
||||||
#include "occgeom.hpp"
|
#include "occgeom.hpp"
|
||||||
|
@ -1,11 +1,16 @@
|
|||||||
#ifndef FILE_OCC_FACE_INCLUDED
|
#ifndef FILE_OCC_FACE_INCLUDED
|
||||||
#define FILE_OCC_FACE_INCLUDED
|
#define FILE_OCC_FACE_INCLUDED
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <GProp_GProps.hxx>
|
#include <GProp_GProps.hxx>
|
||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
#include <TopoDS_Face.hxx>
|
#include <TopoDS_Face.hxx>
|
||||||
#include <ShapeAnalysis_Surface.hxx>
|
#include <ShapeAnalysis_Surface.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "occ_vertex.hpp"
|
#include "occ_vertex.hpp"
|
||||||
#include "meshing.hpp"
|
#include "meshing.hpp"
|
||||||
|
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
|
|
||||||
#include <variant>
|
#include <variant>
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <BRepGProp.hxx>
|
#include <BRepGProp.hxx>
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
#include <GProp_GProps.hxx>
|
#include <GProp_GProps.hxx>
|
||||||
@ -14,6 +17,8 @@
|
|||||||
#include <gp_Trsf.hxx>
|
#include <gp_Trsf.hxx>
|
||||||
#include <gp_GTrsf.hxx>
|
#include <gp_GTrsf.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "meshing.hpp"
|
#include "meshing.hpp"
|
||||||
|
|
||||||
#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=4
|
#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=4
|
||||||
|
@ -1,9 +1,14 @@
|
|||||||
#ifndef FILE_OCC_VERTEX_INCLUDED
|
#ifndef FILE_OCC_VERTEX_INCLUDED
|
||||||
#define FILE_OCC_VERTEX_INCLUDED
|
#define FILE_OCC_VERTEX_INCLUDED
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
#include <BRep_TVertex.hxx>
|
#include <BRep_TVertex.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "meshing.hpp"
|
#include "meshing.hpp"
|
||||||
#include "occ_utils.hpp"
|
#include "occ_utils.hpp"
|
||||||
|
|
||||||
|
@ -5,9 +5,14 @@
|
|||||||
#include <meshing.hpp>
|
#include <meshing.hpp>
|
||||||
#include "occgeom.hpp"
|
#include "occgeom.hpp"
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <GeomLProp_SLProps.hxx>
|
#include <GeomLProp_SLProps.hxx>
|
||||||
#include <ShapeAnalysis_Surface.hxx>
|
#include <ShapeAnalysis_Surface.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#include "occmeshsurf.hpp"
|
#include "occmeshsurf.hpp"
|
||||||
|
|
||||||
namespace netgen
|
namespace netgen
|
||||||
|
@ -10,6 +10,9 @@
|
|||||||
|
|
||||||
#include "occgeom.hpp"
|
#include "occgeom.hpp"
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <BOPAlgo_Builder.hxx>
|
#include <BOPAlgo_Builder.hxx>
|
||||||
#include <BOPTools_AlgoTools.hxx>
|
#include <BOPTools_AlgoTools.hxx>
|
||||||
#include <BRepAlgoAPI_Common.hxx>
|
#include <BRepAlgoAPI_Common.hxx>
|
||||||
@ -74,6 +77,8 @@
|
|||||||
#include <gp_Pln.hxx>
|
#include <gp_Pln.hxx>
|
||||||
#include <gp_Trsf.hxx>
|
#include <gp_Trsf.hxx>
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
using namespace netgen;
|
using namespace netgen;
|
||||||
|
|
||||||
void ExtractEdgeData( const TopoDS_Edge & edge, int index, std::vector<double> * p, Box<3> & box )
|
void ExtractEdgeData( const TopoDS_Edge & edge, int index, std::vector<double> * p, Box<3> & box )
|
||||||
|
Loading…
Reference in New Issue
Block a user