From: maier
Date: Fri, 8 Feb 2013 21:21:07 +0000 (+0000)
Subject: Merge from Mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f60b70a1a8e659e15a66c6d3664e7af2babfc23;p=dealii-svn.git
Merge from Mainline
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
---
6f60b70a1a8e659e15a66c6d3664e7af2babfc23
diff --cc deal.II/doc/development/toc.html
index 108124d01d,b0279d9832..99b2656d20
--- a/deal.II/doc/development/toc.html
+++ b/deal.II/doc/development/toc.html
@@@ -57,24 -55,21 +57,24 @@@
enable automatic documentation generation.
- Porting
+ Porting
deal.II to a new system:
- deal.II uses the mechanism provided by
- GNU 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 ReadMe
- file for more information on supported systems and porting.
+
+ deal.II uses CMake as build system
+ and is fairly ISO (1998) C++ Standard compliant.
+ So, porting to a reasonably POSIX compliant
+ system with a reasonably ISO C++ compliant compiler shouldn't be
+ much work. Other (mostly proprietary) systems might require more
+ work. See the ReadMe
+ file for more information on already supported systems. This
+ resource gives some hints for porting to unknown platforms.
- Bugs:
+
Bugs:
Though well tested, deal.II certainly has
bugs. If you want to report a bug (or enhancement request),
- go to the bug tracking system and enter a new ticket
for your issue.
diff --cc deal.II/doc/readme.html
index a7125b328d,9598ad22de..e27e9d1a88
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@@ -62,21 -60,20 +62,21 @@@
- We expect that deal.II should work on the following
+ deal.II supports at least the following
platforms:
- - Linux: using the GCC compiler versions 4.0 or later; using the
- clang compiler version 3.1 or later.
+
- 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
- Mac OS X: using the GCC compiler version 4.0 or later (Please see
- the deal.II Wiki for installation issues);
+ target="_top">deal.II Wiki for installation issues)
- Cygwin/Windows with recent GCC
- versions. For installing on Windows, please refer to
additional information on
- the deal.II Wiki!
Most other combinations of POSIX-style operating systems and C++
diff --cc deal.II/include/deal.II/grid/grid_generator.h
index d9b5e8938c,68fa62da86..150728a60a
--- a/deal.II/include/deal.II/grid/grid_generator.h
+++ b/deal.II/include/deal.II/grid/grid_generator.h
@@@ -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
- static void hyper_cube (Triangulation &tria,
+ static void hyper_cube (Triangulation &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
* repetitionsdim.
*
- * 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
- static void subdivided_hyper_cube (Triangulation &tria,
+ static void subdivided_hyper_cube (Triangulation &tria,
const unsigned int repetitions,
const double left = 0.,
const double right= 1.);