From 053a7dc195fd133a59ef0d97d50cce388dd0c2a6 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 18 Jul 2010 18:48:05 +0000 Subject: [PATCH] Take over patches r21520 and r21521 from mainline. git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21522 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 12 ++++++++++++ deal.II/examples/step-33/step-33.cc | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index a799e84952..f4898f3893 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -38,6 +38,18 @@ inconvenience this causes.

General

    +
  1. +

    Fixed: The step-33 tutorial program can not be built with GCC versions + 4.5.x. There are in fact two problems, on that pertains to uses of + std::make_pair that don't work any more with the upcoming + C++ 1x standard that GCC 4.5.x already follows, and some in which the + Trilinos package Sacado is incompatible with GCC 4.5.x, at least up to + Trilinos version 10.4.0. While the latter problem can only be fixed in + future Trilinos versions, at least the former problem is solved in step-33. +
    + (WB 2010/07/18) +

    +
  2. Fixed: GCC version 3.4.0 failed to compile the file deal.II/source/numerics/matrices.cc with diff --git a/deal.II/examples/step-33/step-33.cc b/deal.II/examples/step-33/step-33.cc index f862e8abbc..002d7f4aa3 100644 --- a/deal.II/examples/step-33/step-33.cc +++ b/deal.II/examples/step-33/step-33.cc @@ -3,7 +3,7 @@ /* $Id$ */ /* */ -/* Copyright (C) 2007, 2008, 2009 by the deal.II authors and David Neckels */ +/* Copyright (C) 2007, 2008, 2009, 2010 by the deal.II authors and David Neckels */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -2619,14 +2619,14 @@ ConservationLaw::solve (Vector &newton_update) case Parameters::Solver::direct: { SolverControl solver_control (1,0); - TrilinosWrappers::SolverDirect direct (solver_control, - parameters.output == + TrilinosWrappers::SolverDirect direct (solver_control, + parameters.output == Parameters::Solver::verbose); direct.solve (system_matrix, newton_update, right_hand_side); - return std::make_pair (solver_control.last_step(), - solver_control.last_value()); + return std::pair (solver_control.last_step(), + solver_control.last_value()); } // Likewise, if we are to use an @@ -2645,7 +2645,7 @@ ConservationLaw::solve (Vector &newton_update) // solver and set a bunch of options // that can be changed from the // parameter file. - // + // // There are two more practicalities: // Since we have built our right hand // side and solution vector as @@ -2678,9 +2678,9 @@ ConservationLaw::solve (Vector &newton_update) // constantness using a const_cast. case Parameters::Solver::gmres: { - Epetra_Vector x(View, system_matrix.domain_partitioner(), + Epetra_Vector x(View, system_matrix.domain_partitioner(), newton_update.begin()); - Epetra_Vector b(View, system_matrix.range_partitioner(), + Epetra_Vector b(View, system_matrix.range_partitioner(), right_hand_side.begin()); AztecOO solver; @@ -2710,13 +2710,13 @@ ConservationLaw::solve (Vector &newton_update) solver.Iterate(parameters.max_iterations, parameters.linear_residual); - return std::make_pair (solver.NumIters(), - solver.TrueResidual()); + return std::pair (solver.NumIters(), + solver.TrueResidual()); } } Assert (false, ExcNotImplemented()); - return std::make_pair (0,0); + return std::pair (0,0); } -- 2.39.5