From 8a80ccde6d06d46f5bcc3a17fa7f17e40eb43328 Mon Sep 17 00:00:00 2001 From: Marco Tezzele Date: Thu, 16 Apr 2015 11:53:34 +0200 Subject: [PATCH] Changed the order of the arguments of the constructor of MappingFEField and tests --- include/deal.II/fe/mapping_fe_field.h | 6 +++--- source/fe/mapping_fe_field.cc | 4 ++-- tests/fe/mapping_fe_field_real_to_unit_b1.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_q1.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_q2_mask.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc | 2 +- tests/fe/mapping_fe_field_real_to_unit_q5_curved.cc | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h index 8d9666c26c..dd3819ebcc 100644 --- a/include/deal.II/fe/mapping_fe_field.h +++ b/include/deal.II/fe/mapping_fe_field.h @@ -64,7 +64,7 @@ DEAL_II_NAMESPACE_OPEN * Vector eulerq(dhq.n_dofs()); * // Fills the euler vector with information from the Triangulation * VectorTools::get_position_vector(dhq, eulerq, mask); - * MappingFEField map(eulerq, dhq, mask); + * MappingFEField map(dhq, eulerq, mask); * @endcode * * @author Luca Heltai, Marco Tezzele 2013, 2015 @@ -110,8 +110,8 @@ public: * * If an incompatible mask is passed, an exception is thrown. */ - MappingFEField (const VECTOR &euler_vector, - const DH &euler_dof_handler, + MappingFEField (const DH &euler_dof_handler, + const VECTOR &euler_vector, const ComponentMask mask=ComponentMask()); /** diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index 57ac1c495a..db819d7144 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -63,8 +63,8 @@ MappingFEField::InternalData::memory_consumption () cons template -MappingFEField::MappingFEField (const VECTOR &euler_vector, - const DH &euler_dof_handler, +MappingFEField::MappingFEField (const DH &euler_dof_handler, + const VECTOR &euler_vector, const ComponentMask mask) : euler_vector(&euler_vector), diff --git a/tests/fe/mapping_fe_field_real_to_unit_b1.cc b/tests/fe/mapping_fe_field_real_to_unit_b1.cc index 6ac4bd9a47..b3fbb16e23 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_b1.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_b1.cc @@ -83,7 +83,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhb, eulerq, mask); - MappingFEField map(eulerq, dhb, mask); + MappingFEField map(dhb, eulerq, mask); typename Triangulation::active_cell_iterator diff --git a/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc index a11b2d7989..f84cdd3ab4 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc @@ -101,7 +101,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhb, eulerq, mask); - MappingFEField map(eulerq, dhb, mask); + MappingFEField map(dhb, eulerq, mask); typename Triangulation::active_cell_iterator diff --git a/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc b/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc index e8edd1d89d..e8fde030e0 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc @@ -100,7 +100,7 @@ void test_real_to_unit_cell() mask.set(0, false); VectorTools::get_position_vector(dhb, eulerq, mask); - MappingFEField map(eulerq, dhb, mask); + MappingFEField map(dhb, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc index 0df01fc4a3..060e30504b 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc @@ -101,7 +101,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhb, eulerq, mask); - MappingFEField map(eulerq, dhb, mask); + MappingFEField map(dhb, eulerq, mask); typename Triangulation::active_cell_iterator diff --git a/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc index 990ea4d28e..3e563c38f9 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc @@ -101,7 +101,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhb, eulerq, mask); - MappingFEField map(eulerq, dhb, mask); + MappingFEField map(dhb, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc index e6843b985f..446d1bfa82 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc @@ -101,7 +101,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhb, eulerq, mask); - MappingFEField map(eulerq, dhb, mask); + MappingFEField map(dhb, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_q1.cc b/tests/fe/mapping_fe_field_real_to_unit_q1.cc index debf15ae94..547147ce6e 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_q1.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_q1.cc @@ -82,7 +82,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhq, eulerq, mask); - MappingFEField map(eulerq, dhq, mask); + MappingFEField map(dhq, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc index adfe6f3ed1..9fca430dfd 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc @@ -103,7 +103,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhq, eulerq, mask); - MappingFEField map(eulerq, dhq, mask); + MappingFEField map(dhq, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_q2_mask.cc b/tests/fe/mapping_fe_field_real_to_unit_q2_mask.cc index 074c7aa957..86dcba9e49 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_q2_mask.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_q2_mask.cc @@ -85,7 +85,7 @@ void test_real_to_unit_cell() mask.set(0, false); VectorTools::get_position_vector(dhq, eulerq, mask); - MappingFEField map(eulerq, dhq, mask); + MappingFEField map(dhq, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc index 54c5afb21f..cbe3fb6a74 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc @@ -103,7 +103,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhq, eulerq, mask); - MappingFEField map(eulerq, dhq, mask); + MappingFEField map(dhq, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc index 2690693320..564ebbf507 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc @@ -100,7 +100,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhq, eulerq, mask); - MappingFEField map(eulerq, dhq, mask); + MappingFEField map(dhq, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/fe/mapping_fe_field_real_to_unit_q5_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q5_curved.cc index 669ea368a0..2ce4a4d9c6 100644 --- a/tests/fe/mapping_fe_field_real_to_unit_q5_curved.cc +++ b/tests/fe/mapping_fe_field_real_to_unit_q5_curved.cc @@ -100,7 +100,7 @@ void test_real_to_unit_cell() const ComponentMask mask(spacedim, true); VectorTools::get_position_vector(dhq, eulerq, mask); - MappingFEField map(eulerq, dhq, mask); + MappingFEField map(dhq, eulerq, mask); typename Triangulation::active_cell_iterator cell = triangulation.begin_active(); -- 2.39.5