]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Compilable again
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 8 Dec 1999 17:48:58 +0000 (17:48 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 8 Dec 1999 17:48:58 +0000 (17:48 +0000)
git-svn-id: https://svn.dealii.org/trunk@2015 0785d39b-7218-0410-832d-ea1e28bc413d

tests/base/Makefile
tests/deal.II/Makefile
tests/deal.II/dof_test.cc
tests/deal.II/mg.cc
tests/deal.II/mglocal.cc
tests/deal.II/wave-test-3.cc
tests/lac/Makefile

index 93b1ebe28eba9928df4a3d05bc88c1f22cde0e2d..f90226de2c9597b6e45250f9cfecd2b088be5147 100644 (file)
@@ -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
index 0ba860a6e335825beb3e537e4fec8cdd3ef0f557..e91bb7158793efbc3d259180ea8e65bbf6ce7122 100644 (file)
@@ -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/*
 
 
 
index a0554e7d6cc783314fc950051c649af345c3fe09..38aa5745381ac57a57dc743d8bce7da7f09e2b72 100644 (file)
@@ -16,6 +16,7 @@
 #include <lac/sparsematrix.h>
 #include <grid/dof_constraints.h>
 #include <numerics/dof_renumbering.h>
+#include <basic/dof_tools.h>
 
 #include <cmath>
 #include <cstdlib>
@@ -302,7 +303,7 @@ void TestCases<dim>::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;
index 79805a5ad984f97750692f946cd82ae64d86ea52..aa21783ed3d9ae76b10a0669c83d9ff4855f2cf1 100644 (file)
@@ -24,6 +24,7 @@
 #include <numerics/multigrid.h>
 #include <numerics/multigrid.templates.h>
 #include <numerics/mg_smoother.h>
+#include <basic/dof_tools.h>
 
 #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<double> A(structure);
index db69323f4ead3d75f89df1ba71010d3dea1b8a1e..c7bfc07ea906cd99d519439bf3307b72f7cf6acc 100644 (file)
@@ -26,6 +26,7 @@
 #include <numerics/mg_smoother.h>
 MGSmoother* smoother_object;
 #include <numerics/multigrid.templates.h>
+#include <basic/dof_tools.h>
 
 #include <fstream>
 
@@ -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);
index 0d226d9d276aecb23605ab56cacda2f373e25d32..f916f1b382045dc5ac9e6acfbad214809209fdd8 100644 (file)
@@ -7,6 +7,8 @@
 #include <lac/forward-declarations.h>
 #include <basic/forward-declarations.h>
 #include <numerics/time-dependent.h>
+#include <grid/dof.h>
+#include <basic/dof_tools.h>
 
 #include <iostream>
 #include <string>
@@ -5503,7 +5505,7 @@ void TimeStep_Wave<dim>::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 ();
       
index abc17eabfc26c054340080417af63366eb2a343f..fc8e2ad84620de17b9d9f6b506e9c327995fbf23 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.