Merge branch 'archive_mesh_curving' into curved_splinesurface

This commit is contained in:
Christopher Lackner 2018-11-26 16:07:49 +01:00
commit 3df31d513d

View File

@ -1324,13 +1324,18 @@ namespace netgen
if (geometry) if (geometry)
geometry -> SaveToMeshFile (ost); geometry -> SaveToMeshFile (ost);
archive << ost.str(); archive << ost.str();
archive << (geometry ? curvedelems->GetOrder() : 1);
} }
else else
{ {
string str; string str;
archive & str; archive & str;
istringstream ist(str); istringstream ist(str);
geometry = geometryregister.LoadFromMeshFile (ist); geometry = geometryregister.LoadFromMeshFile (ist);
int order;
archive & order;
if(geometry && order > 1)
BuildCurvedElements(order);
} }
if (archive.Input()) if (archive.Input())