diff --git a/Common/Main.cpp b/Common/Main.cpp
index 0389c1b9ebbfa1fddd5c189643e61de8bc4bc8f4..24f2b4a54f73056dd38291b512701ef657cc805d 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.2 2008-06-05 11:52:49 samtech Exp $
+// $Id: Main.cpp,v 1.3 2008-07-02 17:40:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -30,7 +30,10 @@ extern Context_T CTX;
int main(int argc, char *argv[])
{
- CTX.terminal = 1;
+ // print messages on stdout/stderr
+ CTX.terminal = 1;
+ // don't stop for questions (always return the default value)
+ CTX.nopopup = 1;
if(argc < 2){
Print_Usage(argv[0]);
diff --git a/Common/Message.cpp b/Common/Message.cpp
index 1b97705d7c7b3a93d41c90bd6fac3db5fd0ff602..f4862bda83700260f2b4a558c399c53309adaa27 100644
--- a/Common/Message.cpp
+++ b/Common/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.3 2008-06-27 18:00:51 geuzaine Exp $
+// $Id: Message.cpp,v 1.4 2008-07-02 17:40:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -463,7 +463,7 @@ double Message::GetValue(const char *text, double defaultval)
if(CTX.nopopup) return defaultval;
#if defined(HAVE_FLTK)
- if(WID && !CTX.batch){
+ if(!CTX.batch){
char defaultstr[256];
sprintf(defaultstr, "%.16g", defaultval);
const char *ret = fl_input(text, defaultstr);
@@ -474,7 +474,7 @@ double Message::GetValue(const char *text, double defaultval)
}
#endif
- printf("%s (default=%.16g): ", text, defaultval);
+ printf("%s (default=%.16g) ", text, defaultval);
char str[256];
char *ret = fgets(str, sizeof(str), stdin);
if(!ret || !strlen(str) || !strcmp(str, "\n"))
@@ -486,21 +486,28 @@ double Message::GetValue(const char *text, double defaultval)
bool Message::GetBinaryAnswer(const char *question, const char *yes,
const char *no, bool defaultval)
{
- if(CTX.nopopup || CTX.batch) return defaultval;
+ if(CTX.nopopup) return defaultval;
#if defined(HAVE_FLTK)
- if(fl_choice(question, no, yes, NULL))
- return true;
- else
- return false;
+ if(!CTX.batch){
+ if(fl_choice(question, no, yes, NULL))
+ return true;
+ else
+ return false;
+ }
#endif
- char answ[256];
while(1){
- printf("%s (%s/%s)", question, yes, no);
- scanf("%s ", answ);
- if(!strcmp(answ, yes)) return true;
- if(!strcmp(answ, no)) return false;
+ printf("%s\n\n[%s] or [%s]? (default=%s) ", question, yes, no,
+ defaultval ? yes : no);
+ char str[256];
+ char *ret = fgets(str, sizeof(str), stdin);
+ if(!ret || !strlen(str) || !strcmp(str, "\n"))
+ return defaultval;
+ else if(!strcmp(str, yes))
+ return true;
+ else if(!strcmp(str, no))
+ return false;
}
}
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index ee8f28bf3ea5d64dbe4c972590e82ecb0c44d635..30241dc5c7c44377892598652c893b3f003275b1 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,4 +1,4 @@
-// $Id: GModel.cpp,v 1.91 2008-07-01 15:11:38 geuzaine Exp $
+// $Id: GModel.cpp,v 1.92 2008-07-02 17:40:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -499,7 +499,7 @@ void GModel::getMeshVertices(int number, int dim, std::vector<MVertex*> &v)
sv.insert(g->mesh_vertices[0]);
}
else{
- for(int j = 0; j < entities[i]->getNumMeshElements(); j++){
+ for(unsigned int j = 0; j < entities[i]->getNumMeshElements(); j++){
MElement *e = entities[i]->getMeshElement(j);
for(int k = 0; k < e->getNumVertices(); k++)
sv.insert(e->getVertex(k));
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index 391287ee25123dbd73be1de81645e1f36a522fea..bc24ddd68067a4a5ae665a7b68d863a14115edea 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO_OCC.cpp,v 1.38 2008-07-01 15:11:38 geuzaine Exp $
+// $Id: GModelIO_OCC.cpp,v 1.39 2008-07-02 17:40:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -619,10 +619,10 @@ static void applyOCCMeshConstraints(GModel *m, const void *constraints)
ge->getEndVertex()->mesh_vertices[0]->setNum(nodeNum(n - 1));
// set the mesh on the edge
for(int i = 1; i < n - 1; i++){
- double u = nodePar.Value(i);
+ double u = nodePar(i);
GPoint p = ge->point(u);
MEdgeVertex *v = new MEdgeVertex(p.x(), p.y(), p.z(), ge, u);
- v->setNum(nodeNum.Value(i));
+ v->setNum(nodeNum(i));
ge->mesh_vertices.push_back(v);
}
for(unsigned int i = 0; i < ge->mesh_vertices.size() + 1; i++){
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 2a76b56134626737e768ab3a2e53dea19fcd64c8..4fd02a56719a121e192d836103d6dc3cf727c147 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -1,4 +1,4 @@
-// $Id: Geo.cpp,v 1.119 2008-07-01 14:24:07 geuzaine Exp $
+// $Id: Geo.cpp,v 1.120 2008-07-02 17:40:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -935,7 +935,6 @@ static Surface *DuplicateSurface(Surface *s)
{
Surface *ps;
Curve *c, *newc;
- int i;
ps = Create_Surface(NEWSURFACE(), 0);
CopySurface(s, ps);
@@ -949,7 +948,6 @@ static Surface *DuplicateSurface(Surface *s)
static void CopyVolume(Volume *v, Volume *vv)
{
- int i, j;
vv->Typ = v->Typ;
// We should not copy the meshing method (or the recombination
// status): if the meshes are to be copied, the meshing algorithm
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index cc9d7fec589969a98aa0441fee376650e5e04e67..7b8193c66fa8a1b8743b7b2e5077a7e7c06c3798 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -261,7 +261,7 @@ public:
}
if(f == _faces[0]) return _faces[1];
if(f == _faces[1]) return _faces[0];
- printf("otherFace wrong : the edge does not belong to the face \n",numfaces(),p1->iD,p2->iD);
+ printf("otherFace wrong : the edge does not belong to the face \n");
throw;
}
inline void del(BDS_Face *t)
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index bbd30fb241167b7e205a88dd22018dcddb58981f..d8bce170975a3453ccd441f7b6b0818226156c54 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataGModelIO.cpp,v 1.45 2008-05-04 08:31:24 geuzaine Exp $
+// $Id: PViewDataGModelIO.cpp,v 1.46 2008-07-02 17:40:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -38,7 +38,7 @@ bool PViewDataGModel::addNodalData(int step, double time, int partition,
_steps.push_back(new stepData<double>(GModel::current(), numComp));
int numEnt = _steps[step]->getModel()->getNumMeshVertices();
- if(nodalData.size() != numEnt * numComp){
+ if((int)nodalData.size() != numEnt * numComp){
Msg::Error("adding nodal data with wrong number of entries (%d != %d)",
nodalData.size(), numEnt);
return false;
diff --git a/benchmarks/bugs/bug_rabchevitch_optimize.geo b/benchmarks/bugs/bug_rabchevitch_optimize.geo
index 7a0fd63d2c85dbc9d7fb0e8a191e652f5f16dcfb..52af8ea9a11e1c10595644a83fc0f78cd0e30ae5 100644
--- a/benchmarks/bugs/bug_rabchevitch_optimize.geo
+++ b/benchmarks/bugs/bug_rabchevitch_optimize.geo
@@ -1,4 +1,6 @@
-// Gmsh project created on Thu Nov 01 10:31:41 2007
+// This is a case where Tetgen produces tests with ZERO volume, which
+// the optimizer fails to remove
+
//indenter which has a little blunt radius
diff --git a/benchmarks/bugs/cone_tronque_pb_netgen.igs b/benchmarks/bugs/cone_tronque_pb_netgen.igs
deleted file mode 100755
index ba46368f66367f5e30ebda796cc0a979c5428792..0000000000000000000000000000000000000000
--- a/benchmarks/bugs/cone_tronque_pb_netgen.igs
+++ /dev/null
@@ -1,303 +0,0 @@
-Translator GID - IGES S0000001
-1H,,1H;,3HGID,30HD:/IGES_DEPOT/cone_tronque.igs,,,32,,,,,,1,2,,1,0,,0,0,G0000001
-,5HCIMNE,9,,; G0000002
- 502 1 1 D0000001
- 502 2 1 VERTLIST D0000002
- 126 3 1 1 D0000003
- 126 3 NURBLINE 3D0000004
- 126 6 1 1 D0000005
- 126 3 NURBLINE 5D0000006
- 126 9 1 1 D0000007
- 126 3 NURBLINE 6D0000008
- 126 12 1 1 D0000009
- 126 65 NURBLINE 11D0000010
- 110 77 1 1 D0000011
- 110 1 STLINE 12D0000012
- 110 78 1 1 D0000013
- 110 1 STLINE 14D0000014
- 126 79 1 1 D0000015
- 126 67 NURBLINE 16D0000016
- 110 146 1 1 D0000017
- 110 1 STLINE 17D0000018
- 126 147 1 1 D0000019
- 126 65 NURBLINE 19D0000020
- 504 212 1 D0000021
- 504 2 1 EDGELIST D0000022
- 508 214 1 D0000023
- 508 1 1 LOOP D0000024
- 508 215 1 D0000025
- 508 1 1 LOOP D0000026
- 508 216 1 D0000027
- 508 1 1 LOOP D0000028
- 508 217 1 D0000029
- 508 1 1 LOOP D0000030
- 508 218 1 D0000031
- 508 1 1 LOOP D0000032
- 128 219 1 1 D0000033
- 128 2 NURBSURF 4D0000034
- 128 221 1 1 D0000035
- 128 4 NURBSURF 6D0000036
- 128 225 1 1 D0000037
- 128 5 NURBSURF 8D0000038
- 128 230 1 1 D0000039
- 128 5 NURBSURF 10D0000040
- 128 235 1 1 D0000041
- 128 2 NURBSURF 13D0000042
- 510 237 1 1 D0000043
- 510 1 1 FACE D0000044
- 510 238 1 1 D0000045
- 510 1 1 FACE D0000046
- 510 239 1 1 D0000047
- 510 1 1 FACE D0000048
- 510 240 1 1 D0000049
- 510 1 1 FACE D0000050
- 510 241 1 1 D0000051
- 510 1 1 FACE D0000052
- 514 242 1 1 D0000053
- 514 1 1 SHELL D0000054
- 186 243 1 D0000055
- 186 1 SOLID D0000056
-502,6,0,250,0,-216.50635,-125,0,216.50635,-125,0,0,125,500, 1P0000001
--108.25318,-62.5,500,108.25318,-62.5,500; 1P0000002
-126,4,2,0,0,0,0,0,0,0,0.7456669,0.7456669,1,1,1,1,0.70710678,1, 3P0000003
-0.96592583,1,0,250,0,-250,250,0,-250,0,0,-250,-66.987298,0, 3P0000004
--216.50635,-125,0,0,1,0,0,0; 3P0000005
-126,4,2,0,0,0,0,0,0,0,0.7456669,0.7456669,1,1,1,1,0.70710678,1, 5P0000006
-0.96592583,1,-216.50635,-125,0,-91.506351,-341.50635,0,125, 5P0000007
--216.50635,0,183.0127,-183.0127,0,216.50635,-125,0,0,1,0,0,0; 5P0000008
-126,4,2,0,0,0,0,0,0,0,0.7456669,0.7456669,1,1,1,1,0.70710678,1, 7P0000009
-0.96592583,1,216.50635,-125,0,341.50635,91.506351,0,125, 7P0000010
-216.50635,0,66.987298,250,0,1.145578E-013,250,0,0,1,0,0,0; 7P0000011
-126,102,3,0,0,1,0,0,0,0,0,0.0090909455,0.0182522,0.027482877, 9P0000012
-0.036782024,0.046148622,0.055581586,0.065079765,0.074641937, 9P0000013
-0.084266815,0.093953045,0.1036992,0.11350379,0.12336526, 9P0000014
-0.13328199,0.14325227,0.15327436,0.16334644,0.17346662, 9P0000015
-0.18363297,0.19384347,0.20409606,0.21438864,0.22471902, 9P0000016
-0.23508499,0.24548428,0.25591457,0.2663735,0.27685866, 9P0000017
-0.28736762,0.29789791,0.30844703,0.31901244,0.32959159, 9P0000018
-0.3401819,0.35078079,0.36138565,0.37199387,0.38260284, 9P0000019
-0.39320992,0.40381251,0.41440801,0.4249938,0.43556731, 9P0000020
-0.44612597,0.45666724,0.4671886,0.47768755,0.48816164, 9P0000021
-0.49860845,0.50902559,0.51941073,0.52976155,0.54007582, 9P0000022
-0.55035134,0.56058595,0.57077757,0.58092415,0.59102373, 9P0000023
-0.60107437,0.61107423,0.62102152,0.63091451,0.64075153, 9P0000024
-0.65053099,0.66025135,0.66991117,0.67950904,0.68904364, 9P0000025
-0.6985137,0.70791805,0.71725555,0.72652515,0.73572586, 9P0000026
-0.74485675,0.75421303,0.76395415,0.77371855,0.78350424, 9P0000027
-0.79330925,0.80313156,0.81296912,0.82281989,0.83268178, 9P0000028
-0.84255271,0.85243059,0.8623133,0.87219872,0.88208475, 9P0000029
-0.89196926,0.90185013,0.91172525,0.92159253,0.93144985, 9P0000030
-0.94129515,0.95112636,0.96094142,0.9707383,0.98051501, 9P0000031
-0.99026956,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 9P0000032
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 9P0000033
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 9P0000034
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,125,500,-0.9519841,125,500, 9P0000035
--2.3119309,124.98484,500,-4.8036948,124.91617,500,-7.1919738, 9P0000036
-124.80047,500,-9.6279189,124.63676,500,-12.068989,124.42407,500, 9P0000037
--14.525056,124.16148,500,-16.991723,123.84811,500,-19.468392, 9P0000038
-123.48314,500,-21.953366,123.06575,500,-24.445186,122.59523,500, 9P0000039
--26.942263,122.07087,500,-29.442984,121.49206,500,-31.945688, 9P0000040
-120.85821,500,-34.448671,120.16883,500,-36.950191,119.42348,500, 9P0000041
--39.448471,118.62177,500,-41.9417,117.76342,500,-44.428039, 9P0000042
-116.84819,500,-46.905622,115.87594,500,-49.372563,114.8466,500, 9P0000043
--51.826957,113.76018,500,-54.266886,112.61676,500,-56.690422, 9P0000044
-111.41653,500,-59.095633,110.15974,500,-61.480588,108.84675,500, 9P0000045
--63.843358,107.47799,500,-66.182025,106.05397,500,-68.494686, 9P0000046
-104.57531,500,-70.779456,103.0427,500,-73.034472,101.45691,500, 9P0000047
--75.257904,99.818808,500,-77.447951,98.129346,500,-79.602854, 9P0000048
-96.389551,500,-81.720894,94.600529,500,-83.800401,92.763468,500, 9P0000049
--85.839755,90.879629,500,-87.837393,88.950344,500,-89.791813, 9P0000050
-86.977017,500,-91.701574,84.961114,500,-93.565303,82.904167,500, 9P0000051
--95.381699,80.807761,500,-97.149531,78.67354,500,-98.867648, 9P0000052
-76.503196,500,-100.53498,74.298464,500,-102.15052,72.061123,500, 9P0000053
--103.71337,69.792988,500,-105.2227,67.495903,500,-106.67776, 9P0000054
-65.17174,500,-108.0779,62.822394,500,-109.42256,60.449775,500, 9P0000055
--110.71124,58.055806,500,-111.94356,55.642417,500,-113.1192, 9P0000056
-53.211541,500,-114.23794,50.765108,500,-115.29964,48.305043,500, 9P0000057
--116.30424,45.833257,500,-117.25176,43.35165,500,-118.14232, 9P0000058
-40.862098,500,-118.9761,38.366456,500,-119.75334,35.866551,500, 9P0000059
--120.4744,33.364181,500,-121.13965,30.861108,500,-121.74959, 9P0000060
-28.359056,500,-122.30473,25.859712,500,-122.80568,23.364718,500, 9P0000061
--123.25309,20.875672,500,-123.64767,18.394123,500,-123.99019, 9P0000062
-15.921572,500,-124.28144,13.459468,500,-124.5223,11.00921,500, 9P0000063
--124.71366,8.5721406,500,-124.85644,6.1495481,500,-124.95164, 9P0000064
-3.7426656,500,-125.00077,1.3268394,500,-125.00317,-1.136655,500, 9P0000065
--124.95525,-3.6549954,500,-124.85443,-6.2092779,500,-124.701, 9P0000066
--8.7665276,500,-124.49475,-11.32513,500,-124.23549,-13.883457, 9P0000067
-500,-123.92314,-16.43987,500,-123.55766,-18.99272,500,-123.1391, 9P0000068
--21.540356,500,-122.66755,-24.081126,500,-122.14319,-26.61338, 9P0000069
-500,-121.56626,-29.135475,500,-120.93708,-31.645778,500, 9P0000070
--120.25602,-34.142669,500,-119.52353,-36.624544,500,-118.74012, 9P0000071
--39.089819,500,-117.90636,-41.53694,500,-117.02289,-43.964359, 9P0000072
-500,-116.0904,-46.370628,500,-115.10975,-48.75408,500, 9P0000073
--114.08134,-51.114012,500,-113.00761,-53.446317,500,-111.88366, 9P0000074
--55.759741,500,-110.73215,-58.015398,500,-109.47343,-60.351805, 9P0000075
-500,-108.76265,-61.617562,500,-108.25318,-62.5,500,0,1,0,0,0; 9P0000076
-110,0,250,0,0,125,500; 11P0000077
-110,-216.50635,-125,0,-108.25318,-62.5,500; 13P0000078
-126,102,3,0,0,1,0,0,0,0,0,0.0090909455,0.0182522,0.027482877, 15P0000079
-0.036782024,0.046148622,0.055581586,0.065079765,0.074641937, 15P0000080
-0.084266815,0.093953045,0.1036992,0.11350379,0.12336526, 15P0000081
-0.13328199,0.14325227,0.15327436,0.16334644,0.17346662, 15P0000082
-0.18363297,0.19384347,0.20409606,0.21438864,0.22471902, 15P0000083
-0.23508499,0.24548428,0.25591457,0.2663735,0.27685866, 15P0000084
-0.28736762,0.29789791,0.30844703,0.31901244,0.32959159, 15P0000085
-0.3401819,0.35078079,0.36138565,0.37199387,0.38260284, 15P0000086
-0.39320992,0.40381251,0.41440801,0.4249938,0.43556731, 15P0000087
-0.44612597,0.45666724,0.4671886,0.47768755,0.48816164, 15P0000088
-0.49860845,0.50902559,0.51941073,0.52976155,0.54007582, 15P0000089
-0.55035134,0.56058595,0.57077757,0.58092415,0.59102373, 15P0000090
-0.60107437,0.61107423,0.62102152,0.63091451,0.64075153, 15P0000091
-0.65053099,0.66025135,0.66991117,0.67950904,0.68904364, 15P0000092
-0.6985137,0.70791805,0.71725555,0.72652515,0.73572586, 15P0000093
-0.74485675,0.75421303,0.76395415,0.77371855,0.78350424, 15P0000094
-0.79330925,0.80313156,0.81296912,0.82281989,0.83268178, 15P0000095
-0.84255271,0.85243059,0.8623133,0.87219872,0.88208475, 15P0000096
-0.89196926,0.90185013,0.91172525,0.92159253,0.93144985, 15P0000097
-0.94129515,0.95112636,0.96094142,0.9707383,0.98051501, 15P0000098
-0.99026956,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 15P0000099
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 15P0000100
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 15P0000101
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-108.25318,-62.5,500, 15P0000102
--107.77718,-63.324442,500,-107.08408,-64.494609,500,-105.77873, 15P0000103
--66.618206,500,-104.48439,-68.628669,500,-103.12464,-70.656402, 15P0000104
-500,-101.71991,-72.664085,500,-100.26447,-74.659807,500, 15P0000105
--98.759752,-76.639321,500,-97.205337,-78.60169,500,-95.601386, 15P0000106
--80.54505,500,-93.947989,-82.467766,500,-92.245345,-84.36812, 15P0000107
-500,-90.493715,-86.244401,500,-88.693438,-88.094883,500, 15P0000108
--86.844926,-89.91784,500,-84.948668,-91.711542,500,-83.005231, 15P0000109
--93.474263,500,-81.015262,-95.204287,500,-78.979484,-96.899907, 15P0000110
-500,-76.8987,-98.559432,500,-74.773793,-100.18119,500, 15P0000111
--72.605724,-101.76355,500,-70.395532,-103.30488,500,-68.144333, 15P0000112
--104.80361,500,-65.85332,-106.25819,500,-63.52376,-107.66713, 15P0000113
-500,-61.15699,-109.02896,500,-58.754422,-110.3423,500, 15P0000114
--56.317532,-111.60579,500,-53.847864,-112.81815,500,-51.347023, 15P0000115
--113.97816,500,-48.816672,-115.08466,500,-46.258531,-116.13657, 15P0000116
-500,-43.674372,-117.13287,500,-41.066014,-118.07263,500, 15P0000117
--38.43532,-118.95501,500,-35.78419,-119.77922,500,-33.114561, 15P0000118
--120.54459,500,-30.4284,-121.2505,500,-27.727697,-121.89645,500, 15P0000119
--25.014463,-122.48201,500,-22.290725,-123.00685,500,-19.558519, 15P0000120
--123.47073,500,-16.819887,-123.87349,500,-14.07687,-124.21507, 15P0000121
-500,-11.331504,-124.49551,500,-8.5858163,-124.71491,500, 15P0000122
--5.8418185,-124.87348,500,-3.1015028,-124.97152,500,-0.36683709, 15P0000123
--125.00941,500,2.3602391,-124.9876,500,5.0778192,-124.90665,500, 15P0000124
-7.7840337,-124.76718,500,10.477054,-124.56987,500,13.155096, 15P0000125
--124.31551,500,15.816424,-124.00494,500,18.459353,-123.63905, 15P0000126
-500,21.082251,-123.21883,500,23.683546,-122.7453,500,26.261723, 15P0000127
--122.21955,500,28.815327,-121.64271,500,31.342969,-121.01598, 15P0000128
-500,33.843323,-120.34057,500,36.31513,-119.61776,500,38.757198, 15P0000129
--118.84886,500,41.168401,-118.0352,500,43.547684,-117.17814,500, 15P0000130
-45.894059,-116.27909,500,48.206608,-115.33944,500,50.484481, 15P0000131
--114.36062,500,52.726895,-113.34408,500,54.933137,-112.29126, 15P0000132
-500,57.102557,-111.20363,500,59.234576,-110.08263,500,61.351307, 15P0000133
--108.91726,500,63.485955,-107.68759,500,65.642943,-106.38692, 15P0000134
-500,67.804606,-105.02247,500,69.942537,-103.61097,500,72.055224, 15P0000135
--102.15305,500,74.141172,-100.64936,500,76.198915,-99.100653, 15P0000136
-500,78.227009,-97.507716,500,80.224044,-95.871408,500,82.18864, 15P0000137
--94.192649,500,84.119457,-92.472414,500,86.015193,-90.711734, 15P0000138
-500,87.874589,-88.911695,500,89.69643,-87.073436,500,91.479551, 15P0000139
--85.198142,500,93.222835,-83.287048,500,94.925223,-81.34143,500, 15P0000140
-96.585699,-79.362619,500,98.203342,-77.351922,500,99.777147, 15P0000141
--75.310928,500,101.3067,-73.240331,500,102.78967,-71.144301,500, 15P0000142
-104.23118,-69.014217,500,105.60888,-66.889159,500,107.00291, 15P0000143
--64.630869,500,107.7437,-63.382436,500,108.25318,-62.5,500,0,1, 15P0000144
-0,0,0; 15P0000145
-110,216.50635,-125,0,108.25318,-62.5,500; 17P0000146
-126,102,3,0,0,1,0,0,0,0,0,0.0090909455,0.0182522,0.027482877, 19P0000147
-0.036782024,0.046148622,0.055581586,0.065079765,0.074641937, 19P0000148
-0.084266815,0.093953045,0.1036992,0.11350379,0.12336526, 19P0000149
-0.13328199,0.14325227,0.15327436,0.16334644,0.17346662, 19P0000150
-0.18363297,0.19384347,0.20409606,0.21438864,0.22471902, 19P0000151
-0.23508499,0.24548428,0.25591457,0.2663735,0.27685866, 19P0000152
-0.28736762,0.29789791,0.30844703,0.31901244,0.32959159, 19P0000153
-0.3401819,0.35078079,0.36138565,0.37199387,0.38260284, 19P0000154
-0.39320992,0.40381251,0.41440801,0.4249938,0.43556731, 19P0000155
-0.44612597,0.45666724,0.4671886,0.47768755,0.48816164, 19P0000156
-0.49860845,0.50902559,0.51941073,0.52976155,0.54007582, 19P0000157
-0.55035134,0.56058595,0.57077757,0.58092415,0.59102373, 19P0000158
-0.60107437,0.61107423,0.62102152,0.63091451,0.64075153, 19P0000159
-0.65053099,0.66025135,0.66991117,0.67950904,0.68904364, 19P0000160
-0.6985137,0.70791805,0.71725555,0.72652515,0.73572586, 19P0000161
-0.74485675,0.75421303,0.76395415,0.77371855,0.78350424, 19P0000162
-0.79330925,0.80313156,0.81296912,0.82281989,0.83268178, 19P0000163
-0.84255271,0.85243059,0.8623133,0.87219872,0.88208475, 19P0000164
-0.89196926,0.90185013,0.91172525,0.92159253,0.93144985, 19P0000165
-0.94129515,0.95112636,0.96094142,0.9707383,0.98051501, 19P0000166
-0.99026956,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 19P0000167
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 19P0000168
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 19P0000169
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,108.25318,-62.5,500,108.72917, 19P0000170
--61.675557,500,109.39601,-60.490228,500,110.58242,-58.297963, 19P0000171
-500,111.67637,-56.171805,500,112.75256,-53.980357,500,113.7889, 19P0000172
--51.759983,500,114.78952,-49.501672,500,115.75148,-47.208793, 19P0000173
-500,116.67373,-44.881446,500,117.55475,-42.520704,500,118.39317, 19P0000174
--40.127462,500,119.18761,-37.702752,500,119.9367,-35.247656,500, 19P0000175
-120.63913,-32.763329,500,121.2936,-30.250992,500,121.89886, 19P0000176
--27.711933,500,122.4537,-25.147507,500,122.95696,-22.559131,500, 19P0000177
-123.40752,-19.948286,500,123.80432,-17.316511,500,124.14636, 19P0000178
--14.665407,500,124.43268,-11.996626,500,124.66242,-9.3118781, 19P0000179
-500,124.83475,-6.6129189,500,124.94895,-3.9015525,500,125.00435, 19P0000180
--1.1796259,500,125.00035,1.550975,500,124.93645,4.2883288,500, 19P0000181
-124.81222,7.0304831,500,124.62732,9.775459,500,124.38149, 19P0000182
-12.521255,500,124.07458,15.265853,500,123.70648,18.00722,500, 19P0000183
-123.27723,20.743319,500,122.78691,23.472106,500,122.23572, 19P0000184
-26.191542,500,121.62394,28.899594,500,120.95195,31.594242,500, 19P0000185
-120.22021,34.273482,500,119.42927,36.935335,500,118.57977, 19P0000186
-39.577846,500,117.67242,42.199093,500,116.70805,44.797192,500, 19P0000187
-115.68754,47.370297,500,114.61185,49.916611,500,113.48202, 19P0000188
-52.434383,500,112.29918,54.921918,500,111.06451,57.377576,500, 19P0000189
-109.77926,59.79978,500,108.44474,62.187013,500,107.06232, 19P0000190
-64.537829,500,105.63342,66.850847,500,104.15953,69.124759,500, 19P0000191
-102.64215,71.358331,500,101.08284,73.550403,500,99.483212, 19P0000192
-75.699893,500,97.844883,77.805794,500,96.169511,79.86718,500, 19P0000193
-94.458776,81.883203,500,92.714373,83.853094,500,90.938016, 19P0000194
-85.776162,500,89.131426,87.651796,500,87.29633,89.479463,500, 19P0000195
-85.434457,91.258707,500,83.547533,92.989148,500,81.63728, 19P0000196
-94.67048,500,79.705408,96.302473,500,77.753614,97.884965,500, 19P0000197
-75.783579,99.417866,500,73.796964,100.90115,500,71.795407, 19P0000198
-102.33487,500,69.78052,103.71912,500,67.753887,105.05408,500, 19P0000199
-65.717063,106.33996,500,63.64946,107.59042,500,61.517211, 19P0000200
-108.82424,500,59.312306,110.04192,500,57.049821,111.23174,500, 19P0000201
-54.758466,112.3775,500,52.439523,113.47818,500,50.094319, 19P0000202
-114.53282,500,47.724226,115.54052,500,45.330654,116.50044,500, 19P0000203
-42.915053,117.41176,500,40.478907,118.27377,500,38.023731, 19P0000204
-119.08579,500,35.551069,119.84721,500,33.062492,120.55747,500, 19P0000205
-30.559592,121.2161,500,28.04398,121.82269,500,25.517282, 19P0000206
-122.37687,500,22.981133,122.87837,500,20.437195,123.32698,500, 19P0000207
-17.887059,123.72255,500,15.332603,124.06501,500,12.774636, 19P0000208
-124.35434,500,10.217936,124.59062,500,7.6524755,124.77396,500, 19P0000209
-5.1232682,124.90456,500,2.4705189,124.98267,500,1.0189504,125, 19P0000210
-500,0,125,500,0,1,0,0,0; 19P0000211
-504,9,3,1,1,1,2,5,1,2,1,3,7,1,3,1,1,9,1,4,1,5,11,1,1,1,4,13,1,2, 21P0000212
-1,5,15,1,5,1,6,17,1,3,1,6,19,1,6,1,4; 21P0000213
-508,3,0,21,3,1,0,0,21,1,1,0,0,21,2,1,0; 23P0000214
-508,4,0,21,1,0,0,0,21,5,1,0,0,21,4,1,0,0,21,6,0,0; 25P0000215
-508,4,0,21,2,0,0,0,21,6,1,0,0,21,7,1,0,0,21,8,0,0; 27P0000216
-508,4,0,21,3,0,0,0,21,8,1,0,0,21,9,1,0,0,21,5,0,0; 29P0000217
-508,3,0,21,9,0,0,0,21,7,0,0,0,21,4,0,0; 31P0000218
-128,1,1,1,1,0,0,1,0,0,0,0,1,1,0,0,1,1,1,1,1,1,-274.98929,275,0, 33P0000219
--274.98929,-275,0,274.98929,275,0,274.98929,-275,0,0,1,0,1; 33P0000220
-128,1,4,1,2,0,0,0,0,0,0,0,1,1,0,0,0,0.7456669,0.7456669,1,1,1,1, 35P0000221
-1,0.70710678,0.70710678,1,1,0.96592583,0.96592583,1,1,0,250,0,0, 35P0000222
-0,1000,-250,250,0,0,0,1000,-250,0,0,0,0,1000,-250,-66.987298,0, 35P0000223
-0,0,1000,-216.50635,-125,0,0,0,1000,0,1,0,1; 35P0000224
-128,1,4,1,2,0,0,0,0,0,0,0,1,1,0,0,0,0.7456669,0.7456669,1,1,1,1, 37P0000225
-1,0.70710678,0.70710678,1,1,0.96592583,0.96592583,1,1, 37P0000226
--216.50635,-125,0,0,0,1000,-91.506351,-341.50635,0,0,0,1000,125, 37P0000227
--216.50635,0,0,0,1000,183.0127,-183.0127,0,0,0,1000,216.50635, 37P0000228
--125,0,0,0,1000,0,1,0,1; 37P0000229
-128,1,4,1,2,0,0,0,0,0,0,0,1,1,0,0,0,0.7456669,0.7456669,1,1,1,1, 39P0000230
-1,0.70710678,0.70710678,1,1,0.96592583,0.96592583,1,1,216.50635, 39P0000231
--125,0,0,0,1000,341.50635,91.506351,0,0,0,1000,125,216.50635,0, 39P0000232
-0,0,1000,66.987298,250,0,0,0,1000,1.145578E-013,250,0,0,0,1000, 39P0000233
-0,1,0,1; 39P0000234
-128,1,1,1,1,0,0,1,0,0,0,0,1,1,0,0,1,1,1,1,1,1,250,-250,500,-250, 41P0000235
--250,500,250,250,500,-250,250,500,0,1,0,1; 41P0000236
-510,33,1,1,23; 43P0000237
-510,35,1,1,25; 45P0000238
-510,37,1,1,27; 47P0000239
-510,39,1,1,29; 49P0000240
-510,41,1,1,31; 51P0000241
-514,5,43,1,49,1,45,1,47,1,51,1; 53P0000242
-186,53,1,0; 55P0000243
-S0000001G0000002D0000056P0000243 T0000001
diff --git a/benchmarks/bugs/translate_circles.geo b/benchmarks/bugs/translate_circles.geo
deleted file mode 100644
index 6fe21b05e782092b2535ab1c8157ff3c0d3cba9f..0000000000000000000000000000000000000000
--- a/benchmarks/bugs/translate_circles.geo
+++ /dev/null
@@ -1,34 +0,0 @@
-mm=0.001;
-rh=8*mm;
-rc=30*mm;
-lc=3*mm;
-
-Point(1)={0,0,0,lc};
-Point(2)={0,rh,0,lc};
-Point(3)={0,-rh,0,lc};
-Point(4)={rh,0,0,lc};
-Point(5)={-rh,0,0,lc};
-
-Point(6)={0,rc,0,lc};
-Point(7)={0,-rc,0,lc};
-Point(8)={rc,0,0,lc};
-Point(9)={-rc,0,0,lc};
-
-Circle(1) = {5,1,2};
-Circle(2) = {2,1,4};
-Circle(3) = {4,1,3};
-Circle(4) = {3,1,5};
-Circle(5) = {9,1,6};
-Circle(6) = {6,1,8};
-Circle(7) = {8,1,7};
-Circle(8) = {7,1,9};
-Translate {20*mm,0,0} { Duplicata {Line{2,3,4,1};}}
-Rotate {{0,0,1}, {0,0,0}, Pi/3} { Duplicata { Line{9,10,11,12}; }}
-Rotate {{0,0,1}, {0,0,0}, Pi/3} {Duplicata { Line{16,13,14,15}; }}
-Rotate {{0,0,1}, {0,0,0}, Pi/3} {Duplicata { Line{17,18,19,20}; }}
-Rotate {{0,0,1}, {0,0,0}, Pi/3} {Duplicata { Line{24,23,22,21}; }}
-Rotate {{0,0,1}, {0,0,0}, Pi/3} {Duplicata { Line{28,25,26,27}; }}
-
-Dilate {{0,0,0}, 0.5} {Duplicata { Line{8,5,6,7}; }}
-
-Translate {0,0,30*mm} {Line{33};}//When I do this , lines 1,2,3,4 and 5,6,7,8 come along . Very strange ( penny lane)