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

also save occ identifications in mesh file attachment

Browse Source
This commit is contained in:
mhochsteger@cerbsim.com 2021-11-11 12:44:34 +01:00
parent e0afa0a916
commit 36f22a13ce
3 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/gprim/geomobjects.hpp
View File

@ -269,6 +269,11 @@ namespace netgen
CalcInverse (*this, inv);
sol = inv * rhs;
}
void DoArchive(Archive & ar)
{
ar.Do(x, H*W);
}
};

5
libsrc/gprim/transform3d.hpp
View File

@ -133,6 +133,11 @@ public:
Mat<D> & GetMatrix() { return m; }
Vec<D> & GetVector() { return v; }
void DoArchive(Archive& ar)
{
ar & m & v;
}
///
Transformation CalcInverse () const
{

56
libsrc/occ/occgeom.cpp
View File

@ -1668,6 +1668,8 @@ namespace netgen
void OCCGeometry :: DoArchive(Archive& ar)
{
int version = 0;
ar & version;
if(ar.Output())
{
std::stringstream ss;
@ -1683,10 +1685,62 @@ namespace netgen
BRepTools::Read(shape, ss, builder);
}
// enumerate shapes and archive only integers
auto my_hash = [](const TopoDS_Shape & key) {
auto occ_hash = key.HashCode(1<<31UL);
return std::hash<decltype(occ_hash)>()(occ_hash);
};
std::unordered_map<TopoDS_Shape, int, decltype(my_hash)> shape_map(10, my_hash);
Array<TopoDS_Shape> shape_list;
std::map<Handle(TopoDS_TShape), int> tshape_map;
Array<Handle(TopoDS_TShape)> tshape_list;
ar & occdim;
for (auto typ : { TopAbs_SOLID, TopAbs_FACE, TopAbs_EDGE })
for (TopExp_Explorer e(shape, typ); e.More(); e.Next())
ar & global_shape_properties[e.Current().TShape()];
{
auto ds = e.Current();
auto ts = ds.TShape();
if(shape_map.count(ds)==0)
{
shape_map[ds] = shape_list.Size();
shape_list.Append(ds);
}
if(tshape_map.count(ts)==0)
{
tshape_map[ts] = shape_list.Size();
tshape_list.Append(ts);
}
}
for (auto ts : tshape_list)
{
bool has_properties = global_shape_properties.count(ts);
ar & has_properties;
if(has_properties)
ar & global_shape_properties[ts];
bool has_identifications = identifications.count(ts);
ar & has_identifications;
if(has_identifications)
{
auto & idents = identifications[ts];
auto n_idents = idents.size();
ar & n_idents;
idents.resize(n_idents);
for(auto i : Range(n_idents))
{
auto & id = idents[i];
int shape_id;
if(ar.Output())
shape_id = shape_map[id.other];
ar & shape_id & id.trafo & id.inverse & id.name;
if(ar.Input())
id.other = shape_list[shape_id];
}
}
}
if(ar.Input())
{