diff --git a/Post/AdaptiveViews.cpp b/Post/AdaptiveViews.cpp
index 1d6ff861361361e3b6d00c65bfffe1bf7815cdbd..628fc9dc38aa38cd1464e56a7a77830aef881042 100644
--- a/Post/AdaptiveViews.cpp
+++ b/Post/AdaptiveViews.cpp
@@ -193,8 +193,6 @@ void adapt_triangle::Recur_Create(adapt_triangle *t, int maxlevel, int level,
t->e[3] = t4;
}
-
-
void adapt_quad::Recur_Create(adapt_quad *q, int maxlevel, int level,
Double_Matrix *coeffs, Double_Matrix *eexps)
{
@@ -511,7 +509,6 @@ void adapt_triangle::Recur_Error(adapt_triangle *t, double AVG, double tol)
}
}
-
void adapt_quad::Recur_Error(adapt_quad *q, double AVG, double tol)
{
if(!q->e[0])
@@ -674,8 +671,6 @@ void adapt_hex::Recur_Error(adapt_hex *h, double AVG, double tol)
}
}
-static double t0, t1, t2, t3;
-
template < class ELEM >
int Adaptive_Post_View::zoomElement(int ielem,
int level,
@@ -688,8 +683,6 @@ int Adaptive_Post_View::zoomElement(int ielem,
typename std::set < adapt_point >::iterator it = adapt_point::all_points.begin();
typename std::set < adapt_point >::iterator ite = adapt_point::all_points.end();
- double c0 = Cpu();
-
const int N = _coefs->size1();
Double_Vector val(N), res(adapt_point::all_points.size());
@@ -724,8 +717,6 @@ int Adaptive_Post_View::zoomElement(int ielem,
_Geometry->mult(xyz, XYZ);
- double c1 = Cpu();
-
int kk = 0;
for(; it !=ite; ++it){
adapt_point *p = (adapt_point*) &(*it);
@@ -743,7 +734,6 @@ int Adaptive_Post_View::zoomElement(int ielem,
if(maxval < p->val) maxval = p->val;
kk++;
}
- double c2 = Cpu();
typename std::list<ELEM*>::iterator itt = ELEM::all_elems.begin();
typename std::list<ELEM*>::iterator itte = ELEM::all_elems.end();
@@ -759,7 +749,6 @@ int Adaptive_Post_View::zoomElement(int ielem,
if(plug)
plug->assignSpecificVisibility();
- double c3 = Cpu();
itt = ELEM::all_elems.begin();
for(; itt != itte; itt++) {
@@ -790,17 +779,9 @@ int Adaptive_Post_View::zoomElement(int ielem,
}
}
- double c4 = Cpu();
-
- t0 += c1 - c0;
- t1 += c2 - c1;
- t2 += c3 - c2;
- t3 += c4 - c3;
-
return 1;
}
-
/*
We first do the adaptive stuff at level 2 and will only process
elements that have reached the maximal recursion level
@@ -868,8 +849,6 @@ void Adaptive_Post_View::setAdaptiveResolutionLevel(PViewDataList *data, int lev
data->NbTimeStep = 1;
- t0 = t1 = t2 = t3 = 0;
-
while(1){
if(TYP == 7)
setAdaptiveResolutionLevel_TEMPL<adapt_edge>(level_act, level, plug,
@@ -894,7 +873,6 @@ void Adaptive_Post_View::setAdaptiveResolutionLevel(PViewDataList *data, int lev
&(data->SS), &(data->NbSS), done);
int nbDone = 0;
for(int i = 0; i < _STposX->size1(); ++i) nbDone += done[i];
- // printf("adaptive %d %d %d %d\n", level, level_act, nbDone, _STposX->size1());
if(nbDone == _STposX->size1()) break;
if(level_act >= level) break;
level_act++;
@@ -905,8 +883,7 @@ void Adaptive_Post_View::setAdaptiveResolutionLevel(PViewDataList *data, int lev
presentZoomLevel = level;
presentTol = tol;
- // printf("finished %g %g %g %g\n", t0, t1, t2, t3);
- delete[]done;
+ delete [] done;
}
template<class ELEM>
diff --git a/Post/AdaptiveViews.h b/Post/AdaptiveViews.h
index 1cf2c75731ed1094d420517db1b196c2e0cfe07e..23c178d15f455e2d49648a836cccf619d2afb079 100644
--- a/Post/AdaptiveViews.h
+++ b/Post/AdaptiveViews.h
@@ -43,10 +43,6 @@ class adapt_point
double shape_functions[128];
static adapt_point *New(double x, double y, double z,
Double_Matrix *coeffs, Double_Matrix *eexps);
- void print() const
- {
- printf("p %g %g\n", x, y);
- }
bool operator < (const adapt_point &other) const
{
if(other.x < x) return true;
@@ -78,10 +74,6 @@ class adapt_edge
sf[0] = (1 - u) / 2.;
sf[1] = (1 + u) / 2.;
}
- void print()
- {
- printf("p1 %g %g p2 %g %g\n", p[0]->x, p[0]->y, p[1]->x, p[1]->y);
- }
static void Create(int maxlevel, Double_Matrix *coeffs, Double_Matrix *eexps);
static void Recur_Create(adapt_edge *e, int maxlevel, int level,
Double_Matrix *coeffs, Double_Matrix *eexps);
@@ -115,11 +107,6 @@ class adapt_triangle
sf[1] = u;
sf[2] = v;
}
- void print()
- {
- printf("p1 %g %g p2 %g %g p3 %g %g\n",
- p[0]->x, p[0]->y, p[1]->x, p[1]->y, p[2]->x, p[2]->y);
- }
static void Create(int maxlevel, Double_Matrix *coeffs, Double_Matrix *eexps);
static void Recur_Create(adapt_triangle *t, int maxlevel, int level,
Double_Matrix *coeffs, Double_Matrix *eexps);
@@ -155,11 +142,6 @@ class adapt_quad
sf[2] = 0.25 * (1. + u) * (1. + v);
sf[3] = 0.25 * (1. - u) * (1. + v);
}
- void print ()
- {
- printf("p1 %g %g p2 %g %g p3 %g %g\n",
- p[0]->x, p[0]->y, p[1]->x, p[1]->y, p[2]->x, p[2]->y);
- }
static void Create(int maxlevel, Double_Matrix *coeffs, Double_Matrix *eexps);
static void Recur_Create(adapt_quad *q, int maxlevel, int level,
Double_Matrix *coeffs, Double_Matrix *eexps);
@@ -196,11 +178,6 @@ class adapt_tet
{
return (p[0]->val + p[1]->val + p[2]->val + p[3]->val) / 4.;
}
- void print()
- {
- printf("p1 %g %g p2 %g %g p3 %g %g\n",
- p[0]->x, p[0]->y, p[1]->x, p[1]->y, p[2]->x, p[2]->y);
- }
static void Create(int maxlevel, Double_Matrix *coeffs, Double_Matrix *eexps);
static void Recur_Create(adapt_tet *t, int maxlevel, int level,
Double_Matrix *coeffs, Double_Matrix *eexps);
@@ -247,11 +224,6 @@ class adapt_hex
return (p[0]->val + p[1]->val + p[2]->val+ p[3]->val +
p[4]->val + p[5]->val + p[6]->val+ p[7]->val) / 8.;
}
- void print()
- {
- printf("p1 %g %g p2 %g %g p3 %g %g\n",
- p[0]->x, p[0]->y, p[1]->x, p[1]->y, p[2]->x, p[2]->y);
- }
static void Create(int maxlevel, Double_Matrix *coeffs, Double_Matrix *eexps);
static void Recur_Create(adapt_hex *h, int maxlevel, int level,
Double_Matrix *coeffs, Double_Matrix *eexps);
@@ -270,20 +242,20 @@ class Adaptive_Post_View
double minval, maxval;
int presentZoomLevel;
double presentTol;
- Double_Matrix * _eexps;
- Double_Matrix * _coefs;
- Double_Matrix * _coefsGeom;
- Double_Matrix * _eexpsGeom;
- Double_Matrix * _STposX;
- Double_Matrix * _STposY;
- Double_Matrix * _STposZ;
- Double_Matrix * _STval;
+ Double_Matrix *_eexps;
+ Double_Matrix *_coefs;
+ Double_Matrix *_coefsGeom;
+ Double_Matrix *_eexpsGeom;
+ Double_Matrix *_STposX;
+ Double_Matrix *_STposY;
+ Double_Matrix *_STposZ;
+ Double_Matrix *_STval;
// for vectors
- Double_Matrix * _STvalX;
- Double_Matrix * _STvalY;
- Double_Matrix * _STvalZ;
- Double_Matrix * _Interpolate;
- Double_Matrix * _Geometry;
+ Double_Matrix *_STvalX;
+ Double_Matrix *_STvalY;
+ Double_Matrix *_STvalZ;
+ Double_Matrix *_Interpolate;
+ Double_Matrix *_Geometry;
public:
Adaptive_Post_View(PViewDataList *data, List_T *_coeffs, List_T *_eexps,
List_T *_coeffsGeom=0, List_T *_eexpsGeom=0);
diff --git a/Post/PViewDataList.h b/Post/PViewDataList.h
index 3fd82c689e71e1946a8114ed8508306e7014fb70..c00c815e870998f6b5657ca87ef2a83fe4e59bb4 100644
--- a/Post/PViewDataList.h
+++ b/Post/PViewDataList.h
@@ -24,8 +24,8 @@
#include <vector>
#include <string>
#include "PViewData.h"
-#include "SBoundingBox3d.h"
#include "AdaptiveViews.h"
+#include "SBoundingBox3d.h"
#include "List.h"
#define VAL_INF 1.e200