From: frohne Date: Mon, 19 Nov 2012 09:43:45 +0000 (+0000) Subject: Keeping the contact constraints, set_zero for system_rhs_newton in hanging nodes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f55174659246b4343d1824789a14fc08c7b4e06e;p=dealii-svn.git Keeping the contact constraints, set_zero for system_rhs_newton in hanging nodes git-svn-id: https://svn.dealii.org/trunk@27575 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-42/step-42.cc b/deal.II/examples/step-42/step-42.cc index 919838848b..5571fc7769 100644 --- a/deal.II/examples/step-42/step-42.cc +++ b/deal.II/examples/step-42/step-42.cc @@ -400,21 +400,21 @@ namespace Step42 return_value = p(1); if (component == 2) { - // double hz = 0.98; - // double position_x = 0.5; - // double alpha = 12.0; - // double s_x = 0.5039649116; - // double s_y = hz + 0.00026316298; - // if (p(0) > position_x - R && p(0) < s_x) - // { - // return_value = -sqrt(R*R - (p(0)-position_x)*(p(0)-position_x)) + hz + R; - // } - // else if (p(0) >= s_x) - // { - // return_value = 12.0/90.0*p(0) + (s_y - alpha/90.0*s_x); - // } - // else - // return_value = 1e+10; + // double hz = 0.98; + // double position_x = 0.5; + // double alpha = 12.0; + // double s_x = 0.5039649116; + // double s_y = hz + 0.00026316298; + // if (p(0) > position_x - R && p(0) < s_x) + // { + // return_value = -sqrt(R*R - (p(0)-position_x)*(p(0)-position_x)) + hz + R; + // } + // else if (p(0) >= s_x) + // { + // return_value = 12.0/90.0*p(0) + (s_y - alpha/90.0*s_x); + // } + // else + // return_value = 1e+10; // Hindernis Dortmund double x1 = p(0); @@ -430,9 +430,9 @@ namespace Step42 // return_value = 0.032 + data->dicke - input_copy->mikro_height (p(0) + shift_walze_x, p(1) + shift_walze_y, p(2)); // Ball with radius R - // double R = 0.5; + // double R = 1.0; // if (std::pow ((p(0)-1.0/2.0), 2) + std::pow ((p(1)-1.0/2.0), 2) < R*R) - // return_value = 1.0 + R - 0.001 - sqrt (R*R - std::pow ((p(0)-1.0/2.0), 2) + // return_value = 1.0 + R - 0.01 - sqrt (R*R - std::pow ((p(0)-1.0/2.0), 2) // - std::pow ((p(1)-1.0/2.0), 2)); // else // return_value = 1e+5; @@ -752,7 +752,7 @@ namespace Step42 cell->get_dof_indices (local_dof_indices); constraints.distribute_local_to_global (cell_matrix, cell_rhs, local_dof_indices, - system_matrix_newton, system_rhs_newton, false); + system_matrix_newton, system_rhs_newton, true); }; system_matrix_newton.compress (); @@ -962,7 +962,7 @@ namespace Step42 continue; // the local row where - Point point (cell->face (face)->vertex (v)[0],/* + solution (index_x),*/ + Point point (cell->face (face)->vertex (v)[0], cell->face (face)->vertex (v)[1], cell->face (face)->vertex (v)[2]); @@ -974,10 +974,11 @@ namespace Step42 c * diag_mass_matrix_vector_relevant (index_z) * (solution_index_z - gap) - > 0) + > 0 && + !(constraints_hanging_nodes.is_constrained(index_z))) { - constraints.add_line (index_z); - constraints.set_inhomogeneity (index_z, gap); + constraints.add_line (index_z); + constraints.set_inhomogeneity (index_z, gap); distributed_solution (index_z) = gap; @@ -986,15 +987,6 @@ namespace Step42 if (locally_owned_dofs.is_element (index_z)) active_set_locally_owned.add_index (index_z); - - // std::cout<< index_z << ", " - // << "Error: " << lambda (index_z) + - // diag_mass_matrix_vector_relevant (index_z)*c*(solution_index_z - gap) - // << ", " << lambda (index_z) - // << ", " << diag_mass_matrix_vector_relevant (index_z) - // << ", " << obstacle_value - // << ", " << solution_index_z - // < solver(solver_control, mem, @@ -1351,7 +1351,7 @@ namespace Step42 for (unsigned int i=0; i