]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 31 Dec 2012 23:15:23 +0000 (23:15 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 31 Dec 2012 23:15:23 +0000 (23:15 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27890 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/matrix_free/mapping_info.h
deal.II/include/deal.II/matrix_free/mapping_info.templates.h
deal.II/include/deal.II/matrix_free/matrix_free.h
deal.II/include/deal.II/matrix_free/matrix_free.templates.h

index bfd47e83c0c925cbc4999d87480be2c7f208246b,481fe26814a1c480f59f83757a7634e5febc4909..4eb7cab71131dbd24b0831da794632196b9710ed
@@@ -88,11 -79,10 +79,10 @@@ namespace interna
         */
        UpdateFlags
        compute_update_flags (const UpdateFlags                        update_flags,
 -                            const std::vector<dealii::hp::QCollection<1> > &quad) const;
 +                            const std::vector<dealii::hp::QCollection<1> >  &quad) const;
  
        /**
-        * Returns the type of a given cell as
-        * detected during initialization.
+        * Returns the type of a given cell as detected during initialization.
         */
        CellType get_cell_type (const unsigned int cell_chunk_no) const;
  
index 1820dfd9c9b97025dd9b869298059f634ef1766a,647ed1476c1d20e0ee034ef560a52e7078f30e06..871a2838fca6c52d5255ef36c2aa538f54f6ab17
@@@ -908,11 -862,9 +862,9 @@@ end_set
      (STREAM         &out,
       const SizeInfo &size_info) const
      {
-       // print_memory_statistics involves
-       // global communication, so we can
-       // disable the check here only if no
-       // processor has any such data
+       // print_memory_statistics involves global communication, so we can
+       // disable the check here only if no processor has any such data
 -#if DEAL_II_COMPILER_SUPPORTS_MPI
 +#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
        unsigned int general_size_glob = 0, general_size_loc = jacobians.size();
        MPI_Allreduce (&general_size_loc, &general_size_glob, 1, MPI_UNSIGNED,
                       MPI_MAX, size_info.communicator);
index 5c047f81f01d7565c5bd7bf48da0789840257642,97b71f042584fa97845953baa0001e454db0fa33..0c45c7d85dfae3da22d79827df15eaaabb11f191
@@@ -2117,10 -1864,9 +1864,9 @@@ namespace interna
    }
  
  
 -#if DEAL_II_USE_MT==1
 +#ifdef DEAL_II_USE_MT
  
-   // This defines the TBB data structures that
-   // are needed to schedule the
+   // This defines the TBB data structures that are needed to schedule the
    // partition-partition variant
  
    namespace partition
@@@ -2386,18 -2132,16 +2132,16 @@@ MatrixFree<dim, Number>::cell_loo
                                   const std::pair<unsigned int,
                                   unsigned int> &)> &cell_operation,
   OutVector       &dst,
 - const InVector &src) const
 + const InVector  &src) const
  {
 -#if DEAL_II_USE_MT==1
 +#ifdef DEAL_II_USE_MT
  
-   // Use multithreading if so requested and if
-   // there is enough work to do in parallel (the
-   // code might hang if there are less than two
-   // chunks!)
+   // Use multithreading if so requested and if there is enough work to do in
+   // parallel (the code might hang if there are less than two chunks!)
    if (task_info.use_multithreading == true && task_info.n_blocks > 3)
      {
-       // to simplify the function calls, bind away
-       // all arguments except the cell range
+       // to simplify the function calls, bind away all arguments except the
+       // cell range
        typedef
        std_cxx1x::function<void (const std::pair<unsigned int,unsigned int> &range)>
        Worker;
index 97f35dcb2ed591eb0fd1d91fdb38cb98250a13c9,7315162db3e1d560740bb3d240ba7c494f375b87..261a4db7831e05cff203dfc0a3da69f07b70fd3d
@@@ -136,10 -136,9 +136,9 @@@ internal_reinit(const Mapping<dim
        for (unsigned int no=0; no<dof_handler.size(); ++no)
          dof_info[no].store_plain_indices = additional_data.store_plain_indices;
  
-       // initialize the basic multithreading
-       // information that needs to be passed to the
-       // DoFInfo structure
+       // initialize the basic multithreading information that needs to be
+       // passed to the DoFInfo structure
 -#if DEAL_II_USE_MT == 1
 +#ifdef DEAL_II_USE_MT
        if (additional_data.tasks_parallel_scheme != AdditionalData::none)
          {
            task_info.use_multithreading = true;
@@@ -239,10 -231,9 +231,9 @@@ internal_reinit(const Mapping<dim
        for (unsigned int no=0; no<dof_handler.size(); ++no)
          dof_info[no].store_plain_indices = additional_data.store_plain_indices;
  
-       // initialize the basic multithreading
-       // information that needs to be passed to the
-       // DoFInfo structure
+       // initialize the basic multithreading information that needs to be
+       // passed to the DoFInfo structure
 -#if DEAL_II_USE_MT == 1
 +#ifdef DEAL_II_USE_MT
        if (additional_data.tasks_parallel_scheme != AdditionalData::none)
          {
            task_info.use_multithreading = true;
@@@ -995,14 -951,13 +951,13 @@@ namespace interna
        unsigned int n_max_boundary_cells = boundary_cells.size();
        unsigned int n_boundary_cells = n_max_boundary_cells;
  
-       // try to make the number of boundary cells
-       // divisible by the number of vectors in
-       // vectorization
+       // try to make the number of boundary cells divisible by the number of
+       // vectors in vectorization
        /*
-                                   // try to balance the number of cells before
-                                   // and after the boundary part on each
-                                   // processor. probably not worth it!
+       // try to balance the number of cells before and after the boundary part
+       // on each processor. probably not worth it!
 -      #if DEAL_II_COMPILER_SUPPORTS_MPI
 +      #ifdef DEAL_II_COMPILER_SUPPORTS_MPI
        MPI_Allreduce (&n_boundary_cells, &n_max_boundary_cells, 1, MPI_UNSIGNED,
                       MPI_MAX, size_info.communicator);
        #endif

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.