From: Guido Kanschat Date: Thu, 5 Jan 2006 17:53:07 +0000 (+0000) Subject: change sub_face to subface like everywhere else X-Git-Tag: v8.0.0~12701 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db268ea2c17986df2a50cc6f762673cef8aba64d;p=dealii.git change sub_face to subface like everywhere else git-svn-id: https://svn.dealii.org/trunk@11958 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/qprojector.h b/deal.II/base/include/base/qprojector.h index a4232e56c1..da3e4cb579 100644 --- a/deal.II/base/include/base/qprojector.h +++ b/deal.II/base/include/base/qprojector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -323,7 +323,7 @@ class QProjector */ static DataSetDescriptor - sub_face (const unsigned int face_no, + subface (const unsigned int face_no, const unsigned int subface_no, const bool face_orientation, const unsigned int n_quadrature_points); diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index f295340442..01c1f7bfc1 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1032,7 +1032,7 @@ face (const unsigned int face_no, template typename QProjector::DataSetDescriptor QProjector::DataSetDescriptor:: -sub_face (const unsigned int face_no, +subface (const unsigned int face_no, const unsigned int subface_no, const bool face_orientation, const unsigned int n_quadrature_points) diff --git a/deal.II/deal.II/source/fe/fe_nedelec.cc b/deal.II/deal.II/source/fe/fe_nedelec.cc index 781252c9a1..0cc239c62d 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1272,7 +1272,7 @@ FE_Nedelec::fill_fe_subface_values (const Mapping &m // faces are stored contiguously) const typename QProjector::DataSetDescriptor offset = (QProjector::DataSetDescriptor:: - sub_face (face, subface, cell->face_orientation(face), + subface (face, subface, cell->face_orientation(face), quadrature.n_quadrature_points)); // get the flags indicating the diff --git a/deal.II/deal.II/source/fe/fe_poly.cc b/deal.II/deal.II/source/fe/fe_poly.cc index 917aaca24a..86932b2fce 100644 --- a/deal.II/deal.II/source/fe/fe_poly.cc +++ b/deal.II/deal.II/source/fe/fe_poly.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -346,7 +346,7 @@ FE_Poly::fill_fe_subface_values (const Mapping const typename QProjector::DataSetDescriptor dsd; const typename QProjector::DataSetDescriptor offset - = dsd.sub_face (face, subface, cell->face_orientation(face), + = dsd.subface (face, subface, cell->face_orientation(face), quadrature.n_quadrature_points); const UpdateFlags flags(fe_data.update_once | fe_data.update_each); diff --git a/deal.II/deal.II/source/fe/fe_poly_tensor.cc b/deal.II/deal.II/source/fe/fe_poly_tensor.cc index 7c92ab7d75..ba3131dfd1 100644 --- a/deal.II/deal.II/source/fe/fe_poly_tensor.cc +++ b/deal.II/deal.II/source/fe/fe_poly_tensor.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -399,7 +399,7 @@ FE_PolyTensor::fill_fe_subface_values ( const typename QProjector::DataSetDescriptor dsd; const typename QProjector::DataSetDescriptor offset - = dsd.sub_face (face, subface, cell->face_orientation(face), + = dsd.subface (face, subface, cell->face_orientation(face), n_quad); const UpdateFlags flags(fe_data.update_once | fe_data.update_each); diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index 06f734d7ba..911ee35538 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -207,7 +207,7 @@ MappingCartesian::compute_fill (const typename Triangulation::cell_ite quadrature_points.size()) : // called from FESubfaceValues - QProjector::DataSetDescriptor::sub_face (face_no, sub_no, + QProjector::DataSetDescriptor::subface (face_no, sub_no, cell->face_orientation(face_no), quadrature_points.size()) )); diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index 5e53b1efc3..b049360125 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -397,7 +397,7 @@ MappingQ::fill_fe_subface_values (const typename Triangulation::cell_i this->compute_fill_face (cell, face_no, true, n_q_points, QProjector::DataSetDescriptor:: - sub_face (face_no, sub_no, + subface (face_no, sub_no, cell->face_orientation(face_no), n_q_points), q.get_weights(), diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index b867bd7fb2..4c68f11193 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -712,7 +712,7 @@ MappingQ1::fill_fe_subface_values (const typename Triangulation::cell_ compute_fill_face (cell, face_no, true, n_q_points, - DataSetDescriptor::sub_face (face_no, sub_no, + DataSetDescriptor::subface (face_no, sub_no, cell->face_orientation(face_no), n_q_points), q.get_weights(),