Changeset 1275

Timestamp:

Apr 24, 2009 12:45:05 PM (12 years ago)

Author:

andreasw

Message:

synchronize ThirdParty?/HSL/stable/1.1 with trunk rev 1274

Location:

ThirdParty/HSL/stable/1.1

Files:

• . (modified) (1 prop)
• INSTALL.HSL (modified) (5 diffs)
• Makefile.am (modified) (1 diff, 1 prop)
• Makefile.in (modified) (1 prop)
• configure.ac (modified) (1 prop)
• dummy.c (modified) (2 props)

ThirdParty/HSL/stable/1.1/INSTALL.HSL

@@ -15 +15 @@
 
 The sparse symmetric linear solvers that you can use in Ipopt are MA57
-(if you have access for the standard HSL library) and/or MA27 (if you
-have only access to the HSL Archive).  In addition, you should get
-MC19 (from the ASL archive).
+(if you have access for a commercial copy of the HSL library or are an
+academic who wants to use the "HSL 2007 for Researchers" library)
+and/or MA27 (if you have only access to the HSL Archive).  In
+addition, you should get MC19 (from the ASL archive).
 
 Different ways to use the HSL routines in Ipopt:
@@ -37 +38 @@
    below in this file.
 
-Instructions on how to download files from the HSL Archive:
------------------------------------------------------------
+Instructions on how to download files from the HSL Archive or HSL 2007:
+-----------------------------------------------------------------------
 
-If you need to download subroutines from the HSL Archive website, this
-is how it goes:
+If you need to download subroutines from the HSL Archive or from the
+HSL2007 for Researchers website, this is how it goes:
 
 In order to download the HSL Archive subroutines (like ma27 and mc19),
@@ -48 +49 @@
 http://hsl.rl.ac.uk/archive/hslarchive.html
 
-After that you can log in and go to the page that lists all the HSL
-Archive packages for download.  If you then click on the name of the
-desired routine (like MA27), you get to a download page, where one of
-the button reads "Download Package (comments removed)".
+or the HSL 2007 for Researchers website:
+
+http://hsl.rl.ac.uk/hsl2007/hsl20074researchers.html
+
+After that you can log in and go to the page that lists all the
+available HSL packages for download.  If you then click on the name of
+the desired routine (like MA27), you get to a download page, where one
+of the button reads "Download Package (comments removed)".
 
 Click on that button (leave the precision choice at default "Double
@@ -65 +70 @@
 For neither MA27 or MC19 it is necessary to download any dependencies.
 
-Instructions on where to put the source code:
----------------------------------------------
-
-Copy the source files for the required HSL routines into this
-directory before running the `configure' script.  The configuration
-script will detect which source files you have and prepare the
-Makefile accordingly.
-
 If you want to use MA57, please make sure that all source code for
 MA57 ***including dependencies*** is in a file called ma57ad.f.
-Currently, it seems that the dependencies are the files:
+Currently, the dependencies are the files:
 
  fd15ad.f
@@ -84 +81 @@
  mc64ad.f
  mc71ad.f
+
+plus possibly a dummy file (metis.f) for METIS.  However, it is
+strongly suggested that you use METIS (look at the ThirdParty/Metis
+directory for instructions, or use the --with-metis configure flag to
+specify a procompiled Metis library).
+
+
+Instructions on where to put the source code:
+---------------------------------------------
+
+Copy the source files for the required HSL routines into this
+directory before running the `configure' script.  The configuration
+script will detect which source files you have and prepare the
+Makefile accordingly.
 
 

ThirdParty/HSL/stable/1.1/Makefile.am

@@ -3 +3 @@
 # This file is distributed under the Common Public License.
 
-## $Id: Makefile.am 735 2006-06-04 06:10:05Z andreasw $
+## $Id$
 
 AUTOMAKE_OPTIONS = foreign