]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 6 Jan 2013 02:06:04 +0000 (02:06 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 6 Jan 2013 02:06:04 +0000 (02:06 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27944 0785d39b-7218-0410-832d-ea1e28bc413d

31 files changed:
1  2 
deal.II/doc/development/svn.html
deal.II/include/deal.II/base/thread_management.h
deal.II/include/deal.II/base/utilities.h
deal.II/include/deal.II/dofs/dof_renumbering.h
deal.II/include/deal.II/dofs/dof_tools.h
deal.II/include/deal.II/fe/mapping_q_eulerian.h
deal.II/include/deal.II/grid/grid_tools.h
deal.II/include/deal.II/lac/parallel_vector.h
deal.II/include/deal.II/lac/sparse_matrix.h
deal.II/include/deal.II/lac/sparsity_pattern.h
deal.II/include/deal.II/lac/swappable_vector.templates.h
deal.II/include/deal.II/lac/trilinos_block_vector.h
deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h
deal.II/include/deal.II/lac/trilinos_vector_base.h
deal.II/include/deal.II/lac/vector.h
deal.II/include/deal.II/lac/vector.templates.h
deal.II/include/deal.II/multigrid/mg_tools.h
deal.II/include/deal.II/numerics/error_estimator.h
deal.II/include/deal.II/numerics/vector_tools.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/base/subscriptor.cc
deal.II/source/base/thread_management.cc
deal.II/source/base/timer.cc
deal.II/source/base/utilities.cc
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/grid/grid_generator.cc
deal.II/source/grid/tria.cc
deal.II/source/lac/sparse_direct.cc
deal.II/source/numerics/error_estimator.cc
deal.II/source/numerics/matrix_tools.cc

index b1b623865eab3e0ddebea78126dd1885575f33cc,22f1291bfa76ae7fbae7dc7fe0b93c3b1e2a130f..307e0eb7988f719dec30db03c0fbbbf0abd63d92
@@@ -1,96 -1,87 +1,88 @@@
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                  "http://www.w3.org/TR/html4/loose.dtd">
+           "http://www.w3.org/TR/html4/loose.dtd">
  <html>
- <head>
-   <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-   <title>deal.II SVN Archive</title>
-   <link href="../screen.css" rel="StyleSheet">
-   <meta name="author" content="the deal.II authors <authors@dealii.org>">
-   <meta name="copyright" content="Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2009, 2010, 2012 by the deal.II authors">
-   <meta name="date" content="$Date$">
-   <meta name="svn_id" content="$Id$">
-   <meta name="keywords" content="deal dealii finite elements fem triangulation">
-   <meta http-equiv="content-language" content="en">
- </head>
- <body>
  <head>
+     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+     <title>deal.II SVN Archive</title>
+     <link href="../screen.css" rel="StyleSheet">
+     <meta name="author" content="the deal.II authors <authors@dealii.org>">
+     <meta name="copyright" content="Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2009, 2010, 2012, 2013 by the deal.II authors">
+     <meta name="date" content="$Date$">
+     <meta name="svn_id" content="$Id$">
+     <meta name="keywords" content="deal dealii finite elements fem triangulation">
+     <meta http-equiv="content-language" content="en">
  </head>
  <body>
  
-   <h1>Documentation of the deal.II SVN Archive</h1>
+     <h1>Documentation of the deal.II SVN Archive</h1>
  
-   <h2>The global structure</h2>
+     <h2>The global structure</h2>
  
  
-   The root of the deal.II archive is located
-   at <a href="https://svn.dealii.org/">https://svn.dealii.org/</a>.
-   There are three subdirectories:
-   <ul>
-     <li> <a href="https://svn.dealii.org/trunk/">trunk</a>:
-       This is the location of the current development version; it contains the
-     directories <a href="https://svn.dealii.org/trunk/deal.II">deal.II</a>
-     with the library proper
-     and <a href="https://svn.dealii.org/trunk/tests">tests</a>
-     with the testsuite.
+     The root of the deal.II archive is located
+     at <a href="https://svn.dealii.org/">https://svn.dealii.org/</a>.
+     There are three subdirectories:
+     <ul>
+       <li> <a href="https://svn.dealii.org/trunk/">trunk</a>:
+       This is the location of the current development version; it contains the
+       directories <a href="https://svn.dealii.org/trunk/deal.II">deal.II</a>
+       with the library proper
+       and <a href="https://svn.dealii.org/trunk/tests">tests</a>
+       with the testsuite.
  
-     <li> <a href="https://svn.dealii.org/tags/">tags</a>:
-     contains released versions. They have the same
-     structure as the trunk.
+       <li> <a href="https://svn.dealii.org/tags/">tags</a>:
+       contains released versions. They have the same
+       structure as the trunk.
  
-     <li> <a href="https://svn.dealii.org/branches/">branches</a>:
-     currently active branches; it also has subdirectories:
-       <ul>
-       <li> <a href="https://svn.dealii.org/branches/releases">releases</a>:
-       branches for releases of deal.II
+       <li> <a href="https://svn.dealii.org/branches/">branches</a>:
+       currently active branches; it also has subdirectories:
+       <ul>
+         <li> <a href="https://svn.dealii.org/branches/releases">releases</a>:
+           branches for releases of deal.II
          <li> <a href="https://svn.dealii.org/branches/retired">retired</a>:
-         development branches that have been merged into the
-         trunk and are no longer used.
-           </ul>
-       </ul>
+           development branches that have been merged into the
+           trunk and are no longer used.
+       </ul>
+     </ul>
  
-   <h2>Creating a development branch</h2>
+     <h2>Creating a development branch</h2>
  
-   <p>
-     Significant changes in the library often cannot be developed all at once. In a
-     case like this, one can create a development branch in the subversion
-     repository into which one can check in all necessary changes and from which
-     one can merge the final set of changes into the main development line once
-     ready. The <tt>svn</tt> program can be used
-     to keep your branch up-to-date with the trunk.
-   </p>
-   
-   <p><b>Note: </b> Maintaining a branch over a long time can become
-   quite cumbersome, since you have to merge changes on the trunk on a
-   regular basis so that the branch does not deviate too
-   much. Therefore, when adding functionality, like a new class or a
-   new function in a class or namespace, it is advisable not to create
-   a new branch, but to mark in the documentation clearly that this is
-   experimental. Before checking in, verify that the library compiles.</p>
+     <p>
+       Significant changes in the library often cannot be developed all at once. In a
+       case like this, one can create a development branch in the subversion
+       repository into which one can check in all necessary changes and from which
+       one can merge the final set of changes into the main development line once
+       ready. The <tt>svn</tt> program can be used
+       to keep your branch up-to-date with the trunk.
+     </p>
  
-   <p>
-     Creating a branch works through the following steps:
+     <p>
+       Creating a branch works through the following steps:
  
-   <ol>
-     <li> Create the branch using
-       <pre>
-       svn copy https://svn.dealii.org/trunk/ https://svn.dealii.org/branches/new-branch-name
-       </pre>
+       <ol>
+       <li> Create the branch using
+         <pre>
+           svn copy https://svn.dealii.org/trunk/ https://svn.dealii.org/branches/new-branch-name
+         </pre>
  
-     <li> Either check out the new branch or switch your working copy by
-       <pre>
-       svn switch https://svn.dealii.org/branches/new-branch-name
-       </pre>
-       This command assumes you are in the top level directory, the one
-       containing <tt>deal.II</tt> and <tt>tests</tt>
+       <li> Either check out the new branch or switch your working copy by
+         <pre>
+           svn switch https://svn.dealii.org/branches/new-branch-name
+         </pre>
+         This command assumes you are in the top level directory, the one
+         containing <tt>deal.II</tt> and <tt>tests</tt>
  
-     <li> After some development of the branch, if you want to merge changes
-     that have been made on mainline in the meantime, you can use this command:
-       <pre>
+       <li> After some development of the branch, if you want to merge changes
+         that have been made on mainline in the meantime, you can use this command:
+         <pre>
 +
-       svn merge ^/trunk
-       </pre>
-       This command will only run if you have no local changes in your working
-       directory for the branch, and will modify all of your files by merging
-       the changes made on mainline. If there are no conflicts that need to be
-       resolved, you can simply commit the result.
-   </ol>
- </body>
+           svn merge ^/trunk
+         </pre>
+         This command will only run if you have no local changes in your working
+         directory for the branch, and will modify all of your files by merging
+         the changes made on mainline. If there are no conflicts that need to be
+         resolved, you can simply commit the result.
+       </ol>
+     </p>
+   </body>
  </html>
Simple merge
index 6d0bd775deffbf180bfb460284dbed4a68995b67,46c965b9c4c752d140936ec78dd4465b324cac79..bb4638541a3c64514e30e51cb0e64a646da41aee
@@@ -144,10 -144,10 +144,10 @@@ void Subscriptor::do_subscribe (const c
  #ifdef DEBUG
    if (object_info == 0)
      object_info = &typeid(*this);
-   Threads::ThreadMutex::ScopedLock lock (subscription_lock);
+   Threads::Mutex::ScopedLock lock (subscription_lock);
    ++counter;
  
 -#if DEAL_USE_MT == 0
 +#ifndef DEAL_II_USE_MT
    const char *const name = (id != 0) ? id : unknown_subscriber;
  
    map_iterator it = counter_map.find(name);
@@@ -171,10 -171,10 +171,10 @@@ void Subscriptor::do_unsubscribe (cons
    if (counter == 0)
      return;
  
-   Threads::ThreadMutex::ScopedLock lock (subscription_lock);
+   Threads::Mutex::ScopedLock lock (subscription_lock);
    --counter;
  
 -#if DEAL_USE_MT == 0
 +#ifndef DEAL_II_USE_MT
    map_iterator it = counter_map.find(name);
    Assert (it != counter_map.end(), ExcNoSubscriber(object_info->name(), name));
    Assert (it->second > 0, ExcNoSubscriber(object_info->name(), name));
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
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.