From 0fcbe04dcf7677c1282962fa7fbc48a9fba4cc02 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 10 Mar 2021 17:49:05 +0100 Subject: [PATCH] Mesh: [skip ci] fix regular expression in MeshInput --- src/Mod/Mesh/App/Core/MeshIO.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp index 097191f03d..1c49e1205c 100644 --- a/src/Mod/Mesh/App/Core/MeshIO.cpp +++ b/src/Mod/Mesh/App/Core/MeshIO.cpp @@ -1646,7 +1646,7 @@ bool MeshInput::LoadNastran (std::istream &rstrIn) "\\s+([-+]?[0-9]*)\\.?([0-9]+([eE][-+]?[0-9]+)?)\\s*"); boost::regex rx_t("\\s*CTRIA3\\s+([0-9]+)\\s+([0-9]+)" "\\s+([0-9]+)\\s+([0-9]+)\\s+([0-9]+)\\s*"); - boost::regex rx_q("\\s*CTRIA3\\s+([0-9]+)\\s+([0-9]+)" + boost::regex rx_q("\\s*CQUAD4\\s+([0-9]+)\\s+([0-9]+)" "\\s+([0-9]+)\\s+([0-9]+)\\s+([0-9]+)\\s+([0-9]+)\\s*"); boost::cmatch what; @@ -1663,10 +1663,8 @@ bool MeshInput::LoadNastran (std::istream &rstrIn) while (std::getline(rstrIn, line)) { upper(ltrim(line)); if (line.find("GRID*") == 0) { - assert(0); } else if (line.find('*') == 0) { - assert(0); } // insert the read-in vertex into a map to preserve the order else if (line.find("GRID") == 0) {