From: maier Date: Mon, 4 Mar 2013 10:25:59 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acf9be712d93f71f728e7a7124d72b76db6ac61d;p=dealii-svn.git Merge from Mainline git-svn-id: https://svn.dealii.org/branches/branch_cmake@28719 0785d39b-7218-0410-832d-ea1e28bc413d --- acf9be712d93f71f728e7a7124d72b76db6ac61d diff --cc deal.II/include/deal.II/fe/fe_tools.h index 47c2cd4bf5,e15b23cfab..926eaa6e50 --- a/deal.II/include/deal.II/fe/fe_tools.h +++ b/deal.II/include/deal.II/fe/fe_tools.h @@@ -926,37 -618,23 +618,23 @@@ namespace FETool OutVector &u1_interpolated); /** - * Gives the interpolation of the - * @p dof1-function @p u1 to a - * @p dof2-function, and - * interpolates this to a second - * @p dof1-function named - * @p u1_interpolated. - * @p constraints1 and - * @p constraints2 are the - * hanging node constraints - * corresponding to @p dof1 and - * @p dof2, respectively. These - * objects are particular - * important when continuous - * elements on grids with hanging - * nodes (locally refined grids) - * are involved. - * - * Furthermore note, that for the - * specific case when the finite - * element space corresponding to - * @p dof1 is a subset of the - * finite element space - * corresponding to @p dof2, this - * function is simply an identity - * mapping. + * Gives the interpolation of the @p dof1-function @p u1 to a @p + * dof2-function, and interpolates this to a second @p dof1-function named + * @p u1_interpolated. @p constraints1 and @p constraints2 are the hanging + * node constraints corresponding to @p dof1 and @p dof2, + * respectively. These objects are particular important when continuous + * elements on grids with hanging nodes (locally refined grids) are + * involved. + * + * Furthermore note, that for the specific case when the finite element + * space corresponding to @p dof1 is a subset of the finite element space + * corresponding to @p dof2, this function is simply an identity mapping. */ template - void back_interpolate (const DoFHandler &dof1, + void back_interpolate (const DoFHandler &dof1, const ConstraintMatrix &constraints1, const InVector &u1, - const DoFHandler &dof2, + const DoFHandler &dof2, const ConstraintMatrix &constraints2, OutVector &u1_interpolated); @@@ -983,27 -654,22 +654,22 @@@ OutVector &z1_difference); /** - * Gives $(Id-I_h)z_1$ for a given - * @p dof1-function $z_1$, where $I_h$ - * is the interpolation from @p fe1 - * to @p fe2. The result $(Id-I_h)z_1$ is - * written into @p z1_difference. - * @p constraints1 and - * @p constraints2 are the - * hanging node constraints - * corresponding to @p dof1 and - * @p dof2, respectively. These - * objects are particular - * important when continuous - * elements on grids with hanging - * nodes (locally refined grids) - * are involved. + * Gives $(Id-I_h)z_1$ for a given @p dof1-function $z_1$, where $I_h$ is + * the interpolation from @p fe1 to @p fe2. The result $(Id-I_h)z_1$ is + * written into @p z1_difference. @p constraints1 and @p constraints2 are + * the hanging node constraints corresponding to @p dof1 and @p dof2, + * respectively. These objects are particular important when continuous + * elements on grids with hanging nodes (locally refined grids) are + * involved. + * + * For parallel computations with PETSc, supply @p z1 with ghost elements + * and @p z1_difference without ghost elements. */ template - void interpolation_difference(const DoFHandler &dof1, + void interpolation_difference(const DoFHandler &dof1, const ConstraintMatrix &constraints1, const InVector &z1, - const DoFHandler &dof2, + const DoFHandler &dof2, const ConstraintMatrix &constraints2, OutVector &z1_difference); @@@ -1071,29 -715,19 +715,19 @@@ OutVector &z2); /** - * Gives the patchwise - * extrapolation of a @p dof1 - * function @p z1 to a @p dof2 - * function @p z2. @p dof1 and - * @p dof2 need to be DoFHandler - * based on the same triangulation. - * @p constraints is a hanging - * node constraints object - * corresponding to - * @p dof2. This object is - * particular important when - * interpolating onto continuous - * elements on grids with hanging - * nodes (locally refined grids). - * - * Otherwise, the same holds as - * for the other @p extrapolate - * function. + * Gives the patchwise extrapolation of a @p dof1 function @p z1 to a @p + * dof2 function @p z2. @p dof1 and @p dof2 need to be DoFHandler based on + * the same triangulation. @p constraints is a hanging node constraints + * object corresponding to @p dof2. This object is particular important when + * interpolating onto continuous elements on grids with hanging nodes + * (locally refined grids). + * + * Otherwise, the same holds as for the other @p extrapolate function. */ template - void extrapolate (const DoFHandler &dof1, + void extrapolate (const DoFHandler &dof1, const InVector &z1, - const DoFHandler &dof2, + const DoFHandler &dof2, const ConstraintMatrix &constraints, OutVector &z2); //@}