Skip to content
Snippets Groups Projects
Commit ae3c3d11 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

reset default tolerance to smaller value

parent 72d74e42
No related branches found
No related tags found
No related merge requests found
...@@ -393,22 +393,8 @@ bool OctreePost::_getValue(void *in, int nbComp, double P[3], int timestep, ...@@ -393,22 +393,8 @@ bool OctreePost::_getValue(void *in, int nbComp, double P[3], int timestep,
return true; return true;
} }
bool OctreePost::searchScalar(double x, double y, double z, double *values, bool OctreePost::_searchScalar(double x, double y, double z, double *values,
int step, double *size) int step, double *size)
{
bool a = searchScalar_(x,y,z,values,step,size);
if (!a){
element::setTolerance(10.);
a = searchScalar_(x,y,z,values,step,size);
element::setTolerance(1.e-3);
}
if (!a)printf("cannot find %g %g %g\n",x,y,z);
return a;
}
bool OctreePost::searchScalar_(double x, double y, double z, double *values,
int step, double *size)
{ {
double P[3] = {x, y, z}; double P[3] = {x, y, z};
...@@ -438,6 +424,20 @@ bool OctreePost::searchScalar_(double x, double y, double z, double *values, ...@@ -438,6 +424,20 @@ bool OctreePost::searchScalar_(double x, double y, double z, double *values,
return false; return false;
} }
bool OctreePost::searchScalar(double x, double y, double z, double *values,
int step, double *size)
{
bool a = _searchScalar(x, y, z, values, step, size);
if (!a){
double oldeps = element::getTolerance();
element::setTolerance(10.);
a = _searchScalar(x, y, z, values, step, size);
element::setTolerance(oldeps);
}
if (!a) Msg::Debug("No element found containing point (%g,%g,%g)", x, y, z);
return a;
}
bool OctreePost::searchVector(double x, double y, double z, double *values, bool OctreePost::searchVector(double x, double y, double z, double *values,
int step, double *size) int step, double *size)
{ {
......
...@@ -30,8 +30,8 @@ class OctreePost ...@@ -30,8 +30,8 @@ class OctreePost
double *elementSize); double *elementSize);
bool _getValue(void *in, int nbComp, double P[3], int step, bool _getValue(void *in, int nbComp, double P[3], int step,
double *values, double *elementSize); double *values, double *elementSize);
bool searchScalar_(double x, double y, double z, double *values, bool _searchScalar(double x, double y, double z, double *values,
int step = -1, double *size = 0); int step = -1, double *size = 0);
public : public :
OctreePost(PView *); OctreePost(PView *);
~OctreePost(); ~OctreePost();
......
// Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
#include "shapeFunctions.h" #include "shapeFunctions.h"
double element::ONE = 1.+1.e-2;
double element::ZERO = -1.e-2; double element::ONE = 1. + 1.e-6;
double element::ZERO = -1.e-6;
...@@ -17,13 +17,8 @@ protected: ...@@ -17,13 +17,8 @@ protected:
static double ONE, ZERO; static double ONE, ZERO;
public: public:
element(double *x, double *y, double *z) : _x(x), _y(y), _z(z) {} element(double *x, double *y, double *z) : _x(x), _y(y), _z(z) {}
static void setTolerance (const double tol){ static void setTolerance (const double tol){ ONE = 1. + tol; ZERO = -tol; }
ONE = 1.+tol; static double getTolerance () { return -ZERO; }
ZERO = -tol;
}
static double getTolerance () {
return -ZERO;
}
virtual ~element(){} virtual ~element(){}
virtual int getDimension() = 0; virtual int getDimension() = 0;
virtual int getNumNodes() = 0; virtual int getNumNodes() = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment