From: wolf Date: Sun, 28 Sep 2003 14:29:11 +0000 (+0000) Subject: Remove some fields that seem to have been left-over from copy-paste times. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84addf5561c7bb1c4e4f807ee155ae75af4fd09b;p=dealii-svn.git Remove some fields that seem to have been left-over from copy-paste times. git-svn-id: https://svn.dealii.org/trunk@8044 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index f6aef565d8..832fcec868 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -227,21 +227,6 @@ class MappingCartesian : public Mapping * points of all faces. */ std::vector > quadrature_points; - - /** - * Unit tangential vectors. Used - * for the computation of - * boundary forms and normal - * vectors. - * - * Filled once. - */ - Table<2,Tensor<1,dim> > unit_tangentials; - - /** - * Auxiliary vectors for internal use. - */ - Table<2,Tensor<1,dim> > aux; }; /** diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index 5214b53ae3..fcfc88ae3a 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -46,9 +46,7 @@ MappingCartesian::InternalData::memory_consumption () const { return (Mapping::InternalDataBase::memory_consumption() + MemoryConsumption::memory_consumption (length) + - MemoryConsumption::memory_consumption (quadrature_points) + - MemoryConsumption::memory_consumption (unit_tangentials) + - MemoryConsumption::memory_consumption (aux)); + MemoryConsumption::memory_consumption (quadrature_points)); } @@ -81,8 +79,6 @@ typename Mapping::InternalDataBase * MappingCartesian::get_data (const UpdateFlags update_flags, const Quadrature &q) const { - // Assert (flags & update_normal_vectors == 0, ExcNotImplemented()); - InternalData* data = new InternalData (q); data->update_once = update_once(update_flags); @@ -227,43 +223,62 @@ MappingCartesian::compute_fill (const typename DoFHandler::cell_iterat Assert (normal_vectors.size() == npts, ExcDimensionMismatch(normal_vectors.size(), npts)); Point n; - switch (100*dim+face_no) - { - // 2D - case 200: - n (1) = -1.; - break; - case 201: - n (0) = 1.; - break; - case 202: - n (1) = 1.; - break; - case 203: - n (0) = -1.; - break; - // 3D - case 300: - n (1) = -1.; - break; - case 301: - n (1) = 1.; - break; - case 302: - n (2) = -1.; - break; - case 303: - n (0) = 1.; - break; - case 304: - n (2) = 1.; - break; - case 305: - n (0) = -1.; - break; - default: - Assert (false, ExcInternalError()); - } + switch (dim) + { + case 2: + { + switch (face_no) + { + case 0: + n (1) = -1.; + break; + case 1: + n (0) = 1.; + break; + case 2: + n (1) = 1.; + break; + case 3: + n (0) = -1.; + break; + default: + Assert (false, ExcInternalError()); + } + break; + } + + case 3: + { + switch (face_no) + { + case 0: + n (1) = -1.; + break; + case 1: + n (1) = 1.; + break; + case 2: + n (2) = -1.; + break; + case 3: + n (0) = 1.; + break; + case 4: + n (2) = 1.; + break; + case 5: + n (0) = -1.; + break; + default: + Assert (false, ExcInternalError()); + } + break; + } + + default: + Assert (false, ExcNotImplemented()); + } + // furthermore, all normal // vectors on a face are equal std::fill (normal_vectors.begin(), normal_vectors.end(), n);