diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index a6f04061479fa4efd48f810ab30180a20720f80a..baf263fd1489a472f0dbffc541ec9ec0c7e02b65 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1,4 +1,4 @@
-// $Id: HighOrder.cpp,v 1.21 2008-02-21 12:11:12 geuzaine Exp $
+// $Id: HighOrder.cpp,v 1.22 2008-02-21 13:44:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -116,8 +116,6 @@ bool computeEquidistantParameters(GEdge *ge, double u0, double uN, int N, double
int iter = 1;
- double L[100];
-
while (iter < MAX_ITER){
iter++;
myresid(N, ge, u, R);
@@ -196,8 +194,6 @@ bool computeEquidistantParameters(GFace *gf, double u0, double uN, double v0, do
int iter = 1 ;
- double L[100];
-
while (iter < MAX_ITER){
iter++ ;
myresid(N, gf, u, v, R);
@@ -344,8 +340,6 @@ void getEdgeVertices(GFace *gf, MElement *ele, std::vector<MVertex*> &ve,
v = new MVertex(pc.x(), pc.y(), pc.z(), gf);
}
else{
- double uc = (1. - t) * p0[0] + t * p1[0];
- double vc = (1. - t) * p0[1] + t * p1[1];
GPoint pc = gf->point(US[j+1], VS[j+1]);
v = new MFaceVertex(pc.x(), pc.y(), pc.z(), gf, US[j+1], VS[j+1]);
}
@@ -1201,8 +1195,6 @@ void printJacobians(GModel *m, const char *nm)
FILE *f = fopen(nm,"w");
fprintf(f,"View \"\"{\n");
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
- double minJ = 1.e22;
- double maxJ = -1.e22;
for(unsigned int i = 0; i < (*it)->triangles.size(); i++){
MTriangle *t = (*it)->triangles[i];
double mat[2][3];
diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp
index 3901a702d74fe51537b80d96e3b58132947a7b02..9f463bb302a7968a0317b66e5b89c2c36c0959f5 100644
--- a/Mesh/qualityMeasures.cpp
+++ b/Mesh/qualityMeasures.cpp
@@ -1,4 +1,4 @@
-// $Id: qualityMeasures.cpp,v 1.9 2008-02-21 12:11:12 geuzaine Exp $
+// $Id: qualityMeasures.cpp,v 1.10 2008-02-21 13:44:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -67,10 +67,6 @@ double qmTriangle(const double &xa, const double &ya, const double &za,
double b [3] = {xa-xc,ya-yc,za-zc};
double c [3] = {xb-xa,yb-ya,zb-za};
- const double la = norme (a);
- const double lb = norme (b);
- const double lc = norme (c);
-
double pva [3]; prodve(b,c,pva); const double sina = norm3(pva);
double pvb [3]; prodve(c,a,pvb); const double sinb = norm3(pvb);
double pvc [3]; prodve(a,b,pvc); const double sinc = norm3(pvc);
@@ -85,9 +81,9 @@ double qmTriangle(const double &xa, const double &ya, const double &za,
double a [3] = {xc-xa,yc-ya,zc-za};
double b [3] = {xb-xa,yb-ya,zb-za};
double c [3] ; prodve(a,b,c); norme(c);
- double A[3][3] = {a[0] , b[0] , c[0] ,
- a[1] , b[1] , c[1] ,
- a[2] , b[2] , c[2]};
+ double A[3][3] = {{a[0] , b[0] , c[0]} ,
+ {a[1] , b[1] , c[1]} ,
+ {a[2] , b[2] , c[2]}};
quality = -1;
}
break;
diff --git a/Numeric/FunctionSpace.cpp b/Numeric/FunctionSpace.cpp
index b0dc408b15e8dd03ec26057f4b2f8935706ea2ce..e95ea074491e741cc156e3dbc13a8d2c2940aff9 100644
--- a/Numeric/FunctionSpace.cpp
+++ b/Numeric/FunctionSpace.cpp
@@ -1,4 +1,4 @@
-// $Id: FunctionSpace.cpp,v 1.2 2008-02-21 12:11:12 geuzaine Exp $
+// $Id: FunctionSpace.cpp,v 1.3 2008-02-21 13:44:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -423,7 +423,7 @@ Double_Matrix gmshGeneratePointsTetrahedron(int order, bool serendip)
if (!serendip && order > 3) {
Double_Matrix interior = gmshGeneratePointsTetrahedron(order - 4, false);
- for (size_t k = 0; k < interior.size1(); k++) {
+ for (int k = 0; k < interior.size1(); k++) {
point(ns + k, 0) = 1. + interior(k, 0) * (order - 4);
point(ns + k, 1) = 1. + interior(k, 1) * (order - 4);
point(ns + k, 2) = 1. + interior(k, 2) * (order - 4);
diff --git a/Numeric/gsl_min.cpp b/Numeric/gsl_min.cpp
index 132732366ac0fda5eff3e763b2fa538068b45a02..ce7a6a5d038e8476dc5b1b7ccc037f2e73b6a101 100644
--- a/Numeric/gsl_min.cpp
+++ b/Numeric/gsl_min.cpp
@@ -1,4 +1,4 @@
-// $Id: gsl_min.cpp,v 1.4 2008-02-17 08:48:02 geuzaine Exp $
+// $Id: gsl_min.cpp,v 1.5 2008-02-21 13:44:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -111,7 +111,7 @@ void minimize_2 ( double (*f) (double, double, void *data),
f_stat = f;
df_stat = df;
- size_t iter = 0;
+ int iter = 0;
int status;
const gsl_multimin_fdfminimizer_type *T;
@@ -132,49 +132,35 @@ void minimize_2 ( double (*f) (double, double, void *data),
T = gsl_multimin_fdfminimizer_conjugate_fr;
s = gsl_multimin_fdfminimizer_alloc (T, 2);
- gsl_multimin_fdfminimizer_set (s, &my_func, x, 0.01, 1e-4);
+ gsl_multimin_fdfminimizer_set(s, &my_func, x, 0.01, 1e-4);
- // printf("minimizing\n");
-
- do
- {
- iter++;
- status = gsl_multimin_fdfminimizer_iterate (s);
-
- if (status)
- break;
-
- status = gsl_multimin_test_gradient (s->gradient, 1e-3);
-
-// if (status == GSL_SUCCESS)
-// printf ("Minimum found at:\n");
-
-// printf ("%5d %.5f %.5f %22.15e\n", iter,
-// gsl_vector_get (s->x, 0),
-// gsl_vector_get (s->x, 1),
-// s->f);
-
- }
+ do{
+ iter++;
+ status = gsl_multimin_fdfminimizer_iterate(s);
+ if(status)
+ break;
+ status = gsl_multimin_test_gradient(s->gradient, 1e-3);
+ }
while (status == GSL_CONTINUE && iter < niter);
- U = gsl_vector_get (s->x, 0);
- V = gsl_vector_get (s->x, 1);
+ U = gsl_vector_get(s->x, 0);
+ V = gsl_vector_get(s->x, 1);
res = s->f;
gsl_multimin_fdfminimizer_free (s);
gsl_vector_free (x);
-
}
-void minimize_3 ( double (*f) (double, double, double,void *data),
- void (*df) (double , double , double ,
- double &, double &, double &, double &,
- void *data) ,
- void *data,int niter,
- double &U, double &V, double &W, double &res){
+void minimize_3(double (*f) (double, double, double,void *data),
+ void (*df) (double , double , double ,
+ double &, double &, double &, double &,
+ void *data) ,
+ void *data,int niter,
+ double &U, double &V, double &W, double &res)
+{
f_stat3 = f;
df_stat3 = df;
-
- size_t iter = 0;
+
+ int iter = 0;
int status;
const gsl_multimin_fdfminimizer_type *T;
@@ -189,37 +175,22 @@ void minimize_3 ( double (*f) (double, double, double,void *data),
my_func.params = data;
x = gsl_vector_alloc (3);
- gsl_vector_set (x, 0, U);
- gsl_vector_set (x, 1, V);
- gsl_vector_set (x, 2, W);
+ gsl_vector_set(x, 0, U);
+ gsl_vector_set(x, 1, V);
+ gsl_vector_set(x, 2, W);
T = gsl_multimin_fdfminimizer_conjugate_fr;
- s = gsl_multimin_fdfminimizer_alloc (T, 3);
+ s = gsl_multimin_fdfminimizer_alloc(T, 3);
gsl_multimin_fdfminimizer_set (s, &my_func, x, 0.01, 1e-4);
-
- // printf("minimizing\n");
-
- do
- {
- iter++;
- status = gsl_multimin_fdfminimizer_iterate (s);
-
- if (status)
- break;
-
- status = gsl_multimin_test_gradient (s->gradient, 1e-3);
-
-// if (status == GSL_SUCCESS)
-// printf ("Minimum found at:\n");
-
-// printf ("%5d %4.5f %4.5f %4.5f %10.5f\n", iter,
-// gsl_vector_get (s->x, 0),
-// gsl_vector_get (s->x, 1),
-// gsl_vector_get (s->x, 2),
-// s->f);
-
- }
+
+ do{
+ iter++;
+ status = gsl_multimin_fdfminimizer_iterate (s);
+ if (status)
+ break;
+ status = gsl_multimin_test_gradient (s->gradient, 1e-3);
+ }
while (status == GSL_CONTINUE && iter < niter);
U = gsl_vector_get (s->x, 0);
@@ -228,18 +199,17 @@ void minimize_3 ( double (*f) (double, double, double,void *data),
res = s->f;
gsl_multimin_fdfminimizer_free (s);
gsl_vector_free (x);
-
}
-void minimize_N (int N,
- double (*f) (double*,void *data),
- void (*df) (double*,double*,double &,void *data) ,
- void *data,int niter,
- double *U, double &res){
+void minimize_N(int N,
+ double (*f) (double*,void *data),
+ void (*df) (double*,double*,double &,void *data) ,
+ void *data,int niter,
+ double *U, double &res){
f_statN = f;
df_statN = df;
- size_t iter = 0;
+ int iter = 0;
int status;
const gsl_multimin_fdfminimizer_type *T;
@@ -262,28 +232,17 @@ void minimize_N (int N,
gsl_multimin_fdfminimizer_set (s, &my_func, x, 0.01, 1e-4);
- do
- {
- iter++;
- status = gsl_multimin_fdfminimizer_iterate (s);
-
- if (status)
- break;
-
- status = gsl_multimin_test_gradient (s->gradient, 1e-3);
-
-// if (status == GSL_SUCCESS)
-// printf ("Minimum found at:\n");
-
-// printf ("%5d %4.5f %4.5f %4.5f %10.5f\n", iter,
-// gsl_vector_get (s->x, 0),
-// gsl_vector_get (s->x, 1),
-// gsl_vector_get (s->x, 2),
-// s->f);
-
- }
+ do{
+ iter++;
+ status = gsl_multimin_fdfminimizer_iterate (s);
+
+ if (status)
+ break;
+
+ status = gsl_multimin_test_gradient (s->gradient, 1e-3);
+ }
while (status == GSL_CONTINUE && iter < niter);
-
+
for (int i=0;i<N;i++)
U[i] = gsl_vector_get (s->x, i);
res = s->f;
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 865328dfb7902af1f1ce5f182f08a0552eae841b..fa2d3ca57db0c3a562c6a5a398a90f9219db08c2 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataListIO.cpp,v 1.8 2008-02-18 18:32:54 geuzaine Exp $
+// $Id: PViewDataListIO.cpp,v 1.9 2008-02-21 13:44:56 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -718,7 +718,7 @@ bool PViewDataList::writeMSH(std::string name)
writeElementsMSH(fp, NbTY, TY, 5, 9, 3, &nodes, &numelm);
fprintf(fp, "$ENDELM\n");
-#if 1 // test new postpro node-based storage
+#if 0 // test new postpro node-based storage
fprintf(fp, "$NodeData\n");
fprintf(fp, "\"%s\"\n", getName().c_str());
fprintf(fp, "1 1 %d\n", nodes.size());