MRG: resolved merge conflicts from merge from develop branch

2025-11-28 03:28:01 +00:00 · 2017-05-19 16:29:54 +01:00
parent 79bfd7d7d9 6e72ceddd0
commit db5348880e
308 changed files with 2914 additions and 1667 deletions
--- a/src/conversion/ensight/mesh/ensightMesh.C
+++ b/src/conversion/ensight/mesh/ensightMesh.C
@ -151,7 +151,7 @@ void Foam::ensightMesh::correct()
                useAll = false;
                matched = findMatchingStrings
                (
-                    wordReListMatcher(matcher),
+                    wordRes(matcher),
                    patchNames
                );
            }
@ -250,7 +250,7 @@ void Foam::ensightMesh::correct()
        wordList selectZones = mesh_.faceZones().names();
        inplaceSubsetMatchingStrings
        (
-            wordReListMatcher(matcher),
+            wordRes(matcher),
            selectZones
        );