diff --git a/Common/Const.h b/Common/Const.h
index eaaf7fba3582ab10b80bfbb6607cb20933fcac04..12ba3f3c6b397ce3f72aab72b603ee60ce7c014d 100644
--- a/Common/Const.h
+++ b/Common/Const.h
@@ -1,7 +1,9 @@
-/* $Id: Const.h,v 1.2 2000-11-23 14:11:27 geuzaine Exp $ */
+/* $Id: Const.h,v 1.3 2000-11-23 16:07:07 geuzaine Exp $ */
#ifndef _CONSTS_H_
#define _CONSTS_H_
+#include <stdlib.h>
+
//#define RAND_LONG LC * ((rand()%1000)/1.E08)
//#define RAND_LONG LC * ((rand()%1000)/1.E08)/10.
@@ -11,19 +13,17 @@
//EPSILON_LONG in [0, LC/1.e12]
#define EPSILON_LC (LC/1.e12*rand()/RAND_MAX)
-#define RADTODEG 57.29578
-
#define TEXT_BUFFER_SIZE 1024
#define SELECTION_BUFFER_SIZE 1024
#define LABEL_STR_L 16
#define NAME_STR_L 256
#define MAX_OPEN_FILES 20
-#define RacineDeDeux 1.41421356237
-#define RacineDeTrois 1.73205080757
-#define Pi 3.14159265359
-#define Deux_Pi 6.28318530718
-#define UnTiers 0.33333333333
+#define RADTODEG 57.295779513082321
+#define RacineDeDeux 1.4142135623730950
+#define RacineDeTrois 1.7320508075688773
+#define Pi 3.1415926535897932
+#define Deux_Pi 6.2831853071795865
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)<(b))?(b):(a))
@@ -45,10 +45,9 @@
#define THRESHOLD(a,b,c) (((a)>(c))?(c):((a)<(b)?(b):(a)))
#define myhypot(a,b) (sqrt((a)*(a)+(b)*(b)))
-
-#define sign(x) (((x)>=0)?1:-1)
-#define Pred(x) ((x)->prev)
-#define Succ(x) ((x)->next)
-#define square(x) ((x)*(x))
+#define sign(x) (((x)>=0)?1:-1)
+#define Pred(x) ((x)->prev)
+#define Succ(x) ((x)->next)
+#define square(x) ((x)*(x))
#endif
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index 33055cfb9e84c3e6fe14a89c2630ad7d54b9d70e..d728692fca20f65be4b72d19a3d1c7523cf35e84 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-/* $Id: Mesh.cpp,v 1.3 2000-11-23 14:11:32 geuzaine Exp $ */
+/* $Id: Mesh.cpp,v 1.4 2000-11-23 16:07:11 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -362,9 +362,9 @@ void Draw_Simplex_Surfaces (void *a, void *b){
}
else {
K = 3;
- Xc = .333333333333 * ((*s)->V[0]->Pos.X + (*s)->V[1]->Pos.X + (*s)->V[2]->Pos.X);
- Yc = .333333333333 * ((*s)->V[0]->Pos.Y + (*s)->V[1]->Pos.Y + (*s)->V[2]->Pos.Y);
- Zc = .333333333333 * ((*s)->V[0]->Pos.Z + (*s)->V[1]->Pos.Z + (*s)->V[2]->Pos.Z);
+ Xc = ((*s)->V[0]->Pos.X + (*s)->V[1]->Pos.X + (*s)->V[2]->Pos.X) / 3. ;
+ Yc = ((*s)->V[0]->Pos.Y + (*s)->V[1]->Pos.Y + (*s)->V[2]->Pos.Y) / 3. ;
+ Zc = ((*s)->V[0]->Pos.Z + (*s)->V[1]->Pos.Z + (*s)->V[2]->Pos.Z) / 3. ;
}
k=0;
diff --git a/Mesh/2D_Mesh_Aniso.cpp b/Mesh/2D_Mesh_Aniso.cpp
index 98a9b2c151376ae46c00a5840acfec86caa888e2..50a1b58f62569e9f00c7ff744d39091fef462a9e 100644
--- a/Mesh/2D_Mesh_Aniso.cpp
+++ b/Mesh/2D_Mesh_Aniso.cpp
@@ -1,4 +1,4 @@
-/* $Id: 2D_Mesh_Aniso.cpp,v 1.4 2000-11-23 15:05:59 geuzaine Exp $ */
+/* $Id: 2D_Mesh_Aniso.cpp,v 1.5 2000-11-23 16:07:12 geuzaine Exp $ */
/*
Jean-Francois Remacle
@@ -867,7 +867,7 @@ void suppress_simplex_2D (void *data, void *dum){
Vertex * NewVertex_2D (Simplex * s){
Vertex *v;
double lc;
- lc = 0.333333333 * (s->V[0]->lc + s->V[1]->lc + s->V[2]->lc);
+ lc = (s->V[0]->lc + s->V[1]->lc + s->V[2]->lc) / 3. ;
//lc = DMIN(MAXIMUM_LC_FOR_SURFACE,lc);
diff --git a/Mesh/3D_BGMesh.cpp b/Mesh/3D_BGMesh.cpp
index ff49a064454444b89dcb187dd1039aaff5dc5678..9e7b0257ef388d0e2389bb7c3c48e7229c764bb7 100644
--- a/Mesh/3D_BGMesh.cpp
+++ b/Mesh/3D_BGMesh.cpp
@@ -1,4 +1,4 @@
-/* $Id: 3D_BGMesh.cpp,v 1.3 2000-11-23 14:11:34 geuzaine Exp $ */
+/* $Id: 3D_BGMesh.cpp,v 1.4 2000-11-23 16:07:12 geuzaine Exp $ */
#include "Gmsh.h"
#include "Mesh.h"
@@ -226,7 +226,7 @@ double ErrorInView (Post_View * ErrView, int *n){
for (i = 0; i < List_Nbr (ErrView->Triangles); i++){
List_Read (ErrView->Triangles, i, &t);
- e = (t.V[0] + t.V[1] + t.V[2]) * 0.33333333333;
+ e = (t.V[0] + t.V[1] + t.V[2]) / 3. ;
tot += e * e;
j++;
}
@@ -286,7 +286,7 @@ int CreateBGM (Post_View * ErrView, int OptiMethod, double Degree,
h[j + 1] = sqrt ((xc - t.X[0]) * (xc - t.X[0]) +
(yc - t.Y[0]) * (yc - t.Y[0]));
p[j + 1] = Degree;
- e[j + 1] = (t.V[0] + t.V[1] + t.V[2]) * 0.33333333333;
+ e[j + 1] = (t.V[0] + t.V[1] + t.V[2]) / 3. ;
j++;
}
diff --git a/Mesh/Numeric.cpp b/Mesh/Numeric.cpp
index 22e08e761d3d434162fd19ad45b215bcc60ffaec..09d988887911acf140e453d84a155364ef120704 100644
--- a/Mesh/Numeric.cpp
+++ b/Mesh/Numeric.cpp
@@ -1,4 +1,4 @@
-/* $Id: Numeric.cpp,v 1.2 2000-11-23 14:11:35 geuzaine Exp $ */
+/* $Id: Numeric.cpp,v 1.3 2000-11-23 16:07:12 geuzaine Exp $ */
#include "Gmsh.h"
#include "Const.h"
@@ -423,7 +423,7 @@ double angle_3pts (Vertex * a, Vertex * b, Vertex * c){
prosca = ((a->Pos.X - b->Pos.X) * (c->Pos.X - b->Pos.X) +
(a->Pos.Y - b->Pos.Y) * (c->Pos.Y - b->Pos.Y)) / L;
- angle = acos (prosca) * 180. / (3.1415926);
+ angle = acos (prosca) * 180. / Pi ;
return (angle);
}
diff --git a/Mesh/Simplex.cpp b/Mesh/Simplex.cpp
index 7044363a0d18e90147f1f62e790b3342a49b303c..c9c0f780d789b532b7146a858b2250f73ac8e22b 100644
--- a/Mesh/Simplex.cpp
+++ b/Mesh/Simplex.cpp
@@ -1,4 +1,4 @@
-/* $Id: Simplex.cpp,v 1.2 2000-11-23 14:11:35 geuzaine Exp $ */
+/* $Id: Simplex.cpp,v 1.3 2000-11-23 16:07:12 geuzaine Exp $ */
#include "Gmsh.h"
#include "Const.h"
@@ -220,7 +220,7 @@ double Simplex::EtaShapeMeasure (){
lij2 += DSQR (lij (i, j));
}
}
- return 12. * pow (9. * DSQR (fabs (Volume_Simplexe ())), 0.33333333) / (lij2);
+ return 12. * pow (9. * DSQR (fabs (Volume_Simplexe ())), 1./3.) / (lij2);
}
double Simplex::RhoShapeMeasure (){