Commit b3dd6ace authored by whitlocb's avatar whitlocb

Windows fixes, plugin version fixes, warning fixes, lata fixes.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16821 18c085ea-50e0-402c-830e-de6fd14e8384
parent d9fe8134
......@@ -112,24 +112,24 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
MESSAGE(STATUS "Looking for Python")
FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
IF(WIN32)
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
${PYTHON_DIR}/lib
${PYTHON_DIR}/libs)
${PYTHON_DIR}/libs
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs)
ENDIF(WIN32)
FIND_LIBRARY(PYTHON_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
${PYTHON_DIR}/lib
${PYTHON_DIR}/libs
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
......@@ -162,7 +162,7 @@ FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
# not match the version from _CURRENT_VERSION so let's match again
# against the detected filename.
GET_FILENAME_COMPONENT(PYLIB ${PYTHON_LIBRARY} NAME)
FOREACH(CV 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
FOREACH(CV 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
SET(curPYLIB "libpython${CV}.")
IF(${PYLIB} MATCHES ${curPYLIB})
SET(PYTHON_VERSION ${CV})
......
#*****************************************************************************
#
# Copyright (c) 2000 - 2010, Lawrence Livermore National Security, LLC
# Copyright (c) 2000 - 2011, Lawrence Livermore National Security, LLC
# Produced at the Lawrence Livermore National Laboratory
# LLNL-CODE-400142
# All rights reserved.
......@@ -59,6 +59,12 @@
# Don't add VTK's MangledMesa directory to VTK_INCLUDE_DIRS unless VTK
# was built with MangledMesa.
#
# Brad Whitlock, Mon Nov 21 10:22:56 PST 2011
# Print out some variables that were supposed to have been set by the
# FindVTK.cmake routine so we know better what's going on. Also deal with
# the case where VTK has been installed normally (with vtk-5.8 subdirs)
# and change how Python filters are located on Windows.
#
#****************************************************************************/
INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
......@@ -69,11 +75,24 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
# We rely on FindVTK to set it to the right value.
SET(VTK_USE_MANGLED_MESA OFF CACHE INTERNAL "Set a cache variable that FindVTK can override")
SET(VTK_DIR ${VISIT_VTK_DIR}/lib)
IF(EXISTS ${VISIT_VTK_DIR}/lib/vtk-5.8)
SET(VTK_DIR ${VISIT_VTK_DIR}/lib/vtk-5.8)
ELSE(EXISTS ${VISIT_VTK_DIR}/lib/vtk-5.8)
SET(VTK_DIR ${VISIT_VTK_DIR}/lib)
ENDIF(EXISTS ${VISIT_VTK_DIR}/lib/vtk-5.8)
MESSAGE(STATUS "Checking for VTK in ${VTK_DIR}")
INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
MESSAGE(STATUS " VTK_FOUND=${VTK_FOUND}")
MESSAGE(STATUS " VTK_USE_FILE=${VTK_USE_FILE}")
MESSAGE(STATUS " VTK_MAJOR_VERSION=${VTK_MAJOR_VERSION}")
MESSAGE(STATUS " VTK_MINOR_VERSION=${VTK_MINOR_VERSION}")
MESSAGE(STATUS " VTK_BUILD_VERSION=${VTK_BUILD_VERSION}")
MESSAGE(STATUS " VTK_INCLUDE_DIRS=${VTK_INCLUDE_DIRS}")
MESSAGE(STATUS " VTK_LIBRARY_DIRS=${VTK_LIBRARY_DIRS}")
MESSAGE(STATUS " VTK_KITS=${VTK_KITS}")
# Set the VisIt mangled mesa off of the VTK mangled mesa variable.
IF("${VTK_USE_MANGLED_MESA}" STREQUAL "ON")
MESSAGE(STATUS "VTK uses mangled mesa")
......@@ -169,8 +188,9 @@ ENDFOREACH(X)
IF (NOT WIN32)
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
ELSE (NOT WIN32)
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS})
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
ENDIF (NOT WIN32)
MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
......
......@@ -745,7 +745,7 @@ avtScalarMetaData::AddEnumNameValue(std::string name, double val)
enumRanges.push_back(val);
enumRanges.push_back(val);
return enumNames.size() - 1;
return static_cast<int>(enumNames.size()) - 1;
}
// ****************************************************************************
......@@ -915,7 +915,7 @@ avtScalarMetaData::ComboValFromDigits(const std::vector<std::vector<int> > &ptMa
int row, col;
*id = 0.0;
std::list<int>::const_reverse_iterator it;
for (col = digits.size()-1, it = digits.rbegin(); col >= 0; col--, it++)
for (col = static_cast<int>(digits.size()-1), it = digits.rbegin(); col >= 0; col--, it++)
{
for (row = 0; row <= *it; row++)
*id += ptMap[row][col];
......
......@@ -816,7 +816,7 @@ avtSimulationInformation::RemoveGenericCommands(int index)
int
avtSimulationInformation::GetNumGenericCommands() const
{
return genericCommands.size();
return static_cast<int>(genericCommands.size());
}
// ****************************************************************************
......@@ -967,7 +967,7 @@ avtSimulationInformation::RemoveCustomCommands(int index)
int
avtSimulationInformation::GetNumCustomCommands() const
{
return customCommands.size();
return static_cast<int>(customCommands.size());
}
// ****************************************************************************
......
......@@ -597,7 +597,7 @@ avtSpeciesMetaData::RemoveSpecies(int index)
int
avtSpeciesMetaData::GetNumSpecies() const
{
return species.size();
return static_cast<int>(species.size());
}
// ****************************************************************************
......
......@@ -307,7 +307,7 @@ avtSIL::AddCollection(avtSILCollection_p c)
collections.push_back(c);
order.push_back(COLLECTION);
collTable.push_back((int)COLLECTION);
collTable.push_back(collections.size()-1);
collTable.push_back(static_cast<int>(collections.size())-1);
collTable.push_back(prevNumColl+1);
//
......@@ -396,7 +396,7 @@ avtSIL::AddSubset(avtSILSet_p s)
int prevNumSets = setTable[setTable.size()-1];
setTable.push_back((int)SUBSET);
setTable.push_back(sets.size());
setTable.push_back(static_cast<int>(sets.size()));
setTable.push_back(prevNumSets+1);
return AddSet(s);
......@@ -436,7 +436,7 @@ avtSIL::AddWhole(avtSILSet_p w)
{
int prevNumSets = setTable[setTable.size()-1];
setTable.push_back((int)SUBSET);
setTable.push_back(sets.size());
setTable.push_back(static_cast<int>(sets.size()));
setTable.push_back(prevNumSets+1);
int index = AddSet(w);
......@@ -517,12 +517,12 @@ avtSIL::AddArray(avtSILArray_p a)
int prevNumSets = setTable[setTable.size()-1];
setTable.push_back((int)ARRAY);
setTable.push_back(arrays.size()-1);
setTable.push_back(static_cast<int>(arrays.size())-1);
setTable.push_back(prevNumSets+a->GetNumSets());
int prevNumColl = collTable[collTable.size()-1];
collTable.push_back((int)ARRAY);
collTable.push_back(arrays.size()-1);
collTable.push_back(static_cast<int>(arrays.size())-1);
collTable.push_back(prevNumColl+1);
}
......@@ -556,8 +556,6 @@ avtSIL::AddArray(avtSILArray_p a)
void
avtSIL::AddMatrix(avtSILMatrix_p m)
{
int i;
int coll_count = GetNumCollections();
m->SetSIL(this);
......@@ -566,11 +564,11 @@ avtSIL::AddMatrix(avtSILMatrix_p m)
matrices.push_back(m);
const vector<int> &set1 = m->GetSet1();
int rowsize = set1.size();
size_t i, rowsize = set1.size();
for (i = 0 ; i < rowsize ; i++)
{
bool isTemp;
bool isTemp = false;
avtSILSet_p pSet = GetSILSet(set1[i], isTemp);
if (!isTemp)
pSet->AddMatrixMapOut(coll_count);
......@@ -578,7 +576,7 @@ avtSIL::AddMatrix(avtSILMatrix_p m)
}
const vector<int> &set2 = m->GetSet2();
int columnsize = set2.size();
size_t columnsize = set2.size();
for (i = 0 ; i < columnsize ; i++)
{
bool isTemp;
......@@ -592,12 +590,12 @@ avtSIL::AddMatrix(avtSILMatrix_p m)
int prevNumSets = setTable[setTable.size()-1];
setTable.push_back((int)MATRIX);
setTable.push_back(matrices.size()-1);
setTable.push_back(static_cast<int>(matrices.size())-1);
setTable.push_back(prevNumSets + m->GetNumSets());
int prevNumColl = collTable[collTable.size()-1];
collTable.push_back((int)MATRIX);
collTable.push_back(matrices.size()-1);
collTable.push_back(static_cast<int>(matrices.size())-1);
collTable.push_back(prevNumColl + m->GetNumCollections());
}
......@@ -1231,7 +1229,7 @@ avtSIL::MakeSILAttributes(void) const
//
// Add the sets.
//
int nSets = sets.size();
size_t nSets = sets.size();
rv->SetNSets(nSets);
vector<string> names;
vector<int> ids;
......@@ -1247,7 +1245,7 @@ avtSIL::MakeSILAttributes(void) const
//
// Add the collections.
//
int nCols = collections.size();
size_t nCols = collections.size();
rv->SetNCollections(nCols);
vector<string> cats;
vector<int> roles;
......@@ -1270,7 +1268,7 @@ avtSIL::MakeSILAttributes(void) const
//
// Add the matrices.
//
int nMatrices = matrices.size();
size_t nMatrices = matrices.size();
for (i = 0 ; i < nMatrices ; i++)
{
SILMatrixAttributes *atts = matrices[i]->MakeAttributes();
......@@ -1281,7 +1279,7 @@ avtSIL::MakeSILAttributes(void) const
//
// Add the arrays.
//
int nArrays = arrays.size();
size_t nArrays = arrays.size();
for (i = 0 ; i < nArrays ; i++)
{
SILArrayAttributes *atts = arrays[i]->MakeAttributes();
......@@ -1369,7 +1367,7 @@ avtSIL::Print(ostream &out,
}
}
int nColls = collections.size();
size_t nColls = collections.size();
useInfo = perCollInfo.size() == nColls;
for (i = 0 ; i < nColls ; i++)
{
......@@ -1403,7 +1401,7 @@ avtSIL::FindSet(int iSet, EntryType &outType,
int &outLocalIndex,
int &outLocalSubIndex) const
{
int min = 0, max = (setTable.size()-1)/3 - 1;
int min = 0, max = (static_cast<int>(setTable.size())-1)/3 - 1;
int mid = (min+max)/2;
while (min <= max)
......@@ -1452,7 +1450,7 @@ avtSIL::FindColl(int iColl, EntryType &outType,
int &outLocalIndex,
int &outLocalSubIndex) const
{
int min = 0, max = (collTable.size()-1)/3 - 1;
int min = 0, max = (static_cast<int>(collTable.size())-1)/3 - 1;
int mid = (min+max)/2;
while (min <= max)
......
......@@ -181,7 +181,7 @@ class DBATTS_API avtSIL
int AddSet(avtSILSet_p);
int GetNumRealSets() const
{ return sets.size(); };
{ return static_cast<int>(sets.size()); };
EntryType GetCollectionSource(int index,
avtSILArray_p &outArray,
avtSILMatrix_p &outMatrix, int &outIndex);
......
......@@ -133,7 +133,7 @@ avtSILEnumeratedNamespace::ContainsElement(int e) const
}
else if (sortedElems)
{
int min = 0, max = elements.size()-1;
int min = 0, max = static_cast<int>(elements.size())-1;
int mid = (max+min)/2;
while (min <= max)
{
......
......@@ -76,7 +76,7 @@ class DBATTS_API avtSILEnumeratedNamespace : public avtSILNamespace
virtual ~avtSILEnumeratedNamespace() {;};
virtual int GetNumberOfElements(void) const
{ return elements.size(); };
{ return static_cast<int>(elements.size()); };
virtual int GetElement(int idx) const
{ return elements[idx]; };
virtual NamespaceAttributes *GetAttributes(void) const;
......
......@@ -258,8 +258,8 @@ avtSILMatrix::Print(ostream &out) const
avtSILSet_p
avtSILMatrix::GetSILSet(int index) const
{
int row = index / set2.size();
int column = index % set2.size();
int row = index / static_cast<int>(set2.size());
int column = index % static_cast<int>(set2.size());
avtSILSet_p s1 = sil->GetSILSet(set1[row]);
avtSILSet_p s2 = sil->GetSILSet(set2[column]);
......@@ -269,7 +269,7 @@ avtSILMatrix::GetSILSet(int index) const
avtSILSet_p rv = new avtSILSet(name, s1->GetIdentifier());
rv->AddMapIn(collectionsStartAt+row);
rv->AddMapIn(collectionsStartAt+set1.size()+column);
rv->AddMapIn(collectionsStartAt+static_cast<int>(set1.size())+column);
return rv;
}
......@@ -289,7 +289,7 @@ avtSILMatrix::GetSILSet(int index) const
int
avtSILMatrix::GetSILSetID(int index) const
{
int row = index / set2.size();
size_t row = index / set2.size();
return sil->GetSILSetID(set1[row]);
}
......@@ -324,13 +324,13 @@ avtSILMatrix::GetSILCollection(int index) const
vector<int> s;
for (int i = 0 ; i < set2.size() ; i++)
{
s.push_back(setsStartAt + row*set2.size() + i);
s.push_back(setsStartAt + row*static_cast<int>(set2.size()) + i);
}
ens = new avtSILEnumeratedNamespace(s);
}
else
{
int column = index - set1.size();
int column = index - static_cast<int>(set1.size());
topset = set2[column];
name = category1;
......@@ -375,8 +375,8 @@ avtSILMatrix::GetSetState(const vector<unsigned char> &useSet, int index) const
int AllUsedCount = 0;
int AllUsedOtherProcCount = 0;
int set1size = set1.size();
int set2size = set2.size();
int set1size = static_cast<int>(set1.size());
int set2size = static_cast<int>(set2.size());
if (index < set1size)
{
......@@ -452,8 +452,8 @@ bool
avtSILMatrix::GetMaterialList(int index, MaterialList &matlist,
const vector<unsigned char> &useSet) const
{
int set1size = set1.size();
int set2size = set2.size();
int set1size = static_cast<int>(set1.size());
int set2size = static_cast<int>(set2.size());
int usedOne = 0;
int didntUseOne = 0;
......@@ -531,8 +531,8 @@ void
avtSILMatrix::TurnSet(vector<unsigned char> &useSet, int index,
SetState val, bool forLoadBalance) const
{
int set1size = set1.size();
int set2size = set2.size();
int set1size = static_cast<int>(set1.size());
int set2size = static_cast<int>(set2.size());
if (index < set1size)
{
......@@ -585,7 +585,7 @@ avtSILMatrix::TurnSet(vector<unsigned char> &useSet, int index,
int
avtSILMatrix::GetNumSets(void) const
{
return set1.size()*set2.size();
return static_cast<int>(set1.size()*set2.size());
}
......@@ -603,7 +603,7 @@ avtSILMatrix::GetNumSets(void) const
int
avtSILMatrix::GetNumCollections(void) const
{
return set1.size()+set2.size();
return static_cast<int>(set1.size()+set2.size());
}
......@@ -641,14 +641,14 @@ avtSILMatrix::SetIsInCollection(int set) const
if (set2IsSequential)
{
if (set2[0] <= set && set < set2[0]+set2.size())
return (GetStartCollection() + set1.size() + set - set2[0]);
return (GetStartCollection() + static_cast<int>(set1.size()) + set - set2[0]);
}
else
{
for (ii = 0; ii < set2.size(); ii++)
{
if (set2[ii] == set)
return (GetStartCollection() + set1.size() + ii);
return (GetStartCollection() + static_cast<int>(set1.size()) + ii);
}
}
return -1;
......
......@@ -482,7 +482,7 @@ avtSILRestriction::SetTopSet(int ts)
EXCEPTION2(BadIndexException, ts, ns);
}
int i, found = 0;
size_t i, found = 0;
for (i = 0 ; i < wholesList.size() && !found; i++)
{
if (wholesList[i] == ts)
......@@ -504,7 +504,7 @@ avtSILRestriction::SetTopSet(int ts)
//
// Turn off the other whole sets that were not selected as "top".
//
int listSize = wholesList.size();
size_t listSize = wholesList.size();
for (i = 0 ; i < listSize ; i++)
{
if (wholesList[i] != topSet)
......@@ -548,8 +548,8 @@ void
avtSILRestriction::SetTopSet(const char *meshname)
{
int setIndex = -1;
int listSize = wholesList.size();
for (int i = 0 ; i < listSize ; i++)
size_t listSize = wholesList.size();
for (size_t i = 0 ; i < listSize ; i++)
{
avtSILSet_p set = GetSILSet(wholesList[i]);
const string &str = set->GetName();
......@@ -1108,8 +1108,8 @@ avtSILRestriction::FastIntersect(avtSILRestriction_p silr)
{
if (useSet.size() != silr->useSet.size())
{
EXCEPTION2(IncompatibleDomainListsException, useSet.size(),
silr->useSet.size());
EXCEPTION2(IncompatibleDomainListsException, static_cast<int>(useSet.size()),
static_cast<int>(silr->useSet.size()));
}
//
......@@ -1123,8 +1123,8 @@ avtSILRestriction::FastIntersect(avtSILRestriction_p silr)
NoneUsed, SomeUsedOtherProc, SomeUsedOtherProc, SomeUsedOtherProc,
NoneUsed, SomeUsedOtherProc, AllUsedOtherProc, SomeUsedOtherProc, AllUsedOtherProc };
const int nsets = useSet.size();
for (int i = 0 ; i < nsets ; i++)
size_t nsets = useSet.size();
for (size_t i = 0 ; i < nsets ; i++)
{
int index = (STATE_INDEX(useSet[i]) * 5) +
STATE_INDEX(silr->useSet[i]);
......@@ -1171,8 +1171,8 @@ avtSILRestriction::Union(avtSILRestriction_p silr)
{
if (useSet.size() != silr->useSet.size())
{
EXCEPTION2(IncompatibleDomainListsException, useSet.size(),
silr->useSet.size());
EXCEPTION2(IncompatibleDomainListsException, static_cast<int>(useSet.size()),
static_cast<int>(silr->useSet.size()));
}
//
......
......@@ -1086,7 +1086,7 @@ avtSILRestrictionTraverser::AddMaterialList(int chunk, MaterialList &l,
{
materialListForChunk.push_back(-1);
}
materialListForChunk[chunk] = materialList.size();
materialListForChunk[chunk] = static_cast<int>(materialList.size());
materialList.push_back(l);
shouldMatSelect.push_back(shouldMatSel);
}
......
......@@ -510,12 +510,12 @@ template <class iT>
static iT *
BuildMappedArray(const iT *const ibuf, int ncomps, const vector<int> &valsToMap)
{
const int nvals = valsToMap.size();
size_t nvals = valsToMap.size();
// we use malloc here because we'll assign the data to vtkDataArray using
// SetVoidArray and, upon deletion, that assumes malloc was used
iT *rbuf = (iT *) malloc(nvals * ncomps * sizeof(iT));
for (int i = 0; i < nvals; i++)
for (size_t i = 0; i < nvals; i++)
{
for (int j = 0; j < ncomps; j++)
rbuf[i*ncomps+j] = ibuf[valsToMap[i]*ncomps+j];
......@@ -540,7 +540,7 @@ BuildMappedArray(const iT *const ibuf, int ncomps, const vector<int> &valsToMap)
static vtkDataArray *
BuildMappedArray(vtkDataArray *da, const vector<int> &valsToMap)
{
const int nvals = valsToMap.size();
const int nvals = static_cast<int>(valsToMap.size());
const int ncomps = da->GetNumberOfComponents();
const void *buf = da->GetVoidPointer(0);
vtkDataArray *rv;
......
......@@ -77,7 +77,7 @@ public:
void PushName(std::string s) {name_stack.push_back(s);}
std::string PopName();
int GetNumNames(void) const { return name_stack.size(); };
int GetNumNames(void) const { return static_cast<int>(name_stack.size()); };
void SetDataObject(avtDataObject_p d) {dataObject = d;}
avtDataObject_p GetDataObject() {return dataObject;}
......
......@@ -789,7 +789,7 @@ avtFunctionExpr::CreateFilters(ExprPipelineState *state)
// Take the stack of variable names and feed them to the function in
// reverse order.
int size = inputStack.size();
int size = static_cast<int>(inputStack.size());
for (i = 0; i < size; i++)
{
string inputName = inputStack.back();
......
......@@ -176,7 +176,7 @@ avtCylindricalRadiusExpression::ProcessArguments
// Check the number of arguments
std::vector<ArgExpr*> *arguments = args->GetArgs();
int nargs = arguments->size();
size_t nargs = arguments->size();
if (nargs == 0)
{
EXCEPTION2(ExpressionException, outputVariableName,
......
......@@ -3194,7 +3194,7 @@ CCalculateHistogram(avtDataRepresentation &data, void *args, bool &errOccurred)
}
int ntups = arr->GetNumberOfTuples();
int nbins = cha->numVals.size();
int nbins = static_cast<int>(cha->numVals.size());
double min = cha->min;
double max = cha->max;
VISIT_LONG_LONG *numVals = &(cha->numVals[0]);
......
......@@ -180,8 +180,8 @@ avtCompositeRF::GetRayValue(const avtRay *ray,
const float *sample = ray->sample[colorVariableIndex];
const float *sample2 = ray->sample[opacityVariableIndex];
const float *weight = NULL;
float min_weight = 0.;
float min_weight_denom = 0.;
double min_weight = 0.;
double min_weight_denom = 0.;
if (weightVariableIndex >= 0)
{
weight = ray->sample[weightVariableIndex];
......
......@@ -249,7 +249,7 @@ avtDataAttributes::avtDataAttributes() : plotInfoAtts()
{
for (int j=0; j<3; j++)
{
unitCellVectors[i*3+j] = (i==j) ? 1.0 : 0.0;
unitCellVectors[i*3+j] = (i==j) ? 1.f : 0.f;
}
}
unitCellOrigin[0] = unitCellOrigin[1] = unitCellOrigin[2] = 0.0;
......@@ -2788,7 +2788,7 @@ avtDataAttributes::Write(avtDataObjectString &str,