Commit 7dba02cc authored by miller86's avatar miller86
Browse files

I removed some conditional compilation logic that was necessary for earlier

versions of ITAPS_GRUMMP.

I add "silent" option for ITAPS_GRUMMP to eliminate 'Volume mesh is properly
oriented' messages VisIt spits out when reading GRUMMP data. But, that won't
take effect until I update to a newer version of GRUMMP.

I fixed a problem dealing with code-generated filename extensions in the
plugin infos for ITAPS that was introduced when we went to filename globbing.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12646 18c085ea-50e0-402c-830e-de6fd14e8384
parent 968f8a6e
......@@ -184,7 +184,6 @@ FUNCTION(CONFIGURE_ITAPS)
# Build a list of the ITAPS_C source files
FILE(GLOB ITAPS_ABS_FILES ${VISIT_SOURCE_DIR}/databases/ITAPS_C/*.[Ch]
${VISIT_SOURCE_DIR}/databases/ITAPS_C/ITAPS_C.xml
${VISIT_SOURCE_DIR}/databases/ITAPS_C/CMakeLists.txt)
UNSET(ITAPS_FILES)
......@@ -204,14 +203,14 @@ FUNCTION(CONFIGURE_ITAPS)
SET(defExt "")
SET(allExts ${ITAPS_${IMPL}_FILE_PATTERNS})
FOREACH(ext ${allExts})
SET(defExt "${defExt}defaultPatterns.push_back(\"${ext}\");")
SET(defExt "${defExt}defaultPatterns.push_back(\"${ext}\");\n")
ENDFOREACH(ext)
STRING(LENGTH "${defExt}" SLEN)
STRING(REPLACE "ITAPS_C" ITAPS_${IMPL} NEWCONTENTS "${FILECONTENTS}")
IF(${F} MATCHES "ITAPS_CPluginInfo.C")
IF(${SLEN} GREATER 0)
STRING(REPLACE "defaultPatterns.push_back(\"cub\");" "${defExt}" EXTCONTENTS "${NEWCONTENTS}")
STRING(REPLACE "defaultPatterns.push_back(\"*.cub\");" "${defExt}" EXTCONTENTS "${NEWCONTENTS}")
SET(NEWCONTENTS "${EXTCONTENTS}")
UNSET(EXTCONTENTS)
ENDIF(${SLEN} GREATER 0)
......
......@@ -213,8 +213,11 @@ avtITAPS_CFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
vmeshFileName[q-4] == 'u' && vmeshFileName[q-3] == 'b')
tmpFileName = string(vmeshFileName, 0, q-4);
char dummyStr[32] = "";
iMesh_newMesh(dummyStr, &itapsMesh, &itapsError, 0);
string loadOptions;
#ifdef ITAPS_GRUMMP
loadOptions = "silent";
#endif
iMesh_newMesh("", &itapsMesh, &itapsError, 0);
CheckITAPSError(itapsMesh, iMesh_newMesh, NoL);
iMesh_getRootSet(itapsMesh, &rootSet, &itapsError);
CheckITAPSError(itapsMesh, iMesh_getRootSet, NoL);
......@@ -235,8 +238,8 @@ avtITAPS_CFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
CheckITAPSError(itapsMesh, iMeshP_getLocalParts, NoL);
debug3 << "parts_size = " << parts_size << endl;
#else
iMesh_load(itapsMesh, rootSet, tmpFileName.c_str(), dummyStr, &itapsError,
tmpFileName.length(), 0);
iMesh_load(itapsMesh, rootSet, tmpFileName.c_str(), loadOptions.c_str(), &itapsError,
tmpFileName.length(), loadOptions.length());
CheckITAPSError(itapsMesh, iMesh_load, NoL);
#endif
......@@ -534,9 +537,7 @@ avtITAPS_CFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
char desc[256];
desc[0] = '\0';
int tmpError = itapsError;
#if !defined(ITAPS_GRUMMP)
iMesh_getDescription(itapsMesh, desc, &itapsError, sizeof(desc));
#endif
SNPRINTF(msg, sizeof(msg), "Encountered ITAPS error (%d) \"%s\""
"\nUnable to open file!", tmpError, desc);
if (!avtCallback::IssueWarning(msg))
......@@ -761,9 +762,7 @@ avtITAPS_CFileFormat::GetMesh(int domain, const char *meshname)
char desc[256];
desc[0] = '\0';
int tmpError = itapsError;
#if !defined(ITAPS_GRUMMP)
iMesh_getDescription(itapsMesh, desc, &itapsError, sizeof(desc));
#endif
SNPRINTF(msg, sizeof(msg), "Encountered ITAPS error (%d) \"%s\""
"\nUnable to open file!", tmpError, desc);
if (!avtCallback::IssueWarning(msg))
......@@ -951,9 +950,7 @@ avtITAPS_CFileFormat::GetNodalSubsetVar(int domain, const char *varname,
char desc[256];
desc[0] = '\0';
int tmpError = itapsError;
#if !defined(ITAPS_GRUMMP)
iMesh_getDescription(itapsMesh, desc, &itapsError, sizeof(desc));
#endif
SNPRINTF(msg, sizeof(msg), "Encountered ITAPS error (%d) \"%s\""
"\nUnable to open file!", tmpError, desc);
if (!avtCallback::IssueWarning(msg))
......@@ -1133,9 +1130,7 @@ tagFound:
char desc[256];
desc[0] = '\0';
int tmpError = itapsError;
#if !defined(ITAPS_GRUMMP)
iMesh_getDescription(itapsMesh, desc, &itapsError, sizeof(desc));
#endif
SNPRINTF(msg, sizeof(msg), "Encountered ITAPS error (%d) \"%s\""
"\nUnable to open file!", tmpError, desc);
if (!avtCallback::IssueWarning(msg))
......
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