Commit 6aad0638 authored by kgriffin's avatar kgriffin
Browse files

Merge from 2.10RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27930 18c085ea-50e0-402c-830e-de6fd14e8384
parent bc4fede7
...@@ -811,20 +811,15 @@ avtSPHResampleFilter::SampleNMS(vector<double>& scalarValues) ...@@ -811,20 +811,15 @@ avtSPHResampleFilter::SampleNMS(vector<double>& scalarValues)
vector<tensorStruct> m2(ntot); vector<tensorStruct> m2(ntot);
vector<double> A; // correction terms vector<double> A; // correction terms
vector<vector<double> > B; // correction terms vector<vector<double> > B; // correction terms
/*
vector<double> gradm0; scalarValues.resize(ntot, 0.0);
vector<tensorStruct> gradm1(ntot); m0.resize(ntot, 0.0);
vector<tensorStruct> gradm2(ntot); A.resize(ntot, 0.0);
*/
scalarValues = vector<double>();
for(int k=0;k<ntot;++k) for(int k=0;k<ntot;++k)
{ {
scalarValues.push_back(0.0);
m0.push_back(0.0);
m1.push_back(vector<double>(Dim,0.0)); m1.push_back(vector<double>(Dim,0.0));
A.push_back(0.0);
B.push_back(vector<double>(Dim,0.0)); B.push_back(vector<double>(Dim,0.0));
//gradm0.push_back(0.0);
} }
vtkDataArray *input_var = dset->GetPointData()->GetArray(varname.c_str()); vtkDataArray *input_var = dset->GetPointData()->GetArray(varname.c_str());
...@@ -1103,7 +1098,7 @@ avtSPHResampleFilter::SampleNMS(vector<double>& scalarValues) ...@@ -1103,7 +1098,7 @@ avtSPHResampleFilter::SampleNMS(vector<double>& scalarValues)
else else
{ // For processors without any datasets { // For processors without any datasets
#ifdef PARALLEL #ifdef PARALLEL
scalarValues = vector<double>(ntot, 0.0); scalarValues.resize(ntot, 0.0);
vector<double> m0(ntot, 0.0); // moments of data points vector<double> m0(ntot, 0.0); // moments of data points
vector<double> m1(Dim*ntot, 0.0); // data points? vector<double> m1(Dim*ntot, 0.0); // data points?
vector<double> m2(ntot*9, 0.0); vector<double> m2(ntot*9, 0.0);
...@@ -1508,7 +1503,7 @@ avtSPHResampleFilter::Sample(vector<double>& scalarValues) ...@@ -1508,7 +1503,7 @@ avtSPHResampleFilter::Sample(vector<double>& scalarValues)
int myRank = PAR_Rank(); int myRank = PAR_Rank();
vector<int> latticeIndexList(1, 0); vector<int> latticeIndexList(1, 0);
scalarValues = vector<double>(1, 0.0); scalarValues.resize(1, 0.0);
vector<double> m0(1, 0.0); // moments of data points vector<double> m0(1, 0.0); // moments of data points
vector<double> m1(Dim, 0.0); // data points? vector<double> m1(Dim, 0.0); // data points?
...@@ -2226,6 +2221,9 @@ avtSPHResampleFilter::UpdateDataObjectInfo(void) ...@@ -2226,6 +2221,9 @@ avtSPHResampleFilter::UpdateDataObjectInfo(void)
outAtts.GetDesiredDataExtents()->Set(range); outAtts.GetDesiredDataExtents()->Set(range);
} }
outAtts.RemoveVariable(supportVarName);
outAtts.RemoveVariable(weightVarName);
char params[200]; char params[200];
SNPRINTF(params, 200, "nx=%d ny=%d nz=%d", atts.GetXnum(), atts.GetYnum(), (spatialDim == 3 ? atts.GetZnum() : 0)); SNPRINTF(params, 200, "nx=%d ny=%d nz=%d", atts.GetXnum(), atts.GetYnum(), (spatialDim == 3 ? atts.GetZnum() : 0));
outAtts.AddFilterMetaData("SPH Resample", params); outAtts.AddFilterMetaData("SPH Resample", params);
......
...@@ -34,6 +34,7 @@ enhancements and bug-fixes that were added to this release.</p> ...@@ -34,6 +34,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Fixed bug whereby setting 'ssh command' would not work correctly on Windows. If path to ssh contains spaces, the full path and command need to be surrounded in double-quotes, eg <i>"C:\Program Files (x86)\Putty\plink.exe"</i>. If manually adding this to an .xml host profile, The quotes and path-separators should be escaped: <i>"\"C:\\Program Files (x86)\\Putty\\plink.exe\""</i></li> <li>Fixed bug whereby setting 'ssh command' would not work correctly on Windows. If path to ssh contains spaces, the full path and command need to be surrounded in double-quotes, eg <i>"C:\Program Files (x86)\Putty\plink.exe"</i>. If manually adding this to an .xml host profile, The quotes and path-separators should be escaped: <i>"\"C:\\Program Files (x86)\\Putty\\plink.exe\""</i></li>
<li>Fixed bug opening large (> 4gb) silo files on Windows.</li> <li>Fixed bug opening large (> 4gb) silo files on Windows.</li>
<li>Fixed the tensorVectorMult bug in the SPH Resample Operator found by Cody Raskin.</li> <li>Fixed the tensorVectorMult bug in the SPH Resample Operator found by Cody Raskin.</li>
<li>Fixed the contract and data info issues that prevented the SPH Resample Operator from working with the Volume Plot.</li>
</ul> </ul>
<a name="Enhancements"></a> <a name="Enhancements"></a>
......
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