]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Change many file names and the like, to adapt to the new directory structure.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Dec 1999 14:50:14 +0000 (14:50 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Dec 1999 14:50:14 +0000 (14:50 +0000)
git-svn-id: https://svn.dealii.org/trunk@2023 0785d39b-7218-0410-832d-ea1e28bc413d

125 files changed:
deal.II/base/Makefile
deal.II/base/include/base/.cvsignore
deal.II/base/include/base/data_out_base.h
deal.II/base/include/base/function.h
deal.II/base/include/base/tensor_function.h
deal.II/base/source/function_time.cc
deal.II/base/source/job_identifier.cc
deal.II/base/source/log.cc
deal.II/base/source/programid.cc
deal.II/base/source/tensor_function.cc
deal.II/common/Make.global_options
deal.II/common/scripts/forward_declarations
deal.II/deal.II/Makefile
deal.II/deal.II/include/dofs/dof_accessor.h
deal.II/deal.II/include/dofs/dof_accessor.templates.h
deal.II/deal.II/include/dofs/dof_constraints.h
deal.II/deal.II/include/dofs/dof_handler.h
deal.II/deal.II/include/dofs/dof_tools.h
deal.II/deal.II/include/dofs/mg_dof_accessor.h
deal.II/deal.II/include/dofs/mg_dof_handler.h
deal.II/deal.II/include/fe/fe.h
deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/include/grid/.cvsignore [new file with mode: 0644]
deal.II/deal.II/include/grid/grid_generator.h
deal.II/deal.II/include/grid/grid_out.h
deal.II/deal.II/include/grid/tria.h
deal.II/deal.II/include/grid/tria_accessor.h
deal.II/deal.II/include/grid/tria_boundary.h
deal.II/deal.II/include/multigrid/mg_base.h
deal.II/deal.II/include/multigrid/mg_dof_accessor.h
deal.II/deal.II/include/multigrid/mg_dof_handler.h
deal.II/deal.II/include/multigrid/mg_smoother.h
deal.II/deal.II/include/multigrid/multigrid.h
deal.II/deal.II/include/multigrid/multigrid.templates.h
deal.II/deal.II/include/numerics/assembler.h
deal.II/deal.II/include/numerics/base.h
deal.II/deal.II/include/numerics/data_io.h
deal.II/deal.II/include/numerics/data_out.h
deal.II/deal.II/include/numerics/data_out_stack.h
deal.II/deal.II/include/numerics/dof_renumbering.h
deal.II/deal.II/include/numerics/error_estimator.h
deal.II/deal.II/include/numerics/histogram.h
deal.II/deal.II/include/numerics/mg_smoother.h
deal.II/deal.II/include/numerics/multigrid.h
deal.II/deal.II/include/numerics/multigrid.templates.h
deal.II/deal.II/include/numerics/solution_transfer.h
deal.II/deal.II/include/numerics/time_dependent.h
deal.II/deal.II/include/numerics/vectors.h
deal.II/deal.II/source/dofs/dof_accessor.cc
deal.II/deal.II/source/dofs/dof_constraints.cc
deal.II/deal.II/source/dofs/dof_handler.cc
deal.II/deal.II/source/dofs/dof_renumbering.cc
deal.II/deal.II/source/dofs/dof_tools.cc
deal.II/deal.II/source/dofs/mg_dof_accessor.cc
deal.II/deal.II/source/dofs/mg_dof_handler.cc
deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/fe/fe_lib.criss_cross.cc
deal.II/deal.II/source/fe/fe_lib.cubic.cc
deal.II/deal.II/source/fe/fe_lib.dg.constant.cc
deal.II/deal.II/source/fe/fe_lib.linear.cc
deal.II/deal.II/source/fe/fe_lib.quadratic.cc
deal.II/deal.II/source/fe/fe_lib.quartic.cc
deal.II/deal.II/source/fe/fe_values.cc
deal.II/deal.II/source/fe/q1_mapping.cc
deal.II/deal.II/source/fe/q1_mapping.jacobians.cc
deal.II/deal.II/source/grid/grid_out.all_dimensions.cc
deal.II/deal.II/source/grid/grid_out.cc
deal.II/deal.II/source/grid/intergrid_map.cc
deal.II/deal.II/source/grid/persistent_tria.cc
deal.II/deal.II/source/grid/tria.cc
deal.II/deal.II/source/multigrid/mg_dof_accessor.cc
deal.II/deal.II/source/multigrid/mg_dof_handler.cc
deal.II/deal.II/source/multigrid/mg_smoother.cc
deal.II/deal.II/source/multigrid/multigrid.cc
deal.II/deal.II/source/numerics/assembler.cc
deal.II/deal.II/source/numerics/base.cc
deal.II/deal.II/source/numerics/data_io.cc
deal.II/deal.II/source/numerics/data_out.cc
deal.II/deal.II/source/numerics/data_out_stack.cc
deal.II/deal.II/source/numerics/equation.cc
deal.II/deal.II/source/numerics/error_estimator.cc
deal.II/deal.II/source/numerics/histogram.cc
deal.II/deal.II/source/numerics/matrices.cc
deal.II/deal.II/source/numerics/mg_smoother.cc
deal.II/deal.II/source/numerics/multigrid.cc
deal.II/deal.II/source/numerics/solution_transfer.cc
deal.II/deal.II/source/numerics/time_dependent.cc
deal.II/deal.II/source/numerics/vectors.cc
deal.II/lac/Makefile
deal.II/lac/include/lac/.cvsignore
deal.II/lac/include/lac/full_matrix.templates.h
deal.II/lac/include/lac/mgbase.h
deal.II/lac/include/lac/precondition_block.h
deal.II/lac/include/lac/precondition_block.templates.h
deal.II/lac/include/lac/solver.h
deal.II/lac/include/lac/solver_gmres.h
deal.II/lac/include/lac/solver_selector.h
deal.II/lac/include/lac/sparse_ilu.h
deal.II/lac/include/lac/sparse_matrix.templates.h
deal.II/lac/include/lac/sparse_vanka.h
deal.II/lac/include/lac/sparse_vanka.templates.h
deal.II/lac/source/full_matrix.double.cc
deal.II/lac/source/full_matrix.float.cc
deal.II/lac/source/sparse_matrix.cc
deal.II/lac/source/sparse_matrix.double.cc
deal.II/lac/source/sparse_matrix.float.cc
deal.II/lac/source/sparse_matrix.long_double.cc
tests/base/Makefile
tests/deal.II/Makefile
tests/deal.II/constraints.cc
tests/deal.II/dof_test.cc
tests/deal.II/fe_tables.cc
tests/deal.II/gradients.cc
tests/deal.II/grid_test.cc
tests/deal.II/mg.cc
tests/deal.II/mglocal.cc
tests/deal.II/second_derivatives.cc
tests/deal.II/wave-test-3.cc
tests/fe/show_shapes.cc
tests/fe/show_transform.cc
tests/lac/Makefile
tests/lac/mg.cc
tests/lac/solver.cc
tests/lac/testmatrix.cc
tests/lac/testmatrix.h

index 995627cc38e6bcb41d046e2b87578e51939a222e..7e3e925f7e374a39ec7c0182be813bcc52c8ee7f 100644 (file)
@@ -22,7 +22,7 @@ o-files      = $(o-files-base3)
 go-files     = $(patsubst lib/o/%,lib/go/%,$(o-files-base3:.o=.go))
 h-files      = $(shell echo include/base/*.h)
 
-forward-declarations = $D/base/include/base/forward-declarations.h
+forward-declarations = $D/base/include/base/forward_declarations.h
 
 # get options which hold for all files of the project
 include $D/common/Make.global_options
@@ -73,7 +73,8 @@ lib/libbase.g.a: $(forward-declarations) $(go-files)
 
 
 clean:
-       -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go include/base/forward-declarations.h*
+       -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go \
+               include/base/forward_declarations.h*
 
 
 
@@ -88,7 +89,7 @@ clean:
 #appended
 lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/Make_dep_2.pl $(INCLUDE) $(cc-files) \
+       @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \
                | perl -p -e 's!(lib/g?o/data_out_base)(.g?o)!$$1_1d$$2 $$1_2d$$2 $$1_3d$$2 $$1_4d$$2!g;' \
                > lib/Makefile.dep
 
@@ -97,7 +98,7 @@ lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
 include lib/Makefile.dep
 
 # include a rule which tells how to remake the forward declarations file
-include $D/common/Makescripts/forward_declarations
+include $D/common/scripts/forward_declarations
 
 
 .PHONY: clean
index e6ca8c2e66281a8523502d3be1f713b4de157cbc..fa946188cbccaa474a22b381b439d86ebcadfc10 100644 (file)
@@ -1 +1 @@
-forward-declarations.h
+forward_declarations.h
index 566796546f2088ca7c05b08a39a91cb0a589a905..3387b778a0319a3a45b341382430062964e2626d 100644 (file)
@@ -5,9 +5,9 @@
 /*----------------------------   data_out_base.h     ---------------------------*/
 
 
-#include <base/forward-declarations.h>
+#include <base/forward_declarations.h>
 #include <base/point.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 #include <grid/geometry_info.h>
 #include <iostream>
 #include <vector>
index 3b24e96c7a74a1fab1633793fd27141490c66cc8..d8696ec7fc268e5f1fdc559f1436eca6e260645b 100644 (file)
@@ -6,9 +6,9 @@
 /*----------------------------   function.h     ---------------------------*/
 
 
-#include <base/forward-declarations.h>
+#include <base/forward_declarations.h>
 #include <base/exceptions.h>
-#include <base/functiontime.h>
+#include <base/function_time.h>
 #include <base/subscriptor.h>
 #include <vector>
 
index 6d0cacbc78ed4a8bd9f1c9f23a9b4cd2ea79eef9..18ea31e0dd9b9e355bbdf6266ec512b3ad7e4118 100644 (file)
@@ -12,8 +12,8 @@
 #include <base/smartpointer.h>
 #include <base/function.h>
 #include <base/point.h>
-#include <base/functiontime.h>
-#include <base/forward-declarations.h>
+#include <base/function_time.h>
+#include <base/forward_declarations.h>
 
 
 
index 0fa1f827c99e9d9bcc645bbdf4cdb9f1b97bdfea..1701c855880827ba1b16b3281260e90c72051acd 100644 (file)
@@ -1,6 +1,6 @@
 // $Id$
 
-#include <base/functiontime.h>
+#include <base/function_time.h>
 
 
 FunctionTime::FunctionTime(double initial_time)
index 9c04be267dd1a42289553352e2837bebed2f8986..f475d14ea9dad63087e7ea5973e71b915d22058d 100644 (file)
@@ -1,6 +1,6 @@
 // $Id$
 
-#include <base/jobidentifier.h>
+#include <base/job_identifier.h>
 #include <ctime>
 
 
index ce3d0d1ce5685ae0bb8efd17c8a6dc210e2377c0..02d70e7213513c6d9c87761a4135004575f0c874 100644 (file)
@@ -1,7 +1,7 @@
 // $Id$
 
 #include <base/logstream.h>
-#include <base/jobidentifier.h>
+#include <base/job_identifier.h>
 
 
 
index 9ded9fe055b6d9a97977ae54092299c8e69912f7..b5e64f609223d089479751d9640a37084ed59aa8 100644 (file)
@@ -1,6 +1,6 @@
 // $Id$
 
-#include <base/jobidentifier.h>
+#include <base/job_identifier.h>
 
 const char*
 JobIdentifier::program_id()
index 34801c9c77734bad6281dc8bda0df437ecae741d..85ac7c405baee3c59f2a28983c83199836f927aa 100644 (file)
@@ -1,7 +1,7 @@
 // $Id$
 
 
-#include <base/tensorfunction.h>
+#include <base/tensor_function.h>
 #include <vector>
 #include <base/tensor.h>
 #include <cmath>
index c5473376a740751153d6abe76e7c9655c90e7b0f..97a2ff1b74b52c95b3f8c2da3ee0c567dcf09395 100644 (file)
@@ -30,7 +30,7 @@ CXXFLAGS.o= -O2 -Wuninitialized -ffast-math \
 # DEAL_II_USE_MT=true
 
 ifeq ($(DEAL_II_USE_MT),true)
-  INCLUDE    += -I $(ACE_ROOT)
+  INCLUDE    += -I$(ACE_ROOT)
   CXXFLAGS.g += -DDEAL_II_USE_MT -threads
   CXXFLAGS.o += -DDEAL_II_USE_MT -threads
 
index 5835842046265d8a86a7163373121e2352909ee8..642afc41b655ee9e9b2f4816b19417e6cedae795 100644 (file)
@@ -21,7 +21,7 @@ $(forward-declarations): $(filter-out %forward-declarations%,$(h-files))
        @echo ============================ Remaking $(@F)
        @touch $@.old
        @-cp $@ $@.old > /dev/null 2>&1
-       @perl $D/common/scripts/Make_forward_declarations.pl   \
+       @perl $D/common/scripts/forward_declarations.pl   \
               $(filter-out %forward-declarations.h,$(h-files)) \
             > $@.new
        @if test -n "`diff $(forward-declarations).old $(forward-declarations).new`" ; then \
index 519c95c6632596f934b54b69af1fce188c6abaec..febe1e3bee11b86dbc870fd175a85f5037d03f57 100644 (file)
@@ -23,7 +23,7 @@ default: 2dg 2d
 cc-files     = $(shell echo source/*/*.cc)
 h-files      = $(shell echo include/*/*.h)
 
-forward-declarations = $D/deal.II/include/basic/forward-declarations.h
+forward-declarations = $D/deal.II/include/grid/forward_declarations.h
 
 
 # strip subdirectories from cc file names, preprend a "lib/[g]o"
@@ -72,7 +72,7 @@ lib/3d/o/%.o :
        @$(CXX) $(CXXFLAGS) $(CXXFLAGS.o) -Ddeal_II_dimension=3 -c $< -o $@
 
 # special rules for exceptional files
-lib/3d/o/q1_mapping_jacobians_3d.o:
+lib/3d/o/q1_mapping.jacobians_3d.o:
        @echo =====deal.II====3d====opt==special== $(<:source/%=%)
        @$(CXX) $(CXXFLAGS) $(filter-out -O2 -Wuninitialized,$(CXXFLAGS.o)) -Ddeal_II_dimension=3 -c $< -o $@
 
@@ -108,7 +108,7 @@ lib/libdeal_II_3d.a: $(o-files-3d)
 #of this file.
 lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/Make_dep_2.pl $(INCLUDE) $(cc-files) \
+       @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \
                | perl -p -e 's!^lib/(g?o/.*):!lib/DIM_PLACEHOLDER/$$1:!g;' \
                | perl -pe 's!(\.g?o):!_DIM_PLACEHOLDER$$1:!g;' \
                | perl -pe 's!^lib/DIM_PLACEHOLDER/(.*):!lib/1d/$$1 lib/2d/$$1 lib/3d/$$1:!g;'\
@@ -121,7 +121,7 @@ lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
 include lib/Makefile.dep
 
 # include a rule which tells how to remake the forward declarations file
-include $D/common/Makescripts/forward_declarations
+include $D/common/scripts/forward_declarations
 
 
 
@@ -138,7 +138,7 @@ examples:
 clean: examples-clean lib-clean 
 
 lib-clean:
-       -rm -f *~ */*~ */*/*~ include/basic/forward-declarations.h*
+       -rm -f *~ */*~ */*/*~ include/grid/forward_declarations.h*
        cd lib ; $(MAKE) clean
 
 examples-clean:
index f068cce28d1754a69c03d7580fd4ae1552bba5fb..832b94d3d84b2e459e0988d537a40152ffbc4cee 100644 (file)
@@ -7,7 +7,7 @@
 
 
 #include <grid/tria_accessor.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <vector>
 
 
index 3142ec24cfb74c8415934a8fff52f4e6514725b5..0ecbae29e59ab22893880770e481b831a7752c31 100644 (file)
@@ -5,16 +5,16 @@
 /*----------------------------   dof_accessor.templates.h     ---------------------------*/
 
 
-#include <grid/dof_accessor.h>
-#include <grid/dof.h>
-#include <grid/dof_levels.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_levels.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 #include <fe/fe.h>
 
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <vector>
 
index a56fff95fd28d09b1fb74f742b79f5b567349bdb..ae3a955c9d6a72acd0c0a321fd879e45a0633427 100644 (file)
@@ -10,7 +10,7 @@
 #include <utility>
 #include <base/exceptions.h>
 #include <base/subscriptor.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 
 
 
index 533a50295432debe255ffe01436a847a38b39b63..07c191c11702468d2311156ceedbc472344d269a 100644 (file)
@@ -8,10 +8,10 @@
 #include <vector>
 #include <map>
 #include <base/exceptions.h>
-#include <base/forward-declarations.h>
+#include <base/forward_declarations.h>
 #include <base/smartpointer.h>
-#include <basic/forward-declarations.h>
-#include <lac/forward-declarations.h>
+#include <grid/forward_declarations.h>
+#include <lac/forward_declarations.h>
 
 
 
index be4db5aafcd59c7072b3f77dc7e926bff44b2be3..5e7dc299259e25a9d4030b8a500eb1c0a8980c2c 100644 (file)
@@ -6,7 +6,7 @@
 // Copyright Wolfgang Bangerth, Guido Kanschat, and others 1999
 
 
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <vector>
 
 
index 6059b05f5cf73f080d91553afb2ca66bdb1a6d92..7e94014b42084f8e21296e020da168a733ca20b3 100644 (file)
@@ -6,7 +6,7 @@
 /*----------------------------   mg_dof_accessor.h     ---------------------------*/
 
 
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 
 
 
index 22705878e54c43b4131de65e6318f7a1f5f76af7..f27031aa0cdbd6d2ded672f230b9eae951bfaa71 100644 (file)
@@ -6,7 +6,7 @@
 /*----------------------------   mg_dof.h     ---------------------------*/
 
 
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 
 
 
index a5a9e20896c9830351d32d48bad8eb5eafb70ca2..f5f21be4cfa8d99f558c9f37f684efccfe55f549 100644 (file)
@@ -9,9 +9,9 @@
 #include <base/subscriptor.h>
 #include <base/point.h>
 #include <base/tensor.h>
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/geometry_info.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 
 
 
index 6803c8cd11b49a9325e915b7c30176097ff601d8..db369ffef5c45aa35c450330322abd254da95f48 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <base/exceptions.h>
 #include <base/subscriptor.h>
-#include <lac/fullmatrix.h>
-#include <grid/dof.h>
+#include <lac/full_matrix.h>
+#include <dofs/dof_handler.h>
 #include <base/point.h>
 #include <base/tensor.h>
 #include <grid/tria.h>
diff --git a/deal.II/deal.II/include/grid/.cvsignore b/deal.II/deal.II/include/grid/.cvsignore
new file mode 100644 (file)
index 0000000..fa94618
--- /dev/null
@@ -0,0 +1 @@
+forward_declarations.h
index f425ccc041e5d08d2c07216ca9577cf960ac3e80..e1e22d34c0810ef49129e9ff96cf6362493732e6 100644 (file)
@@ -5,8 +5,8 @@
 /*----------------------------   grid_generator.h     ---------------------------*/
 
 
-#include <base/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <base/forward_declarations.h>
+#include <grid/forward_declarations.h>
 #include <base/exceptions.h>
 
 
index 197ba7a3d05343931e6d5285b4a2c8e49fc8b8fd..92cbafbadfab5b8aa6d8847c8b99fa6b12d871a0 100644 (file)
@@ -4,7 +4,7 @@
 #define __grid_out_H
 /*----------------------------   grid_out.h     ---------------------------*/
 
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 #include <base/exceptions.h>
 #include <string>
 
index ad8761314729e07762387dbf8e09a8fbc2ee8395..4afca25a99694b428c8f76d476946b8e41309330 100644 (file)
@@ -6,9 +6,9 @@
 /*----------------------------   tria.h     ---------------------------*/
 
 #include <vector>
-#include <basic/forward-declarations.h>
-#include <lac/forward-declarations.h>
-#include <base/forward-declarations.h>
+#include <grid/forward_declarations.h>
+#include <lac/forward_declarations.h>
+#include <base/forward_declarations.h>
 #include <base/point.h>
 #include <grid/geometry_info.h>
 #include <base/subscriptor.h>
index 02fe5f494f5fdffd471ef7e2f258030b184cc959..e3bf65f933b96775c6c275c345c0b8e3f2f20685 100644 (file)
@@ -7,8 +7,8 @@
 
 
 #include <base/exceptions.h>
-#include <base/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <base/forward_declarations.h>
+#include <grid/forward_declarations.h>
 #include <grid/tria_iterator_base.h>
 
 
index 81ce9da8a0c2238e9495fc8cd1e7541c3f27f391..233564c814ed712966490ad2eb1c6bf885ca8d21 100644 (file)
@@ -8,7 +8,7 @@
 #include <base/point.h>
 #include <base/subscriptor.h>
 #include <grid/geometry_info.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 
 
 
index 319e51e17c834eedbf87439d530236f555d0fa8f..baea5b2fecf700a8a8d09a35cb0926215cdd91e4 100644 (file)
@@ -8,11 +8,10 @@
 
 #include <base/subscriptor.h>
 #include <base/smartpointer.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <lac/vector.h>
 
 #include <vector>
-#include <base/smartpointer.h>
 
 
 
@@ -258,7 +257,7 @@ class MGVector : public Subscriptor
  * with a subscriptor for smart pointers.
  * @author Guido Kanschat, 1999
  */
-template<class MATRIX = SparseMatrix<double> >
+template <class MATRIX = SparseMatrix<double> >
 class MGMatrix : public Subscriptor,
                 public vector<MATRIX>
 {
index 6059b05f5cf73f080d91553afb2ca66bdb1a6d92..7e94014b42084f8e21296e020da168a733ca20b3 100644 (file)
@@ -6,7 +6,7 @@
 /*----------------------------   mg_dof_accessor.h     ---------------------------*/
 
 
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 
 
 
index 22705878e54c43b4131de65e6318f7a1f5f76af7..f27031aa0cdbd6d2ded672f230b9eae951bfaa71 100644 (file)
@@ -6,7 +6,7 @@
 /*----------------------------   mg_dof.h     ---------------------------*/
 
 
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 
 
 
index 6b76df8894852c4b462da50d3267eb44a6acb3bb..0c73624f053990dbab2f8c39f7d05e279ab64c87 100644 (file)
@@ -5,9 +5,9 @@
 /*----------------------------   mg_smoother.h     ---------------------------*/
 
 
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <lac/mgbase.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 #include <base/smartpointer.h>
 #include <vector>
 
index 1c0b779a78d5a3ea9dc1dfa76da0daba42f50fd7..bdac914ff0f53c73f9f1fa3df8d6d5e587ee2732 100644 (file)
@@ -6,9 +6,9 @@
 
 #include <base/subscriptor.h>
 #include <base/smartpointer.h>
-#include <lac/forward-declarations.h>
-#include <basic/forward-declarations.h>
-#include <lac/sparsematrix.h>
+#include <lac/forward_declarations.h>
+#include <grid/forward_declarations.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <lac/mgbase.h>
 
index 9f908631be60336b1504e69c3ebb9c4a4f13e5ab..b116393928be608d263ea5fe4de71319f4ea17eb 100644 (file)
@@ -5,7 +5,7 @@
 /*----------------------------   multigrid.templates.h     ---------------------------*/
 
 
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <numerics/multigrid.h>
 #include <algorithm>
 #include <fstream>
index 15952928104b8e219dde3bb677fe1a9d1dd53442..0386f7ff9342867275a37f4f5943332cd5ac4f03 100644 (file)
@@ -6,8 +6,8 @@
 /*----------------------------   problem_assembler.h     ---------------------------*/
 
 #include <base/exceptions.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <fe/fe_values.h>
 #include <vector>
 
index 0b6b71b5f97e1cf71936e53772f6c841d91dd667..1b0834b2c30504743ebe8332ddb51d2b6a4a5b5c 100644 (file)
@@ -6,9 +6,9 @@
 /*----------------------------   problem_base.h     ---------------------------*/
 
 
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <base/exceptions.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <fe/fe_update_flags.h>
 #include <map>
 #include <string>
index dcb3575b907d3dd36d2e11448a068b3a137a6d30..810217620cd9dedf6833206cbe62547104bd2834 100644 (file)
@@ -6,8 +6,8 @@
 /*----------------------------   data_io.h     ---------------------------*/
 
 #include <base/exceptions.h>
-#include <basic/forward-declarations.h>
-#include <lac/forward-declarations.h>
+#include <grid/forward_declarations.h>
+#include <lac/forward_declarations.h>
 #include <vector>
 #include <string>
 
index b3366ea63dd48371ecffe1215d7239f7b5760e97..f4e3cb57a23491c34604812d1a1c10054940704c 100644 (file)
@@ -4,8 +4,8 @@
 #define __data_out_H
 /*----------------------------   data_out.h     ---------------------------*/
 
-#include <lac/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <lac/forward_declarations.h>
+#include <grid/forward_declarations.h>
 #include <base/data_out_base.h>
 
 
index 8e48fdd3159be4c85c429a2f681e8bb5237b84e6..5e7c3b20c942cb18eae99ff620dc014a3dd29e27 100644 (file)
@@ -6,8 +6,8 @@
 
 
 #include <base/data_out_base.h>
-#include <lac/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <lac/forward_declarations.h>
+#include <grid/forward_declarations.h>
 #include <base/smartpointer.h>
 
 #include <string>
index 4e8beacb8759e4985d252d03428a420d2a1160b1..33a2cf70b71660688e0bf0cad491e1622df6dc93 100644 (file)
@@ -6,7 +6,7 @@
 
 
 #include <base/exceptions.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 
 
 
index fb802549d51dd5ba2afb0c2390c6a872c97dfe0c..69018e41e53cdb43f65207b2552b9cf44b93c97d 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <base/exceptions.h>
 #include <base/function.h>
-#include <basic/forward-declarations.h>
-#include <grid/dof.h>
+#include <grid/forward_declarations.h>
+#include <dofs/dof_handler.h>
 #include <map>
 
 
index 14d9e46f40640f0a5631c34834b7521f700fc4e6..8bdacaaf41f4f3673fc4c6c1826d30279c0d3648 100644 (file)
@@ -6,7 +6,7 @@
 
 
 #include <base/exceptions.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <vector>
 #include <string>
 
index 6b76df8894852c4b462da50d3267eb44a6acb3bb..0c73624f053990dbab2f8c39f7d05e279ab64c87 100644 (file)
@@ -5,9 +5,9 @@
 /*----------------------------   mg_smoother.h     ---------------------------*/
 
 
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <lac/mgbase.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 #include <base/smartpointer.h>
 #include <vector>
 
index 1c0b779a78d5a3ea9dc1dfa76da0daba42f50fd7..bdac914ff0f53c73f9f1fa3df8d6d5e587ee2732 100644 (file)
@@ -6,9 +6,9 @@
 
 #include <base/subscriptor.h>
 #include <base/smartpointer.h>
-#include <lac/forward-declarations.h>
-#include <basic/forward-declarations.h>
-#include <lac/sparsematrix.h>
+#include <lac/forward_declarations.h>
+#include <grid/forward_declarations.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <lac/mgbase.h>
 
index 9f908631be60336b1504e69c3ebb9c4a4f13e5ab..b116393928be608d263ea5fe4de71319f4ea17eb 100644 (file)
@@ -5,7 +5,7 @@
 /*----------------------------   multigrid.templates.h     ---------------------------*/
 
 
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <numerics/multigrid.h>
 #include <algorithm>
 #include <fstream>
index 36e5939550f9e70e833a82f77c11cc6513b14762..4b9ba455b69ae4563bec10dc44aa4e312d58c207 100644 (file)
@@ -6,8 +6,8 @@
 /*----------------------------   solutiontransfer.h     ----------------------*/
 
 
-#include <lac/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <lac/forward_declarations.h>
+#include <grid/forward_declarations.h>
 
 #include <base/exceptions.h>
 #include <vector>
index 008254309ca20961541dd4872caeaeeb12ccf399..c3d0a35675684a92b1d231db1fc1a6f6b2c22a5d 100644 (file)
@@ -7,8 +7,8 @@
 
 #include <base/exceptions.h>
 #include <base/subscriptor.h>
-#include <basic/forward-declarations.h>
-#include <lac/forward-declarations.h>
+#include <grid/forward_declarations.h>
+#include <lac/forward_declarations.h>
 
 #include <vector>
 #include <utility>
index 22f9c72953a66f66b0ea96e75e4054bbdd31c30e..521261f480ca187b1158976d6ad2ecfce01232a6 100644 (file)
@@ -6,9 +6,9 @@
 /*----------------------------   vectors.h     ---------------------------*/
 
 
-#include <base/forward-declarations.h>
+#include <base/forward_declarations.h>
 #include <base/exceptions.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 #include <map>
 #include <vector>
 
index 374e5de19532ee0553e447c2c9fde3b43f3b4514..c980269fa54637889a8084384359b5e09b29c978 100644 (file)
@@ -3,17 +3,17 @@
 
 
 
-#include <grid/dof_accessor.h>
-#include <grid/dof_accessor.templates.h>
-#include <grid/dof.h>
-#include <grid/dof_levels.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/dof_accessor.templates.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_levels.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 #include <fe/fe.h>
 
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <vector>
 
index e66b41e8cf92fdc8179dcd712213c6e5c4ee0cf9..ce0cd63e92f34ce8f028efd79837a3ec1a799659 100644 (file)
@@ -3,8 +3,8 @@
 
 
 
-#include <grid/dof_constraints.h>
-#include <lac/sparsematrix.h>
+#include <dofs/dof_constraints.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <iostream>
 #include <algorithm>
@@ -323,7 +323,7 @@ void ConstraintMatrix::print (ostream &out) const {
   AssertThrow (out, ExcIO());
 };
 
-#include <grid/dof_constraints.templates.h>
+#include <dofs/dof_constraints.templates.h>
 
 #define number double
 template void ConstraintMatrix::condense(const SparseMatrix<number> &uncondensed,
index d574d5cf0d86aa231dc3c32736266122eb0869fb..1a2b242a79adec892d60ee53a61382e1c5aee2df 100644 (file)
@@ -2,17 +2,17 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <grid/dof.h>
-#include <grid/dof_levels.h>
-#include <grid/dof_accessor.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_levels.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/dof_constraints.h>
 #include <grid/tria_levels.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <grid/geometry_info.h>
 #include <fe/fe.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <lac/vector.h>
 
index 6261c537bc619ecf1e81b6bfa8fdf411c49e2e4e..97c537e6e70b1e99c595990626c335df30ad6b45 100644 (file)
@@ -1,14 +1,14 @@
 /* $Id$ */
 
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof.h>
-#include <grid/mg_dof.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_handler.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_constraints.h>
 #include <fe/fe.h>
 #include <numerics/dof_renumbering.h>
-#include <basic/dof_tools.h>
-#include <lac/sparsematrix.h>
+#include <dofs/dof_tools.h>
+#include <lac/sparse_matrix.h>
 
 #include <vector>
 #include <map>
index a534d11259624e8466d6db911a48f96f695638cb..13d44ab7538c61e83592e390bd600a5b8518d945 100644 (file)
@@ -1,15 +1,15 @@
 // $Id$
 // Copyright Guido Kanschat, 1999
 
-#include <grid/dof.h>
-#include <grid/mg_dof.h>
-#include <grid/dof_accessor.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_system.h>
-#include <basic/dof_tools.h>
-#include <lac/sparsematrix.h>
+#include <dofs/dof_tools.h>
+#include <lac/sparse_matrix.h>
 
 #include <algorithm>
 
index 0e72ae0e8f1be45ad7ce52fe7568ba1bfc2815b3..96dab7eaa894e6c87938df34fd77b96562f6b7e5 100644 (file)
@@ -3,16 +3,16 @@
 
 
 
-#include <grid/mg_dof_accessor.h>
-#include <grid/mg_dof.h>
-#include <grid/dof_levels.h>
+#include <dofs/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_levels.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 #include <fe/fe.h>
 
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 
 
 
index 499d92e29e5cce27937c64fc4f5b983490bd0808..87f8192c253916752c2b072554ac285af9fd69c8 100644 (file)
@@ -2,17 +2,17 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <grid/mg_dof.h>
-#include <grid/dof_levels.h>
-#include <grid/mg_dof_accessor.h>
-#include <grid/dof_constraints.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_levels.h>
+#include <dofs/mg_dof_accessor.h>
+#include <dofs/dof_constraints.h>
 #include <grid/tria_levels.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <grid/geometry_info.h>
 #include <fe/fe.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <algorithm>
 
index 9c76b0f53a4aa9c6e1ff98fd841cf5e2b925811b..c924ad07f2c3f1914675bedfdd85648fc55be1c1 100644 (file)
@@ -6,7 +6,7 @@
 #include <base/quadrature.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_boundary.h>
 
 
index 3c0adf2f3b31ee86a63dbb1ab52290a6168fbfad..9c38373122c28080c64ea6e92f54ee32f43c9792 100644 (file)
@@ -4,7 +4,7 @@
 
 #include <fe/fe_lib.criss_cross.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 
 #include <cmath>
index e5c37f342d49d24fc5db786428c8cbbdf779d7e7..79f7324b6122eb21d85384340a76217bd05c318c 100644 (file)
@@ -4,7 +4,7 @@
 
 #include <fe/fe_lib.lagrange.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 #include <algorithm>
 
index 0c98e7ccbb8bd9296c572cab9157f7091900cc8f..60292f722e621f76e5c67fe5c1b9c4037a2fef85 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <fe/fe_lib.dg.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 #include <algorithm>
 
index 1bea588b69137195d11bdc7bef15de284711043e..ff6751470d439a7940459b7cbef607826f3535dc 100644 (file)
@@ -5,7 +5,7 @@
 
 #include <fe/fe_lib.lagrange.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 #include <algorithm>
 
index afcda64e039153ad7b768339f09900671c99a02b..5a44fa9e7af0e6e5f9565006bf1b34f7c7de91f3 100644 (file)
@@ -4,7 +4,7 @@
 
 #include <fe/fe_lib.lagrange.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 #include <algorithm>
 
index 0ea1ef55dcf26237bcc7add20878221331074b8a..09988f107a9f502b3f78405e643118d5144b4822 100644 (file)
@@ -4,7 +4,7 @@
 
 #include <fe/fe_lib.lagrange.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 #include <algorithm>
 
index d3adb919c4ac16ceabe50bdbcaffa4068ce25a28..ba61fe7923142619fed40cd36540daa1b07d9cad 100644 (file)
@@ -8,7 +8,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_boundary.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <lac/vector.h>
 
 
index 32b7ac9fcda9f0a253f228adc89a35efeb7a9a61..a69a63d74a0adeefc69efa0d6c9bddab739f7026 100644 (file)
@@ -6,7 +6,7 @@
 #include <fe/q1_mapping.h>
 #include <base/quadrature.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 
 #include <cmath>
 
@@ -665,12 +665,12 @@ void FEQ1Mapping<dim>::fill_fe_values (const DoFHandler<dim>::cell_iterator &cel
   -------------------------------------------
   #include <grid/tria.h>
   #include <grid/tria_boundary.h>
-  #include <grid/dof.h>
+  #include <dofs/dof_handler.h>
   #include <fe/fe_values.h>
   #include <fe/fe_lib.lagrange.h>
   #include <base/quadrature_lib.h>
   #include <grid/tria_iterator.h>
-  #include <grid/dof_accessor.h>
+  #include <dofs/dof_accessor.h>
   #include <lac/vector.h>
 
   int main () {
index c82d50415dc8d07aa864e36f97eb72f5c7bb2bd4..1c9f8642fa47369018f189e98b21b20828eaac5d 100644 (file)
@@ -5,7 +5,7 @@
 
 #include <fe/q1_mapping.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 
 #include <cmath>
 
index 77651cc8f3d169aa608ff814d7e96312297cf436..3ee7217c76117c8cb0c93b10930686bc71e12de4 100644 (file)
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#include <basic/grid_out.h>
+#include <grid/grid_out.h>
 
 
 GridOut::UcdFlags::UcdFlags (const bool write_preamble,
index a1bfc0babc0444044fa04e7421282464f1f31a02..1f9fd183c920f64e18dbbfa01995b12026a50641 100644 (file)
@@ -2,7 +2,7 @@
 
 
 #include <base/point.h>
-#include <basic/grid_out.h>
+#include <grid/grid_out.h>
 #include <grid/tria.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
index d3850351c39fd478971aefb7ffd93fd08f133c14..e99ee47d7a207941b6804722894be041c41219e9 100644 (file)
@@ -1,11 +1,11 @@
 /* $Id$ */
 
 #include <grid/tria.h>
-#include <grid/dof.h>
-#include <grid/mg_dof.h>
+#include <dofs/dof_handler.h>
+#include <dofs/mg_dof_handler.h>
 #include <grid/tria_accessor.h>
-#include <grid/dof_accessor.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid//intergrid_map.h>
 
index 2d37deb6f8cf8dac132a0b9d1c29673902a95e39..be4b0c1bfaf1bb45b75db0b56de88b5024e6d54a 100644 (file)
@@ -1,7 +1,7 @@
 /* $Id$ */
 
 #include <grid/persistent_tria.h>
-#include <basic/magic_numbers.h>
+#include <grid/magic_numbers.h>
 #include <iostream>
 
 
index 7431b6ff9655a7e0407dec1228042cb3ad27093b..35c64d92b2d09197b0b8372800e3b05706b70ff2 100644 (file)
@@ -8,7 +8,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/geometry_info.h>
-#include <basic/magic_numbers.h>
+#include <grid/magic_numbers.h>
 #include <lac/vector.h>
 #include <iostream>
 #include <algorithm>
index 0e72ae0e8f1be45ad7ce52fe7568ba1bfc2815b3..96dab7eaa894e6c87938df34fd77b96562f6b7e5 100644 (file)
@@ -3,16 +3,16 @@
 
 
 
-#include <grid/mg_dof_accessor.h>
-#include <grid/mg_dof.h>
-#include <grid/dof_levels.h>
+#include <dofs/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_levels.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 #include <fe/fe.h>
 
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 
 
 
index 499d92e29e5cce27937c64fc4f5b983490bd0808..87f8192c253916752c2b072554ac285af9fd69c8 100644 (file)
@@ -2,17 +2,17 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <grid/mg_dof.h>
-#include <grid/dof_levels.h>
-#include <grid/mg_dof_accessor.h>
-#include <grid/dof_constraints.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_levels.h>
+#include <dofs/mg_dof_accessor.h>
+#include <dofs/dof_constraints.h>
 #include <grid/tria_levels.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <grid/geometry_info.h>
 #include <fe/fe.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <algorithm>
 
index 9fad33f9c8cb3c2fd6c8439cadf0175842a6d490..2b68b6ba36f500edb1fc123ef889995dd5f63bc2 100644 (file)
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 #include <grid/tria.h>
-#include <grid/mg_dof.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <numerics/multigrid.h>
index 84dc85d452eea667c98464fc568f2cc0f6121485..1b23f08634331ea7581f28c2cc00e1cb57ea79ff 100644 (file)
@@ -2,8 +2,8 @@
 // Copyright Guido Kanschat, Universitaet Heidelberg, 1999
 
 #include <grid/tria.h>
-#include <grid/mg_dof.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <numerics/multigrid.h>
index 41f44c8102688c00d4edb9b282394f3d04b27e39..fa8df868fc75da09fa5895e756f61734c14c741b 100644 (file)
@@ -6,9 +6,9 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 #include <fe/fe.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 
 template <int dim>
index 8a0e99c71d21f83351f414ea268acc32a5da26a5..30c7516540226d441abbb8943acc8a8db28f2e77 100644 (file)
@@ -6,10 +6,10 @@
 #include <numerics/base.h>
 #include <numerics/matrices.h>
 #include <numerics/vectors.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <grid/tria_iterator.h>
-#include <basic/data_out.h>
-#include <basic/dof_tools.h>
+#include <numerics/data_out.h>
+#include <dofs/dof_tools.h>
 #include <base/function.h>
 #include <fe/fe.h>
 #include <base/quadrature.h>
index 5deb30cdd344ae8616cd9f4649b41ed472c50246..c348740fb504b08d7220ddb28631f15016b80a44 100644 (file)
@@ -2,9 +2,9 @@
 /* Copyright W. Bangerth, Guido Kanschat, Stefan Nauber  */
 /* University of Heidelberg, 1998, 1999                  */
 
-#include <basic/data_io.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <numerics/data_io.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <grid/geometry_info.h>
index d33d5f2ccba19ab3c3e6540ebabe00a2c132923f..5fc709eac66ea4d1724f54b31a6f7624884dbe98 100644 (file)
@@ -3,10 +3,10 @@
 
 #include <base/quadrature_lib.h>
 #include <lac/vector.h>
-#include <basic/data_out.h>
+#include <numerics/data_out.h>
 #include <grid/tria.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
index 4ede3bd6493e02f503ef7ec40395862f0fbb5b6d..45e38031ffbe6ce061af41182b135260a49825ba 100644 (file)
@@ -1,10 +1,10 @@
 /* $Id$ */
 
-#include <basic/data_out_stack.h>
+#include <numerics/data_out_stack.h>
 #include <base/quadrature_lib.h>
 #include <lac/vector.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
index ccf0415e69eece3f9a102b9bc46e3d2dfc69c5a0..117d0c36c0b4147ee4e823b23262e14987e7354a 100644 (file)
@@ -4,9 +4,9 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 #include <fe/fe.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 template <int dim>
 Equation<dim>::Equation (const unsigned int n_equations) :
index e3605c7cb85177fb7662b55179591b4b72951f80..0a9be5f7dd0f57f828f91e8b851f0ed7ed75a248 100644 (file)
@@ -7,9 +7,9 @@
 #include <base/quadrature.h>
 #include <base/quadrature_lib.h>
 #include <numerics/error_estimator.h>
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/geometry_info.h>
 #include <lac/vector.h>
 
index 71c9d9aefa9d12b8e30d407cb9d9f9899d19926d..290da45e0a75ed1cb99b5d2d0316c544b40b01ae 100644 (file)
@@ -1,7 +1,7 @@
 /* $Id$ */
 
 #include <lac/vector.h>
-#include <basic/histogram.h>
+#include <numerics/histogram.h>
 #include <algorithm>
 #include <cmath>
 
index 0e079544511734866ce4eeb70bee85c05c731e54..42260889104a28a9040278680b7fefaed1be0927 100644 (file)
@@ -1,8 +1,8 @@
 /*      $Id$                 */
 
 #include <base/function.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/geometry_info.h>
 #include <base/quadrature.h>
@@ -11,7 +11,7 @@
 #include <numerics/matrices.h>
 #include <numerics/assembler.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <algorithm>
 #include <set>
index 9fad33f9c8cb3c2fd6c8439cadf0175842a6d490..2b68b6ba36f500edb1fc123ef889995dd5f63bc2 100644 (file)
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 #include <grid/tria.h>
-#include <grid/mg_dof.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <numerics/multigrid.h>
index 84dc85d452eea667c98464fc568f2cc0f6121485..1b23f08634331ea7581f28c2cc00e1cb57ea79ff 100644 (file)
@@ -2,8 +2,8 @@
 // Copyright Guido Kanschat, Universitaet Heidelberg, 1999
 
 #include <grid/tria.h>
-#include <grid/mg_dof.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <numerics/multigrid.h>
index 01c369c37c1020c069ba4774771c6242b85319c1..09a10eadc4460c139bcba09e33bc8c835a764e49 100644 (file)
@@ -3,13 +3,13 @@
 /*           Ralf Hartmann, University of Heidelberg                          */
 
 #include <grid/tria.h>
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/tria_accessor.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <lac/vector.h>
-#include <numerics/solutiontransfer.h>
+#include <numerics/solution_transfer.h>
 
 
 
index d07ec7c95b24a287b2b82db058fbd1b541ed3985..5e0f7be8225c30506a055747a55917a47abc2809 100644 (file)
@@ -1,7 +1,7 @@
 // $Id$
 
 
-#include <numerics/time-dependent.h>
+#include <numerics/time_dependent.h>
 #include <grid/tria.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
index 621168aadb5d30c5ca54c5ccd5a0e03caf25c6cc..ea5463742994bb03ae4849a285e6c7f99cc1d462 100644 (file)
@@ -4,19 +4,19 @@
 
 
 #include <base/function.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <base/quadrature.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
-#include <basic/dof_tools.h>
+#include <dofs/dof_tools.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/precondition.h>
 #include <lac/solver_cg.h>
 #include <lac/vector_memory.h>
index d235bf70068349ee6ef639e4480da8889afb227d..4f274653802006f18d2f653e3a9b032ced4c592e 100644 (file)
@@ -17,7 +17,7 @@ o-files      = $(o-files-base3)
 go-files     = $(patsubst lib/o/%,lib/go/%,$(o-files-base3:.o=.go))
 h-files      = $(shell echo include/lac/*.h)
 
-forward-declarations = $D/lac/include/lac/forward-declarations.h
+forward-declarations = $D/lac/include/lac/forward_declarations.h
 
 # get options which hold for all files of the project
 include $D/common/Make.global_options
@@ -46,7 +46,8 @@ lib/liblac.g.a: $(forward-declarations) $(go-files)
 
 
 clean:
-       -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go include/base/forward-declarations.h*
+       -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go \
+               include/base/forward_declarations.h*
 
 
 
@@ -57,14 +58,14 @@ clean:
 #of this file.
 lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/Make_dep_2.pl $(INCLUDE) $(cc-files) \
+       @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \
                > lib/Makefile.dep
 
 # include all the dependencies
 include lib/Makefile.dep
 
 # include a rule which tells how to remake the forward declarations file
-include $D/common/Makescripts/forward_declarations
+include $D/common/scripts/forward_declarations
 
 
 .PHONY: clean
index e6ca8c2e66281a8523502d3be1f713b4de157cbc..fa946188cbccaa474a22b381b439d86ebcadfc10 100644 (file)
@@ -1 +1 @@
-forward-declarations.h
+forward_declarations.h
index 0be861f1fbae3ac8ddf7e801dde72a311ad527e9..10b97c8def8f74c87e4c3367f6232f6103ce4aa8 100644 (file)
@@ -1,7 +1,7 @@
 // $Id$
 
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 
 #include <vector>
 #include <cmath>
index 595bfb3f8064e4bdbfc9d8d0b6fd9b5b7457111d..92fec377f0511fe58d11c74921ad2d3c003094b6 100644 (file)
@@ -8,11 +8,10 @@
 
 #include <base/subscriptor.h>
 #include <base/smartpointer.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <lac/vector.h>
 
 #include <vector>
-#include <base/smartpointer.h>
 
 
 
@@ -258,7 +257,7 @@ class MGVector : public Subscriptor
  * with a subscriptor for smart pointers.
  * @author Guido Kanschat, 1999
  */
-template<class MATRIX = SparseMatrix<double> >
+template <class MATRIX = SparseMatrix<double> >
 class MGMatrix : public Subscriptor,
                 public vector<MATRIX>
 {
index ee42d8f4166f12876a141975c7d5d299a9d79869..75d33a9a939803b6bfcaf55c023c9f14ed42ce99 100644 (file)
@@ -4,7 +4,7 @@
 #define __precondition_block_H
 /*----------------------------   precondition_block.h     ---------------------------*/
 
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <base/exceptions.h>
 #include <base/subscriptor.h>
 #include <base/smartpointer.h>
index cc193eb454d978c68b22f8fc9a2973cb40c0ba69..4aad18d3a9ef77ff43090bdb7ba502c1c9e3a483 100644 (file)
@@ -5,8 +5,8 @@
 
 #include <lac/precondition_block.h>
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 
 
 template <typename number, typename inverse_type>
index 35e8e73bf5a8000eacfede1ee0a6049514116480..530a8b2f5c9542d46606fc9a1ce2382bb50e51a1 100644 (file)
@@ -6,7 +6,7 @@
 
 
 
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 
 
 
index 3d3508231021eb01d0a7d9a9b9bf8922b210c2a3..1dbd82e1c6b1027e037a6b0ba44b2e2d6032aeb1 100644 (file)
@@ -8,7 +8,7 @@
 #include <base/logstream.h>
 #include <lac/solver.h>
 #include <lac/solver_control.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 #include <vector>
 
 
index 0f7855dc7e558be74805de77b1018c5427cc2f50..410b8108c784b676a36216755c59817a85bdef56 100644 (file)
@@ -7,7 +7,7 @@
 
 #include <lac/solver.h>
 #include <base/smartpointer.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <lac/vector_memory.h>
 #include <lac/solver_control.h>
index 4666a03683bebd950fc652202a6c2e40496291d8..9e13efa130fcd5a143a828d369ddaa87158b19f1 100644 (file)
@@ -5,7 +5,7 @@
 /*----------------------------   sparse_ilu.h     ---------------------------*/
 
 
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 
 
index 87bffb716b747509a18f485f12f644de46f3bee7..d635266a1929e28d740c5e0adee245601f31484c 100644 (file)
@@ -6,7 +6,7 @@
 // Revised, modified and extended by Wolfgang Bangerth, 1998, 1999
 
 
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 
 
index b6744161033d5f21ba7709836c63a25bdc7ee192..1191b6ea0c0eadf20fd1dbd3d7498c9d8561d6d7 100644 (file)
@@ -8,7 +8,7 @@
 
 
 #include <base/smartpointer.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 
 #include <vector>
 
index 5d66fda67a5bb4bec506c5039d7703ada3a55695..60e6b88ccdf787e5e682ad8468be2b1a6cfc531b 100644 (file)
@@ -2,8 +2,8 @@
 // Copyright Guido Kanschat, 1999
 
 #include <lac/sparse_vanka.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 
 #include <map>
index 5a7f56265d6f7a497ffb88c6006c91b4fd1cbafd..1818ba60d0da90af999766c6f240e0c52f0af05f 100644 (file)
@@ -10,7 +10,7 @@
  * 4. TYPEMAT2: numerical type for the second matrix
  */
 
-#include <lac/fullmatrix.templates.h>
+#include <lac/full_matrix.templates.h>
 
 #define TYPEMAT double
 
index e662511cc5e21c157afb990adc9d5177d0583d22..1871cb4d528d83468d414a7685acc7adb3e8fae1 100644 (file)
@@ -10,7 +10,7 @@
  * 4. TYPEMAT2: numerical type for the second matrix
  */
 
-#include <lac/fullmatrix.templates.h>
+#include <lac/full_matrix.templates.h>
 
 #define TYPEMAT float
 
index 89710fcf78ca044bd5b581a8a8acdc82aceb6432..3df0ce0b8735d5128fddfecb04940e0933583c38 100644 (file)
@@ -6,7 +6,7 @@
 // Revised, modified and extended by Wolfgang Bangerth, 1998, 1999
 
 
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <iostream>
 #include <iomanip>
index 3f46545d3001eb45ce36d7db16769a531e1cdcf4..5768bb4f3786f0dc927c9a571cbe75ff0cf9793c 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #include <cmath>
-#include <lac/sparsematrix.templates.h>
+#include <lac/sparse_matrix.templates.h>
 
 #define TYPEMAT double
 
@@ -18,17 +18,17 @@ template class SparseMatrix<TYPEMAT>;
 
 #define TYPE2 float
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #define TYPE2 double
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #define TYPE2 long double
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #undef TYPEMAT
index d2a2963b45f7edc18a6cd76af8f4f49e2f5baf2c..7a8a327aeb60d79704145731f6d0d7892cdf6c65 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #include <cmath>
-#include <lac/sparsematrix.templates.h>
+#include <lac/sparse_matrix.templates.h>
 
 
 #define TYPEMAT float
@@ -20,14 +20,14 @@ template class SparseMatrix<TYPEMAT>;
 
 #define TYPE2 float
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #define TYPE2 double
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #define TYPE2 long double
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
index 651197dab07aa2f7b85919ca3dc75a39252e8441..62f326ca38b3b2de9bb5b204aa513a4b13ed0933 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #include <cmath>
-#include <lac/sparsematrix.templates.h>
+#include <lac/sparse_matrix.templates.h>
 
 
 #define TYPEMAT long double
@@ -20,14 +20,14 @@ template class SparseMatrix<TYPEMAT>;
 
 #define TYPE2 float
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #define TYPE2 double
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
 
 #undef TYPE2
 #define TYPE2 long double
 
-#include <lac/sparsematrix.2.templates>
+#include <lac/sparse_matrix.2.templates>
index f90226de2c9597b6e45250f9cfecd2b088be5147..b8a900ff9c6eb62621e891d8c3047fa75885f252 100644 (file)
@@ -2,7 +2,7 @@
 # Directory with the DEAL distribution
 ############################################################
 
-D = ../..
+D = ../../deal.II
 
 
 ############################################################
index b7c640c851f7b695f3d07ea1f496f1bf3f04917d..a28e9fa1cbbdcd12681e63999a443e8350fb1ded 100644 (file)
@@ -2,7 +2,7 @@
 # Directory with the DEAL distribution
 ############################################################
 
-D = ../..
+D = ../../deal.II
 
 
 ############################################################
index b9cdfee7f89eb835ec9e28509f15ba150d307fb3..ed72ae91a29227d4755755acb2c616622a8a95a5 100644 (file)
 // was correct.
 
 
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/tria.h>
 #include <fe/fe_lib.lagrange.h>
 #include <grid/tria_boundary.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <base/parameter_handler.h>
-#include <grid/dof_constraints.h>
-#include <basic/grid_out.h>
+#include <dofs/dof_constraints.h>
+#include <grid/grid_out.h>
 #include <base/logstream.h>
 
 #include <fstream>
index c6e0aa377c3ea5115c7f1a71eae367db4aa93dfd..76c56ed1d913ba5ee1dc4c67585aca94d8d46119 100644 (file)
@@ -6,17 +6,17 @@
 
 
 
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/tria.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_lib.lagrange.h>
 #include <grid/tria_boundary.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
-#include <lac/sparsematrix.h>
-#include <grid/dof_constraints.h>
+#include <lac/sparse_matrix.h>
+#include <dofs/dof_constraints.h>
 #include <numerics/dof_renumbering.h>
-#include <basic/dof_tools.h>
+#include <dofs/dof_tools.h>
 #include <base/logstream.h>
 
 #include <cmath>
index a55d2cb0a70620843dbebf834e8d9b01b85e4cd1..308edfab6630f72e5ae9f4bb0a97f4276945ff45 100644 (file)
@@ -13,8 +13,8 @@
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/grid_generator.h>
 #include <iomanip>
 #include <fstream>
index cd97cf1a3663936f1407ff7faa8cfb976a4d1a52..d6539c759a3cb9e205c5fc63b9167d73b02759e1 100644 (file)
 
 #include <grid/tria.h>
 #include <grid/tria_boundary.h>
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_values.h>
 #include <fe/fe_lib.lagrange.h>
 #include <base/quadrature_lib.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <lac/vector.h>
 #include <base/logstream.h>
 
index 92b00508cfbaaf8af5d721a5ee6f7a709a8738ea..352afcae3e27713771f7b6f3c37aab6a8a63c764 100644 (file)
@@ -14,7 +14,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <grid/grid_generator.h>
-#include <basic/grid_out.h>
+#include <grid/grid_out.h>
 #include <base/logstream.h>
 #include <cmath>
 #include <cstdlib>
index e417533b6717fb69d3082106b95baff3f8657adb..b1ae34d72b36cfe0ad4ca5abde9588926bf7d4dc 100644 (file)
@@ -8,24 +8,24 @@
 #include <base/quadrature_lib.h>
 #include <base/logstream.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/solver_cg.h>
 #include <lac/solver_richardson.h>
 #include <lac/vector_memory.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
-#include <grid/mg_dof.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof_accessor.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_values.h>
 #include <numerics/multigrid.h>
 #include <numerics/multigrid.templates.h>
 #include <numerics/mg_smoother.h>
-#include <basic/dof_tools.h>
+#include <dofs/dof_tools.h>
 
 #include "helmholtz.h"
 
index bb2c983be31a8cdaee658f5be63dd06b133c51bf..43d7c228186556cb45f155477350f90075e9bb9c 100644 (file)
@@ -8,26 +8,26 @@
 #include <base/quadrature_lib.h>
 #include <base/logstream.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/solver_cg.h>
 #include <lac/solver_richardson.h>
 #include <lac/vector_memory.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
-#include <grid/mg_dof.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof_accessor.h>
-#include <grid/mg_dof_accessor.h>
+#include <dofs/mg_dof_handler.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/mg_dof_accessor.h>
 #include <grid/grid_generator.h>
-#include <basic/data_io.h>
+#include <numerics/data_io.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_values.h>
 #include <numerics/multigrid.h>
 #include <numerics/mg_smoother.h>
 MGSmoother* smoother_object;
 #include <numerics/multigrid.templates.h>
-#include <basic/dof_tools.h>
+#include <dofs/dof_tools.h>
 
 #include <fstream>
 
index b5b95b45f6fc0b7507d36e00e6c6688ec7976604..a9083c0327ffc97da38c84df34dcf9809f612cdd 100644 (file)
@@ -6,13 +6,13 @@
 
 #include <grid/tria.h>
 #include <grid/tria_boundary.h>
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_values.h>
 #include <fe/fe_lib.lagrange.h>
 #include <base/quadrature_lib.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <lac/vector.h>
 #include <base/logstream.h>
 
index 4d2434951f41edd2f12b71ae2e8df7b636a97ce9..afd6f89610ffbd338ccbb0dca0b89fc045fb5877 100644 (file)
@@ -1,15 +1,15 @@
 // deal_II_libraries.g=-ldeal_II_2d.g
 // deal_II_libraries=-ldeal_II_2d
 
+#include <base/logstream.h>
 #include <grid/tria_boundary_lib.h>
 #include <base/parameter_handler.h>
-#include <base/forward-declarations.h>
-#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 <base/logstream.h>
+#include <base/forward_declarations.h>
+#include <lac/forward_declarations.h>
+#include <grid/forward_declarations.h>
+#include <numerics/time_dependent.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_tools.h>
 
 #include <fstream>
 #include <string>
@@ -187,7 +187,7 @@ class TimeStep_Dual :  public TimeStep_Wave<dim>
 
 
 
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 
 
 
@@ -638,9 +638,9 @@ class HuyghensWave : public DualFunctional<dim> {
 };
 
 
-#include <basic/forward-declarations.h>
-#include <base/forward-declarations.h>
-#include <lac/forward-declarations.h>
+#include <grid/forward_declarations.h>
+#include <base/forward_declarations.h>
+#include <lac/forward_declarations.h>
 #include <base/exceptions.h>
 #include <string>
 
@@ -1112,7 +1112,7 @@ class SweepInfo
 
 
 
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 
 
@@ -1174,7 +1174,7 @@ class UserMatrix :  public SparseMatrix<double> {
 
 
 #include <base/exceptions.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
 
 #include <string>
 
@@ -1244,8 +1244,8 @@ struct FEHelper {
 
 
 
-#include <base/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <base/forward_declarations.h>
+#include <grid/forward_declarations.h>
 #include <list>
 #include <string>
 
@@ -1843,7 +1843,7 @@ class WaveParameters
 
 
 
-#include <numerics/time-dependent.h>
+#include <numerics/time_dependent.h>
 
 template <int dim> class WaveParameters;
 template <int dim> class DataOutStack;
@@ -1979,11 +1979,11 @@ class WaveProblem :  public MultipleParameterLoop::UserClass {
 
 
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <lac/sparse_matrix.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <base/quadrature.h>
@@ -2650,17 +2650,17 @@ template class HuyghensWave<2>;
 
 
 #include <grid/tria.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <grid/geometry_info.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <base/quadrature.h>
 #include <base/function.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 #include <cmath>
 #include <fstream>
@@ -3323,11 +3323,11 @@ template class EvaluateHuyghensWave<2>;
 /* $Id$ */
 
 #include <base/data_out_base.h>
-#include <basic/histogram.h>
-#include <lac/sparsematrix.h>
+#include <numerics/histogram.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_handler.h>
 #include <grid/geometry_info.h>
 
 #include <cmath>
@@ -3336,7 +3336,7 @@ template class EvaluateHuyghensWave<2>;
 #include <fstream>
 #include <iomanip>
 
-#include <basic/data_out_stack.h>
+#include <numerics/data_out_stack.h>
 
 
 template <int dim>
@@ -3692,7 +3692,7 @@ template class TimestepManager<2>;
 #include <base/exceptions.h>
 #include <base/function.h>
 #include <base/parameter_handler.h>
-#include <basic/histogram.h>
+#include <numerics/histogram.h>
 #include <base/data_out_base.h>
 #include <grid/tria.h>
 #include <grid/tria_accessor.h>
@@ -5047,8 +5047,8 @@ void WaveParameters<dim>::parse_parameters (ParameterHandler &prm) {
 template class WaveParameters<2>;
 /* $Id$ */
 
-#include <basic/data_out_stack.h>
-#include <grid/dof.h>  //??
+#include <numerics/data_out_stack.h>
+#include <dofs/dof_handler.h>  //??
 #include <lac/vector.h>
 
 
@@ -5166,15 +5166,15 @@ void SweepInfo::write_summary (const list<EvaluationBase<2>*> &eval_list,
 #include <base/quadrature.h>
 #include <base/function.h>
 #include <lac/vector.h>
-#include <lac/fullmatrix.h>
-#include <lac/sparsematrix.h>
+#include <lac/full_matrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/solver_cg.h>
 #include <lac/vector_memory.h>
 #include <lac/precondition.h>
 #include <grid/geometry_info.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <fe/fe.h>
@@ -5769,13 +5769,13 @@ template class TimeStep_Wave<2>;
 /* $Id$ */
 
 #include <base/function.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <grid/tria.h>
-#include <grid/dof.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe_values.h>
 #include <fe/fe.h>
@@ -6556,10 +6556,10 @@ template class TimeStep_Dual<2>;
 #include <base/tensor.h>
 #include <lac/vector.h>
 #include <grid/tria.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <numerics/error_estimator.h>
@@ -7679,9 +7679,9 @@ template class TimeStep_ErrorEstimation<2>;
 
 
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof.h>
+#include <lac/sparse_matrix.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_handler.h>
 
 
 
@@ -7835,14 +7835,14 @@ template class TimeStep<2>;
 
 
 #include <lac/vector.h>
-#include <basic/data_out.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof.h>
-#include <grid/dof_accessor.h>
+#include <numerics/data_out.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
 #include <grid/geometry_info.h>
-#include <basic/data_out_stack.h>
+#include <numerics/data_out_stack.h>
 
 #include <fstream>
 #include <iomanip>
@@ -8117,13 +8117,13 @@ template class TimeStep_Postprocess<2>;
 /* $Id$ */
 
 #include <base/function.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
 #include <lac/vector.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <grid/tria.h>
-#include <grid/dof.h>
-#include <grid/dof_constraints.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_constraints.h>
+#include <dofs/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe_values.h>
 #include <fe/fe.h>
@@ -9058,10 +9058,10 @@ template class FEHelper<2>;
 
 
 #include <base/logstream.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
-#include <grid/dof.h>
-#include <grid/dof_constraints.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_constraints.h>
 
 
 
index 656be2921abcfb9180c8054f9ec2f7c496349118..bd5b95833dda3e37abb3133aca88083e134d1017 100644 (file)
@@ -7,7 +7,7 @@
 #include <lac/vector.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_values.h>
index df7954ebc42bf93c1d20ea188b0c6039e922145b..934507a1a56c724b48b330fcd4b60af3cff9c4ab 100644 (file)
@@ -7,7 +7,7 @@
 #include <lac/vector.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_values.h>
index fc8e2ad84620de17b9d9f6b506e9c327995fbf23..abbdcb8df83bed95e3d782e5515b6e7ed2fc99cb 100644 (file)
@@ -2,7 +2,7 @@
 # Directory with the DEAL distribution
 ############################################################
 
-D = ../..
+D = ../../deal.II
 
 
 ############################################################
index 23510ccf16f7895a5078cc77498395cd568ee12c..dd2779769a2f5d0a73a28cf14618ab33601a74ce 100644 (file)
@@ -6,7 +6,7 @@
 #include <fstream>
 #include "testmatrix.h"
 #include <base/logstream.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <lac/vector_memory.h>
 #include <lac/solver_control.h>
index eb6e0d4f48dfaae481aa1dd488851c60a3435b36..3c126b0adbfe81978863e4803f999a6534bc9d12 100644 (file)
@@ -7,7 +7,7 @@
 #include <iomanip>
 #include "testmatrix.h"
 #include <base/logstream.h>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 #include <lac/vector.h>
 #include <lac/vector_memory.h>
 #include <lac/solver_control.h>
index 94502617382512c978c470202a6a0018251fd43e..2b3ae8afd4c53ea819b690f0b0996a80162d609e 100644 (file)
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "testmatrix.h"
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
 
 FDMatrix::FDMatrix(unsigned int nx, unsigned int ny)
                :
index 885e6db18bd9eacf21de3ab48173fc467066d3a0..7b9f0e8e3fc3f058b322b57684c25199ffb2dbf7 100644 (file)
@@ -1,6 +1,6 @@
 // $Id$
 
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
 #include <base/exceptions.h>
 #include <lac/mgbase.h>
 

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.