Skip to content
Snippets Groups Projects
Commit 3fc6c714 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

revert part of commit r6039 by Koen to snap high order vertices on the

geometry. It introduces subtle bugs when reading high-order post-processing views.

IMHO we should have an explicit command to do this, and not modify the mesh without
warning just by reading a file
parent f03e429c
No related branches found
No related tags found
No related merge requests found
...@@ -473,10 +473,17 @@ int MergeFile(const std::string &fileName, bool warnIfMissing, bool setWindowTit ...@@ -473,10 +473,17 @@ int MergeFile(const std::string &fileName, bool warnIfMissing, bool setWindowTit
if(status > 1) status = PView::readMSH(fileName); if(status > 1) status = PView::readMSH(fileName);
#endif #endif
#if defined(HAVE_MESH) #if defined(HAVE_MESH)
/*
This was introduced in r6039 by Koen to snap high order vertices on the
geometry. But it introduces subtle bugs when reading high-order
post-processing views ; we should have an explicit command to do this, and
not modify the mesh without warning just by reading a file --CG.
if(CTX::instance()->mesh.order > 1) if(CTX::instance()->mesh.order > 1)
SetOrderN(GModel::current(), CTX::instance()->mesh.order, SetOrderN(GModel::current(), CTX::instance()->mesh.order,
CTX::instance()->mesh.secondOrderLinear, CTX::instance()->mesh.secondOrderLinear,
CTX::instance()->mesh.secondOrderIncomplete); CTX::instance()->mesh.secondOrderIncomplete);
*/
#endif #endif
} }
#if defined(HAVE_POST) #if defined(HAVE_POST)
......
...@@ -260,7 +260,6 @@ static void Mesh1D(GModel *m) ...@@ -260,7 +260,6 @@ static void Mesh1D(GModel *m)
static void PrintMesh2dStatistics(GModel *m) static void PrintMesh2dStatistics(GModel *m)
{ {
FILE *statreport = 0; FILE *statreport = 0;
if(CTX::instance()->createAppendMeshStatReport == 1) if(CTX::instance()->createAppendMeshStatReport == 1)
statreport = Fopen(CTX::instance()->meshStatReportFileName.c_str(), "w"); statreport = Fopen(CTX::instance()->meshStatReportFileName.c_str(), "w");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment