From bbd134e5d18cd451ed89985f61c67c4c833a6ae3 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 29 Feb 2000 17:56:45 +0000 Subject: [PATCH] Make this test compile at least. git-svn-id: https://svn.dealii.org/trunk@2522 0785d39b-7218-0410-832d-ea1e28bc413d --- .../nonlinear/fixed-point-iteration/Makefile | 10 +++++---- .../fixed-point-iteration/nonlinear.cc | 22 +++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile index 7598a66d68..6d6f4c8d4c 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile +++ b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile @@ -43,7 +43,7 @@ delete-files = gnuplot* *.eps # Internals -include $D/Make.global_options +include $D/common/Make.global_options @@ -52,7 +52,9 @@ cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) h-files = $(filter-out *%, $(shell echo *.h)) -lib-h-files = $(filter-out *%, $(shell echo ../../include/*.h)) +lib-h-files = $(filter-out *%, $(shell echo $D/base/include/base/*.h \ + $D/lac/include/lac/*.h \ + $D/deal.II/include/*/*.h)) # list of libraries needed to link with libs.g = ./Obj.g.a \ @@ -102,7 +104,7 @@ run: $(target) %.o : %.cc @echo ============================ Compiling with optimization: $< @echo $(CXX) ... -c $< -o $@ - @$(CXX) $(CXXFLAGS) -c $< -o $@ + @$(CXX) $(CXXFLAGS.o) -c $< -o $@ # rules which files the libraries depend upon @@ -129,7 +131,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @$(PERL) $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc b/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc index 30155302fa..17fecd7db9 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc +++ b/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -110,9 +110,9 @@ void PoissonEquation::assemble (FullMatrix &cell_matrix, right_hand_side.value_list (fe_values.get_quadrature_points(), rhs_values); for (unsigned int point=0; point::run () { clear (); tria = new Triangulation(); - dof = new DoFHandler (tria); + dof = new DoFHandler (*tria); set_tria_and_dof (tria, dof); @@ -166,7 +166,7 @@ void NonlinearProblem::run () { ZeroFunction boundary_values; StraightBoundary boundary; - FELinear fe; + FEQ1 fe; PoissonEquation equation (rhs, last_solution); QGauss2 quadrature; @@ -174,7 +174,7 @@ void NonlinearProblem::run () { dirichlet_bc[0] = &boundary_values; - GridGenerator::hypercube (*tria); + GridGenerator::hyper_cube (*tria); tria->refine_global (4); for (unsigned int refinement_step=0; refinement_step<10; ++refinement_step) @@ -198,7 +198,7 @@ void NonlinearProblem::run () { { cout << " Nonlinear step " << nonlinear_step << endl; cout << " Assembling matrices..." << endl; - assemble (equation, quadrature, fe, + assemble (equation, quadrature, UpdateFlags(update_values | update_gradients | update_JxW_values | update_q_points), dirichlet_bc); @@ -228,10 +228,10 @@ void NonlinearProblem::run () { Vector error_indicator; KellyErrorEstimator ee; QSimpson eq; - ee.estimate_error (*dof, eq, fe, - KellyErrorEstimator::FunctionMap(), - solution, - error_indicator); + ee.estimate (*dof, eq, + KellyErrorEstimator::FunctionMap(), + solution, + error_indicator); tria->refine_and_coarsen_fixed_number (error_indicator, 0.3, 0); tria->execute_coarsening_and_refinement (); }; -- 2.39.5