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

move DoArchive to cpp-file

Browse Source
This commit is contained in:
Joachim Schöberl 2018-04-28 12:07:57 +02:00
parent 8522cfdac5
commit 5a320121fd
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/general/archive_base.hpp
View File

@ -67,11 +67,13 @@ namespace ngstd
std::map<void*,int> ptr2nr; std::map<void*,int> ptr2nr;
std::vector<void*> nr2ptr; std::vector<void*> nr2ptr;
/*
// necessary for msvc ??? // necessary for msvc ???
Archive & operator& (string* & ps) Archive & operator& (string* & ps)
{ {
return operator&<string> (ps); return operator&<string> (ps);
} }
*/
template <typename T> template <typename T>
Archive & operator& (T *& p) Archive & operator& (T *& p)

20
libsrc/meshing/meshtype.cpp
View File

@ -148,6 +148,15 @@ namespace netgen
return *this; return *this;
} }
ngstd::Archive & Segment :: DoArchive (ngstd::Archive & ar)
{
return ar & pnums[0] & pnums[1] & pnums[2]
& edgenr & singedge_left & singedge_right
& si & cd2i & domin & domout & tlosurf
& surfnr1 & surfnr2
& bcname;
}
ostream & operator<<(ostream & s, const Segment & seg) ostream & operator<<(ostream & s, const Segment & seg)
{ {
@ -2417,6 +2426,17 @@ namespace netgen
bcn = &default_bcname; bcn = &default_bcname;
} }
ngstd::Archive & FaceDescriptor :: DoArchive (ngstd::Archive & ar)
{
return ar & surfnr & domin & domout & tlosurf & bcprop
& surfcolour.X() & surfcolour.Y() & surfcolour.Z()
& bcname
& domin_singular & domout_singular ;
// don't need: firstelement
}
ostream & operator<<(ostream & s, const FaceDescriptor & fd) ostream & operator<<(ostream & s, const FaceDescriptor & fd)
{ {
s << "surfnr = " << fd.SurfNr() s << "surfnr = " << fd.SurfNr()

20
libsrc/meshing/meshtype.hpp
View File

@ -1049,15 +1049,7 @@ namespace netgen
#else #else
int GetPartition () const { return 0; } int GetPartition () const { return 0; }
#endif #endif
ngstd::Archive & DoArchive (ngstd::Archive & ar) ngstd::Archive & DoArchive (ngstd::Archive & ar);
{
return ar & pnums[0] & pnums[1] & pnums[2]
& edgenr & singedge_left & singedge_right
& si & cd2i & domin & domout & tlosurf
& surfnr1 & surfnr2
& bcname;
}
}; };
inline ngstd::Archive & operator & (ngstd::Archive & archive, Segment & mp) inline ngstd::Archive & operator & (ngstd::Archive & archive, Segment & mp)
@ -1150,15 +1142,7 @@ namespace netgen
// friend ostream & operator<<(ostream & s, const FaceDescriptor & fd); // friend ostream & operator<<(ostream & s, const FaceDescriptor & fd);
friend class Mesh; friend class Mesh;
ngstd::Archive & DoArchive (ngstd::Archive & ar) ngstd::Archive & DoArchive (ngstd::Archive & ar);
{
return ar & surfnr & domin & domout & tlosurf & bcprop
& surfcolour.X() & surfcolour.Y() & surfcolour.Z()
& bcname
& domin_singular & domout_singular ;
// don't need: firstelement
}
}; };
inline ngstd::Archive & operator & (ngstd::Archive & archive, FaceDescriptor & mp) inline ngstd::Archive & operator & (ngstd::Archive & archive, FaceDescriptor & mp)