Changeset 1487


Ignore:
Timestamp:
Feb 21, 2010 11:01:20 AM (10 years ago)
Author:
stefan
Message:

synchronize with trunk by merging chgset 1411:1457 from trunk

Location:
ThirdParty/Mumps/branches/BSPsplit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/BSPsplit

  • ThirdParty/Mumps/branches/BSPsplit/INSTALL.MUMPS

    r1257 r1487  
    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.8.3).
     30Check the Mumps home page for the most recent version number (say, 4.9).
    3131You may then download
    3232
    33 http://mumps.enseeiht.fr/MUMPS_4.8.3.tar.gz (or try
    34 http://graal.ens-lyon.fr/MUMPS/MUMPS_4.8.3.tar.gz if first URL doesn't work)
     33http://mumps.enseeiht.fr/MUMPS_4.9.tar.gz (or try
     34http://graal.ens-lyon.fr/MUMPS/MUMPS_4.9.tar.gz if first URL doesn't work)
    3535
    3636and unpack it in this directory:
    3737
    38 gunzip MUMPS_4.8.3.tar.gz
    39 tar xf MUMPS_4.8.3.tar
     38gunzip MUMPS_4.9.tar.gz
     39tar xf MUMPS_4.9.tar
    4040
    41 Then, rename the MUMPS_4.8.3 directory just to be MUMPS:
     41Then, rename the MUMPS_4.9 directory just to be MUMPS:
    4242
    43 mv MUMPS_4.8.3 MUMPS
     43mv MUMPS_4.9 MUMPS
    4444
    4545**********************************************************************
  • ThirdParty/Mumps/branches/BSPsplit/Makefile.am

    r1469 r1487  
    1515
    1616nodist_libcoinmumps_la_SOURCES = \
     17        $(MUMPSDIR)/src/tools_common_mod.F \
    1718        $(MUMPSDIR)/src/dmumps_comm_buffer.F \
    1819        $(MUMPSDIR)/src/dmumps_struc_def.F \
     
    3839        $(MUMPSDIR)/src/mumps_io_thread.c\
    3940        $(MUMPSDIR)/src/mumps_io_err.c\
     41        $(MUMPSDIR)/src/mumps_size.c\
    4042        $(MUMPSDIR)/libseq/mpi.f \
    4143        $(MUMPSDIR)/libseq/mpic.c \
     
    7476dmumps_part1.lo dmumps_part2.lo dmumps_part3.lo dmumps_part4.lo dmumps_part5.lo dmumps_part6.lo dmumps_part8.lo: dmumps_ooc.lo
    7577
     78dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
    7679
    7780# Module files that need to be deleted
  • ThirdParty/Mumps/branches/BSPsplit/Makefile.in

    r1469 r1487  
    8484LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
    8585libcoinmumps_la_LIBADD =
    86 nodist_libcoinmumps_la_OBJECTS = dmumps_comm_buffer.lo \
    87         dmumps_struc_def.lo mumps_ooc_common.lo \
     86nodist_libcoinmumps_la_OBJECTS = tools_common_mod.lo \
     87        dmumps_comm_buffer.lo dmumps_struc_def.lo mumps_ooc_common.lo \
    8888        mumps_static_mapping.lo dmumps_ooc_buffer.lo dmumps_load.lo \
    8989        dmumps_ooc.lo dmumps_part1.lo dmumps_part2.lo dmumps_part3.lo \
     
    9191        dmumps_part7.lo dmumps_part8.lo mumps_part9.lo mumps_c.lo \
    9292        mumps_common.lo mumps_orderings.lo mumps_io.lo \
    93         mumps_io_basic.lo mumps_io_thread.lo mumps_io_err.lo mpi.lo \
    94         mpic.lo elapse.lo
     93        mumps_io_basic.lo mumps_io_thread.lo mumps_io_err.lo \
     94        mumps_size.lo mpi.lo mpic.lo elapse.lo
    9595libcoinmumps_la_OBJECTS = $(nodist_libcoinmumps_la_OBJECTS)
    9696depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    295295thirdpartylib_LTLIBRARIES = libcoinmumps.la
    296296nodist_libcoinmumps_la_SOURCES = \
     297        $(MUMPSDIR)/src/tools_common_mod.F \
    297298        $(MUMPSDIR)/src/dmumps_comm_buffer.F \
    298299        $(MUMPSDIR)/src/dmumps_struc_def.F \
     
    318319        $(MUMPSDIR)/src/mumps_io_thread.c\
    319320        $(MUMPSDIR)/src/mumps_io_err.c\
     321        $(MUMPSDIR)/src/mumps_size.c\
    320322        $(MUMPSDIR)/libseq/mpi.f \
    321323        $(MUMPSDIR)/libseq/mpic.c \
     
    352354DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
    353355DocFiles = README AUTHORS LICENSE
    354 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
     356DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    355357all: all-am
    356358
     
    441443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mumps_io_thread.Plo@am__quote@
    442444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mumps_orderings.Plo@am__quote@
     445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mumps_size.Plo@am__quote@
    443446
    444447.F.o:
     
    450453.F.lo:
    451454        $(LTPPF77COMPILE) -c -o $@ $<
     455
     456tools_common_mod.lo: $(MUMPSDIR)/src/tools_common_mod.F
     457        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o tools_common_mod.lo `test -f '$(MUMPSDIR)/src/tools_common_mod.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/tools_common_mod.F
    452458
    453459dmumps_comm_buffer.lo: $(MUMPSDIR)/src/dmumps_comm_buffer.F
     
    570576@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    571577@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mumps_io_err.lo `test -f '$(MUMPSDIR)/src/mumps_io_err.c' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_io_err.c
     578
     579mumps_size.lo: $(MUMPSDIR)/src/mumps_size.c
     580@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mumps_size.lo -MD -MP -MF "$(DEPDIR)/mumps_size.Tpo" -c -o mumps_size.lo `test -f '$(MUMPSDIR)/src/mumps_size.c' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_size.c; \
     581@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/mumps_size.Tpo" "$(DEPDIR)/mumps_size.Plo"; else rm -f "$(DEPDIR)/mumps_size.Tpo"; exit 1; fi
     582@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(MUMPSDIR)/src/mumps_size.c' object='mumps_size.lo' libtool=yes @AMDEPBACKSLASH@
     583@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     584@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mumps_size.lo `test -f '$(MUMPSDIR)/src/mumps_size.c' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_size.c
    572585
    573586mpic.lo: $(MUMPSDIR)/libseq/mpic.c
     
    965978dmumps_part1.lo dmumps_part2.lo dmumps_part3.lo dmumps_part4.lo dmumps_part5.lo dmumps_part6.lo dmumps_part8.lo: dmumps_ooc.lo
    966979
     980dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
     981
    967982install-doc: $(DocFiles)
    968983        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
  • ThirdParty/Mumps/branches/BSPsplit/configure

    r1469 r1487  
    2369523695
    2369623696    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
    23697     if test -d "${libdir}"; then
    23698       PKG_CONFIG_PATH="${libdir}/pkgconfig:$PKG_CONFIG_PATH"
     23697    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     23698    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     23699    if test -d "${prefix}"; then
     23700      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    2369923701    fi
    2370023702
     
    2393123933
    2393223934    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
    23933     if test -d "${libdir}"; then
    23934       PKG_CONFIG_PATH="${libdir}/pkgconfig:$PKG_CONFIG_PATH"
     23935    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     23936    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     23937    if test -d "${prefix}"; then
     23938      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    2393523939    fi
    2393623940
  • ThirdParty/Mumps/branches/BSPsplit/get.Mumps

    r1257 r1487  
    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.8.3
     5mumps_ver=4.9
    66
    77set -e
    88
    99wgetcmd=wget
    10 wgetcount=`which wget 2>/dev/null | wc -w`
    11 if test ! $wgetcount = 1; then
     10whichwget=`which wget 2>/dev/null`
     11if test -z "$whichwget" ; then
    1212  echo "Utility wget not found in your PATH."
    1313  if test `uname` = Darwin; then
Note: See TracChangeset for help on using the changeset viewer.