Attached Files | vtkBiQuadraticQuadraticWedge.diff [^] (2,115 bytes) 2007-08-10 09:57 [Show Content] [Hide Content]Index: vtkBiQuadraticQuadraticWedge.cxx
===================================================================
RCS file: /cvsroot/VTK/VTK/Filtering/vtkBiQuadraticQuadraticWedge.cxx,v
retrieving revision 1.9
diff -u -r1.9 vtkBiQuadraticQuadraticWedge.cxx
--- vtkBiQuadraticQuadraticWedge.cxx 31 Jul 2006 22:18:16 -0000 1.9
+++ vtkBiQuadraticQuadraticWedge.cxx 10 Aug 2007 13:45:33 -0000
@@ -317,7 +317,7 @@
for (int j=0; j<6; j++) //for each point of wedge
{
this->Wedge->Points->SetPoint(j,this->Points->GetPoint(LinearWedges[i][j]));
- this->Wedge->PointIds->SetId(j,LinearWedges[i][j]);
+ this->Wedge->PointIds->SetId(j,this->PointIds->GetId(LinearWedges[i][j]));
this->Scalars->SetValue(j,cellScalars->GetTuple1(LinearWedges[i][j]));
}
this->Wedge->Contour(value,this->Scalars,locator,verts,lines,polys, inPd,outPd,inCd,cellId,outCd);
@@ -325,7 +325,7 @@
}
//----------------------------------------------------------------------------
-// Clip this quadratic wedge using scalar value provided. Like contouring,
+// Clip this biquadratic wedge using scalar value provided. Like contouring,
// except that it cuts the wedge to produce tetrahedra.
void
vtkBiQuadraticQuadraticWedge::Clip (double value, vtkDataArray *cellScalars,
@@ -339,7 +339,7 @@
for (int j=0; j<6; j++) //for each of the six vertices of the wedge
{
this->Wedge->Points->SetPoint(j,this->Points->GetPoint(LinearWedges[i][j]));
- this->Wedge->PointIds->SetId(j,LinearWedges[i][j]);
+ this->Wedge->PointIds->SetId(j,this->PointIds->GetId(LinearWedges[i][j]));
this->Scalars->SetValue(j,cellScalars->GetTuple1(LinearWedges[i][j]));
}
this->Wedge->Clip(value,this->Scalars,locator,tets,inPd,outPd, inCd,cellId,outCd,insideOut);
@@ -649,6 +649,9 @@
derivs[52] = (x + 1)*(y + 1) * (-2 * z);
derivs[53] = -(y + 1)*(x + y) * (-2 * z);
+ // we compute derivatives in [-1; 1] but we need them in [ 0; 1]
+ for(int i = 0; i < 54; i++)
+ derivs[i] *= 2;
}
//----------------------------------------------------------------------------
|