Cleanup NR includes

Geo/CAD.cpp

-// $Id: CAD.cpp,v 1.61 2003-03-11 05:57:06 geuzaine Exp $
+// $Id: CAD.cpp,v 1.62 2003-03-18 00:15:43 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -30,13 +30,6 @@
 #include "Edge.h"
 #include "Context.h"
 
-#if defined(HAVE_GSL)
-#include "gsl_newt.h"
-#include "gsl_brent.h"
-#else
-#include "NR.h"
-#endif
-
 extern Mesh *THEM;
 extern Context_T CTX;
 

Geo/Makefile

-# $Id: Makefile,v 1.36 2003-03-02 18:44:16 geuzaine Exp $
+# $Id: Makefile,v 1.37 2003-03-18 00:15:43 geuzaine Exp $
 
 include ../variables
 
@@ -44,8 +44,7 @@ CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../Numeric/Numeric.h Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
   ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h \
   ../Mesh/Metric.h ../Mesh/Matrix.h DataBase.h ../Mesh/Interpolation.h \
-  ../Mesh/Create.h CAD.h ExtrudeParams.h ../Common/Context.h \
-  ../Numeric/gsl_newt.h ../Numeric/gsl_brent.h
+  ../Mesh/Create.h CAD.h ExtrudeParams.h ../Common/Context.h
 DataBase.o: DataBase.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
   ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Geo.h \

Mesh/Utils.cpp

-// $Id: Utils.cpp,v 1.17 2003-03-01 22:36:42 geuzaine Exp $
+// $Id: Utils.cpp,v 1.18 2003-03-18 00:15:43 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -31,7 +31,7 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_linalg.h>
 #else
-#include "NR.h"
+#include "nrutil.h"
 #endif
 
 extern Context_T CTX;

NR/NR.h

-#ifndef _NR_H_
-#define _NR_H_
-
-#include "Gmsh.h"
-#include "nrutil.h"
-
-/* "public" routines used in Gmsh */
-
-void dsvdcmp(double **a, int m, int n, double w[], double **v);
-double brent(double ax, double bx, double cx,
-	     double (*f)(double), double tol, double *xmin);
-void mnbrak(double *ax, double *bx, double *cx, double *fa, double *fb,
-	    double *fc, double (*func)(double));
-void newt(double x[], int n, int *check,
-	  void (*vecfunc)(int, double [], double []));
-
-#endif

NR/nrutil.h

@@ -4,6 +4,7 @@
 /* This file has been modified for inclusion in Gmsh */
 
 /* Gmsh: */
+#include "Gmsh.h"
 #include "Numeric.h"
 
 /* Gmsh:

Numeric/Numeric.h

@@ -74,4 +74,15 @@ double InterpolateIso(double *X, double *Y, double *Z,
 void gradSimplex (double *x, double *y, double *z, double *v, double *grad);
 
 
+/* Numerical routines implemented using either Numerical Recipes or
+   the GSL */
+
+void dsvdcmp(double **a, int m, int n, double w[], double **v);
+double brent(double ax, double bx, double cx,
+	     double (*f)(double), double tol, double *xmin);
+void mnbrak(double *ax, double *bx, double *cx, double *fa, double *fb,
+	    double *fc, double (*func)(double));
+void newt(double x[], int n, int *check,
+	  void (*vecfunc)(int, double [], double []));
+
 #endif

Numeric/gsl_brent.h

-#ifndef _GSL_BRENT_H_
-#define _GSL_BRENT_H_
-
-// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-// 
-// Please report all bugs and problems to "gmsh@geuz.org".
-
-double brent(double ax, double xx, double bx, 
-	     double (*f)(double), double tol, double *xmin);
-void mnbrak(double *ax, double *bx, double *cx, double *fa, double *fb, double *fc,
-	    double (*func)(double));
-
-#endif

Numeric/gsl_newt.h

-#ifndef _GSL_NEWT_H_
-#define _GSL_NEWT_H_
-
-// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-// 
-// Please report all bugs and problems to "gmsh@geuz.org".
-
-void newt(double x[], int n, int *check, void (*func)(int, double [], double []));
-
-#endif