From 8950eb29216811c9e621fee187240f674436ee0e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 18 Aug 2015 08:41:10 -0500 Subject: [PATCH] Rename a member variable for clarity. --- include/deal.II/fe/mapping_cartesian.h | 6 +- source/fe/mapping_cartesian.cc | 98 +++++++++++++------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/include/deal.II/fe/mapping_cartesian.h b/include/deal.II/fe/mapping_cartesian.h index 433bdc7bd0..01424fee79 100644 --- a/include/deal.II/fe/mapping_cartesian.h +++ b/include/deal.II/fe/mapping_cartesian.h @@ -166,10 +166,10 @@ private: virtual std::size_t memory_consumption () const; /** - * Length of the cell in different coordinate directions, - * hx, hy, hz. + * Extents of the last cell we have seen in the coordinate directions, + * i.e., hx, hy, hz. */ - mutable Tensor<1,dim> length; + mutable Tensor<1,dim> cell_extents; /** * The volume element diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc index 0fd570e2c6..c4c4ec1cc6 100644 --- a/source/fe/mapping_cartesian.cc +++ b/source/fe/mapping_cartesian.cc @@ -50,7 +50,7 @@ std::size_t MappingCartesian::InternalData::memory_consumption () const { return (Mapping::InternalDataBase::memory_consumption() + - MemoryConsumption::memory_consumption (length) + + MemoryConsumption::memory_consumption (cell_extents) + MemoryConsumption::memory_consumption (volume_element) + MemoryConsumption::memory_consumption (quadrature_points)); } @@ -207,16 +207,16 @@ MappingCartesian::compute_fill (const typename Triangulationvertex(1)(0) - start(0); + data.cell_extents[0] = cell->vertex(1)(0) - start(0); break; case 2: - data.length[0] = cell->vertex(1)(0) - start(0); - data.length[1] = cell->vertex(2)(1) - start(1); + data.cell_extents[0] = cell->vertex(1)(0) - start(0); + data.cell_extents[1] = cell->vertex(2)(1) - start(1); break; case 3: - data.length[0] = cell->vertex(1)(0) - start(0); - data.length[1] = cell->vertex(2)(1) - start(1); - data.length[2] = cell->vertex(4)(2) - start(2); + data.cell_extents[0] = cell->vertex(1)(0) - start(0); + data.cell_extents[1] = cell->vertex(2)(1) - start(1); + data.cell_extents[2] = cell->vertex(4)(2) - start(2); break; default: Assert(false, ExcNotImplemented()); @@ -257,7 +257,7 @@ MappingCartesian::compute_fill (const typename Triangulation::cell_iterator &cell, if (data.update_each & (update_JxW_values | update_volume_elements)) if (cell_similarity != CellSimilarity::translation) { - double J = data.length[0]; + double J = data.cell_extents[0]; for (unsigned int d=1; d::cell_iterator &cell, { output_data.jacobians[i] = DerivativeForm<1,dim,spacedim>(); for (unsigned int j=0; j::cell_iterator &cell, { output_data.inverse_jacobians[i]=Tensor<2,dim>(); for (unsigned int j=0; j::cell_iterator & double J = 1.; for (unsigned int d=0; d::unit_normal_direction[face_no]) - J *= data.length[d]; + J *= data.cell_extents[d]; if (data.update_each & update_JxW_values) for (unsigned int i=0; i::cell_iterator & if (data.update_each & update_volume_elements) { - J = data.length[0]; + J = data.cell_extents[0]; for (unsigned int d=1; d::cell_iterator & { output_data.jacobians[i] = DerivativeForm<1,dim,spacedim>(); for (unsigned int d=0; d::cell_iterator & { output_data.inverse_jacobians[i] = DerivativeForm<1,dim,spacedim>(); for (unsigned int d=0; d::cell_iterato double J = 1.; for (unsigned int d=0; d::unit_normal_direction[face_no]) - J *= data.length[d]; + J *= data.cell_extents[d]; if (data.update_each & update_JxW_values) { @@ -528,9 +528,9 @@ fill_fe_subface_values (const typename Triangulation::cell_iterato if (data.update_each & update_volume_elements) { - J = data.length[0]; + J = data.cell_extents[0]; for (unsigned int d=1; d::cell_iterato { output_data.jacobians[i] = DerivativeForm<1,dim,spacedim>(); for (unsigned int d=0; d::cell_iterato { output_data.inverse_jacobians[i] = DerivativeForm<1,spacedim,dim>(); for (unsigned int d=0; d::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int i=0; i::transform ( for (unsigned int k=0; k::transform ( for (unsigned int k=0; k::transform ( for (unsigned int k=0; k::transform ( for (unsigned int k=0; k