From 49d73ee37e3ef1c0de65a604278c8051a4978fc9 Mon Sep 17 00:00:00 2001 From: heltai Date: Wed, 15 Jan 2014 09:34:44 +0000 Subject: [PATCH] Merged from trunk r32200 through r32214. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32215 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/config.h.in | 6 +++++- .../deal.II/dofs/dof_accessor.templates.h | 8 +++++--- deal.II/include/deal.II/grid/grid_tools.h | 14 +++++++------- deal.II/include/deal.II/lac/vector.h | 4 ++-- deal.II/source/grid/grid_out.cc | 4 ++-- deal.II/source/grid/tria_accessor.cc | 4 ++-- .../numerics/vector_tools_interpolate.inst.in | 17 +++++++++-------- 7 files changed, 32 insertions(+), 25 deletions(-) diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index c0a1eda16b..757cf70c39 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2012 - 2013 by the deal.II authors +// Copyright (C) 2012 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -187,6 +187,10 @@ # pragma warning( disable : 4700 ) /* uninitialized local variable */ # pragma warning( disable : 4789 ) /* destination of memory copy is too small */ # pragma warning( disable : 4808 ) /* case 'value' is not a valid value for switch condition of type 'bool */ + +/* Also make sure we don't let MS Windows headers define min/max as + macros, see http://support.microsoft.com/kb/143208 */ +# define NOMINMAX #endif /*_MSC_VER*/ diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index e3dc97f94b..327146e3f5 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1999 - 2013 by the deal.II authors +// Copyright (C) 1999 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -77,7 +77,8 @@ template template inline DoFAccessor::DoFAccessor (const DoFAccessor &other) - : BaseClass(other), dof_handler(const_cast(other.dof_handler)) + : BaseClass(other), + dof_handler(0) { Assert (false, ExcInvalidObject()); } @@ -88,7 +89,8 @@ template template inline DoFAccessor::DoFAccessor (const DoFAccessor &other) - : BaseClass(other), dof_handler(const_cast(other.dof_handler)) + : BaseClass(other), + dof_handler(const_cast(other.dof_handler)) { } diff --git a/deal.II/include/deal.II/grid/grid_tools.h b/deal.II/include/deal.II/grid/grid_tools.h index b65081d4a5..5f43b3af9e 100644 --- a/deal.II/include/deal.II/grid/grid_tools.h +++ b/deal.II/include/deal.II/grid/grid_tools.h @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2001 - 2013 by the deal.II authors +// Copyright (C) 2001 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -1236,11 +1236,11 @@ namespace GridTools - template - std::vector - get_active_child_cells (const typename DH::cell_iterator &cell) + template + std::vector + get_active_child_cells (const typename Container::cell_iterator &cell) { - std::vector child_cells; + std::vector child_cells; if (cell->has_children()) { @@ -1248,8 +1248,8 @@ namespace GridTools childn_children(); ++child) if (cell->child (child)->has_children()) { - const std::vector - children = get_active_child_cells (cell->child(child)); + const std::vector + children = get_active_child_cells (cell->child(child)); child_cells.insert (child_cells.end(), children.begin(), children.end()); } diff --git a/deal.II/include/deal.II/lac/vector.h b/deal.II/include/deal.II/lac/vector.h index 8dae825247..ceea283c5d 100644 --- a/deal.II/include/deal.II/lac/vector.h +++ b/deal.II/include/deal.II/lac/vector.h @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1999 - 2013 by the deal.II authors +// Copyright (C) 1999 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -1233,7 +1233,7 @@ inline Vector & Vector::operator = (const Vector &v) { - internal::Vector::copy_vector (v, *this); + dealii::internal::Vector::copy_vector (v, *this); return *this; } diff --git a/deal.II/source/grid/grid_out.cc b/deal.II/source/grid/grid_out.cc index edf857458e..f0dd256b68 100644 --- a/deal.II/source/grid/grid_out.cc +++ b/deal.II/source/grid/grid_out.cc @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1999 - 2013 by the deal.II authors +// Copyright (C) 1999 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -1530,7 +1530,7 @@ void GridOut::write_svg(const Triangulation<2,2> &tria, std::ostream &out) const Point<3> camera_direction_temp; Point<3> camera_horizontal_temp; - const float angle_factor = 3.14159265 / 180.; + const double angle_factor = 3.14159265 / 180.; // (I) rotate the camera to the chosen polar angle camera_position_temp[1] = cos(angle_factor * svg_flags.polar_angle) * camera_position[1] - sin(angle_factor * svg_flags.polar_angle) * camera_position[2]; diff --git a/deal.II/source/grid/tria_accessor.cc b/deal.II/source/grid/tria_accessor.cc index e979820df3..3db487f43f 100644 --- a/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/source/grid/tria_accessor.cc @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1998 - 2013 by the deal.II authors +// Copyright (C) 1998 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -1249,7 +1249,7 @@ bool CellAccessor<3>::point_inside (const Point<3> &p) const return (GeometryInfo::is_inside_unit_cell (StaticMappingQ1::mapping.transform_real_to_unit_cell(cell_iterator, p))); } - catch (const Mapping::ExcTransformationFailed &e) + catch (const Mapping::ExcTransformationFailed &) { return false; } diff --git a/deal.II/source/numerics/vector_tools_interpolate.inst.in b/deal.II/source/numerics/vector_tools_interpolate.inst.in index 9889393677..a21c69a76b 100644 --- a/deal.II/source/numerics/vector_tools_interpolate.inst.in +++ b/deal.II/source/numerics/vector_tools_interpolate.inst.in @@ -32,6 +32,15 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens (const DoFHandler&, const Function&, VEC&); + + template + void interpolate + (const DoFHandler&, + const DoFHandler&, + const FullMatrix&, + const VEC&, + VEC&); + \} #endif } @@ -57,14 +66,6 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens (const hp::DoFHandler&, const Function&, VEC&); - - template - void interpolate - (const DoFHandler&, - const DoFHandler&, - const FullMatrix&, - const VEC&, - VEC&); template void interpolate_based_on_material_id(const Mapping&, -- 2.39.5