From 18d7c0487661ee1af34badb0075dd8855c732c66 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Sun, 3 Apr 2011 18:12:14 +0000 Subject: [PATCH] add functions to module git-svn-id: https://svn.dealii.org/trunk@23555 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/integrators/l2.h | 14 +++++++++++++- deal.II/include/deal.II/integrators/laplace.h | 8 +++++++- .../deal.II/integrators/local_integrators.h | 10 +++------- deal.II/include/deal.II/integrators/maxwell.h | 2 ++ 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/deal.II/include/deal.II/integrators/l2.h b/deal.II/include/deal.II/integrators/l2.h index b93851703a..6a045693f0 100644 --- a/deal.II/include/deal.II/integrators/l2.h +++ b/deal.II/include/deal.II/integrators/l2.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2010 by the deal.II authors +// Copyright (C) 2010, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -44,6 +44,10 @@ namespace LocalIntegrators * \f[ * \int_F uv\,ds \quad \text{or} \quad \int_F \mathbf u\cdot \mathbf v\,ds * \f] + * + * @ingroup Integrators + * @author Guido Kanschat + * @date 2008, 2009, 2010 */ template void mass_matrix ( @@ -99,6 +103,10 @@ namespace LocalIntegrators * \quad \text{or} \quad * \int_F \mathbf f\cdot \mathbf v\,ds * \f] + * + * @ingroup Integrators + * @author Guido Kanschat + * @date 2008, 2009, 2010 */ template void L2 ( @@ -132,6 +140,10 @@ namespace LocalIntegrators * * Using appropriate weights, this term can be used to penalize * violation of conformity in H1. + * + * @ingroup Integrators + * @author Guido Kanschat + * @date 2008, 2009, 2010 */ template void jump_matrix ( diff --git a/deal.II/include/deal.II/integrators/laplace.h b/deal.II/include/deal.II/integrators/laplace.h index 4cf20b86b9..156866ed2c 100644 --- a/deal.II/include/deal.II/integrators/laplace.h +++ b/deal.II/include/deal.II/integrators/laplace.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2010 by the deal.II authors +// Copyright (C) 2010, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -77,6 +77,7 @@ namespace LocalIntegrators * Here, $\gamma$ is the penalty parameter suitably computed * with compute_penalty(). * + * @ingroup Integrators * @author Guido Kanschat * @date 2008, 2009, 2010 */ @@ -120,6 +121,10 @@ namespace LocalIntegrators * Dinput, respectively. g is the inhomogeneous * boundary value in the argument data. $\gamma$ is the usual * penalty parameter. + * + * @ingroup Integrators + * @author Guido Kanschat + * @date 2008, 2009, 2010 */ template void nitsche_residual ( @@ -217,6 +222,7 @@ namespace LocalIntegrators * the same on both sides. If factors differ, note that the penalty * parameter has to be computed accordingly. * + * @ingroup Integrators * @author Guido Kanschat * @date 2008, 2009, 2010 */ diff --git a/deal.II/include/deal.II/integrators/local_integrators.h b/deal.II/include/deal.II/integrators/local_integrators.h index fafc0af412..651530e792 100644 --- a/deal.II/include/deal.II/integrators/local_integrators.h +++ b/deal.II/include/deal.II/integrators/local_integrators.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2010 by the deal.II authors +// Copyright (C) 2010, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -31,13 +31,9 @@ DEAL_II_NAMESPACE_OPEN * functions for computing cell matrices and cell residuals for the * Laplacian operator, as well as functions for the weak boundary * conditions by Nitsche or the interior penalty discontinuous - * Galerkin method. The namespace Maxwell would do the same for + * Galerkin method. The namespace Maxwell does the same for * curl-curl type problems. * - * There is a namespace Differential containing general - * first order differential operators like divergence, gradient and - * curl, and their traces on faces. - * * The namespace L2 contains functions for mass matrices and * L2-inner products. * @@ -141,7 +137,7 @@ void MatrixIntegrator::cell( typename MeshWorker::IntegrationInfo& info) { Laplace::cell_matrix(dinfo.matrix(0,false).matrix, info.fe_values(0)); - Differential::div_primal_matrix(dinfo.matrix(1,false).matrix, info.fe_values(0), info.fe_values(1)); + Divergence::cell_matrix(dinfo.matrix(1,false).matrix, info.fe_values(0), info.fe_values(1)); L2::cell_matrix(dinfo.matrix(2,false).matrix, info.fe_values(1)); } * @endcode diff --git a/deal.II/include/deal.II/integrators/maxwell.h b/deal.II/include/deal.II/integrators/maxwell.h index b8e7a72787..59b6ac8c16 100644 --- a/deal.II/include/deal.II/integrators/maxwell.h +++ b/deal.II/include/deal.II/integrators/maxwell.h @@ -151,6 +151,7 @@ namespace LocalIntegrators * \nabla\!\times\! v \,dx * @f] * + * @ingroup Integrators * @author Guido Kanschat * @date 2011 */ @@ -203,6 +204,7 @@ namespace LocalIntegrators * * This is the standard curl operator in 3D and the scalar curl in 2D. * + * @ingroup Integrators * @author Guido Kanschat * @date 2011 */ -- 2.39.5