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
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*
#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
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
-forward-declarations.h
+forward_declarations.h
/*---------------------------- 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>
/*---------------------------- 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>
#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>
// $Id$
-#include <base/functiontime.h>
+#include <base/function_time.h>
FunctionTime::FunctionTime(double initial_time)
// $Id$
-#include <base/jobidentifier.h>
+#include <base/job_identifier.h>
#include <ctime>
// $Id$
#include <base/logstream.h>
-#include <base/jobidentifier.h>
+#include <base/job_identifier.h>
// $Id$
-#include <base/jobidentifier.h>
+#include <base/job_identifier.h>
const char*
JobIdentifier::program_id()
// $Id$
-#include <base/tensorfunction.h>
+#include <base/tensor_function.h>
#include <vector>
#include <base/tensor.h>
#include <cmath>
# 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
@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 \
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"
@$(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 $@
#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;'\
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
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:
#include <grid/tria_accessor.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#include <vector>
/*---------------------------- 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>
#include <utility>
#include <base/exceptions.h>
#include <base/subscriptor.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#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>
// Copyright Wolfgang Bangerth, Guido Kanschat, and others 1999
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#include <vector>
/*---------------------------- mg_dof_accessor.h ---------------------------*/
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
/*---------------------------- mg_dof.h ---------------------------*/
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
#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>
#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>
--- /dev/null
+forward_declarations.h
/*---------------------------- 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>
#define __grid_out_H
/*---------------------------- grid_out.h ---------------------------*/
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
#include <base/exceptions.h>
#include <string>
/*---------------------------- 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>
#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>
#include <base/point.h>
#include <base/subscriptor.h>
#include <grid/geometry_info.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
#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>
* 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>
{
/*---------------------------- mg_dof_accessor.h ---------------------------*/
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
/*---------------------------- mg_dof.h ---------------------------*/
-#include <grid/dof.h>
+#include <dofs/dof_handler.h>
/*---------------------------- 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>
#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>
/*---------------------------- multigrid.templates.h ---------------------------*/
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
#include <numerics/multigrid.h>
#include <algorithm>
#include <fstream>
/*---------------------------- 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>
/*---------------------------- 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>
/*---------------------------- 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>
#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>
#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>
#include <base/exceptions.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
#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>
#include <base/exceptions.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#include <vector>
#include <string>
/*---------------------------- 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>
#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>
/*---------------------------- multigrid.templates.h ---------------------------*/
-#include <grid/dof_constraints.h>
+#include <dofs/dof_constraints.h>
#include <numerics/multigrid.h>
#include <algorithm>
#include <fstream>
/*---------------------------- 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>
#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>
/*---------------------------- 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>
-#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>
-#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>
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,
/* 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>
/* $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>
// $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>
-#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>
/* 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>
#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>
#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>
#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>
#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>
#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>
#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>
#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>
#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>
#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>
-------------------------------------------
#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 () {
#include <fe/q1_mapping.h>
#include <grid/tria_iterator.h>
-#include <grid/dof_accessor.h>
+#include <dofs/dof_accessor.h>
#include <cmath>
/* $Id$ */
-#include <basic/grid_out.h>
+#include <grid/grid_out.h>
GridOut::UcdFlags::UcdFlags (const bool write_preamble,
#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>
/* $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>
/* $Id$ */
#include <grid/persistent_tria.h>
-#include <basic/magic_numbers.h>
+#include <grid/magic_numbers.h>
#include <iostream>
#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>
-#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>
/* 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>
/* $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>
// 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>
#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>
#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>
/* 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>
#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>
/* $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>
#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) :
#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>
/* $Id$ */
#include <lac/vector.h>
-#include <basic/histogram.h>
+#include <numerics/histogram.h>
#include <algorithm>
#include <cmath>
/* $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>
#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>
/* $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>
// 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>
/* 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>
// $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>
#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>
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
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*
#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
-forward-declarations.h
+forward_declarations.h
// $Id$
#include <lac/vector.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
#include <vector>
#include <cmath>
#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>
* 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>
{
#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>
#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>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#include <base/logstream.h>
#include <lac/solver.h>
#include <lac/solver_control.h>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
#include <vector>
#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>
/*---------------------------- sparse_ilu.h ---------------------------*/
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
// Revised, modified and extended by Wolfgang Bangerth, 1998, 1999
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
#include <lac/vector.h>
#include <base/smartpointer.h>
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#include <vector>
// 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>
* 4. TYPEMAT2: numerical type for the second matrix
*/
-#include <lac/fullmatrix.templates.h>
+#include <lac/full_matrix.templates.h>
#define TYPEMAT double
* 4. TYPEMAT2: numerical type for the second matrix
*/
-#include <lac/fullmatrix.templates.h>
+#include <lac/full_matrix.templates.h>
#define TYPEMAT float
// Revised, modified and extended by Wolfgang Bangerth, 1998, 1999
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
#include <iostream>
#include <iomanip>
*/
#include <cmath>
-#include <lac/sparsematrix.templates.h>
+#include <lac/sparse_matrix.templates.h>
#define TYPEMAT double
#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
*/
#include <cmath>
-#include <lac/sparsematrix.templates.h>
+#include <lac/sparse_matrix.templates.h>
#define TYPEMAT float
#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>
*/
#include <cmath>
-#include <lac/sparsematrix.templates.h>
+#include <lac/sparse_matrix.templates.h>
#define TYPEMAT long double
#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>
# Directory with the DEAL distribution
############################################################
-D = ../..
+D = ../../deal.II
############################################################
# Directory with the DEAL distribution
############################################################
-D = ../..
+D = ../../deal.II
############################################################
// 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>
-#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>
#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>
#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>
#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>
#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"
#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>
#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>
// 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>
-#include <lac/fullmatrix.h>
+#include <lac/full_matrix.h>
};
-#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>
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
#include <base/exceptions.h>
-#include <basic/forward-declarations.h>
+#include <grid/forward_declarations.h>
#include <string>
-#include <base/forward-declarations.h>
-#include <basic/forward-declarations.h>
+#include <base/forward_declarations.h>
+#include <grid/forward_declarations.h>
#include <list>
#include <string>
-#include <numerics/time-dependent.h>
+#include <numerics/time_dependent.h>
template <int dim> class WaveParameters;
template <int dim> class DataOutStack;
#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>
#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>
/* $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>
#include <fstream>
#include <iomanip>
-#include <basic/data_out_stack.h>
+#include <numerics/data_out_stack.h>
template <int dim>
#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>
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>
#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>
/* $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>
#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>
#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>
#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>
/* $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>
#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>
#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>
#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>
# Directory with the DEAL distribution
############################################################
-D = ../..
+D = ../../deal.II
############################################################
#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>
#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>
// $Id$
#include "testmatrix.h"
-#include <lac/sparsematrix.h>
+#include <lac/sparse_matrix.h>
FDMatrix::FDMatrix(unsigned int nx, unsigned int ny)
:
// $Id$
-#include <lac/forward-declarations.h>
+#include <lac/forward_declarations.h>
#include <base/exceptions.h>
#include <lac/mgbase.h>