From: Peter Munch Date: Tue, 18 May 2021 19:40:42 +0000 (+0200) Subject: Move FEPointEvaluation from fe to matrix_free X-Git-Tag: v9.3.0-rc1~35^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c306f0852b6d00781ccd47bf7e3a14a8174a79c;p=dealii.git Move FEPointEvaluation from fe to matrix_free --- diff --git a/examples/step-19/step-19.cc b/examples/step-19/step-19.cc index 4acbb2034b..84f0e53960 100644 --- a/examples/step-19/step-19.cc +++ b/examples/step-19/step-19.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/fe/fe_point_evaluation.h b/include/deal.II/matrix_free/fe_point_evaluation.h similarity index 100% rename from include/deal.II/fe/fe_point_evaluation.h rename to include/deal.II/matrix_free/fe_point_evaluation.h diff --git a/include/deal.II/numerics/vector_tools_evaluate.h b/include/deal.II/numerics/vector_tools_evaluate.h index aa178b87e9..6a53e2ec7a 100644 --- a/include/deal.II/numerics/vector_tools_evaluate.h +++ b/include/deal.II/numerics/vector_tools_evaluate.h @@ -23,7 +23,7 @@ #include -#include +#include #include diff --git a/source/fe/CMakeLists.txt b/source/fe/CMakeLists.txt index 9a75812e3b..7cbd87bb87 100644 --- a/source/fe/CMakeLists.txt +++ b/source/fe/CMakeLists.txt @@ -34,7 +34,6 @@ SET(_unity_include_src fe_nedelec.cc fe_nedelec_sz.cc fe_nothing.cc - fe_point_evaluation.cc fe_poly.cc fe_poly_tensor.cc fe_pyramid_p.cc @@ -108,7 +107,6 @@ SET(_inst fe_nedelec.inst.in fe_nedelec_sz.inst.in fe_nothing.inst.in - fe_point_evaluation.inst.in fe_poly.inst.in fe_poly_tensor.inst.in fe_pyramid_p.inst.in diff --git a/source/matrix_free/CMakeLists.txt b/source/matrix_free/CMakeLists.txt index a993b8391c..bb85bc75d7 100644 --- a/source/matrix_free/CMakeLists.txt +++ b/source/matrix_free/CMakeLists.txt @@ -23,6 +23,7 @@ SET(_src evaluation_template_factory_inst4.cc evaluation_template_factory_inst5.cc evaluation_template_factory_inst6.cc + fe_point_evaluation.cc mapping_info.cc mapping_info_inst2.cc mapping_info_inst3.cc @@ -34,6 +35,7 @@ SET(_src SET(_inst evaluation_template_factory.inst.in + fe_point_evaluation.inst.in mapping_info.inst.in matrix_free.inst.in shape_info.inst.in diff --git a/source/fe/fe_point_evaluation.cc b/source/matrix_free/fe_point_evaluation.cc similarity index 98% rename from source/fe/fe_point_evaluation.cc rename to source/matrix_free/fe_point_evaluation.cc index d08c6a0144..7ecde1907a 100644 --- a/source/fe/fe_point_evaluation.cc +++ b/source/matrix_free/fe_point_evaluation.cc @@ -18,10 +18,10 @@ #include #include -#include #include #include +#include #include #include diff --git a/source/fe/fe_point_evaluation.inst.in b/source/matrix_free/fe_point_evaluation.inst.in similarity index 100% rename from source/fe/fe_point_evaluation.inst.in rename to source/matrix_free/fe_point_evaluation.inst.in diff --git a/tests/grid/grid_generator_marching_cube_algorithm_01.cc b/tests/grid/grid_generator_marching_cube_algorithm_01.cc index fbca3a0ef2..02de9d4a9e 100644 --- a/tests/grid/grid_generator_marching_cube_algorithm_01.cc +++ b/tests/grid/grid_generator_marching_cube_algorithm_01.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include +#include #include #include diff --git a/tests/fe/point_evaluation_01.cc b/tests/matrix_free/point_evaluation_01.cc similarity index 98% rename from tests/fe/point_evaluation_01.cc rename to tests/matrix_free/point_evaluation_01.cc index 7467fb8325..e704004cb3 100644 --- a/tests/fe/point_evaluation_01.cc +++ b/tests/matrix_free/point_evaluation_01.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -31,6 +30,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_01.output b/tests/matrix_free/point_evaluation_01.output similarity index 100% rename from tests/fe/point_evaluation_01.output rename to tests/matrix_free/point_evaluation_01.output diff --git a/tests/fe/point_evaluation_02.cc b/tests/matrix_free/point_evaluation_02.cc similarity index 98% rename from tests/fe/point_evaluation_02.cc rename to tests/matrix_free/point_evaluation_02.cc index 14650173c1..a89eba36af 100644 --- a/tests/fe/point_evaluation_02.cc +++ b/tests/matrix_free/point_evaluation_02.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -31,6 +30,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_02.output b/tests/matrix_free/point_evaluation_02.output similarity index 100% rename from tests/fe/point_evaluation_02.output rename to tests/matrix_free/point_evaluation_02.output diff --git a/tests/fe/point_evaluation_03.cc b/tests/matrix_free/point_evaluation_03.cc similarity index 98% rename from tests/fe/point_evaluation_03.cc rename to tests/matrix_free/point_evaluation_03.cc index a344c05ef8..0c95269f15 100644 --- a/tests/fe/point_evaluation_03.cc +++ b/tests/matrix_free/point_evaluation_03.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -32,6 +31,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_03.output b/tests/matrix_free/point_evaluation_03.output similarity index 100% rename from tests/fe/point_evaluation_03.output rename to tests/matrix_free/point_evaluation_03.output diff --git a/tests/fe/point_evaluation_04.cc b/tests/matrix_free/point_evaluation_04.cc similarity index 99% rename from tests/fe/point_evaluation_04.cc rename to tests/matrix_free/point_evaluation_04.cc index d9004d7463..c598625cce 100644 --- a/tests/fe/point_evaluation_04.cc +++ b/tests/matrix_free/point_evaluation_04.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -32,6 +31,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_04.output b/tests/matrix_free/point_evaluation_04.output similarity index 100% rename from tests/fe/point_evaluation_04.output rename to tests/matrix_free/point_evaluation_04.output diff --git a/tests/fe/point_evaluation_05.cc b/tests/matrix_free/point_evaluation_05.cc similarity index 98% rename from tests/fe/point_evaluation_05.cc rename to tests/matrix_free/point_evaluation_05.cc index c487eb2e9d..9cf98f4d5d 100644 --- a/tests/fe/point_evaluation_05.cc +++ b/tests/matrix_free/point_evaluation_05.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -32,6 +31,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_05.output b/tests/matrix_free/point_evaluation_05.output similarity index 100% rename from tests/fe/point_evaluation_05.output rename to tests/matrix_free/point_evaluation_05.output diff --git a/tests/fe/point_evaluation_06.cc b/tests/matrix_free/point_evaluation_06.cc similarity index 98% rename from tests/fe/point_evaluation_06.cc rename to tests/matrix_free/point_evaluation_06.cc index e01aae2018..d37c868e66 100644 --- a/tests/fe/point_evaluation_06.cc +++ b/tests/matrix_free/point_evaluation_06.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -33,6 +32,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_06.output b/tests/matrix_free/point_evaluation_06.output similarity index 100% rename from tests/fe/point_evaluation_06.output rename to tests/matrix_free/point_evaluation_06.output diff --git a/tests/fe/point_evaluation_07.cc b/tests/matrix_free/point_evaluation_07.cc similarity index 98% rename from tests/fe/point_evaluation_07.cc rename to tests/matrix_free/point_evaluation_07.cc index d1fca88c17..795d46ace2 100644 --- a/tests/fe/point_evaluation_07.cc +++ b/tests/matrix_free/point_evaluation_07.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -32,6 +31,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_07.output b/tests/matrix_free/point_evaluation_07.output similarity index 100% rename from tests/fe/point_evaluation_07.output rename to tests/matrix_free/point_evaluation_07.output diff --git a/tests/fe/point_evaluation_08.cc b/tests/matrix_free/point_evaluation_08.cc similarity index 99% rename from tests/fe/point_evaluation_08.cc rename to tests/matrix_free/point_evaluation_08.cc index ae90d70076..b4457c68d2 100644 --- a/tests/fe/point_evaluation_08.cc +++ b/tests/matrix_free/point_evaluation_08.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -32,6 +31,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_08.output b/tests/matrix_free/point_evaluation_08.output similarity index 100% rename from tests/fe/point_evaluation_08.output rename to tests/matrix_free/point_evaluation_08.output diff --git a/tests/fe/point_evaluation_09.cc b/tests/matrix_free/point_evaluation_09.cc similarity index 98% rename from tests/fe/point_evaluation_09.cc rename to tests/matrix_free/point_evaluation_09.cc index 88bcf04904..3bea6919a4 100644 --- a/tests/fe/point_evaluation_09.cc +++ b/tests/matrix_free/point_evaluation_09.cc @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -32,6 +31,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_09.output b/tests/matrix_free/point_evaluation_09.output similarity index 100% rename from tests/fe/point_evaluation_09.output rename to tests/matrix_free/point_evaluation_09.output diff --git a/tests/fe/point_evaluation_10.cc b/tests/matrix_free/point_evaluation_10.cc similarity index 98% rename from tests/fe/point_evaluation_10.cc rename to tests/matrix_free/point_evaluation_10.cc index 7661f051ce..714b1ef5e8 100644 --- a/tests/fe/point_evaluation_10.cc +++ b/tests/matrix_free/point_evaluation_10.cc @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -33,6 +32,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_10.output b/tests/matrix_free/point_evaluation_10.output similarity index 100% rename from tests/fe/point_evaluation_10.output rename to tests/matrix_free/point_evaluation_10.output diff --git a/tests/fe/point_evaluation_11.cc b/tests/matrix_free/point_evaluation_11.cc similarity index 98% rename from tests/fe/point_evaluation_11.cc rename to tests/matrix_free/point_evaluation_11.cc index df0fb92662..0cda0c2405 100644 --- a/tests/fe/point_evaluation_11.cc +++ b/tests/matrix_free/point_evaluation_11.cc @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -33,6 +32,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_11.output b/tests/matrix_free/point_evaluation_11.output similarity index 100% rename from tests/fe/point_evaluation_11.output rename to tests/matrix_free/point_evaluation_11.output diff --git a/tests/fe/point_evaluation_12.cc b/tests/matrix_free/point_evaluation_12.cc similarity index 98% rename from tests/fe/point_evaluation_12.cc rename to tests/matrix_free/point_evaluation_12.cc index aabd4dc3b3..316e4ff722 100644 --- a/tests/fe/point_evaluation_12.cc +++ b/tests/matrix_free/point_evaluation_12.cc @@ -22,7 +22,6 @@ #include -#include #include #include @@ -31,6 +30,8 @@ #include +#include + #include #include diff --git a/tests/fe/point_evaluation_12.output b/tests/matrix_free/point_evaluation_12.output similarity index 100% rename from tests/fe/point_evaluation_12.output rename to tests/matrix_free/point_evaluation_12.output diff --git a/tests/remote_point_evaluation/remote_point_evaluation_01.cc b/tests/remote_point_evaluation/remote_point_evaluation_01.cc index 882be509ef..20545e276f 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_01.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_01.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include +#include #include #include diff --git a/tests/remote_point_evaluation/remote_point_evaluation_02.cc b/tests/remote_point_evaluation/remote_point_evaluation_02.cc index 912abba920..c6c2a7e8c7 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_02.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_02.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include +#include #include #include diff --git a/tests/remote_point_evaluation/remote_point_evaluation_03.cc b/tests/remote_point_evaluation/remote_point_evaluation_03.cc index 59f35847f3..83a65d2f5d 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_03.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_03.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -41,6 +40,7 @@ #include #include +#include #include #include diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc index 0fc0aa7630..b62e68bcdd 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -35,6 +34,8 @@ #include #include +#include + #include #include #include diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc index 0651a35d06..04d5e07f38 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -39,6 +38,8 @@ #include #include +#include + #include #include #include diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc index e01ac892e4..3ee52bf96a 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -36,6 +35,8 @@ #include #include +#include + #include #include #include diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc index e40405734f..83b4bb31b3 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -35,6 +34,8 @@ #include #include +#include + #include #include #include diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc index 987bb01495..fa180b5821 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -35,6 +34,8 @@ #include #include +#include + #include #include #include