From ebc920d0fce670a5b605a3f8a9a4ebe819b05993 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sun, 13 Aug 2017 12:07:07 -0600 Subject: [PATCH] Moved Sacado product type header and Sacado tests --- include/deal.II/base/sacado_product_type.h | 4 ++-- .../deal.II/differentiation/{ => ad}/sacado_product_types.h | 4 ++-- source/base/symmetric_tensor.cc | 2 +- source/fe/fe_values.cc | 2 +- .../fe_values_view_get_function_from_local_dof_values_02.cc | 2 +- tests/sacado/sacado_product_type_01.cc | 2 +- tests/sacado/sacado_product_type_02.cc | 2 +- tests/sacado/sacado_product_type_03.cc | 2 +- tests/sacado/sacado_product_type_04.cc | 2 +- tests/sacado/sacado_product_type_05.cc | 2 +- tests/sacado/sacado_product_type_06.cc | 2 +- tests/sacado/sacado_product_type_07.cc | 2 +- tests/sacado/sacado_product_type_08.cc | 2 +- tests/sacado/sacado_product_type_09.cc | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) rename include/deal.II/differentiation/{ => ad}/sacado_product_types.h (97%) diff --git a/include/deal.II/base/sacado_product_type.h b/include/deal.II/base/sacado_product_type.h index 29524a20f0..1870ee147a 100644 --- a/include/deal.II/base/sacado_product_type.h +++ b/include/deal.II/base/sacado_product_type.h @@ -1,7 +1,7 @@ #ifndef dealii_sacado_product_type_h_deprecated #define dealii_sacado_product_type_h_deprecated -#warning This file is deprecated. Use instead. +#warning This file is deprecated. Use instead. -# include +# include #endif diff --git a/include/deal.II/differentiation/sacado_product_types.h b/include/deal.II/differentiation/ad/sacado_product_types.h similarity index 97% rename from include/deal.II/differentiation/sacado_product_types.h rename to include/deal.II/differentiation/ad/sacado_product_types.h index dbcdb949dd..54de3762b1 100644 --- a/include/deal.II/differentiation/sacado_product_types.h +++ b/include/deal.II/differentiation/ad/sacado_product_types.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef dealii_differentiation_sacado_product_types_h -#define dealii_differentiation_sacado_product_types_h +#ifndef dealii_differentiation_ad_sacado_product_types_h +#define dealii_differentiation_ad_sacado_product_types_h #include #include diff --git a/source/base/symmetric_tensor.cc b/source/base/symmetric_tensor.cc index 787b037321..cb167583aa 100644 --- a/source/base/symmetric_tensor.cc +++ b/source/base/symmetric_tensor.cc @@ -22,7 +22,7 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS -#include +#include #endif #include diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index dc3329a95d..3133c8a633 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -39,7 +39,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/tests/fe/fe_values_view_get_function_from_local_dof_values_02.cc b/tests/fe/fe_values_view_get_function_from_local_dof_values_02.cc index 9ec99e04a8..c9ff474b76 100644 --- a/tests/fe/fe_values_view_get_function_from_local_dof_values_02.cc +++ b/tests/fe/fe_values_view_get_function_from_local_dof_values_02.cc @@ -25,7 +25,7 @@ #include "../tests.h" #include -#include +#include #include #include #include diff --git a/tests/sacado/sacado_product_type_01.cc b/tests/sacado/sacado_product_type_01.cc index da039d9e88..b2c5360f77 100644 --- a/tests/sacado/sacado_product_type_01.cc +++ b/tests/sacado/sacado_product_type_01.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_02.cc b/tests/sacado/sacado_product_type_02.cc index 11133bf73c..b6fae8a672 100644 --- a/tests/sacado/sacado_product_type_02.cc +++ b/tests/sacado/sacado_product_type_02.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_03.cc b/tests/sacado/sacado_product_type_03.cc index 024831bf90..11e3da1b08 100644 --- a/tests/sacado/sacado_product_type_03.cc +++ b/tests/sacado/sacado_product_type_03.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_04.cc b/tests/sacado/sacado_product_type_04.cc index 52400174f5..fce2b3d49d 100644 --- a/tests/sacado/sacado_product_type_04.cc +++ b/tests/sacado/sacado_product_type_04.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_05.cc b/tests/sacado/sacado_product_type_05.cc index 610c4342b1..cb16847447 100644 --- a/tests/sacado/sacado_product_type_05.cc +++ b/tests/sacado/sacado_product_type_05.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_06.cc b/tests/sacado/sacado_product_type_06.cc index 655521fa25..edeb0cf6e6 100644 --- a/tests/sacado/sacado_product_type_06.cc +++ b/tests/sacado/sacado_product_type_06.cc @@ -18,7 +18,7 @@ #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_07.cc b/tests/sacado/sacado_product_type_07.cc index a4d05357b3..8622c726fa 100644 --- a/tests/sacado/sacado_product_type_07.cc +++ b/tests/sacado/sacado_product_type_07.cc @@ -18,7 +18,7 @@ #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_08.cc b/tests/sacado/sacado_product_type_08.cc index 886464c743..8f924149e2 100644 --- a/tests/sacado/sacado_product_type_08.cc +++ b/tests/sacado/sacado_product_type_08.cc @@ -18,7 +18,7 @@ #include -#include +#include #include "../tests.h" diff --git a/tests/sacado/sacado_product_type_09.cc b/tests/sacado/sacado_product_type_09.cc index caa41c8630..bcc9fea2d8 100644 --- a/tests/sacado/sacado_product_type_09.cc +++ b/tests/sacado/sacado_product_type_09.cc @@ -18,7 +18,7 @@ #include -#include +#include #include "../tests.h" -- 2.39.5