From c0b3788a4d33ab27cd970c77ca8e2a4157ea18a3 Mon Sep 17 00:00:00 2001 From: Andrew McBride Date: Fri, 15 Apr 2011 07:19:18 +0000 Subject: [PATCH] Update to tut 44. git-svn-id: https://svn.dealii.org/trunk@23598 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-44/step-44.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/deal.II/examples/step-44/step-44.cc b/deal.II/examples/step-44/step-44.cc index 6b45449c1c..e8c203822e 100644 --- a/deal.II/examples/step-44/step-44.cc +++ b/deal.II/examples/step-44/step-44.cc @@ -1002,8 +1002,13 @@ void Solid::run (void) BlockVector solution_delta (dofs_per_block); solution_delta.collect_sizes (); +<<<<<<< .mine + + while (time.current() <= time.end()) { +======= while (time.current() <= time.end()) { +>>>>>>> .r23597 solution_delta = 0.0; // Solve step and update total solution vector @@ -1336,6 +1341,11 @@ void Solid::solve_nonlinear_timestep (BlockVector & solution_delta // in the K_pt block and K_tt^{-1} in the K_pp block assemble_SC(); + + // Do the static condensation to make K'_uu, and put K_pt^{-1} + // in the K_pt block and K_tt^{-1} in the K_pp block + assemble_SC(); + constraints.condense (tangent_matrix, residual); // Apply BC's solve_linear_system (newton_update); constraints.distribute(newton_update); // Populate the constrained DOF's with their values @@ -1443,6 +1453,10 @@ void Solid::solve_linear_system (BlockVector & newton_update) // Solve for du { +<<<<<<< .mine + +======= +>>>>>>> .r23597 // K'uu du = Ru − Kup Ktp^-1 (Rt − Ktt Kpt^{-1} Rp) tangent_matrix.block(p_dof, t_dof).vmult(A.block(t_dof), residual.block(p_dof)); tangent_matrix.block(t_dof, t_dof).vmult (B.block(t_dof), A.block(t_dof)); -- 2.39.5