Also do what I just did in step-20

git-svn-id: https://svn.dealii.org/trunk@15784 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/examples/step-22/Makefile b/deal.II/examples/step-22/Makefile
index 4aee8cd9ccb914796c707ce01b04b32f8fc612ad..1f628a29fbb80087753e60b921567f3e043d2f02 100644 (file)
--- a/deal.II/examples/step-22/Makefile
+++ b/deal.II/examples/step-22/Makefile
@@ -14,7 +14,7 @@ target = $(basename $(shell echo step-*.cc))
 # run-time checking of parameters and internal states is performed, so
 # you should set this value to `on' while you develop your program,
 # and to `off' when running production computations.
-debug-mode = on
+debug-mode = off
 
 
 # As third field, we need to give the path to the top-level deal.II
@@ -96,11 +96,12 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target) UMFPACK-check
        @echo ============================ Running $<
        @./$(target)$(EXEEXT)
 
 
+
 # As a last rule to the `make' program, we define what to do when
 # cleaning up a directory. This usually involves deleting object files
 # and other automatically created files such as the executable itself,
@@ -123,10 +124,21 @@ clean:
        @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
+# A rule made to ensure that UMFPACK is indeed configured
+ifeq ($(USE_CONTRIB_UMFPACK),yes)
+UMFPACK-check:
+else
+UMFPACK-check:
+       @echo "This program can only be run if deal.II is configured with UMFPACK support"
+       @false
+endif
+
+
+
 # The following statement tells make that the rules `run' and `clean'
 # are not expected to produce files of the same name as Makefile rules
 # usually do.
-.PHONY: run clean
+.PHONY: run clean UMFPACK-check
 
 
 # Finally there is a rule which you normally need not care much about:

diff --git a/deal.II/examples/step-22/step-22.cc b/deal.II/examples/step-22/step-22.cc
index c19973e26970b51602202fc43ecd8db001d48274..f2cb34e5b2c24a8187970074274a14df72b9288d 100644 (file)
--- a/deal.II/examples/step-22/step-22.cc
+++ b/deal.II/examples/step-22/step-22.cc
@@ -244,8 +244,6 @@ class InverseMatrix : public Subscriptor
   private:
     const SmartPointer<const Matrix> matrix;
     const Preconditioner &preconditioner;
-
-    mutable GrowingVectorMemory<> vector_memory;    
 };