From: kanschat Date: Tue, 22 Jan 2013 15:39:44 +0000 (+0000) Subject: remove deprecated function calls X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d7189b1b0642f731d79c030433a8bb1a5ea118;p=dealii-svn.git remove deprecated function calls git-svn-id: https://svn.dealii.org/trunk@28155 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/multigrid/mg_block_smoother.h b/deal.II/include/deal.II/multigrid/mg_block_smoother.h index 23ac5d7175..6c5b41768b 100644 --- a/deal.II/include/deal.II/multigrid/mg_block_smoother.h +++ b/deal.II/include/deal.II/multigrid/mg_block_smoother.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2005, 2006, 2010, 2012 by the deal.II authors +// Copyright (C) 2005, 2006, 2010, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -203,8 +203,8 @@ template inline void MGSmootherBlock::clear () { - unsigned int i=matrices.get_minlevel(), - max_level=matrices.get_maxlevel(); + unsigned int i=matrices.min_level(), + max_level=matrices.max_level(); for (; i<=max_level; ++i) { smoothers[i] = 0; @@ -220,8 +220,8 @@ MGSmootherBlock::initialize ( const MGMATRIX &m, const MGRELAX &s) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); matrices.resize(min, max); smoothers.resize(min, max); diff --git a/deal.II/include/deal.II/multigrid/mg_smoother.h b/deal.II/include/deal.II/multigrid/mg_smoother.h index b50788d9cb..866beb447e 100644 --- a/deal.II/include/deal.II/multigrid/mg_smoother.h +++ b/deal.II/include/deal.II/multigrid/mg_smoother.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -779,8 +779,8 @@ namespace mg const MGLevelObject &m, const typename RELAX::AdditionalData &data) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); this->resize(min, max); @@ -796,8 +796,8 @@ namespace mg const MGLevelObject &m, const MGLevelObject &data) { - const unsigned int min = std::max(m.get_minlevel(), data.get_minlevel()); - const unsigned int max = std::min(m.get_maxlevel(), data.get_maxlevel()); + const unsigned int min = std::max(m.min_level(), data.min_level()); + const unsigned int max = std::min(m.max_level(), data.max_level()); this->resize(min, max); @@ -813,7 +813,7 @@ namespace mg VECTOR &u, const VECTOR &rhs) const { - unsigned int maxlevel = this->get_maxlevel(); + unsigned int maxlevel = this->max_level(); unsigned int steps2 = this->steps; if (this->variable) @@ -872,8 +872,8 @@ MGSmootherRelaxation::clear () { smoothers.clear(); - unsigned int i=matrices.get_minlevel(), - max_level=matrices.get_maxlevel(); + unsigned int i=matrices.min_level(), + max_level=matrices.max_level(); for (; i<=max_level; ++i) matrices[i]=0; } @@ -886,8 +886,8 @@ MGSmootherRelaxation::initialize ( const MGLevelObject &m, const typename RELAX::AdditionalData &data) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); matrices.resize(min, max); smoothers.resize(min, max); @@ -906,13 +906,13 @@ MGSmootherRelaxation::initialize ( const MGLevelObject &m, const MGLevelObject &data) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); - Assert (data.get_minlevel() == min, - ExcDimensionMismatch(data.get_minlevel(), min)); - Assert (data.get_maxlevel() == max, - ExcDimensionMismatch(data.get_maxlevel(), max)); + Assert (data.min_level() == min, + ExcDimensionMismatch(data.min_level(), min)); + Assert (data.max_level() == max, + ExcDimensionMismatch(data.max_level(), max)); matrices.resize(min, max); smoothers.resize(min, max); @@ -933,8 +933,8 @@ MGSmootherRelaxation::initialize ( const unsigned int row, const unsigned int col) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); matrices.resize(min, max); smoothers.resize(min, max); @@ -955,13 +955,13 @@ MGSmootherRelaxation::initialize ( const unsigned int row, const unsigned int col) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); - Assert (data.get_minlevel() == min, - ExcDimensionMismatch(data.get_minlevel(), min)); - Assert (data.get_maxlevel() == max, - ExcDimensionMismatch(data.get_maxlevel(), max)); + Assert (data.min_level() == min, + ExcDimensionMismatch(data.min_level(), min)); + Assert (data.max_level() == max, + ExcDimensionMismatch(data.max_level(), max)); matrices.resize(min, max); smoothers.resize(min, max); @@ -981,7 +981,7 @@ MGSmootherRelaxation::smooth( VECTOR &u, const VECTOR &rhs) const { - unsigned int maxlevel = smoothers.get_maxlevel(); + unsigned int maxlevel = smoothers.max_level(); unsigned int steps2 = this->steps; if (this->variable) @@ -1041,8 +1041,8 @@ MGSmootherPrecondition::clear () { smoothers.clear(); - unsigned int i=matrices.get_minlevel(), - max_level=matrices.get_maxlevel(); + unsigned int i=matrices.min_level(), + max_level=matrices.max_level(); for (; i<=max_level; ++i) matrices[i]=0; } @@ -1056,8 +1056,8 @@ MGSmootherPrecondition::initialize ( const MGLevelObject &m, const typename PRECONDITIONER::AdditionalData &data) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); matrices.resize(min, max); smoothers.resize(min, max); @@ -1078,13 +1078,13 @@ MGSmootherPrecondition::initialize ( const MGLevelObject &m, const MGLevelObject &data) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); - Assert (data.get_minlevel() == min, - ExcDimensionMismatch(data.get_minlevel(), min)); - Assert (data.get_maxlevel() == max, - ExcDimensionMismatch(data.get_maxlevel(), max)); + Assert (data.min_level() == min, + ExcDimensionMismatch(data.min_level(), min)); + Assert (data.max_level() == max, + ExcDimensionMismatch(data.max_level(), max)); matrices.resize(min, max); smoothers.resize(min, max); @@ -1107,8 +1107,8 @@ MGSmootherPrecondition::initialize ( const unsigned int row, const unsigned int col) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); matrices.resize(min, max); smoothers.resize(min, max); @@ -1131,13 +1131,13 @@ MGSmootherPrecondition::initialize ( const unsigned int row, const unsigned int col) { - const unsigned int min = m.get_minlevel(); - const unsigned int max = m.get_maxlevel(); + const unsigned int min = m.min_level(); + const unsigned int max = m.max_level(); - Assert (data.get_minlevel() == min, - ExcDimensionMismatch(data.get_minlevel(), min)); - Assert (data.get_maxlevel() == max, - ExcDimensionMismatch(data.get_maxlevel(), max)); + Assert (data.min_level() == min, + ExcDimensionMismatch(data.min_level(), min)); + Assert (data.max_level() == max, + ExcDimensionMismatch(data.max_level(), max)); matrices.resize(min, max); smoothers.resize(min, max); @@ -1158,7 +1158,7 @@ MGSmootherPrecondition::smooth( VECTOR &u, const VECTOR &rhs) const { - unsigned int maxlevel = matrices.get_maxlevel(); + unsigned int maxlevel = matrices.max_level(); unsigned int steps2 = this->steps; if (this->variable)