Commit eb5e5ccd authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot
Browse files

Merge topic '19202-exodus-reader-prefix-match' into release

b397f318

 exodus: less aggressive prefix matching
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !3474
parents 625f6f1a b397f318
......@@ -242,8 +242,9 @@ void vtkExodusFileSeriesReader::FindRestartedResults()
// numbering).
//
// The `e` in the above pattern can be any of exodus supported extensions e.g.
// exo, ex2, etc. Hence we keep the regex generic (ref: paraview/paraview#19056).
vtksys::RegularExpression regEx("^(.*\\.[a-zA-Z0-9]+)(-s.[0-9]+)?(\\.[0-9]+\\.[0-9]+)?$");
// exo, ex2, etc. Hence we keep the regex generic (ref: paraview/paraview#19056,
// paraview/paraview#19202).
vtksys::RegularExpression regEx("^([^\\.]*\\.[a-zA-Z0-9]+)(-s.[0-9]+)?(\\.[0-9]+\\.[0-9]+)?$");
if (!regEx.find(baseName))
{
// Filename does not follow convention. Just use it.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment