From c3879c1ca297c3bf6928004906de56765bccd2ec Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Sat, 10 Mar 2018 09:49:32 -0700
Subject: [PATCH] Update code gallery code to make it compile cleanly.

Specifically, remove inclusion of a header file that is (i) no longer around, and
(ii) apparently not needed. Also avoid calling a deprecated function.
---
 two_phase_flow/LevelSetSolver.cc     | 3 +--
 two_phase_flow/MultiPhase.cc         | 1 -
 two_phase_flow/NavierStokesSolver.cc | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/two_phase_flow/LevelSetSolver.cc b/two_phase_flow/LevelSetSolver.cc
index 8718586..bf6ceb2 100644
--- a/two_phase_flow/LevelSetSolver.cc
+++ b/two_phase_flow/LevelSetSolver.cc
@@ -4,7 +4,6 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/solver_cg.h>
 #include <deal.II/lac/constraint_matrix.h>
-#include <deal.II/lac/compressed_simple_sparsity_pattern.h>
 #include <deal.II/lac/petsc_parallel_sparse_matrix.h>
 #include <deal.II/lac/petsc_sparse_matrix.h>
 #include <deal.II/lac/petsc_parallel_vector.h>
@@ -1335,7 +1334,7 @@ void LevelSetSolver<dim>::compute_MPP_uH_with_iterated_FCT
       for (int iter=0; iter<NUM_ITER; iter++)
 	{
 	  MPP_uLkp1_solution_ghosted = MPP_uH_solution;
-	  Akp1_matrix.add(LxAkp1_matrix,-1.0); //new matrix to limit: A-LxA
+	  Akp1_matrix.add(-1.0, LxAkp1_matrix); //new matrix to limit: A-LxA
 	  
 	  // loop on locally owned i-DOFs (rows)
 	  IndexSet::ElementIterator idofs_iter = locally_owned_dofs_LS.begin();
diff --git a/two_phase_flow/MultiPhase.cc b/two_phase_flow/MultiPhase.cc
index 4d151a0..a64e800 100644
--- a/two_phase_flow/MultiPhase.cc
+++ b/two_phase_flow/MultiPhase.cc
@@ -4,7 +4,6 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/solver_cg.h>
 #include <deal.II/lac/constraint_matrix.h>
-#include <deal.II/lac/compressed_simple_sparsity_pattern.h>
 #include <deal.II/lac/petsc_parallel_sparse_matrix.h>
 #include <deal.II/lac/petsc_parallel_vector.h>
 #include <deal.II/lac/petsc_solver.h>
diff --git a/two_phase_flow/NavierStokesSolver.cc b/two_phase_flow/NavierStokesSolver.cc
index 15ab57a..d7d5c4c 100644
--- a/two_phase_flow/NavierStokesSolver.cc
+++ b/two_phase_flow/NavierStokesSolver.cc
@@ -4,7 +4,6 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/solver_cg.h>
 #include <deal.II/lac/constraint_matrix.h>
-#include <deal.II/lac/compressed_simple_sparsity_pattern.h>
 #include <deal.II/lac/petsc_parallel_sparse_matrix.h>
 #include <deal.II/lac/petsc_parallel_vector.h>
 #include <deal.II/lac/petsc_solver.h>
-- 
2.39.5