Updated references to other software packacges.

19 years ago · ae9c37efae
parent ff39626e08
commit ae9c37efae
3 changed files with 57 additions and 46 deletions
--- a/60
+++ b/60
@ -1,31 +1,31 @@
- *
- *             Parallel Sparse BLAS  v2.0
- *   (C) Copyright 2006 Salvatore Filippone    University of Rome Tor Vergata
- *                      Alfredo Buttari        University of Rome Tor Vergata
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions, and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *   3. The name of the PSBLAS group or the names of its contributors may
- *      not be used to endorse or promote products derived from this
- *      software without specific written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * 
+ 
+              Parallel Sparse BLAS  v2.0
+    (C) Copyright 2006 Salvatore Filippone    University of Rome Tor Vergata
+                       Alfredo Buttari        University of Rome Tor Vergata
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions, and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the PSBLAS group or the names of its contributors may
+       not be used to endorse or promote products derived from this
+       software without specific written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+ 
+  

--- a/35
+++ b/35
@ -76,18 +76,29 @@ ACM Trans. Math. Softw., 23(3), 379-401, 1997.

 In the multilevel preconditioners we use SMMP by Randolph E. Bank and
 Craig C. Douglas  na.bank@na-net.ornl.gov and
-na.cdouglas@na-net.ornl.gov;  we interfaced it with dynamic memory
-allocation from Fortran 95. 
-
-
-We have had good results with  the METIS library, which can be
-obtained from
-http://www-users.cs.umn.edu/~karypis/metis/metis/main.html 
-
-We include interfaces to:
--  SuperLU 3.0        http://crd.lbl.gov/~xiaoye/SuperLU/
--  UMFPACK 4.4        http://www.cise.ufl.edu/research/sparse/umfpack/ 
-
+na.cdouglas@na-net.ornl.gov;  we wrapped  it in a Fortran 95 interface
+with dynamic memory allocation. 
+
+To compile and run our software you will need 
+
+1. A working version of MPI
+2. The MPI version of the BLACS  from
+   http://www.netlib.org/blacs/index.html
+3. A version of the BLAS; if you don't have a specific version for
+   your platform you may try ATLAS available from
+   http://math-atlas.sourceforge.net/ 
+
+4. We have had good results with  the METIS library, from 
+   http://www-users.cs.umn.edu/~karypis/metis/metis/main.html 
+   This is not necessary to compile our library, but the test program
+   in test/Fileread assumes you have it installed.  
+
+5. For our preconditioners we include interfaces to the following
+   software  packages:
+   --  SuperLU 3.0        http://crd.lbl.gov/~xiaoye/SuperLU/
+   --  UMFPACK 4.4        http://www.cise.ufl.edu/research/sparse/umfpack/ 
+   These are optional, you only need to install them if you actually
+   want to use them 



--- a/src/methd/psb_dgmresr.f90
+++ b/src/methd/psb_dgmresr.f90
@ -189,10 +189,10 @@ Subroutine psb_dgmresr(a,prec,b,x,eps,desc_a,info,&
     goto 9999
  End If

-  Call psb_dsall(mglob,nl+1,v,desc_a,info)
-  Call psb_dsall(mglob,w,desc_a,info)
-  Call psb_dsasb(v,desc_a,info)  
-  Call psb_dsasb(w,desc_a,info)  
+  Call psb_alloc(mglob,nl+1,v,desc_a,info)
+  Call psb_alloc(mglob,w,desc_a,info)
+  Call psb_asb(v,desc_a,info)  
+  Call psb_asb(w,desc_a,info)  
  if (info.ne.0) Then 
     info=4011 
     call psb_errpush(info,name)