Changeset 2210


Ignore:
Timestamp:
May 15, 2011 8:37:55 AM (9 years ago)
Author:
stefan
Message:

update to Mumps 4.10.0; change version number in .pc files to version of thirdparty/mumps

Location:
ThirdParty/Mumps/trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/INSTALL.MUMPS

    r1500 r2210  
    2828If you don't have wget available, follow those instructions:
    2929
    30 Check the Mumps home page for the most recent version number (say, 4.9).
    31 You may then download
     30Download Mumps 4.10:
    3231
    33 http://mumps.enseeiht.fr/MUMPS_4.9.tar.gz (or try
    34 http://graal.ens-lyon.fr/MUMPS/MUMPS_4.9.tar.gz if first URL doesn't work)
     32http://mumps.enseeiht.fr/MUMPS_4.10.0.tar.gz (or try
     33http://graal.ens-lyon.fr/MUMPS/MUMPS_4.10.0.tar.gz if first URL doesn't work)
    3534
    3635and unpack it in this directory:
    3736
    38 gunzip MUMPS_4.9.tar.gz
    39 tar xf MUMPS_4.9.tar
     37gunzip MUMPS_4.10.0.tar.gz
     38tar xf MUMPS_4.10.0.tar
    4039
    41 Then, rename the MUMPS_4.9 directory just to be MUMPS:
     40Then, rename the MUMPS_4.10.0 directory just to be MUMPS:
    4241
    43 mv MUMPS_4.9 MUMPS
    44 
    45 Further, you may apply a patch that fixes problems with matrices of size 1:
    46 
    47 patch -p0 < mumps.patch
     42mv MUMPS_4.10.0 MUMPS
    4843
    4944**********************************************************************
  • ThirdParty/Mumps/trunk/Makefile.am

    r2085 r2210  
    3131        $(MUMPSDIR)/src/dmumps_part8.F \
    3232        $(MUMPSDIR)/src/mumps_part9.F \
     33        $(MUMPSDIR)/src/mumps_sol_es.F \
    3334        $(MUMPSDIR)/src/mumps_c.c \
    3435        $(MUMPSDIR)/src/mumps_common.c\
     
    7879dmumps_part5.lo dmumps_ooc.lo: mumps_static_mapping.lo
    7980
    80 dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
     81dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo mumps_sol_es.lo
     82
     83# actually only dmumps_part8.lo depends on mumps_sol_es.lo, but having only one target
     84# on the left side makes automake think that we provide a rule how to build this target
     85dmumps_part2.lo dmumps_part8.lo: mumps_sol_es.lo
    8186
    8287# Module files that need to be deleted
  • ThirdParty/Mumps/trunk/Makefile.in

    r2125 r2210  
    8787        dmumps_ooc.lo dmumps_part1.lo dmumps_part2.lo dmumps_part3.lo \
    8888        dmumps_part4.lo dmumps_part5.lo dmumps_part6.lo \
    89         dmumps_part7.lo dmumps_part8.lo mumps_part9.lo mumps_c.lo \
    90         mumps_common.lo mumps_orderings.lo mumps_io.lo \
     89        dmumps_part7.lo dmumps_part8.lo mumps_part9.lo mumps_sol_es.lo \
     90        mumps_c.lo mumps_common.lo mumps_orderings.lo mumps_io.lo \
    9191        mumps_io_basic.lo mumps_io_thread.lo mumps_io_err.lo \
    9292        mumps_size.lo mpi.lo mpic.lo elapse.lo
     
    326326        $(MUMPSDIR)/src/dmumps_part8.F \
    327327        $(MUMPSDIR)/src/mumps_part9.F \
     328        $(MUMPSDIR)/src/mumps_sol_es.F \
    328329        $(MUMPSDIR)/src/mumps_c.c \
    329330        $(MUMPSDIR)/src/mumps_common.c\
     
    514515mumps_part9.lo: $(MUMPSDIR)/src/mumps_part9.F
    515516        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o mumps_part9.lo `test -f '$(MUMPSDIR)/src/mumps_part9.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_part9.F
     517
     518mumps_sol_es.lo: $(MUMPSDIR)/src/mumps_sol_es.F
     519        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o mumps_sol_es.lo `test -f '$(MUMPSDIR)/src/mumps_sol_es.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_sol_es.F
    516520.F.f:
    517521        $(F77COMPILE) -F $<
     
    970974dmumps_part5.lo dmumps_ooc.lo: mumps_static_mapping.lo
    971975
    972 dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
     976dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo mumps_sol_es.lo
     977
     978# actually only dmumps_part8.lo depends on mumps_sol_es.lo, but having only one target
     979# on the left side makes automake think that we provide a rule how to build this target
     980dmumps_part2.lo dmumps_part8.lo: mumps_sol_es.lo
    973981
    974982test:
  • ThirdParty/Mumps/trunk/coinmumps-uninstalled.pc.in

    r2058 r2210  
    55Description: Multifrontal Massively Parallel sparse direct Solver
    66URL: https://projects.coin-or.org/BuildTools
    7 Version: 4.9.2
     7Version: @PACKAGE_VERSION@
    88Libs: ${libdir}/libcoinmumps.la @MUMPS_PCLIBS@
    99Cflags: -I@abs_source_dir@/MUMPS/libseq -I@abs_source_dir@/MUMPS/include
  • ThirdParty/Mumps/trunk/coinmumps.pc.in

    r2058 r2210  
    77Description: Multifrontal Massively Parallel sparse direct Solver
    88URL: https://projects.coin-or.org/BuildTools
    9 Version: 4.9.2
     9Version: @PACKAGE_VERSION@
    1010Libs: -L${libdir} -lcoinmumps @MUMPS_PCLIBS@
    1111Cflags: -I${includedir}
  • ThirdParty/Mumps/trunk/get.Mumps

    r2138 r2210  
    33# Set the following to the latest MUMPS version.
    44#  THERE MUST BE NO SPACE BEFORE AND AFTER THE EQUAL (=) OPERATOR.
    5 mumps_ver=4.9.2
     5mumps_ver=4.10.0
    66
    77set -e
     
    4545
    4646echo " "
    47 echo "Applying patch."
    48 echo " "
    49 
    50 patch -p0 < mumps.patch
    51 
    52 echo " "
    5347echo "Verify that there are no error message in the output above."
Note: See TracChangeset for help on using the changeset viewer.