From 01d14b18e478e9cbe7f454fc508a9db141f4b4b3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 10 Jul 2008 11:54:05 +0000
Subject: [PATCH] wrong commit
---
Common/GmshMatrix.h | 4 ++--
contrib/NR/Makefile | 35 ++++++++++++++++++++---------------
contrib/NR/nrutil.cpp | 2 +-
doc/gmsh.html | 2 +-
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/Common/GmshMatrix.h b/Common/GmshMatrix.h
index f460b383ed..78ee5175b5 100644
--- a/Common/GmshMatrix.h
+++ b/Common/GmshMatrix.h
@@ -96,13 +96,13 @@ class Gmsh_Matrix
for(int i = 0; i < b.size1(); i++)
for(int j = 0; j < b.size2(); j++)
for(int k = 0; k < size2(); k++)
- b(i, j) += (*this)(i, k) * x(k, j);
+ b.data[i + r *j] += (*this)(i, k) * x(k, j);
}
inline void mult(const Gmsh_Vector<SCALAR> &x, Gmsh_Vector<SCALAR> &b)
{
for(int i = 0; i < b.size(); i++)
for(int j = 0; j < b.size(); j++)
- b(i) += (*this)(i, j) * x(j);
+ b.data[i] += (*this)(i, j) * x(j);
}
inline void set_all(const double &m)
{
diff --git a/contrib/NR/Makefile b/contrib/NR/Makefile
index a2f6d416ee..ed9acd096a 100644
--- a/contrib/NR/Makefile
+++ b/contrib/NR/Makefile
@@ -1,11 +1,27 @@
-# GetDP - Copyright (C) 1997-2008 P. Dular, C. Geuzaine
+# $Id: Makefile,v 1.18 2008-07-10 11:54:05 geuzaine Exp $
#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to <getdp@geuz.org>.
+# Copyright (C) 1997-2008 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>.
include ../../variables
-LIB = ../../lib/libGetDPNR${LIBEXT}
+LIB = ../../lib/libGmshNR${LIBEXT}
INC = ${DASH}I../../Common ${DASH}I../../DataStr ${DASH}I../../Numeric
@@ -47,14 +63,3 @@ depend:
rm -f Makefile.new
# DO NOT DELETE THIS LINE
-brent.o: brent.cpp nrutil.h
-dpythag.o: dpythag.cpp nrutil.h
-dsvdcmp.o: dsvdcmp.cpp nrutil.h
-fdjac.o: fdjac.cpp nrutil.h
-fmin.o: fmin.cpp nrutil.h
-lnsrch.o: lnsrch.cpp nrutil.h
-lubksb.o: lubksb.cpp
-ludcmp.o: ludcmp.cpp nrutil.h
-mnbrak.o: mnbrak.cpp nrutil.h
-newt.o: newt.cpp nrutil.h
-nrutil.o: nrutil.cpp ../../Common/Message.h ../../Common/GmshClient.h
diff --git a/contrib/NR/nrutil.cpp b/contrib/NR/nrutil.cpp
index 019d915a65..64bf6eaa81 100644
--- a/contrib/NR/nrutil.cpp
+++ b/contrib/NR/nrutil.cpp
@@ -1,4 +1,4 @@
-// This file has been modified for inclusion in GetDP
+// This file has been modified for inclusion in Gmsh
#include <stdio.h>
#include <stddef.h>
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 08ea5e6200..6c16981c26 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -30,9 +30,9 @@ generator with built-in pre- and post-processing facilities</h1>
<center>
<a href="#Description">Description</a> |
<a href="#Download"><b>Download</b></a> |
+ <a href="#Authors">Authors and credits</a> |
<a href="#Documentation">Documentation</a> |
<a href="#Mailing lists">Mailing lists</a> |
- <a href="#Authors">Authors and credits</a> |
<a href="#Licensing">Licensing</a> |
<a href="#Screenshots">Screenshots</a> |
<a href="#Links">Links</a>
--
GitLab