cleanup

Post/OctreePost.cpp

@@ -227,7 +227,7 @@ static void addListOfStuff(Octree *o, std::vector<double> &l, int nbelm)
 
 OctreePost::~OctreePost()
 {
-  Octree_Delete(_SP); Octree_Delete(_VP); Octree_Delete(_TP);
+  Octree_Delete(_SPP); Octree_Delete(_VPP); Octree_Delete(_TPP);
   Octree_Delete(_SL); Octree_Delete(_VL); Octree_Delete(_TL);
   Octree_Delete(_ST); Octree_Delete(_VT); Octree_Delete(_TT);
   Octree_Delete(_SQ); Octree_Delete(_VQ); Octree_Delete(_TQ);
@@ -249,7 +249,7 @@ OctreePost::OctreePost(PViewData *data)
 
 void OctreePost::_create(PViewData *data)
 {
-  _SP = _VP = _TP = _SL = _VL = _TL = _ST = _VT = _TT = 0;
+  _SPP = _VPP = _TPP = _SL = _VL = _TL = _ST = _VT = _TT = 0;
   _SQ = _VQ = _TQ = _SS = _VS = _TS = _SH = _VH = _TH = 0;
   _SI = _VI = _TI = _SY = _VY = _TY = 0;
   _theViewDataList = 0;
@@ -282,15 +282,15 @@ void OctreePost::_create(PViewData *data)
                       bbmax.z() - bbmin.z()};
     const int maxElePerBucket = 100; // memory vs. speed trade-off
 
-    _SP = Octree_Create(maxElePerBucket, min, size, pntBB, pntCentroid, pntInEle);
-    addListOfStuff(_SP, l->SP, 3 + 1 * l->getNumTimeSteps());
-    Octree_Arrange(_SP);
-    _VP = Octree_Create(maxElePerBucket, min, size, pntBB, pntCentroid, pntInEle);
-    addListOfStuff(_VP, l->VP, 3 + 3 * l->getNumTimeSteps());
-    Octree_Arrange(_VP);
-    _TP = Octree_Create(maxElePerBucket, min, size, pntBB, pntCentroid, pntInEle);
-    addListOfStuff(_TP, l->TP, 3 + 9 * l->getNumTimeSteps());
-    Octree_Arrange(_TP);
+    _SPP = Octree_Create(maxElePerBucket, min, size, pntBB, pntCentroid, pntInEle);
+    addListOfStuff(_SPP, l->SP, 3 + 1 * l->getNumTimeSteps());
+    Octree_Arrange(_SPP);
+    _VPP = Octree_Create(maxElePerBucket, min, size, pntBB, pntCentroid, pntInEle);
+    addListOfStuff(_VPP, l->VP, 3 + 3 * l->getNumTimeSteps());
+    Octree_Arrange(_VPP);
+    _TPP = Octree_Create(maxElePerBucket, min, size, pntBB, pntCentroid, pntInEle);
+    addListOfStuff(_TPP, l->TP, 3 + 9 * l->getNumTimeSteps());
+    Octree_Arrange(_TPP);
 
     _SL = Octree_Create(maxElePerBucket, min, size, linBB, linCentroid, linInEle);
     addListOfStuff(_SL, l->SL, 6 + 2 * l->getNumTimeSteps());
@@ -462,7 +462,7 @@ bool OctreePost::searchScalar(double x, double y, double z, double *values,
     if(_getValue(Octree_Search(P, _ST), 2, 3, 1, P, step, values, size)) return true;
     if(_getValue(Octree_Search(P, _SQ), 2, 4, 1, P, step, values, size)) return true;
     if(_getValue(Octree_Search(P, _SL), 1, 2, 1, P, step, values, size)) return true;
-    if(_getValue(Octree_Search(P, _SP), 0, 1, 1, P, step, values, size)) return true;
+    if(_getValue(Octree_Search(P, _SPP), 0, 1, 1, P, step, values, size)) return true;
   }
   else if(_theViewDataGModel){
     GModel *m = _theViewDataGModel->getModel((step < 0) ? 0 : step);
@@ -515,7 +515,7 @@ bool OctreePost::searchVector(double x, double y, double z, double *values,
     if(_getValue(Octree_Search(P, _VT), 2, 3, 3, P, step, values, size)) return true;
     if(_getValue(Octree_Search(P, _VQ), 2, 4, 3, P, step, values, size)) return true;
     if(_getValue(Octree_Search(P, _VL), 1, 2, 3, P, step, values, size)) return true;
-    if(_getValue(Octree_Search(P, _VP), 0, 1, 3, P, step, values, size)) return true;
+    if(_getValue(Octree_Search(P, _VPP), 0, 1, 3, P, step, values, size)) return true;
   }
   else if(_theViewDataGModel){
     GModel *m = _theViewDataGModel->getModel((step < 0) ? 0 : step);
@@ -552,7 +552,7 @@ bool OctreePost::searchTensor(double x, double y, double z, double *values,
     if(_getValue(Octree_Search(P, _TT), 2, 3, 9, P, step, values, size)) return true;
     if(_getValue(Octree_Search(P, _TQ), 2, 4, 9, P, step, values, size)) return true;
     if(_getValue(Octree_Search(P, _TL), 1, 2, 9, P, step, values, size)) return true;
-    if(_getValue(Octree_Search(P, _TP), 0, 1, 9, P, step, values, size)) return true;
+    if(_getValue(Octree_Search(P, _TPP), 0, 1, 9, P, step, values, size)) return true;
   }
   else if(_theViewDataGModel){
     GModel *m = _theViewDataGModel->getModel((step < 0) ? 0 : step);

Post/OctreePost.h

@@ -16,7 +16,7 @@ class PViewDataGModel;
 class OctreePost
 {
  private:
-  Octree *_SP, *_VP, *_TP;
+  Octree *_SPP, *_VPP, *_TPP; // _SP & co reserved by win32
   Octree *_SL, *_VL, *_TL;
   Octree *_ST, *_VT, *_TT;
   Octree *_SQ, *_VQ, *_TQ;