]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Feb 2013 21:21:07 +0000 (21:21 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Feb 2013 21:21:07 +0000 (21:21 +0000)
Conflicts:
deal.II/doc/readme-petsc-trilinos.html
deal.II/doc/readme.html

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

1  2 
deal.II/doc/development/navbar.html
deal.II/doc/development/toc.html
deal.II/doc/readme.html
deal.II/examples/step-1/doc/intro.dox
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/grid/grid_in.h
deal.II/include/deal.II/lac/trilinos_vector_base.h

Simple merge
index 108124d01d6f38904a951ce8ade5505c5bba81b1,b0279d9832c4d3fb370f8a7af1273727f3694ecc..99b2656d20458e2f2f9b49e89347b04b7e97470f
           enable automatic documentation generation.
         </p>
  
 -    <li> <p><a href="../porting.html" target="body">Porting
 +    <li> <p><a href="porting.html" target="body">Porting
           <acronym>deal.II</acronym> to a new system</a>:
 -         <acronym>deal.II</acronym> uses the mechanism provided by
 -         GNU&nbsp;autoconf. Therefore, porting to a reasonably
 -         standardized UNIX system should not be too difficult. Other
 -         systems, such as proprietary ones, might or might not work (it is
 -       possible, for example, to use Microsoft Windows);
 -         see the <a href="../readme.html" target="body">ReadMe</a>
 -         file for more information on supported systems and porting.
 +
 +         <acronym>deal.II</acronym> uses CMake as build system
 +         and is fairly ISO (1998) C++ Standard compliant.
 +         So, porting to a reasonably <a
 +         href="http://www.opengroup.org/austin/">POSIX</a> compliant
 +         system with a reasonably ISO C++ compliant compiler shouldn't be
 +         much work. Other (mostly proprietary) systems might require more
 +         work. See the <a href="../readme.html" target="body">ReadMe</a>
 +         file for more information on already supported systems. This
 +         resource gives some hints for porting to unknown platforms.
         </p>
  
-     <li> <p><a href="https://sourceforge.net/apps/trac/dealii" target="_top">Bugs</a>:
+     <li> <p><a href="https://code.google.com/p/dealii/issues/list" target="_top">Bugs</a>:
           Though well tested, <acronym>deal.II</acronym> certainly has
           bugs. If you want to report a bug (or enhancement request),
-          go to the <a href="https://sourceforge.net/apps/trac/dealii"
+          go to the <a href="https://code.google.com/p/dealii/issues/list"
           target="_top">bug tracking system</a> and enter a new ticket
           for your issue.
         </p>
index a7125b328d08bad43763356224c0bb29bd3e2087,9598ad22de14db116aea44a503b27464d27e418b..e27e9d1a887328f6a2632b994a1b4c542f11e3ec
      </p>
  
      <p>
 -      We expect that <acronym>deal.II</acronym> should work on the following
 +      <acronym>deal.II</acronym> supports at least the following
        platforms:
        <ul>
 -      <li>Linux: using the GCC compiler versions 4.0 or later; using the
 -        clang compiler version 3.1 or later.
 +      <li>GNU/Linux: using the GCC compiler version 4.0 or later; using the
 +        Clang compiler version 3.0 or later; using the ICC compiler
 +          version 12 or later
        <li>Mac OS X: using the GCC compiler version 4.0 or later (Please see
-           the <a href="http://dealii.sourceforge.net/index.php?title=Main_Page"
+           the <a href="https://code.google.com/p/dealii/w/list"
 -               target="_top">deal.II Wiki</a> for installation issues);
 +               target="_top">deal.II Wiki</a> for installation issues)
        <li><a href="http://www.cygwin.com"
                 target="_top">Cygwin/Windows</a> with recent GCC
-           versions. For <a href="http://dealii.sourceforge.net/index.php?title=Windows"
+           versions. For <a href="https://code.google.com/p/dealii/wiki/Windows"
                           target="_top">installing on Windows</a>, please refer to
            additional information on
-           the <a href="http://dealii.sourceforge.net/index.php?title=Main_Page"
+           the <a href="https://code.google.com/p/dealii/w/list"
                 target="_top">deal.II Wiki</a>!
        </ul>
        Most other combinations of POSIX-style operating systems and C++
Simple merge
Simple merge
index d9b5e8938c782c328d547ad44b5041e4a8a60615,68fa62da86efb5df044f01e3ab6ca0a1cc238767..150728a60a25dde2b8705e1bd888e95b144e3cc1
@@@ -69,52 -62,32 +62,32 @@@ public
     *
     * @image html hyper_cubes.png
     *
-    * See also
-    * subdivided_hyper_cube() for a
-    * coarse mesh consisting of
-    * several cells. See
-    * hyper_rectangle(), if
-    * different lengths in different
-    * ordinate directions are
-    * required.
-    *
-    * @note The triangulation needs to be
-    * void upon calling this
-    * function.
+    * See also subdivided_hyper_cube() for a coarse mesh consisting of several
+    * cells. See hyper_rectangle(), if different lengths in different ordinate
+    * directions are required.
+    *
+    * @note The triangulation needs to be void upon calling this function.
     */
    template <int dim, int spacedim>
 -  static void hyper_cube (Triangulation<dim,spacedim> &tria,
 +  static void hyper_cube (Triangulation<dim,spacedim>  &tria,
                            const double        left = 0.,
                            const double        right= 1.);
  
    /**
-    * Same as hyper_cube(), but
-    * with the difference that not
-    * only one cell is created but
-    * each coordinate direction is
-    * subdivided into
-    * @p repetitions cells. Thus,
-    * the number of cells filling
-    * the given volume is
+    * Same as hyper_cube(), but with the difference that not only one cell is
+    * created but each coordinate direction is subdivided into @p repetitions
+    * cells. Thus, the number of cells filling the given volume is
     * <tt>repetitions<sup>dim</sup></tt>.
     *
-    * If spacedim=dim+1 the same
-    * mesh as in the case
-    * spacedim=dim is created, but
-    * the vertices have an
-    * additional coordinate =0. So,
-    * if dim=1 one obtains line
-    * along the x axis in the xy
-    * plane, and if dim=3 one
-    * obtains a square in lying in
-    * the xy plane in 3d space.
-    *
-    * @note The triangulation needs
-    * to be void upon calling this
-    * function.
+    * If spacedim=dim+1 the same mesh as in the case spacedim=dim is created,
+    * but the vertices have an additional coordinate =0. So, if dim=1 one
+    * obtains line along the x axis in the xy plane, and if dim=3 one obtains a
+    * square in lying in the xy plane in 3d space.
+    *
+    * @note The triangulation needs to be void upon calling this function.
     */
    template <int dim>
 -  static void subdivided_hyper_cube (Triangulation<dim> &tria,
 +  static void subdivided_hyper_cube (Triangulation<dim>  &tria,
                                       const unsigned int  repetitions,
                                       const double        left = 0.,
                                       const double        right= 1.);

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.