From 116e5288c2df4d8664d334e2134a25e196319029 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Thu, 21 Feb 2019 19:31:41 +0100 Subject: [PATCH] msh4 -> 4.1 --- Common/CommandLine.cpp | 2 +- Common/CreateFile.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp index d497008a38..749350a703 100644 --- a/Common/CommandLine.cpp +++ b/Common/CommandLine.cpp @@ -829,7 +829,7 @@ void GetOptions(int argc, char *argv[], bool readConfigFiles, bool exitOnError) #endif // convert mesh to latest binary format if(GModel::current()->getMeshStatus() > 0){ - CTX::instance()->mesh.mshFileVersion = 4.0; + CTX::instance()->mesh.mshFileVersion = 4.1; CTX::instance()->mesh.binary = 1; CreateOutputFile(fileName, FORMAT_MSH); } diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp index 6cf6a2822e..35f8646a2a 100644 --- a/Common/CreateFile.cpp +++ b/Common/CreateFile.cpp @@ -39,7 +39,7 @@ int GetFileFormatFromExtension(const std::string &ext, double *version) else if(ext == ".msh1") { if(version) *version = 1.0; return FORMAT_MSH; } else if(ext == ".msh2") { if(version) *version = 2.2; return FORMAT_MSH; } else if(ext == ".msh3") { if(version) *version = 3.0; return FORMAT_MSH; } - else if(ext == ".msh4") { if(version) *version = 4.0; return FORMAT_MSH; } + else if(ext == ".msh4") { if(version) *version = 4.1; return FORMAT_MSH; } else if(ext == ".x3d") return FORMAT_X3D; else if(ext == ".pos") return FORMAT_POS; else if(ext == ".pvtu") return FORMAT_PVTU; -- GitLab