From a4ce654e3e9fff90575b6a80852de9950cd551d1 Mon Sep 17 00:00:00 2001 From: kanschat Date: Wed, 8 Dec 1999 17:48:58 +0000 Subject: [PATCH] Compilable again git-svn-id: https://svn.dealii.org/trunk@2015 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/base/Makefile | 2 +- tests/deal.II/Makefile | 2 +- tests/deal.II/dof_test.cc | 3 ++- tests/deal.II/mg.cc | 3 ++- tests/deal.II/mglocal.cc | 3 ++- tests/deal.II/wave-test-3.cc | 4 +++- tests/lac/Makefile | 4 ++-- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/base/Makefile b/tests/base/Makefile index 93b1ebe28e..f90226de2c 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -152,7 +152,7 @@ target1: $(target1-o-files) $(libraries) ############################################################ clean: - rm -f *.o *.go *.output + rm -f Make.depend *.o *.go *.output veryclean: clean rm -f *.testcase *.inp *.gpl *.eps *.gnuplot diff --git a/tests/deal.II/Makefile b/tests/deal.II/Makefile index 0ba860a6e3..e91bb71587 100644 --- a/tests/deal.II/Makefile +++ b/tests/deal.II/Makefile @@ -77,7 +77,7 @@ check: $(executables) $(targets) clean: - -rm -f *.o *.go *~ Makefile.dep $(executables) $(output-files) tmp/* + -rm -f *.o *.go *~ Make.depend Makefile.dep $(executables) $(output-files) tmp/* diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index a0554e7d6c..38aa574538 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -302,7 +303,7 @@ void TestCases::run (const unsigned int test_case) dof->max_couplings_between_dofs()); - dof->make_sparsity_pattern (sparsity); + DoFTools::make_sparsity_pattern (*dof, sparsity); int unconstrained_bandwidth = sparsity.bandwidth(); cout << " Writing sparsity pattern..." << endl; diff --git a/tests/deal.II/mg.cc b/tests/deal.II/mg.cc index 79805a5ad9..aa21783ed3 100644 --- a/tests/deal.II/mg.cc +++ b/tests/deal.II/mg.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include "helmholtz.h" @@ -90,7 +91,7 @@ int main() deallog << "Levels: " << tr.n_levels() << endl; SparseMatrixStruct structure(size, dof.max_couplings_between_dofs()); - dof.make_sparsity_pattern(structure); + DoFTools::make_sparsity_pattern(dof, structure); structure.compress(); SparseMatrix A(structure); diff --git a/tests/deal.II/mglocal.cc b/tests/deal.II/mglocal.cc index db69323f4e..c7bfc07ea9 100644 --- a/tests/deal.II/mglocal.cc +++ b/tests/deal.II/mglocal.cc @@ -26,6 +26,7 @@ #include MGSmoother* smoother_object; #include +#include #include @@ -97,7 +98,7 @@ int main() { deallog << "smoothing-steps" << step << endl; SparseMatrixStruct structure(size, dof.max_couplings_between_dofs()); - dof.make_sparsity_pattern(structure); + DoFTools::make_sparsity_pattern(dof, structure); ConstraintMatrix hanging_nodes; dof.make_hanging_node_constraints(hanging_nodes); diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 0d226d9d27..f916f1b382 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include @@ -5503,7 +5505,7 @@ void TimeStep_Wave::create_matrices () dof_handler->max_couplings_between_dofs()); // build sparsity pattern and condense // with hanging nodes - dof_handler->make_sparsity_pattern (system_sparsity); + DoFTools::make_sparsity_pattern (*dof_handler, system_sparsity); constraints.condense (system_sparsity); system_sparsity.compress (); diff --git a/tests/lac/Makefile b/tests/lac/Makefile index abc17eabfc..fc8e2ad846 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -147,13 +147,13 @@ target1: $(target1-o-files) $(libraries) @perl -pi -e 's/JobId.*//;s/value.*//;' $@ %.check:%.output - @diff $< $(patsubst %.output,%.checked, $<) && echo '=====OK============' + @-diff $< $(patsubst %.output,%.checked, $<) && echo '=====OK============' ############################################################ # Cleanup targets ############################################################ clean: - rm -f *.o *.go *.output + rm -f Make.depend *.o *.go *.output veryclean: clean rm -f *.testcase *.inp *.gpl *.eps *.gnuplot -- 2.39.5