From 6d1b0bd814740ef8fc2d86bcafd4b36deb09c52f Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sat, 13 Oct 2018 23:53:17 +0200 Subject: [PATCH] Fix failing Sacado tests --- tests/ad_common_tests/step-44-helper_res_lin_01.h | 9 ++------- tests/ad_common_tests/step-44-helper_var_form_01.h | 6 ++---- tests/sacado/physics_functions_01_1.cc | 8 ++++---- tests/sacado/physics_functions_02_1.cc | 8 ++++---- tests/sacado/physics_functions_03_1.cc | 8 ++++---- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/tests/ad_common_tests/step-44-helper_res_lin_01.h b/tests/ad_common_tests/step-44-helper_res_lin_01.h index 5b53d78d78..c1a6cdb751 100644 --- a/tests/ad_common_tests/step-44-helper_res_lin_01.h +++ b/tests/ad_common_tests/step-44-helper_res_lin_01.h @@ -43,11 +43,9 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -483,9 +481,6 @@ namespace Step44 SymmetricTensor<2, dim, NumberType> get_tau_bar(const Tensor<2, dim, NumberType> &F) const { - using adtl::pow; - using std::pow; - const NumberType det_F = determinant(F); SymmetricTensor<2, dim, NumberType> b_bar = symmetrize(F * transpose(F)); b_bar *= std::pow(det_F, -2.0 / dim); @@ -609,7 +604,7 @@ namespace Step44 const QGauss qf_face; const unsigned int n_q_points; const unsigned int n_q_points_f; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix tangent_matrix; BlockVector system_rhs; @@ -699,7 +694,7 @@ namespace Step44 make_grid(); system_setup(); { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); const ComponentSelectFunction J_mask(J_component, n_components); VectorTools::project(dof_handler_ref, diff --git a/tests/ad_common_tests/step-44-helper_var_form_01.h b/tests/ad_common_tests/step-44-helper_var_form_01.h index 4ce1729ab3..9a61b5a702 100644 --- a/tests/ad_common_tests/step-44-helper_var_form_01.h +++ b/tests/ad_common_tests/step-44-helper_var_form_01.h @@ -43,11 +43,9 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -572,7 +570,7 @@ namespace Step44 const QGauss qf_face; const unsigned int n_q_points; const unsigned int n_q_points_f; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix tangent_matrix; BlockVector system_rhs; @@ -662,7 +660,7 @@ namespace Step44 make_grid(); system_setup(); { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); const ComponentSelectFunction J_mask(J_component, n_components); VectorTools::project(dof_handler_ref, diff --git a/tests/sacado/physics_functions_01_1.cc b/tests/sacado/physics_functions_01_1.cc index eb8044132e..70f624dcb9 100644 --- a/tests/sacado/physics_functions_01_1.cc +++ b/tests/sacado/physics_functions_01_1.cc @@ -30,16 +30,16 @@ main() deallog.push("Double"); { - test_physics<2, double, AD::NumberTypes::adolc_taped>(); - test_physics<3, double, AD::NumberTypes::adolc_taped>(); + test_physics<2, double, AD::NumberTypes::sacado_dfad>(); + test_physics<3, double, AD::NumberTypes::sacado_dfad>(); deallog << "OK" << std::endl; } deallog.pop(); deallog.push("Float"); { - test_physics<2, float, AD::NumberTypes::adolc_taped>(); - test_physics<3, float, AD::NumberTypes::adolc_taped>(); + test_physics<2, float, AD::NumberTypes::sacado_dfad>(); + test_physics<3, float, AD::NumberTypes::sacado_dfad>(); deallog << "OK" << std::endl; } deallog.pop(); diff --git a/tests/sacado/physics_functions_02_1.cc b/tests/sacado/physics_functions_02_1.cc index d071399260..6d3218b600 100644 --- a/tests/sacado/physics_functions_02_1.cc +++ b/tests/sacado/physics_functions_02_1.cc @@ -30,16 +30,16 @@ main() deallog.push("Double"); { - test_physics<2, double, AD::NumberTypes::adolc_taped>(); - test_physics<3, double, AD::NumberTypes::adolc_taped>(); + test_physics<2, double, AD::NumberTypes::sacado_dfad>(); + test_physics<3, double, AD::NumberTypes::sacado_dfad>(); deallog << "OK" << std::endl; } deallog.pop(); deallog.push("Float"); { - test_physics<2, float, AD::NumberTypes::adolc_taped>(); - test_physics<3, float, AD::NumberTypes::adolc_taped>(); + test_physics<2, float, AD::NumberTypes::sacado_dfad>(); + test_physics<3, float, AD::NumberTypes::sacado_dfad>(); deallog << "OK" << std::endl; } deallog.pop(); diff --git a/tests/sacado/physics_functions_03_1.cc b/tests/sacado/physics_functions_03_1.cc index 64ada8f6b4..6873f2daeb 100644 --- a/tests/sacado/physics_functions_03_1.cc +++ b/tests/sacado/physics_functions_03_1.cc @@ -30,16 +30,16 @@ main() deallog.push("Double"); { - test_physics<2, double, AD::NumberTypes::adolc_taped>(); - test_physics<3, double, AD::NumberTypes::adolc_taped>(); + test_physics<2, double, AD::NumberTypes::sacado_dfad>(); + test_physics<3, double, AD::NumberTypes::sacado_dfad>(); deallog << "OK" << std::endl; } deallog.pop(); deallog.push("Float"); { - test_physics<2, float, AD::NumberTypes::adolc_taped>(); - test_physics<3, float, AD::NumberTypes::adolc_taped>(); + test_physics<2, float, AD::NumberTypes::sacado_dfad>(); + test_physics<3, float, AD::NumberTypes::sacado_dfad>(); deallog << "OK" << std::endl; } deallog.pop(); -- 2.39.5