From 3c90dffa631cee981cbe25f53f3e56c00d5de7e4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 8 Jan 2010 09:13:09 +0000 Subject: [PATCH] Minor edits of little things. git-svn-id: https://svn.dealii.org/trunk@20332 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/include/numerics/mesh_worker.h | 3 +- .../include/numerics/mesh_worker_info.h | 29 ++++++++++++------- .../include/numerics/mesh_worker_loop.h | 8 +++-- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/deal.II/deal.II/include/numerics/mesh_worker.h b/deal.II/deal.II/include/numerics/mesh_worker.h index 4910541b8f..e950c69637 100644 --- a/deal.II/deal.II/include/numerics/mesh_worker.h +++ b/deal.II/deal.II/include/numerics/mesh_worker.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2006, 2007, 2008, 2009 by Guido Kanschat +// Copyright (C) 2006, 2007, 2008, 2009, 2010 by Guido Kanschat // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -377,6 +377,7 @@ namespace MeshWorker * the local data. */ AssemblingIntegrator(const INTEGRATOR& local); + /** * The cell operator called by * integration_loop(). diff --git a/deal.II/deal.II/include/numerics/mesh_worker_info.h b/deal.II/deal.II/include/numerics/mesh_worker_info.h index cef55748d3..a2ceadb635 100644 --- a/deal.II/deal.II/include/numerics/mesh_worker_info.h +++ b/deal.II/deal.II/include/numerics/mesh_worker_info.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2006, 2007, 2008, 2009 by Guido Kanschat +// Copyright (C) 2006, 2007, 2008, 2009, 2010 by Guido Kanschat // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -38,14 +38,16 @@ namespace MeshWorker template class LocalResults { + private: /** * Initialize a single local * matrix block. A helper * function for initialize() */ - void initialize_local( - MatrixBlock >& M, - unsigned int row, unsigned int col); + void initialize_local(MatrixBlock >& M, + const unsigned int row, + const unsigned int col); + public: void initialize_numbers(const unsigned int n); void initialize_vectors(const unsigned int n); @@ -105,7 +107,7 @@ namespace MeshWorker * The local vectors. This * field is public, so that * local integrators can - * write it. + * write to it. */ std::vector > R; @@ -236,7 +238,7 @@ namespace MeshWorker template void reinit(const DHCellIterator& c, const DHFaceIterator& f, - unsigned int n); + const unsigned int n); /** * Set the current subface @@ -246,13 +248,15 @@ namespace MeshWorker template void reinit(const DHCellIterator& c, const DHFaceIterator& f, - const unsigned int n, const unsigned int s); + const unsigned int n, + const unsigned int s); const BlockIndices& local_indices() const; /// The block structure of the system SmartPointer > block_info; + private: /// Fill index vector void get_indices(const typename DoFHandler::cell_iterator c); @@ -327,6 +331,7 @@ namespace MeshWorker template class IntegrationInfo : public DoFInfo { + private: /// vector of FEValues objects std::vector > fevalv; public: @@ -408,7 +413,7 @@ namespace MeshWorker * * @see DGBlockSplitApplication */ - const FEVALUESBASE& fe(unsigned int i) const; + const FEVALUESBASE& fe(const unsigned int i) const; /** * The vector containing the @@ -496,7 +501,7 @@ namespace MeshWorker * #values, #gradients and * #hessians. */ - void fill_local_data(bool split_fevalues); + void fill_local_data(const bool split_fevalues); /** * The global data vector @@ -505,6 +510,7 @@ namespace MeshWorker * points. */ boost::shared_ptr > global_data; + private: /** * Use the finite element @@ -577,7 +583,7 @@ namespace MeshWorker template inline void - LocalResults::initialize_vectors(unsigned int n) + LocalResults::initialize_vectors(const unsigned int n) { R.resize(n); } @@ -611,7 +617,8 @@ namespace MeshWorker template inline void - LocalResults::initialize_matrices(unsigned int n, bool both) + LocalResults::initialize_matrices(const unsigned int n, + const bool both) { M1.resize(n); if (both) diff --git a/deal.II/deal.II/include/numerics/mesh_worker_loop.h b/deal.II/deal.II/include/numerics/mesh_worker_loop.h index edcba4a04b..2d79b8f10a 100644 --- a/deal.II/deal.II/include/numerics/mesh_worker_loop.h +++ b/deal.II/deal.II/include/numerics/mesh_worker_loop.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2006, 2007, 2008, 2009 by Guido Kanschat +// Copyright (C) 2006, 2007, 2008, 2009, 2010 by Guido Kanschat // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,7 @@ #define __deal2__mesh_worker_loop_h #include +#include #include #include @@ -180,8 +181,9 @@ namespace MeshWorker * @ingroup MeshWorker * @author Guido Kanschat, 2009 */ - template - void integration_loop(ITERATOR begin, ENDITERATOR end, + template + void integration_loop(ITERATOR begin, + typename identity::type end, IntegrationInfoBox& box, LOCALWORKER& localworker, bool cells_first = true) -- 2.39.5