Skip to content

Commit 590b341

Browse files
cquammenkwrobot
authored andcommitted
Merge topic 'exodus-remove-xml'
ead3cb5 Stop looking for .xml, .dart, and .dta files alongside Exodus II files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com> Merge-request: !3778
2 parents 51c63cf + ead3cb5 commit 590b341

File tree

2 files changed

+1
-29
lines changed

2 files changed

+1
-29
lines changed

IO/Exodus/vtkExodusIIReader.cxx

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6402,29 +6402,6 @@ bool vtkExodusIIReader::FindXMLFile()
64026402
{
64036403
if ( this->FileName )
64046404
{
6405-
vtkStdString baseName( vtksys::SystemTools::GetFilenameWithoutExtension( this->FileName ) );
6406-
vtkStdString xmlExt( baseName + ".xml" );
6407-
if ( vtksys::SystemTools::FileExists( xmlExt ) )
6408-
{
6409-
this->SetXMLFileName( xmlExt.c_str() );
6410-
return true;
6411-
}
6412-
6413-
vtkStdString dartExt( baseName + ".dart" );
6414-
if ( vtksys::SystemTools::FileExists( dartExt ) )
6415-
{
6416-
this->SetXMLFileName( dartExt.c_str() );
6417-
return true;
6418-
}
6419-
6420-
vtkStdString baseDir( vtksys::SystemTools::GetFilenamePath( this->FileName ) );
6421-
vtkStdString artifact( baseDir + "/artifact.dta" );
6422-
if ( vtksys::SystemTools::FileExists( artifact ) )
6423-
{
6424-
this->SetXMLFileName( artifact.c_str() );
6425-
return true;
6426-
}
6427-
64286405
// Catch the case where filename was non-nullptr but didn't exist.
64296406
this->SetXMLFileName( nullptr );
64306407
}

IO/Exodus/vtkExodusIIReader.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -803,12 +803,7 @@ class VTKIOEXODUS_EXPORT vtkExodusIIReader : public vtkMultiBlockDataSetAlgorith
803803
vtkGetObjectMacro(Metadata,vtkExodusIIReaderPrivate);
804804

805805
/**
806-
* Returns true if XMLFileName has already been set. Otherwise, look for the XML
807-
* metadata file in the same directory as the data file(s) using the following
808-
* possible file names:
809-
* DATA_FILE_NAME.xml
810-
* DATA_FILE_NAME.dart
811-
* artifact.dta
806+
* Returns true if the file given by XMLFileName exists.
812807
* Return true if found, false otherwise
813808
*/
814809
bool FindXMLFile();

0 commit comments

Comments
 (0)