]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Dec 2012 08:43:14 +0000 (08:43 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Dec 2012 08:43:14 +0000 (08:43 +0000)
Conflicts:
deal.II/Makefile
deal.II/common/Make.global_options.in
deal.II/doc/external-libs/mumps.html
deal.II/include/deal.II/lac/block_indices.h

git-svn-id: https://svn.dealii.org/branches/branch_cmake@27863 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/Makefile
deal.II/bundled/boost-1.49.0/include/boost/functional/hash/detail/hash_float.hpp
deal.II/doc/external-libs/mumps.html
deal.II/include/deal.II/lac/block_indices.h
deal.II/include/deal.II/lac/parallel_vector.h
deal.II/include/deal.II/lac/trilinos_sparse_matrix.h
deal.II/include/deal.II/matrix_free/fe_evaluation.h
deal.II/source/fe/fe_system.cc

index 74e55a3af5e83b29e07933ff3d39745575d58417,460bce3223d8d8854aefab4576550c9126f354c6..94aa101fa8769bf421244432aa5aafe6a18d93a5
@@@ -3,9 -156,27 +3,14 @@@ default
  style-h-files:= $(wildcard include/deal.II/*/*.h)
  style-cc-files:= $(wildcard source/*/*.cc)
  style-examples:= $(wildcard examples/*/*.cc)
 +
  indent:
        @echo "============ Indenting all files"
-       astyle --options=contrib/utilities/astyle.rc $(style-h-files) $(style-cc-files) $(style-examples)
+       @for f in  $(style-h-files) $(style-cc-files) $(style-examples) ;\
+       do\
+         echo $$f ;\
+         astyle --options=common/astyle.rc $$f ;\
+       done
  
 -.PHONY: indent        
 -
 -
 -.PHONY: all \
 -        online-doc doc printable-doc tex-doc contrib \
 -        clean clean-contrib clean-base clean-lac clean-dealII \
 -      clean-doc clean-examples clean-lib clean-tests clean-common-scripts \
 -      distclean \
 -      build-test build-test-do \
 -      TAGS TODO
 +.PHONY: indent
 -# mark the following two as phony since they mark two actual files but
 -# we don't want to list the full dependencies here. let the sub-makefiles
 -# do that
 -.PHONY: common/scripts/make_dependencies \
 -        common/scripts/expand_instantiations
index af11f22bcbf91b4e1353117f1fa85af5c50be019,6ea5ba841e80a4e7255ee892ccdb1c9a6b149dd4..12e10ac45e8b3bf2fd06e67b891c75592504f00d
      <h1>Interfacing <acronym>deal.II</acronym>
        to <acronym>MUMPS</acronym></h1>
  
 -    <p> This documentation describes the compilation process
 -      of <acronym>MUMPS</acronym> and its dependencies starting with
 -      <acronym>BLACS</acronym> and following
 -      with <acronym>SCALAPACK</acronym>. The compilation
 -      of <acronym>MUMPS</acronym> and its dependencies is not as
 -      straightforward is we would like, however, it is not so
 -      difficult that we can not talk about it. That said, we cannot
 +    <p>
 +      <a href="http://mumps.enseeiht.fr" target="_top">MUMPS</a>
 +      should be readily packaged by most Linux distributions.
 +      Don't forget to install a develpment version of the library.
 +    </p>
 +
 +    <p>
 +      Below is a detailed instruction on how to compile and install
 +      <acronym>MUMPS</acronym> and some of its dependencies by hand (for
 +      the case you wish to do so).
 +    </p>
 +
 +    <h2>How to compile and install <acronym>MUMPS</acronym> by hand</h2>
 +
 +    <p>
 +      In the following, we describe the compilation process of
 +      <acronym>MUMPS</acronym> and its dependencies starting
 +      with <acronym>BLACS</acronym> and following with
 +      <acronym>SCALAPACK</acronym>.
 +
 +      The compilation of <acronym>MUMPS</acronym> and its dependencies
 +      is not as straightforward is we would like, however, it is not
 +      so difficult that we can not talk about it. That said, we cannot
        discuss every possible choice of parameters, because this is too
        involved (and we would probably much rather be doing something
 -      productive with the interface and
 -      <acronym>deal.II</acronym>). Thus we give only a short
 -      walk-through mentioning the most important parameters needed for
 -      successful compliation and linking.
 +      productive with the interface and <acronym>deal.II</acronym>). Thus
 +      we give only a short walk-through mentioning the most important
 +      parameters needed for successful compliation and linking.
      </p>
-     
      <p> The compilation scheme involves repeating the same three steps
        for each piece of software we want installed: (i) Selecting an
        appropriate makefile; (ii) Modifying symbols in this makefile to
@@@ -62,9 -47,9 +62,9 @@@
        considered. Otherwise start right below with the installation
        of <acronym>BLACS</acronym>.
      </p>
-     
 -    <h2>1. BLACS</h2>
 +    <h3>1. BLACS</h3>
-     
      <p> The <a href="http://www.netlib.org/blacs/">BLACS</a> library
        provides basic linear algebra routines together with a
        communication model such that they can be used in parallel. The
        the <acronym>BLACS</acronym> root directory and compile the
        library with the command <code>make mpi</code>.
      </p>
-     
 -    <h2>2. SCALAPACK</h2>
 +    <h3>2. SCALAPACK</h3>
-     
      <p> The <a href="http://www.netlib.org/scalapack">SCALAPACK</a>
        library provides high-performance linear algebra routines for
        distributed-memory message-passing <acronym>MIMD</acronym>
        computers. The library can be found on the
        official <a href="http://www.netlib.org/scalapack">SCALAPACK
        webpage</a>. We require the
--      file <b><code>scalapack.tgz</code></b> version <= 1.8.0 only.
++      file <b><code>scalapack.tgz</code></b> version &lt;= 1.8.0 only.
      </p>
-     
      <p> After extracting the file and changing to the directory which
        was created, we find a file
        called <code>SLmake.inc.example</code> and rename it
        the <acronym>SCALAPACK</acronym> library with the
        command <code>make</code>.
      </p>
-     
 -    <h2>3. MUMPS</h2>
 +    <h3>3. MUMPS</h3>
-     
      <p> Now we come to the main program for which we are doing all
        this. We want to install the parallel sparse direct
        solver <a href="http://graal.ens-lyon.fr/MUMPS">MUMPS</a>.
        </li>
        </ul>
      </p>
-     
 -    <p> Now we are done with configuration and can
 +    <p>
 +      Now we are done with configuration and can
        compile <acronym>MUMPS</acronym> with the
        command <code>make</code>.
      </p>
-     
 -    <h2>4. Linking with deal.II</h2>
 +    <h2>Linking with deal.II</h2>
 +
 +    <p>
 +      Support for <acronym>MUMPS</acronym> will be enabled automatically
 +      if a system wide installation of <acronym>MUMPS</acronym>
 +      can be found.  To use a self compiled version, specify
 +      <pre>
  
 -    <p> To be able to use the interface of <acronym>deal.II</acronym>
 -      for the MUMPS solver we then
 -      configure <acronym>deal.II</acronym> with the following
 -      additional options:
 +    -DMUMPS_DIR=/path/to/mumps
 +      </pre> on the command line when invoking <code>cmake</code>.
 +    </p>
 +
 +    <p>
 +      For <acronym>SCALAPACK</acronym> and <acronym>BLACS</acronym> a hint
 +      - if necessary - may be given by
        <pre>
 -      <code>
 -          --with-mumps=path/to/mumps
 -          --with-blacs=path/to/blacs
 -          --with-scalapack=path/to/scalapack
 -      </code>
 +
 +    -DSCALAPACK_DIR=/path/to/scalapack
 +    -DBLACS_DIR=/path/to/blacs
        </pre>
      </p>
  
      <p>
 -      Note: Throughout this description of the compilation process
 -      of <acronym>MUMPS</acronym> we have emphasised adding the
 -      compiler flag <code>-fPIC</code>. This is a definite requirement
 -      if we are compiling <acronym>deal.II</acronym> with shared
 -      libraries (which is the default). If we had preferred to be
 -      compiling <acronym>deal.II</acronym> without shared libraries,
 -      that's ok too; in that case we would do exactly the same thing
 -      as described above, but this time omitting
 -      the <code>-fPIC</code> flag from the scheme.
 +      You can override the autodetection by manually specifying
 +      <pre>
 +    -DDEAL_II_WITH_MUMPS=OFF|ON
 +      </pre>.
 +    </p>
-     
++
 +    <p>
 +      <b>Note:</b> Throughout this description of the compilation process
 +      of <acronym>MUMPS</acronym> we have emphasised adding the compiler
 +      flag <code>-fPIC</code>. This is a definite requirement if we
 +      are compiling <acronym>deal.II</acronym> with shared libraries
 +      (which is the default). If we had preferred to be compiling
 +      <acronym>deal.II</acronym> without shared libraries, that's ok too;
 +      in that case we would do exactly the same thing as described above,
 +      but this time omitting the <code>-fPIC</code> flag from the scheme.
      </p>
  
 +    <hr>
 +    <address>
 +      <a href="mail.html">The deal.II Group</a>
 +      $Date$
 +    </address>
    </body>
  </html>
index 5a8264c52b4213f2e25d79c7b06519a6cb56de0e,031b9fd5d7a48d0a76c726f3bbf47d6d4aca3d78..19c836bb6c35f10a46e6d6e4401709728611bdc2
@@@ -408,7 -407,8 +408,8 @@@ BlockIndices::global_to_local (const un
    while (i < start_indices[block])
      --block;
  
-   return std::make_pair(block, i-start_indices[block]);
+   return std::pair<unsigned int,unsigned int>(block,
 -                                            i-start_indices[block]);
++                                              i-start_indices[block]);
  }
  
  
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.