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.

diff --git a/two_phase_flow/LevelSetSolver.cc b/two_phase_flow/LevelSetSolver.cc
index 87185864ff8a24ceaa0d34fa139d0de7b40fffb2..bf6ceb222871dc6f9cd48b6edbdd74508aff9292 100644 (file)
--- 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 4d151a0e574ec4255a003b05bfb614aac7c286e8..a64e8006fafaa74862765bf67bc6bf38eaae6aaf 100644 (file)
--- 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 15ab57adef6c8d2e1ac5c3962ca57559e0e69023..d7d5c4cbc7b1503708adbe05052edfbb01418ca2 100644 (file)
--- 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>