Commit e9a59eae authored by allens's avatar allens
Browse files

added defaults

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@33970 18c085ea-50e0-402c-830e-de6fd14e8384
parent 561de8c2
......@@ -99,12 +99,7 @@ const double NAN_REPLACE_VAL = 1.0E9;
// ****************************************************************************
avtUintahFileFormat::avtUintahFileFormat(const char *filename,
DBOptionsAttributes* attrs) :
avtMTMDFileFormat(filename),
loadExtraElements(1),
dataVariesOverTime(true),
forceMeshReload(true),
archive(NULL),
grid(NULL)
avtMTMDFileFormat(filename)
{
// int t1 = visitTimer->StartTimer();
......
......@@ -138,48 +138,52 @@ protected:
std::string meshName, avtCentering cent );
// Data members
int loadExtraElements;
bool dataVariesOverTime;
int currTimeStep;
bool forceMeshReload;
int loadExtraElements {0};
bool dataVariesOverTime {true};
bool forceMeshReload {true};
int currTimeStep {0};
// VisIt meshes (see https://visitbugs.ornl.gov/issues/52)
std::map<std::string, void_ref_ptr> mesh_domains;
std::map<std::string, void_ref_ptr> mesh_boundaries;
// Data that is not dependent on time
DataArchive *archive;
unsigned int nProcs;
DataArchive *archive {nullptr};
unsigned int nProcs {0};
std::vector<double> cycleTimes;
// Data that is dependent on time
GridP *grid;
TimeStepInfo *stepInfo;
GridP *grid {nullptr};
TimeStepInfo *stepInfo {nullptr};
// Interface to the uda2vis library
void * libHandle;
// Symbols in the archive interface library
void * libHandle {nullptr};
DataArchive* (*openDataArchive)(const std::string&);
void (*closeDataArchive)(DataArchive*);
DataArchive* (*openDataArchive)(const std::string&) {nullptr};
void (*closeDataArchive)(DataArchive*);
GridP* (*getGrid)(DataArchive*, int);
void (*releaseGrid)(GridP*);
GridP* (*getGrid)(DataArchive*, int) {nullptr};
void (*releaseGrid)(GridP*) {nullptr};
unsigned int (*queryProcessors)(DataArchive*);
std::vector<double> (*getCycleTimes)(DataArchive*);
TimeStepInfo* (*getTimeStepInfo)(DataArchive*, GridP*, int, int);
unsigned int (*queryProcessors)(DataArchive*) {nullptr};
std::vector<double> (*getCycleTimes)(DataArchive*) {nullptr};
TimeStepInfo* (*getTimeStepInfo)(DataArchive*, GridP*,
int, int) {nullptr};
GridDataRaw* (*getGridData)(DataArchive*, GridP*, int, int,
std::string, int, int, int[3], int[3], int);
bool (*variableExists)(DataArchive*, std::string) {nullptr};
bool (*variableExists)(DataArchive*, std::string);
GridDataRaw* (*getGridData)(DataArchive*, GridP*, int, int,
std::string, int, int,
int[3], int[3], int) {nullptr};
unsigned int (*getNumberParticles)(DataArchive*, GridP*, int, int,
int, int);
unsigned int (*getNumberParticles)(DataArchive*, GridP*, int, int,
int, int) {nullptr};
ParticleDataRaw* (*getParticleData)(DataArchive*, GridP*, int, int,
std::string, int, int);
ParticleDataRaw* (*getParticleData)(DataArchive*, GridP*, int, int,
std::string, int, int) {nullptr};
std::string (*getParticlePositionName)(DataArchive*);
std::string (*getParticlePositionName)(DataArchive*) {nullptr};
};
#endif
......@@ -58,7 +58,7 @@ GetUintahReadOptions(void)
extraOpts.push_back(UINTAH_LOAD_EXTRA_CELLS); // 1
extraOpts.push_back(UINTAH_LOAD_EXTRA_PATCHES); // 2
rv->SetEnum( UINTAH_LOAD_EXTRA, 1);
rv->SetEnum( UINTAH_LOAD_EXTRA, 0);
rv->SetEnumStrings(UINTAH_LOAD_EXTRA, extraOpts);
rv->SetBool(UINTAH_DATA_VARIES_OVER_TIME, true);
......
Supports Markdown
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