Commit a7c27e6b authored by Dave Partyka's avatar Dave Partyka

BUG: undo switches to size_t as it appears to cause the strides to be computed incorrectly.

parent ffd74778
......@@ -54,7 +54,7 @@ public:
// Global common information
int getNumberOfParts() { return this->global.getNumberOfParts(); }
size_t getNumberOfTimeSteps() { return this->global.getNumberOfTimeSteps(); }
int getNumberOfTimeSteps() { return this->global.getNumberOfTimeSteps(); }
int getTimeStep(int dump) { return this->global.getDumpTime(dump); }
int getNumberOfVariables() { return this->global.getNumberOfVariables(); }
......
......@@ -58,15 +58,15 @@ public:
int getNumberOfParts() { return this->numberOfFiles; }
int getNumberOfDirectories() { return this->numberOfDirectories; }
size_t getNumberOfTimeSteps() { return this->numberOfTimeSteps; }
int getNumberOfTimeSteps() { return this->numberOfTimeSteps; }
string getDirectoryName(int i) { return this->directoryName[i]; }
string getBaseFileName(int i) { return this->baseFileName[i]; }
string getDumpName(int time) { return this->dumpName[time]; }
int getDumpTime(int time) { return this->dumpTime[time]; }
size_t getTimeFieldLen() { return this->timeFieldLen; }
size_t getProcFieldLen() { return this->procFieldLen; }
int getTimeFieldLen() { return this->timeFieldLen; }
int getProcFieldLen() { return this->procFieldLen; }
// Grid and physical grid information
float* getPhysicalOrigin() { return this->physicalOrigin; }
......@@ -117,11 +117,11 @@ private:
int** speciesByteCount; // Bytes per basic type
// Time information
size_t numberOfTimeSteps; // Number of time steps
int numberOfTimeSteps; // Number of time steps
vector<string> dumpName; // Dump subdirectory names
vector<int> dumpTime; // Dump subdirectory times
size_t procFieldLen; // fields.tttttt.pppp part names
size_t timeFieldLen; // fields.tttttt.pppp part names
int procFieldLen; // fields.tttttt.pppp part names
int timeFieldLen; // fields.tttttt.pppp part names
// Variable information
int numberOfVariables; // All field and species variables
......
......@@ -474,8 +474,8 @@ void VPICView::loadVariableData(
void VPICView::getPartFileNames(string* partFileName, int timeStep, int part)
{
size_t timeFieldLen = this->global.getTimeFieldLen();
size_t procFieldLen = this->global.getProcFieldLen();
int timeFieldLen = this->global.getTimeFieldLen();
int procFieldLen = this->global.getProcFieldLen();
int dumpTime = this->global.getDumpTime(timeStep);
string dumpName = this->global.getDumpName(timeStep);
......
......@@ -77,7 +77,7 @@ public:
int getNumberOfCells() { return this->numberOfCells; }
int getNumberOfNodes() { return this->numberOfNodes; }
size_t getNumberOfParts() { return this->numberOfMyParts; }
int getNumberOfParts() { return this->numberOfMyParts; }
private:
VPICGlobal& global; // Common information for overall data
......@@ -113,9 +113,7 @@ private:
int partSize[DIMENSION]; // # of grids in each dim per part
vector<VPICPart*> myParts; // Every VPICPart this processor handles
size_t numberOfMyParts;
void operator=(const VPICView&); // Not implemented.
int numberOfMyParts;
};
#endif
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