From 141f12453e1004ee44592779ac8a993f316329b9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 20 Mar 2008 07:34:43 +0000
Subject: [PATCH] work on octree for model views
---
Plugin/Probe.cpp | 29 ++++----
Post/OctreePost.cpp | 141 ++++++++++++++++++++++++++++++---------
Post/OctreePost.h | 7 +-
Post/PViewDataGModel.cpp | 7 +-
Post/PViewDataGModel.h | 3 +
5 files changed, 140 insertions(+), 47 deletions(-)
diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp
index 1da81ddbcb..a975415ff8 100644
--- a/Plugin/Probe.cpp
+++ b/Plugin/Probe.cpp
@@ -1,4 +1,4 @@
-// $Id: Probe.cpp,v 1.19 2008-02-17 08:48:07 geuzaine Exp $
+// $Id: Probe.cpp,v 1.20 2008-03-20 07:34:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -162,22 +162,19 @@ PView *GMSH_ProbePlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewDataList *data1 = getDataList(v1);
- if(!data1) return v;
-
PView *v2 = new PView(true);
-
PViewDataList *data2 = getDataList(v2);
- if(!data2) return v;
- double *val = new double[9 * data1->getNumTimeSteps()];
+ int numSteps = v1->getData()->getNumTimeSteps();
+ double *val = new double[9 * numSteps];
+
OctreePost o(v1);
if(o.searchScalar(x, y, z, val)){
List_Add(data2->SP, &x);
List_Add(data2->SP, &y);
List_Add(data2->SP, &z);
- for(int i = 0; i < data1->getNumTimeSteps(); i++)
+ for(int i = 0; i < numSteps; i++)
List_Add(data2->SP, &val[i]);
data2->NbSP++;
}
@@ -186,7 +183,7 @@ PView *GMSH_ProbePlugin::execute(PView *v)
List_Add(data2->VP, &x);
List_Add(data2->VP, &y);
List_Add(data2->VP, &z);
- for(int i = 0; i < data1->getNumTimeSteps(); i++){
+ for(int i = 0; i < numSteps; i++){
for(int j = 0; j < 3; j++)
List_Add(data2->VP, &val[3*i+j]);
}
@@ -197,7 +194,7 @@ PView *GMSH_ProbePlugin::execute(PView *v)
List_Add(data2->TP, &x);
List_Add(data2->TP, &y);
List_Add(data2->TP, &z);
- for(int i = 0; i < data1->getNumTimeSteps(); i++){
+ for(int i = 0; i < numSteps; i++){
for(int j = 0; j < 9; j++)
List_Add(data2->TP, &val[9*i+j]);
}
@@ -206,11 +203,13 @@ PView *GMSH_ProbePlugin::execute(PView *v)
delete [] val;
- for(int i = 0; i < List_Nbr(data1->Time); i++)
- List_Add(data2->Time, List_Pointer(data1->Time, i));
- data2->setName(data1->getName() + "_Probe");
- data2->setFileName(data1->getName() + "_Probe.pos");
+ for(int i = 0; i < numSteps; i++){
+ double time = v1->getData()->getTime(i);
+ List_Add(data2->Time, &time);
+ }
+ data2->setName(v1->getData()->getName() + "_Probe");
+ data2->setFileName(v1->getData()->getName() + "_Probe.pos");
data2->finalize();
-
+
return v2;
}
diff --git a/Post/OctreePost.cpp b/Post/OctreePost.cpp
index 1b8e745a64..c820980141 100644
--- a/Post/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -1,4 +1,4 @@
-// $Id: OctreePost.cpp,v 1.4 2008-03-18 19:30:14 geuzaine Exp $
+// $Id: OctreePost.cpp,v 1.5 2008-03-20 07:34:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -28,6 +28,10 @@
#include "Numeric.h"
#include "Message.h"
#include "ShapeFunctions.h"
+#include "GModel.h"
+#include "MElement.h"
+
+// helper routines for list-based views
static void minmax(int n, double *X, double *Y, double *Z,
double *min, double *max)
@@ -215,6 +219,49 @@ static void addListOfStuff(Octree *o, List_T *l, int nbelm)
}
}
+// helper routines for GModel-based views
+
+void MElementBB(void *a, double *min, double *max)
+{
+ MElement *e = (MElement*)a;
+ MVertex *v = e->getVertex(0);
+ min[0] = max[0] = v->x();
+ min[1] = max[1] = v->y();
+ min[2] = max[2] = v->z();
+ for(int i = 1; i < e->getNumVertices(); i++){
+ v = e->getVertex(i);
+ min[0] = std::min(min[0], v->x()); max[0] = std::max(max[0], v->x());
+ min[1] = std::min(min[1], v->y()); max[1] = std::max(max[1], v->y());
+ min[2] = std::min(min[2], v->z()); max[2] = std::max(max[2], v->z());
+ }
+}
+
+void MElementCentroid(void *a, double *x)
+{
+ MElement *e = (MElement*)a;
+ MVertex *v = e->getVertex(0);
+ int n = e->getNumVertices();
+ x[0] = v->x(); x[1] = v->y(); x[2] = v->z();
+ for(int i = 1; i < n; i++) {
+ v = e->getVertex(i);
+ x[0] += v->x(); x[1] += v->y(); x[2] += v->z();
+ }
+ double oc = 1. / (double)n;
+ x[0] *= oc;
+ x[1] *= oc;
+ x[2] *= oc;
+}
+
+int MElementInEle(void *a, double *x)
+{
+ MElement *e = (MElement*)a;
+ double uvw[3];
+ e->xyz2uvw(x, uvw);
+ return e->isInside(uvw[0], uvw[1], uvw[2]) ? 1 : 0;
+}
+
+// OctreePost implementation
+
OctreePost::~OctreePost()
{
if(_ST) Octree_Delete(_ST); if(_VT) Octree_Delete(_VT); if(_TT) Octree_Delete(_TT);
@@ -229,7 +276,7 @@ OctreePost::~OctreePost()
OctreePost::OctreePost(PView *v)
: _ST(0), _VT(0), _TT(0), _SQ(0), _VQ(0), _TQ(0), _SS(0), _VS(0), _TS(0),
_SH(0), _VH(0), _TH(0), _SI(0), _VI(0), _TI(0), _SY(0), _VY(0), _TY(0),
- _GModel(0), _theView(v), _viewType(-1)
+ _GModel(0), _theView(v), _theViewDataList(0), _theViewDataGModel(0)
{
SBoundingBox3d bb = v->getData()->getBoundingBox();
@@ -241,10 +288,9 @@ OctreePost::OctreePost(PView *v)
const int maxElePerBucket = 100; // memory vs. speed trade-off
- PViewDataList *l = dynamic_cast<PViewDataList*>(_theView->getData());
- if(l){
- _viewType = 0;
-
+ _theViewDataList = dynamic_cast<PViewDataList*>(_theView->getData());
+ if(_theViewDataList){
+ PViewDataList *l = _theViewDataList;
_SL = Octree_Create(maxElePerBucket, min, size, linBB, linCentroid, linInEle);
addListOfStuff(_SL, l->SL, 6 + 2 * l->getNumTimeSteps());
Octree_Arrange(_SL);
@@ -315,15 +361,16 @@ OctreePost::OctreePost(PView *v)
addListOfStuff(_TY, l->TY, 15 + 45 * l->getNumTimeSteps());
Octree_Arrange(_TY);
}
-
- PViewDataGModel *g = dynamic_cast<PViewDataGModel*>(_theView->getData());
- if(g){
- _viewType = 1;
-
- //_GModel = Octree_Create(maxElePerBucket, min, size,
- // MElementBB, MElementCentroid, MElementInEle);
- // add MElement pointers in
- //Octree_Arrange(_GModel);
+ else{
+ _theViewDataGModel = dynamic_cast<PViewDataGModel*>(_theView->getData());
+ if(_theViewDataGModel){
+ _GModel = Octree_Create(maxElePerBucket, min, size,
+ MElementBB, MElementCentroid, MElementInEle);
+ for(int i = 0; i < _theViewDataGModel->getNumEntities(0); i++)
+ for(int j = 0; j < _theViewDataGModel->getEntity(0, i)->getNumMeshElements(); j++)
+ Octree_Insert(_theViewDataGModel->getEntity(0, i)->getMeshElement(j), _GModel);
+ Octree_Arrange(_GModel);
+ }
}
}
@@ -342,7 +389,7 @@ bool OctreePost::_getValue(void *in, int dim, int nbNod, int nbComp,
e->xyz2uvw(P, U);
if(step < 0){
- for(int i = 0; i < _theView->getData()->getNumTimeSteps(); i++)
+ for(int i = 0; i < _theViewDataList->getNumTimeSteps(); i++)
for(int j = 0; j < nbComp; j++)
values[nbComp * i + j] = e->interpolate(&V[nbNod * nbComp * i + j],
U[0], U[1], U[2], nbComp);
@@ -359,6 +406,43 @@ bool OctreePost::_getValue(void *in, int dim, int nbNod, int nbComp,
return true;
}
+bool OctreePost::_getValue(void *in, int nbComp, double P[3], int step, double *values,
+ double *elementSize)
+{
+ if(!in) return false;
+
+ if(_theViewDataGModel->getNumComponents(0, 0, 0) != nbComp) return false;
+
+ MElement *e = (MElement*)in;
+
+ if(e) printf("found ele %d!!\n", e->getNum());
+
+ int dataIndex[8];
+ for(int i = 0; i < e->getNumVertices(); i++){
+ dataIndex[i] = e->getVertex(i)->getDataIndex();
+ if(dataIndex[i] < 0) return false; // no data
+ }
+
+ double U[3];
+ e->xyz2uvw(P, U);
+ /*
+ if(step < 0){
+ for(int i = 0; i < _theViewDataGModel->getNumTimeSteps(); i++)
+ for(int j = 0; j < nbComp; j++)
+ values[nbComp * i + j] = e->interpolate(&V[nbNod * nbComp * i + j],
+ U[0], U[1], U[2], nbComp);
+ }
+ else{
+ for(int j = 0; j < nbComp; j++)
+ values[j] = e->interpolate(&V[nbNod * nbComp * step + j],
+ U[0], U[1], U[2], nbComp);
+ }
+ */
+
+ if(elementSize) *elementSize = e->maxEdge();
+ return true;
+}
+
bool OctreePost::searchScalar(double x, double y, double z, double *values,
int step, double *size)
{
@@ -370,7 +454,7 @@ bool OctreePost::searchScalar(double x, double y, double z, double *values,
else
values[0] = 0.0;
- if(_viewType == 0){
+ if(_theViewDataList){
if(_getValue(Octree_Search(P, _SS), 3, 4, 1, P, step, values, size)) return true;
if(_getValue(Octree_Search(P, _SH), 3, 8, 1, P, step, values, size)) return true;
if(_getValue(Octree_Search(P, _SI), 3, 6, 1, P, step, values, size)) return true;
@@ -379,11 +463,10 @@ bool OctreePost::searchScalar(double x, double y, double z, double *values,
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(_viewType == 1){
-
+ else if(_theViewDataGModel){
+ if(_getValue(Octree_Search(P, _GModel), 1, P, step, values, size)) return true;
}
-
+
return false;
}
@@ -399,7 +482,7 @@ bool OctreePost::searchVector(double x, double y, double z, double *values,
for(int i = 0; i < 3; i++)
values[i] = 0.0;
- if(_viewType == 0){
+ if(_theViewDataList){
if(_getValue(Octree_Search(P, _VS), 3, 4, 3, P, step, values, size)) return true;
if(_getValue(Octree_Search(P, _VH), 3, 8, 3, P, step, values, size)) return true;
if(_getValue(Octree_Search(P, _VI), 3, 6, 3, P, step, values, size)) return true;
@@ -408,9 +491,8 @@ bool OctreePost::searchVector(double x, double y, double z, double *values,
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(_viewType == 1){
-
+ else if(_theViewDataGModel){
+ if(_getValue(Octree_Search(P, _GModel), 3, P, step, values, size)) return true;
}
return false;
@@ -428,7 +510,7 @@ bool OctreePost::searchTensor(double x, double y, double z, double *values,
for(int i = 0; i < 9; i++)
values[i] = 0.0;
- if(_viewType == 0){
+ if(_theViewDataList){
if(_getValue(Octree_Search(P, _TS), 3, 4, 9, P, step, values, size)) return true;
if(_getValue(Octree_Search(P, _TH), 3, 8, 9, P, step, values, size)) return true;
if(_getValue(Octree_Search(P, _TI), 3, 6, 9, P, step, values, size)) return true;
@@ -437,10 +519,9 @@ bool OctreePost::searchTensor(double x, double y, double z, double *values,
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(_viewType == 1){
-
+ else if(_theViewDataGModel){
+ if(_getValue(Octree_Search(P, _GModel), 9, P, step, values, size)) return true;
}
-
+
return false;
}
diff --git a/Post/OctreePost.h b/Post/OctreePost.h
index b1e0911d24..cd8d008fb3 100644
--- a/Post/OctreePost.h
+++ b/Post/OctreePost.h
@@ -23,6 +23,8 @@
#include "Octree.h"
class PView;
+class PViewDataList;
+class PViewDataGModel;
class OctreePost
{
@@ -36,10 +38,13 @@ class OctreePost
Octree *_SY, *_VY, *_TY;
Octree *_GModel;
PView *_theView;
- int _viewType; // internal view type (0=list, 1=GModel)
+ PViewDataList *_theViewDataList;
+ PViewDataGModel *_theViewDataGModel;
bool _getValue(void *in, int dim, int nbNod, int nbComp,
double P[3], int step, double *values,
double *elementSize);
+ bool _getValue(void *in, int nbComp, double P[3], int step,
+ double *values, double *elementSize);
public :
OctreePost(PView *);
~OctreePost();
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index 18c546d578..40c2d457d3 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataGModel.cpp,v 1.30 2008-03-19 20:06:17 geuzaine Exp $
+// $Id: PViewDataGModel.cpp,v 1.31 2008-03-20 07:34:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -179,3 +179,8 @@ bool PViewDataGModel::hasMultipleMeshes()
if(m != _steps[i]->getModel()) return true;
return false;
}
+
+GEntity *PViewDataGModel::getEntity(int step, int ent)
+{
+ return _steps[step]->getEntity(ent);
+}
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index ab346132e2..5786be231d 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -151,6 +151,9 @@ class PViewDataGModel : public PViewData {
// create old-style list-based dataset from this one
//PViewDataList *convertToPViewDataList();
+ // acces GModel entities directly
+ GEntity *getEntity(int step, int ent);
+
// I/O routines
bool readMSH(std::string fileName, int fileIndex, FILE *fp, bool binary,
bool swap, int step, double time, int partition,
--
GitLab