From: bangerth Date: Sun, 22 May 2011 18:47:43 +0000 (+0000) Subject: Adjust two more instances of old-style paths. No idea how the script missed that... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=527224141a9cec92df5431548e6197ce90e90469;p=dealii-svn.git Adjust two more instances of old-style paths. No idea how the script missed that... git-svn-id: https://svn.dealii.org/trunk@23734 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/relaxation_block.templates.h b/deal.II/include/deal.II/lac/relaxation_block.templates.h index 135953a0ed..1ede67e156 100644 --- a/deal.II/include/deal.II/lac/relaxation_block.templates.h +++ b/deal.II/include/deal.II/lac/relaxation_block.templates.h @@ -15,7 +15,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -56,15 +56,15 @@ RelaxationBlock::initialize ( const AdditionalData parameters) { Assert (parameters.invert_diagonal, ExcNotImplemented()); - + clear(); // Assert (M.m() == M.n(), ExcNotQuadratic()); A = &M; additional_data = parameters; - + this->reinit(additional_data.block_list->size(), 0, additional_data.same_diagonal, additional_data.inversion); - + if (parameters.invert_diagonal) invert_diagblocks(); } @@ -159,16 +159,16 @@ RelaxationBlock::do_step ( const bool backward) const { Assert (additional_data.invert_diagonal, ExcNotImplemented()); - + const MATRIX &M=*this->A; Vector b_cell, x_cell; - + const unsigned int n_blocks = additional_data.block_list->size(); for (unsigned int bi=0;biblock_size(block); - + b_cell.reinit(bs); x_cell.reinit(bs); // Collect off-diagonal parts diff --git a/deal.II/source/fe/mapping_q1.cc b/deal.II/source/fe/mapping_q1.cc index bd7010fbc6..f612f60f31 100644 --- a/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/source/fe/mapping_q1.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -1466,7 +1466,7 @@ MappingQ1::transform_unit_to_real_cell ( if(mdata->mapping_support_points.size() > mdata->shape_values.size()) mdata->mapping_support_points.resize (GeometryInfo::vertices_per_cell); - + return transform_unit_to_real_cell_internal(*mdata); } @@ -1547,15 +1547,15 @@ transform_real_to_unit_cell_internal const unsigned int n_shapes=mdata.shape_values.size(); Assert(n_shapes!=0, ExcInternalError()); Assert(mdata.shape_derivatives.size()==n_shapes, ExcInternalError()); - + std::vector > &points=mdata.mapping_support_points; Assert(points.size()==n_shapes, ExcInternalError()); - + // Newton iteration to solve // f(x)=p(x)-p=0 // x_{n+1}=x_n-[f'(x)]^{-1}f(x) - + // The start value is set to be the // center of the unit cell. @@ -1629,7 +1629,7 @@ transform_real_to_unit_cell_internal // by the cell. for(unsigned int i=0;i > (1, p_unit), mdata);