Commit 7436d195 authored by allens's avatar allens

added refinement and mesh reads

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26764 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2fd92670
......@@ -31,6 +31,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}
${NEKTAR++_INCLUDE_DIR}
${NEKTAR++_INCLUDE_DIRS}
${NEKTAR++_TP_INCLUDE_DIRS}}
${VISIT_SOURCE_DIR}/third_party_builtin/nektar++
${ACCELERATE_FRAMEWORK_INCLUDE_DIR}
${VISIT_COMMON_INCLUDES}
${VISIT_INCLUDE_DIR}/avt/DBAtts/MetaData
......@@ -66,19 +67,19 @@ SET(INSTALLTARGETS INektarPPDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MNektarPPDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MNektarPPDatabase visitcommon avtdbatts avtdatabase_ser ${NEKTAR++_LIB} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES} vtkIOXML)
TARGET_LINK_LIBRARIES(MNektarPPDatabase visitcommon avtdbatts avtdatabase_ser ${NEKTAR++_LIB} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES} vtkIOXML vtkNektar++)
ADD_TARGET_DEFINITIONS(MNektarPPDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MNektarPPDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ENektarPPDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ENektarPPDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${NEKTAR++_LIB} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES} vtkIOXML )
TARGET_LINK_LIBRARIES(ENektarPPDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${NEKTAR++_LIB} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES} vtkIOXML vtkNektar++)
ADD_TARGET_DEFINITIONS(ENektarPPDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ENektarPPDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ENektarPPDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ENektarPPDatabase_par visitcommon avtdatabase_par avtpipeline_par ${NEKTAR++_LIB} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES} vtkIOXML )
TARGET_LINK_LIBRARIES(ENektarPPDatabase_par visitcommon avtdatabase_par avtpipeline_par ${NEKTAR++_LIB} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES} vtkIOXML vtkNektar++)
ADD_TARGET_DEFINITIONS(ENektarPPDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ENektarPPDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -22,7 +22,7 @@
vtkIOXML
</LIBS>
<FilePatterns>
*.chk *.fld
*.chk *.fld *.xml *.rst *.bse
</FilePatterns>
<Files components="M">
avtNektarPPFileFormat.C
......
......@@ -168,6 +168,9 @@ NektarPPGeneralPluginInfo::GetDefaultFilePatterns() const
std::vector<std::string> defaultPatterns;
defaultPatterns.push_back("*.chk");
defaultPatterns.push_back("*.fld");
defaultPatterns.push_back("*.xml");
defaultPatterns.push_back("*.rst");
defaultPatterns.push_back("*.bse");
return defaultPatterns;
}
......
This diff is collapsed.
......@@ -108,7 +108,11 @@ class avtNektarPPFileFormat : public avtMTSDFileFormat
std::vector<int> m_cycles;
std::vector<double> m_times;
int m_refinement;
bool m_ignoreCurvedElements;
std::string m_meshFile;
std::string m_fieldFile;
std::string vectorVarComponents[3];
......
......@@ -37,7 +37,7 @@
*****************************************************************************/
// ************************************************************************* //
// avtNektarPPOptions.C //
// avtNektarPPOptions.C //
// ************************************************************************* //
#include <avtNektarPPOptions.h>
......@@ -67,24 +67,25 @@ DBOptionsAttributes *
GetNektarPPReadOptions(void)
{
DBOptionsAttributes *rv = new DBOptionsAttributes;
return rv;
/* EXAMPLE OF OPTIONS
rv->SetBool("Binary format", true);
rv->SetBool("Big Endian", false);
rv->SetEnum("Dimension", 1);
vector<string> dims;
dims.push_back("0D");
dims.push_back("1D");
dims.push_back("2D");
dims.push_back("3D");
rv->SetEnumStrings("Dimension", dims);
rv->SetInt("Number of variables", 5);
rv->SetString("Name of auxiliary file", );
rv->SetDouble("Displacement factor", 1.0);
// When reading or writing the file, you can get the options out of this object like:
rv->GetDouble("Displacement factor");
*/
rv->SetEnum("Mesh refinement", 0);
std::vector<std::string> refinement;
refinement.push_back("auto");
refinement.push_back("1");
refinement.push_back("2");
refinement.push_back("3");
refinement.push_back("4");
refinement.push_back("5");
refinement.push_back("6");
refinement.push_back("7");
refinement.push_back("8");
refinement.push_back("9");
refinement.push_back("10");
rv->SetEnumStrings("Mesh refinement", refinement);
rv->SetBool("Assume linear/planar elements", false);
return rv;
}
......
......@@ -37,7 +37,7 @@
*****************************************************************************/
// ************************************************************************* //
// avtNektarPPOptions.h //
// avtNektarPPOptions.h //
// ************************************************************************* //
#ifndef AVT_NektarPP_OPTIONS_H
......@@ -45,9 +45,6 @@
class DBOptionsAttributes;
#include <string>
// ****************************************************************************
// Functions: avtNektarPPOptions
//
......
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