Commit 0385933e authored by ghweber's avatar ghweber
Browse files

Updated VisIt to use more recent version of BoxLib

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12670 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8527f638
......@@ -48,8 +48,8 @@ IF (WIN32)
SET_UP_THIRD_PARTY(BOXLIB2D lib/${VISIT_MSVC_VERSION} include boxlib2D)
SET_UP_THIRD_PARTY(BOXLIB3D lib/${VISIT_MSVC_VERSION} include boxlib3D)
ELSE (WIN32)
SET_UP_THIRD_PARTY(BOXLIB2D lib include/2D box2D)
SET_UP_THIRD_PARTY(BOXLIB3D lib include/3D box3D)
SET_UP_THIRD_PARTY(BOXLIB2D lib include box2D)
SET_UP_THIRD_PARTY(BOXLIB3D lib include box3D)
ENDIF (WIN32)
......@@ -67,8 +67,8 @@ VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON)
##
## Boxlib
##
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/boxlib/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_BOXLIB3D_DIR ${VISITHOME}/boxlib/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/boxlib/2010.10.01/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_BOXLIB3D_DIR ${VISITHOME}/boxlib/2010.10.01/${VISITARCH})
##
## CCMIO
......
......@@ -1160,6 +1160,9 @@ avtBoxlibFileFormat::GetDimensions(int *dims, double *lo, double *hi,
// Hank Childs, Wed Jul 7 16:15:36 PDT 2004
// Account for non 0-origin variables.
//
// Gunther H. Weber, Mon Oct 4 11:06:18 PDT 2010
// Only get reference to fab. (BoxLib no longer provides a copy constructor.
//
// ****************************************************************************
vtkDataArray *
......@@ -1196,7 +1199,7 @@ avtBoxlibFileFormat::GetVar(int patch, const char *var_name)
clearlist.push_back(compId);
// Get the data (an FArrayBox)
FArrayBox fab = vmf->GetFab(local_patch, compId);
const FArrayBox &fab = vmf->GetFab(local_patch, compId);
const int *len = fab.length();
int dims[BL_SPACEDIM];
......@@ -1260,7 +1263,6 @@ avtBoxlibFileFormat::GetVar(int patch, const char *var_name)
}
#endif
fab.clear();
return farr;
}
......@@ -1299,6 +1301,10 @@ avtBoxlibFileFormat::GetVar(int patch, const char *var_name)
// Kathleen Bonnell, Thu Sep 25 09:06:25 PDT 2008
// fab[2] doesn't exist for 2d case, so use 0 to initialzie fptr instead.
//
// Gunther H. Weber, Mon Oct 4 11:07:45 PDT 2010
// Work with pointers to fabs since BoxLib no longer provides copy
// construcotr.
//
// ****************************************************************************
vtkDataArray *
......@@ -1324,7 +1330,7 @@ avtBoxlibFileFormat::GetVectorVar(int patch, const char *var_name)
EXCEPTION1(InvalidVariableException, var_name);
// Get the data for the components (in FArrayBoxes).
vector<FArrayBox *> fab(dimension);
vector<const FArrayBox *> fab(dimension);
int i;
vector<int> compIdsList;
......@@ -1342,7 +1348,7 @@ avtBoxlibFileFormat::GetVectorVar(int patch, const char *var_name)
clearlist.push_back(compId);
VisMF *vmf = GetVisMF(mfIndex);
fab[i] = new FArrayBox(vmf->GetFab(local_patch, compId));
fab[i] = &vmf->GetFab(local_patch, compId);
compIdsList.push_back(compId);
vmfList.push_back(vmf);
}
......@@ -1421,12 +1427,6 @@ avtBoxlibFileFormat::GetVectorVar(int patch, const char *var_name)
}
#endif
for (i = 0; i < dimension; ++i)
{
fab[i]->clear();
delete fab[i];
}
return farr;
}
......
This diff is collapsed.
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