diff --git a/Plugin/LevelsetPlugin.cpp b/Plugin/LevelsetPlugin.cpp
index c27fce0e9f76dad8db1c3dce2c39d2e0cb1d4377..cc0ae4eb2bef522897a7bafa12fca5cfbc7d0a37 100644
--- a/Plugin/LevelsetPlugin.cpp
+++ b/Plugin/LevelsetPlugin.cpp
@@ -1,4 +1,4 @@
-// $Id: LevelsetPlugin.cpp,v 1.25 2002-11-05 19:52:06 geuzaine Exp $
+// $Id: LevelsetPlugin.cpp,v 1.26 2003-01-20 23:30:32 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -51,120 +51,175 @@ void GMSH_LevelsetPlugin::Run ()
Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
{
- /*
- This plugin creates a new view which is the result of
- a cut of the actual view with a levelset.
- */
- int k,i,j,nb,edtet[6][2] = {{0,1},{0,2},{0,3},{1,2},{1,3},{2,3}};
+ // This plugin creates a new view which is the result of a cut of
+ // the actual view with a levelset.
+
+ int nb, singleOutputView=1, edtet[6][2] = {{0,1},{0,2},{0,3},{1,2},{1,3},{2,3}};
double *X, *Y, *Z, *Vals, levels[6], coef;
double Xp[6], Yp[6], Zp[6], myVals[6];
double Xpi[6], Ypi[6], Zpi[6], myValsi[6];
- Post_View *View;
-
- // for all scalar tets
+ double test;
+ Post_View *View[v->NbTimeStep];
if(v->NbSS){
- View = BeginView(1);
+
+ switch(_orientation){
+ case ORIENT_PLANE:
+ case ORIENT_SPHERE:
+ // We know the levelset is spatially "fixed", so we can create a
+ // single view for all time steps
+ singleOutputView = 1;
+ View[0] = BeginView(1);
+ break;
+ case ORIENT_MAP:
+ default:
+ // Each time step will give rise to a new view
+ singleOutputView = 0;
+ for(int ts=0 ; ts<v->NbTimeStep ; ts++)
+ View[ts] = BeginView(1);
+ break;
+ }
+
+ // for all scalar tets
nb = List_Nbr(v->SS) / v->NbSS ;
- for(i=0 ; i<List_Nbr(v->SS) ; i+=nb){
+ for(int i=0 ; i<List_Nbr(v->SS) ; i+=nb){
X = (double*)List_Pointer_Fast(v->SS,i);
Y = (double*)List_Pointer_Fast(v->SS,i+4);
Z = (double*)List_Pointer_Fast(v->SS,i+8);
- Vals = (double*)List_Pointer_Fast(v->SS,i+12);
- for(j=0 ; j<4 ; j++)
- levels[j] = levelset(X[j],Y[j],Z[j],Vals[j]);
- int nx = 0;
- for(k=0 ; k<6 ; k++){
- if(levels[edtet[k][0]] * levels[edtet[k][1]] <= 0.0){
- coef = InterpolateIso(X,Y,Z,levels,0.0,
- edtet[k][0],edtet[k][1],
- &Xp[nx],&Yp[nx],&Zp[nx]);
- myVals[nx] = what_to_draw (Xp[nx],Yp[nx],Zp[nx],
- edtet[k][0],edtet[k][1],coef,Vals);
- nx++;
- }
- }
-
- if(nx == 4){
- double xx = Xp[3];
- double yy = Yp[3];
- double zz = Zp[3];
- double vv = myVals[3];
- Xp[3] = Xp[2];
- Yp[3] = Yp[2];
- Zp[3] = Zp[2];
- myVals[3] = myVals[2];
- Xp[2] = xx;
- Yp[2] = yy;
- Zp[2] = zz;
- myVals[2] = vv;
- }
- if(nx == 3 || nx == 4){
- double v1[3] = {Xp[2]-Xp[0],Yp[2]-Yp[0],Zp[2]-Zp[0]};
- double v2[3] = {Xp[1]-Xp[0],Yp[1]-Yp[0],Zp[1]-Zp[0]};
- double gr[3];
- double n[3],test;
- prodve(v1,v2,n);
-
- switch(_orientation){
- case ORIENT_MAP:
- gradSimplex(X,Y,Z,Vals,gr);
- prosca(gr,n,&test);
- break;
- case ORIENT_PLANE:
- prosca(n,_ref,&test);
- break;
- case ORIENT_SPHERE:
- gr[0] = Xp[0]-_ref[0];
- gr[1] = Yp[0]-_ref[1];
- gr[2] = Zp[0]-_ref[2];
- prosca(gr,n,&test);
- break;
- default:
- test = 0.;
- break;
+ // for all time steps
+ for(int ts=0 ; ts<v->NbTimeStep ; ts++){
+ Vals = (double*)List_Pointer_Fast(v->SS,i+12+(4*ts));
+ for(int j=0 ; j<4 ; j++)
+ levels[j] = levelset(X[j],Y[j],Z[j],Vals[j]);
+ int nx = 0;
+ for(int k=0 ; k<6 ; k++){
+ if(levels[edtet[k][0]] * levels[edtet[k][1]] <= 0.0){
+ coef = InterpolateIso(X,Y,Z,levels,0.0,
+ edtet[k][0],edtet[k][1],
+ &Xp[nx],&Yp[nx],&Zp[nx]);
+ myVals[nx] = what_to_draw(Xp[nx],Yp[nx],Zp[nx],
+ edtet[k][0],edtet[k][1],coef,Vals);
+ nx++;
+ }
}
- if(test>0){
- for(k=0;k<nx;k++){
- Xpi[k] = Xp[k];
- Ypi[k] = Yp[k];
- Zpi[k] = Zp[k];
- myValsi[k] = myVals[k];
- }
- for(k=0;k<nx;k++){
- Xp[k] = Xpi[nx-k-1];
- Yp[k] = Ypi[nx-k-1];
- Zp[k] = Zpi[nx-k-1];
- myVals[k] = myValsi[nx-k-1];
- }
+ if(nx == 4){
+ double xx = Xp[3];
+ double yy = Yp[3];
+ double zz = Zp[3];
+ double vv = myVals[3];
+ Xp[3] = Xp[2];
+ Yp[3] = Yp[2];
+ Zp[3] = Zp[2];
+ myVals[3] = myVals[2];
+ Xp[2] = xx;
+ Yp[2] = yy;
+ Zp[2] = zz;
+ myVals[2] = vv;
}
- for(k=0 ; k<3 ; k++) List_Add(View->ST, &Xp[k]);
- for(k=0 ; k<3 ; k++) List_Add(View->ST, &Yp[k]);
- for(k=0 ; k<3 ; k++) List_Add(View->ST, &Zp[k]);
- for(k=0 ; k<3 ; k++) List_Add(View->ST, &myVals[k]);
- View->NbST++;
-
- if(nx == 4){
- for(k=2 ; k<5 ; k++) List_Add(View->ST, &Xp[k % 4]);
- for(k=2 ; k<5 ; k++) List_Add(View->ST, &Yp[k % 4]);
- for(k=2 ; k<5 ; k++) List_Add(View->ST, &Zp[k % 4]);
- for(k=2 ; k<5 ; k++) List_Add(View->ST, &myVals[k % 4]);
- View->NbST++;
+ if(nx == 3 || nx == 4){
+
+ if(!ts || !singleOutputView){ // test this only once for "fixed" views
+ double v1[3] = {Xp[2]-Xp[0],Yp[2]-Yp[0],Zp[2]-Zp[0]};
+ double v2[3] = {Xp[1]-Xp[0],Yp[1]-Yp[0],Zp[1]-Zp[0]};
+ double gr[3];
+ double n[3];
+ prodve(v1,v2,n);
+ switch(_orientation){
+ case ORIENT_MAP:
+ gradSimplex(X,Y,Z,Vals,gr);
+ prosca(gr,n,&test);
+ break;
+ case ORIENT_PLANE:
+ prosca(n,_ref,&test);
+ break;
+ case ORIENT_SPHERE:
+ gr[0] = Xp[0]-_ref[0];
+ gr[1] = Yp[0]-_ref[1];
+ gr[2] = Zp[0]-_ref[2];
+ prosca(gr,n,&test);
+ break;
+ default:
+ test = 0.;
+ break;
+ }
+ }
+
+ if(test>0){
+ for(int k=0;k<nx;k++){
+ Xpi[k] = Xp[k];
+ Ypi[k] = Yp[k];
+ Zpi[k] = Zp[k];
+ myValsi[k] = myVals[k];
+ }
+ for(int k=0;k<nx;k++){
+ Xp[k] = Xpi[nx-k-1];
+ Yp[k] = Ypi[nx-k-1];
+ Zp[k] = Zpi[nx-k-1];
+ myVals[k] = myValsi[nx-k-1];
+ }
+ }
+
+ if(singleOutputView){
+ if(nx == 3){
+ if(!ts){ // for the first time step only
+ for(int k=0 ; k<3 ; k++) List_Add(View[0]->ST, &Xp[k]);
+ for(int k=0 ; k<3 ; k++) List_Add(View[0]->ST, &Yp[k]);
+ for(int k=0 ; k<3 ; k++) List_Add(View[0]->ST, &Zp[k]);
+ View[0]->NbST++;
+ }
+ for(int k=0 ; k<3 ; k++) List_Add(View[0]->ST, &myVals[k]);
+ }
+ if(nx == 4){
+ if(!ts){ // for the first time step only
+ for(int k=0 ; k<4 ; k++) List_Add(View[0]->SQ, &Xp[k]);
+ for(int k=0 ; k<4 ; k++) List_Add(View[0]->SQ, &Yp[k]);
+ for(int k=0 ; k<4 ; k++) List_Add(View[0]->SQ, &Zp[k]);
+ View[0]->NbSQ++;
+ }
+ for(int k=0 ; k<4 ; k++) List_Add(View[0]->SQ, &myVals[k]);
+ }
+ }
+ else{
+ if(nx == 3){
+ for(int k=0 ; k<3 ; k++) List_Add(View[ts]->ST, &Xp[k]);
+ for(int k=0 ; k<3 ; k++) List_Add(View[ts]->ST, &Yp[k]);
+ for(int k=0 ; k<3 ; k++) List_Add(View[ts]->ST, &Zp[k]);
+ for(int k=0 ; k<3 ; k++) List_Add(View[ts]->ST, &myVals[k]);
+ View[ts]->NbST++;
+ }
+ if(nx == 4){
+ for(int k=0 ; k<4 ; k++) List_Add(View[ts]->SQ, &Xp[k]);
+ for(int k=0 ; k<4 ; k++) List_Add(View[ts]->SQ, &Yp[k]);
+ for(int k=0 ; k<4 ; k++) List_Add(View[ts]->SQ, &Zp[k]);
+ for(int k=0 ; k<4 ; k++) List_Add(View[ts]->SQ, &myVals[k]);
+ View[ts]->NbSQ++;
+ }
+ }
+
}
}
}
char name[1024],filename[1024];
- sprintf(name,"cut-%s",v->Name);
- sprintf(filename,"cut-%s",v->FileName);
- EndView(View, 1, filename, name);
-
- Msg(INFO, "Created view '%s' (%d triangles)", name, View->NbST);
- processed = View;
- return View;
+ if(singleOutputView){
+ sprintf(name,"cut-%s",v->Name);
+ sprintf(filename,"cut-%s",v->FileName);
+ EndView(View[0], 1, filename, name);
+ }
+ else{
+ for(int ts=0 ; ts<v->NbTimeStep ; ts++){
+ sprintf(name,"cut-%s-%d",v->Name, ts);
+ sprintf(filename,"cut-%s-%d",v->FileName, ts);
+ EndView(View[ts], 1, filename, name);
+ }
+ }
+
+ // a little bogus if multiple output views, but we don't use it anyway
+ processed = View[0];
+ return View[0];
}
return 0;
@@ -179,7 +234,7 @@ double GMSH_LevelsetPlugin::what_to_draw (double x, double y, double z,
int offset = _ith_field_to_draw_on_the_iso * 4;
// TEST JF, this would draw y coord on the iso
- // return y;
+ //return y;
p2 += offset;
p1 += offset;