ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-11 21:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Set flags correctly when loading Element from Archive

Browse Source
This commit is contained in:
Matthias Hochsteger 2021-06-14 11:58:46 +02:00
parent a51f8ed307
commit 958bbb1ae0
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/meshing/meshtype.cpp
View File

@ -1124,6 +1124,26 @@ namespace netgen
is_curved = typ != TET; // false; is_curved = typ != TET; // false;
} }
void Element :: DoArchive (Archive & ar)
{
short _np, _typ;
bool _curved;
if (ar.Output())
{ _np = np; _typ = typ; _curved = is_curved; }
ar & _np;
// placement new to init flags
if (ar.Input())
new (this) Element(_np);
ar & _typ & index & _curved;
typ = ELEMENT_TYPE(_typ);
is_curved = _curved;
for (size_t i = 0; i < np; i++)
ar & pnum[i];
}
void Element :: SetOrder (const int aorder) void Element :: SetOrder (const int aorder)
{ {
orderx = aorder; orderx = aorder;

13
libsrc/meshing/meshtype.hpp
View File

@ -836,18 +836,7 @@ namespace netgen
/// ///
const PointIndex & PNumMod (int i) const { return pnum[(i-1) % np]; } const PointIndex & PNumMod (int i) const { return pnum[(i-1) % np]; }
void DoArchive (Archive & ar) void DoArchive (Archive & ar);
{
short _np, _typ;
bool _curved;
if (ar.Output())
{ _np = np; _typ = typ; _curved = is_curved; }
ar & _np & _typ & index & _curved;
if (ar.Input())
{ np = _np; typ = ELEMENT_TYPE(_typ); is_curved = _curved; }
for (size_t i = 0; i < np; i++)
ar & pnum[i];
}
#ifdef PARALLEL #ifdef PARALLEL
static MPI_Datatype MyGetMPIType(); static MPI_Datatype MyGetMPIType();