Commit d000d961 authored by Robert Maynard's avatar Robert Maynard
Browse files

More fixes for 64bit support in the mili reader.

parent 37e94d71
......@@ -1533,8 +1533,8 @@ avtMiliFileFormat::ValidateVariables(int dom)
// ****************************************************************************
avtMaterial *
avtMiliFileFormat::ConstructMaterials(vector< vector<int *> > &mat_list,
vector< vector<int> > &list_size,
avtMiliFileFormat::ConstructMaterials(vector< vector<vtkIdType *> > &mat_list,
vector< vector<int> > &list_size,
int meshId)
{
int size = 0;
......@@ -1555,10 +1555,10 @@ avtMiliFileFormat::ConstructMaterials(vector< vector<int *> > &mat_list,
{
for (gr = 0; gr < mat_list[elem].size(); ++gr)
{
int *ml = mat_list[elem][gr];
vtkIdType *ml = mat_list[elem][gr];
for (i = 0; i < list_size[elem][gr]; ++i)
{
int mat = ml[i];
int mat = (int)ml[i];
mlist[count++] = mat;
}
}
......
......@@ -54,6 +54,7 @@ extern "C" {
#include <avtMTMDFileFormat.h>
#include <avtTypes.h>
#include "vtkType.h"
class avtMaterial;
class vtkDataArray;
......@@ -179,7 +180,7 @@ class avtMiliFileFormat : public avtMTMDFileFormat
void IssueWarning(const char *msg, int key);
void ReadMesh(int dom);
void ValidateVariables(int dom);
avtMaterial * ConstructMaterials(vector< vector<int*> >&,
avtMaterial * ConstructMaterials(vector< vector<vtkIdType*> >&,
vector< vector<int> > &, int);
int GetVariableIndex(const char *);
int GetVariableIndex(const char *, int mesh_id);
......
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