From 981ada3dee8e61a1aa267eae239d98e6b382788c Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 13 Sep 2007 23:47:15 +0000 Subject: [PATCH] Rename the patch_second_derivatives field in the private Data structures of the DataOut classes to patch_hessians, to be conforming to the new naming convention Guido introduces. git-svn-id: https://svn.dealii.org/trunk@15211 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/data_out.h | 12 +++++----- .../deal.II/include/numerics/data_out_faces.h | 4 ++-- .../include/numerics/data_out_rotation.h | 4 ++-- deal.II/deal.II/source/numerics/data_out.cc | 22 +++++++++---------- .../deal.II/source/numerics/data_out_faces.cc | 14 ++++++------ .../source/numerics/data_out_rotation.cc | 14 ++++++------ 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 94cec56ec0..c7a9d4515e 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -637,7 +637,7 @@ class DataOut_DoFData : public DataOutInterface virtual void get_function_second_derivatives (const FEValuesBase &fe_patch_values, - std::vector > &patch_second_derivatives) const = 0; + std::vector > &patch_hessians) const = 0; /** * Given a FEValuesBase object, extract @@ -650,7 +650,7 @@ class DataOut_DoFData : public DataOutInterface virtual void get_function_second_derivatives (const FEValuesBase &fe_patch_values, - std::vector > > &patch_second_derivatives_system) const = 0; + std::vector > > &patch_hessians_system) const = 0; /** * Clear all references to the @@ -779,7 +779,7 @@ class DataOut_DoFData : public DataOutInterface virtual void get_function_second_derivatives (const FEValuesBase &fe_patch_values, - std::vector > &patch_second_derivatives) const; + std::vector > &patch_hessians) const; /** * Given a FEValuesBase object, extract @@ -792,7 +792,7 @@ class DataOut_DoFData : public DataOutInterface virtual void get_function_second_derivatives (const FEValuesBase &fe_patch_values, - std::vector > > &patch_second_derivatives_system) const; + std::vector > > &patch_hessians_system) const; /** * Clear all references to the @@ -1143,8 +1143,8 @@ class DataOut : public DataOut_DoFData std::vector > patch_values_system; std::vector > patch_gradients; std::vector > > patch_gradients_system; - std::vector > patch_second_derivatives; - std::vector > > patch_second_derivatives_system; + std::vector > patch_hessians; + std::vector > > patch_hessians_system; std::vector > dummy_normals; std::vector > > postprocessed_values; diff --git a/deal.II/deal.II/include/numerics/data_out_faces.h b/deal.II/deal.II/include/numerics/data_out_faces.h index 49b17a46d2..bd86ce8ce8 100644 --- a/deal.II/deal.II/include/numerics/data_out_faces.h +++ b/deal.II/deal.II/include/numerics/data_out_faces.h @@ -200,8 +200,8 @@ class DataOutFaces : public DataOut_DoFData > patch_values_system; std::vector > patch_gradients; std::vector > > patch_gradients_system; - std::vector > patch_second_derivatives; - std::vector > > patch_second_derivatives_system; + std::vector > patch_hessians; + std::vector > > patch_hessians_system; std::vector > > postprocessed_values; std::vector > patch_normals; Data () diff --git a/deal.II/deal.II/include/numerics/data_out_rotation.h b/deal.II/deal.II/include/numerics/data_out_rotation.h index c8733d1228..843f395281 100644 --- a/deal.II/deal.II/include/numerics/data_out_rotation.h +++ b/deal.II/deal.II/include/numerics/data_out_rotation.h @@ -189,8 +189,8 @@ class DataOutRotation : public DataOut_DoFData std::vector > patch_values_system; std::vector > patch_gradients; std::vector > > patch_gradients_system; - std::vector > patch_second_derivatives; - std::vector > > patch_second_derivatives_system; + std::vector > patch_hessians; + std::vector > > patch_hessians_system; std::vector > > postprocessed_values; std::vector > dummy_normals; Data () diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 2d6622b26c..d51968fadb 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -143,9 +143,9 @@ void DataOut_DoFData:: DataEntry:: get_function_second_derivatives (const FEValuesBase &fe_patch_values, - std::vector > > &patch_second_derivatives_system) const + std::vector > > &patch_hessians_system) const { - fe_patch_values.get_function_2nd_derivatives (*vector, patch_second_derivatives_system); + fe_patch_values.get_function_2nd_derivatives (*vector, patch_hessians_system); } @@ -157,9 +157,9 @@ void DataOut_DoFData:: DataEntry:: get_function_second_derivatives (const FEValuesBase &fe_patch_values, - std::vector > &patch_second_derivatives) const + std::vector > &patch_hessians) const { - fe_patch_values.get_function_2nd_derivatives (*vector, patch_second_derivatives); + fe_patch_values.get_function_2nd_derivatives (*vector, patch_hessians); } @@ -615,11 +615,11 @@ void DataOut::build_some_patches (Data &data) data.patch_gradients); if (update_flags & update_hessians) this->dof_data[dataset]->get_function_second_derivatives (fe_patch_values, - data.patch_second_derivatives); + data.patch_hessians); postprocessor-> compute_derived_quantities_scalar(data.patch_values, data.patch_gradients, - data.patch_second_derivatives, + data.patch_hessians, data.dummy_normals, data.postprocessed_values[dataset]); } @@ -637,11 +637,11 @@ void DataOut::build_some_patches (Data &data) data.patch_gradients_system); if (update_flags & update_hessians) this->dof_data[dataset]->get_function_second_derivatives (fe_patch_values, - data.patch_second_derivatives_system); + data.patch_hessians_system); postprocessor-> compute_derived_quantities_vector(data.patch_values_system, data.patch_gradients_system, - data.patch_second_derivatives_system, + data.patch_hessians_system, data.dummy_normals, data.postprocessed_values[dataset]); } @@ -893,8 +893,8 @@ void DataOut::build_patches (const Mapping &mapping, thread_data[i].patch_values_system.resize (n_q_points); thread_data[i].patch_gradients.resize (n_q_points); thread_data[i].patch_gradients_system.resize (n_q_points); - thread_data[i].patch_second_derivatives.resize (n_q_points); - thread_data[i].patch_second_derivatives_system.resize (n_q_points); + thread_data[i].patch_hessians.resize (n_q_points); + thread_data[i].patch_hessians_system.resize (n_q_points); thread_data[i].dummy_normals.clear(); thread_data[i].postprocessed_values.resize(this->dof_data.size()); thread_data[i].mapping = &mapping; @@ -905,7 +905,7 @@ void DataOut::build_patches (const Mapping &mapping, { thread_data[i].patch_values_system[k].reinit(n_components); thread_data[i].patch_gradients_system[k].resize(n_components); - thread_data[i].patch_second_derivatives_system[k].resize(n_components); + thread_data[i].patch_hessians_system[k].resize(n_components); } for (unsigned int dataset=0; datasetdof_data.size(); ++dataset) diff --git a/deal.II/deal.II/source/numerics/data_out_faces.cc b/deal.II/deal.II/source/numerics/data_out_faces.cc index 2263826986..5d13229800 100644 --- a/deal.II/deal.II/source/numerics/data_out_faces.cc +++ b/deal.II/deal.II/source/numerics/data_out_faces.cc @@ -130,11 +130,11 @@ void DataOutFaces::build_some_patches (Data &data) data.patch_gradients); if (update_flags & update_hessians) this->dof_data[dataset]->get_function_second_derivatives (fe_patch_values, - data.patch_second_derivatives); + data.patch_hessians); postprocessor-> compute_derived_quantities_scalar(data.patch_values, data.patch_gradients, - data.patch_second_derivatives, + data.patch_hessians, data.patch_normals, data.postprocessed_values[dataset]); } @@ -152,11 +152,11 @@ void DataOutFaces::build_some_patches (Data &data) data.patch_gradients_system); if (update_flags & update_hessians) this->dof_data[dataset]->get_function_second_derivatives (fe_patch_values, - data.patch_second_derivatives_system); + data.patch_hessians_system); postprocessor-> compute_derived_quantities_vector(data.patch_values_system, data.patch_gradients_system, - data.patch_second_derivatives_system, + data.patch_hessians_system, data.patch_normals, data.postprocessed_values[dataset]); } @@ -293,8 +293,8 @@ void DataOutFaces::build_patches (const unsigned int nnnn_subdivisions, thread_data[i].patch_values_system.resize (n_q_points); thread_data[i].patch_gradients.resize (n_q_points); thread_data[i].patch_gradients_system.resize (n_q_points); - thread_data[i].patch_second_derivatives.resize (n_q_points); - thread_data[i].patch_second_derivatives_system.resize (n_q_points); + thread_data[i].patch_hessians.resize (n_q_points); + thread_data[i].patch_hessians_system.resize (n_q_points); thread_data[i].patch_normals.resize (n_q_points); thread_data[i].postprocessed_values.resize (this->dof_data.size()); @@ -302,7 +302,7 @@ void DataOutFaces::build_patches (const unsigned int nnnn_subdivisions, { thread_data[i].patch_values_system[k].reinit(n_components); thread_data[i].patch_gradients_system[k].resize(n_components); - thread_data[i].patch_second_derivatives_system[k].resize(n_components); + thread_data[i].patch_hessians_system[k].resize(n_components); } for (unsigned int dataset=0; datasetdof_data.size(); ++dataset) diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index a76adfb4f3..1a488bae32 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -214,11 +214,11 @@ void DataOutRotation::build_some_patches (Data &data) data.patch_gradients); if (update_flags & update_hessians) this->dof_data[dataset]->get_function_second_derivatives (fe_patch_values, - data.patch_second_derivatives); + data.patch_hessians); postprocessor-> compute_derived_quantities_scalar(data.patch_values, data.patch_gradients, - data.patch_second_derivatives, + data.patch_hessians, data.dummy_normals, data.postprocessed_values[dataset]); } @@ -236,11 +236,11 @@ void DataOutRotation::build_some_patches (Data &data) data.patch_gradients_system); if (update_flags & update_hessians) this->dof_data[dataset]->get_function_second_derivatives (fe_patch_values, - data.patch_second_derivatives_system); + data.patch_hessians_system); postprocessor-> compute_derived_quantities_vector(data.patch_values_system, data.patch_gradients_system, - data.patch_second_derivatives_system, + data.patch_hessians_system, data.dummy_normals, data.postprocessed_values[dataset]); } @@ -492,8 +492,8 @@ void DataOutRotation::build_patches ( thread_data[i].patch_values_system.resize (n_q_points); thread_data[i].patch_gradients.resize (n_q_points); thread_data[i].patch_gradients_system.resize (n_q_points); - thread_data[i].patch_second_derivatives.resize (n_q_points); - thread_data[i].patch_second_derivatives_system.resize (n_q_points); + thread_data[i].patch_hessians.resize (n_q_points); + thread_data[i].patch_hessians_system.resize (n_q_points); thread_data[i].dummy_normals.clear(); thread_data[i].postprocessed_values.resize(this->dof_data.size()); @@ -501,7 +501,7 @@ void DataOutRotation::build_patches ( { thread_data[i].patch_values_system[k].reinit(n_components); thread_data[i].patch_gradients_system[k].resize(n_components); - thread_data[i].patch_second_derivatives_system[k].resize(n_components); + thread_data[i].patch_hessians_system[k].resize(n_components); } for (unsigned int dataset=0; datasetdof_data.size(); ++dataset) -- 2.39.5