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

Merge branch 'uzerbinati/curved' into 'master'

Browse Source 
Added ``curved'' field for Datalayout of Element and Elements2D

See merge request ngsolve/netgen!649
This commit is contained in:
Schöberl, Joachim 2024-05-06 18:31:46 +02:00
commit 08eec4460c
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/meshing/meshtype.cpp
View File

@ -216,7 +216,7 @@ namespace netgen
orderx = ordery = 1;
refflag = 1;
strongrefflag = false;
is_curved = false;
is_curved = 0;
}
Element2d :: Element2d (int anp)

10
libsrc/meshing/meshtype.hpp
View File

@ -423,7 +423,7 @@ namespace netgen
// Set a new property for each element, to
// control whether it is visible or not
bool visible:1; // element visible
bool is_curved:1; // element is (high order) curved
bool is_curved; // element is (high order) curved
/// order for hp-FEM
unsigned int orderx:6;
unsigned int ordery:6;
@ -440,7 +440,8 @@ namespace netgen
{ "pnum", offsetof(Element2d, pnum)},
{ "index", offsetof(Element2d, index) },
{ "np", offsetof(Element2d, np) },
{ "refine", offsetof(Element2d, refflag) }
{ "refine", offsetof(Element2d, refflag) },
{ "curved", offsetof(Element2d, is_curved)}
});
}
@ -741,7 +742,7 @@ namespace netgen
unsigned int levelz:6; */
/// stored shape-badness of element
float badness;
bool is_curved:1; // element is (high order) curved
bool is_curved; // element is (high order) curved
class flagstruct {
public:
@ -767,7 +768,8 @@ namespace netgen
{ "pnum", offsetof(Element, pnum)},
{ "index", offsetof(Element, index) },
{ "np", offsetof(Element, np) },
{ "refine", offsetof(Element, flags.refflag) }
{ "refine", offsetof(Element, flags.refflag) },
{ "curved", offsetof(Element, is_curved)}
});
}

8
libsrc/meshing/python_mesh.cpp
View File

@ -466,6 +466,10 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
py::detail::field_descriptor {
"refine", data_layout["refine"], sizeof(bool),
py::format_descriptor<bool>::format(),
py::detail::npy_format_descriptor<bool>::dtype() },
py::detail::field_descriptor {
"curved", data_layout["curved"], sizeof(bool),
py::format_descriptor<bool>::format(),
py::detail::npy_format_descriptor<bool>::dtype()}
});
}
@ -557,6 +561,10 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
py::detail::field_descriptor {
"refine", data_layout["refine"], sizeof(bool),
py::format_descriptor<bool>::format(),
py::detail::npy_format_descriptor<bool>::dtype() },
py::detail::field_descriptor {
"curved", data_layout["curved"], sizeof(bool),
py::format_descriptor<bool>::format(),
py::detail::npy_format_descriptor<bool>::dtype() }
});
}