Commit 16a572d7 authored by allens's avatar allens
Browse files

fixed compiler warnings and change the bit flags

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23516 18c085ea-50e0-402c-830e-de6fd14e8384
parent 56a01276
...@@ -58,7 +58,7 @@ avtIVPFlashField::avtIVPFlashField( vtkDataSet* dataset, ...@@ -58,7 +58,7 @@ avtIVPFlashField::avtIVPFlashField( vtkDataSet* dataset,
avtCellLocator* locator, avtCellLocator* locator,
double fact) : double fact) :
avtIVPVTKField( dataset, locator ), avtIVPVTKField( dataset, locator ),
B_vtkDataArray(0), E_vtkDataArray(0), factor(1.0/fact) factor(1.0/fact), B_vtkDataArray(0), E_vtkDataArray(0),
{ {
order = 2; order = 2;
......
...@@ -69,10 +69,14 @@ avtIVPM3DC1Field::avtIVPM3DC1Field( vtkDataSet* dataset, ...@@ -69,10 +69,14 @@ avtIVPM3DC1Field::avtIVPM3DC1Field( vtkDataSet* dataset,
double fact) : double fact) :
avtIVPVTKField( dataset, locator ), avtIVPVTKField( dataset, locator ),
elements(0), trigtable(0), neighbors(0), elements(0), trigtable(0), neighbors(0),
f0(0), psi0(0), fnr(0), fni(0), psinr(0), psini(0), tElements(0), element_dimension(0),
nplanes(0), element_size(0), scalar_size(0),
reparameterize(false), factor(fact),
psi0(0), f0(0),
psinr(0), psini(0), fnr(0), fni(0),
I0(0), f(0), psi(0), I(0), I0(0), f(0), psi(0), I(0),
eqsubtract(0), linflag(0), tmode(0), bzero(0), rzero(0), F0(0), factor(fact), eqsubtract(0), linflag(0), nelms(0), tmode(0),
nelms(0), element_dimension(0), nplanes(0), reparameterize(false) bzero(0), rzero(0), F0(0)
{ {
vtkFieldData *fieldData = dataset->GetFieldData(); vtkFieldData *fieldData = dataset->GetFieldData();
......
...@@ -95,18 +95,18 @@ public: ...@@ -95,18 +95,18 @@ public:
// historyMask and the *Sample* member functions. // historyMask and the *Sample* member functions.
enum Attribute enum Attribute
{ {
SAMPLE_TIME = 0x000000000001, SAMPLE_TIME = 0x0001,
SAMPLE_POSITION = 0x000000000010, SAMPLE_POSITION = 0x0002,
SAMPLE_VELOCITY = 0x000000000100, SAMPLE_VELOCITY = 0x0004,
SAMPLE_VORTICITY = 0x000000001000, SAMPLE_VORTICITY = 0x0008,
SAMPLE_ARCLENGTH = 0x000000010000, SAMPLE_ARCLENGTH = 0x0010,
SAMPLE_VARIABLE = 0x000000100000, SAMPLE_VARIABLE = 0x0020,
SAMPLE_SECONDARY0 = 0x000001000000, SAMPLE_SECONDARY0 = 0x0040,
SAMPLE_SECONDARY1 = 0x000010000000, SAMPLE_SECONDARY1 = 0x0080,
SAMPLE_SECONDARY2 = 0x000100000000, SAMPLE_SECONDARY2 = 0x0100,
SAMPLE_SECONDARY3 = 0x001000000000, SAMPLE_SECONDARY3 = 0x0200,
SAMPLE_SECONDARY4 = 0x010000000000, SAMPLE_SECONDARY4 = 0x0400,
SAMPLE_SECONDARY5 = 0x100000000000, SAMPLE_SECONDARY5 = 0x0800,
}; };
struct Sample struct Sample
......
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