]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
new gcc
authorcvs <cvs@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 1 Nov 1999 21:29:47 +0000 (21:29 +0000)
committercvs <cvs@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 1 Nov 1999 21:29:47 +0000 (21:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@1814 0785d39b-7218-0410-832d-ea1e28bc413d

tests/base/Makefile
tests/base/logtest.cc
tests/base/reference.cc
tests/base/tensor.cc
tests/lac/Makefile
tests/lac/mg.cc
tests/lac/mgbase.cc
tests/lac/solver.cc

index 963b110a0fb5cdc15736ea5eaf45e721c1580ada..93b1ebe28eba9928df4a3d05bc88c1f22cde0e2d 100644 (file)
@@ -74,6 +74,7 @@ logtest-o-files = $(logtest-cc-files:.cc=.o)
 endif
 
 logtest.testcase: $(logtest-o-files) $(libraries)
+       @echo =====linking======= $<
        @$(CXX) $(flags) -o $@ $^
 
 
@@ -89,6 +90,7 @@ tensor-o-files = $(tensor-cc-files:.cc=.o)
 endif
 
 tensor.testcase: $(tensor-o-files) $(libraries)
+       @echo =====linking======= $<
        @$(CXX) $(flags) -o $@ $^
 
 
@@ -105,6 +107,7 @@ reference-o-files = $(reference-cc-files:.cc=.o)
 endif
 
 reference.testcase: $(reference-o-files) $(libraries)
+       @echo =====linking======= $<
        @$(CXX) $(flags) -o $@ $^
 
 
@@ -128,6 +131,7 @@ target1-o-files = $(target1-cc-files:.cc=.o)
 endif
 
 target1: $(target1-o-files) $(libraries)
+       @echo =====linking======= $<
        @$(CXX) $(flags) -o $@ $^
 
 
@@ -160,7 +164,7 @@ veryclean: clean
 all-cc-files = $(shell echo *.cc)
 
 Make.depend: $(all-cc-files)
-       @echo =====Dependecies=== Make.depend
+       @echo =====Dependencies== Make.depend
        @$(CXX) $(flags) $^ -M > $@
        @perl -pi~ -e 's/(^[^.]+)\.o:/\1.o \1.go:/;' $@
 
index d5dd315cf27de20de292df56ce12dbf7c7645104..83fdf300c244bd5870398e65ac5a95dc24528646 100644 (file)
@@ -1,7 +1,10 @@
+// $Id$
+// (c) Guido Kanschat, 1999
+
 #include <base/logstream.h>
 #include <fstream>
 
-main()
+int main()
 {
   ofstream logfile("logtest.output");
   deallog.attach(logfile);
index db28098f5585e413473d5ae8b17a2e256184511c..1811c56f4bedb1607605d01089521ed0903def0f 100644 (file)
@@ -1,3 +1,5 @@
+// $Id$
+// (c) Guido Kanschat, 1999
 
 #include <fstream>
 #include <base/subscriptor.h>
@@ -29,7 +31,7 @@ public:
 
 
 
-main()
+int main()
 {
   ofstream logfile("reference.output");
   deallog.attach(logfile);
index 5abf3afaaeb7e98dcf24a56f9c4241146b0c5be9..7a2a882b2f413fdfd3dfcd67b1550eb59858e7fd 100644 (file)
@@ -1,3 +1,5 @@
+// $Id$
+
 #include <base/tensor.h>
 #include <base/logstream.h>
 #include <lac/vector.h>
index 73c284c038e5301c2a82848a6985af2f15e6c56a..ae159e36411a4452a066c4744b037f7291cc9d38 100644 (file)
@@ -41,15 +41,6 @@ libraries = $(libs)
 flags     = $(CXXFLAGS.o) $(CXXFLAGS)
 endif
 
-
-%.go : %.cc Makefile
-       @echo =====debug========= $<
-       @$(CXX) $(flags) -c $< -o $@
-%.o : %.cc Makefile
-       @echo =====optimized===== $<
-       @$(CXX) $(flags) -c $< -o $@
-
-
 all: solver.check mgbase.check mg.check
 exe: $(all:.check=.testcase) benchmark
 run: $(all:.check=.output)
@@ -75,7 +66,8 @@ solver-o-files = $(solver-cc-files:.cc=.o)
 endif
 
 solver.testcase: $(solver-o-files) $(libraries)
-       $(CXX) $(flags) -o $@ $^
+       @echo =====linking======= $<
+       @$(CXX) $(flags) -o $@ $^
 
 
 ############################################################
@@ -90,7 +82,8 @@ mgbase-o-files = $(mgbase-cc-files:.cc=.o)
 endif
 
 mgbase.testcase: $(mgbase-o-files) $(libraries)
-       $(CXX) $(flags) -o $@ $^
+       @echo =====linking======= $<
+       @$(CXX) $(flags) -o $@ $^
 
 
 
@@ -106,7 +99,8 @@ mg-o-files = $(mg-cc-files:.cc=.o)
 endif
 
 mg.testcase: $(mg-o-files) $(libraries)
-       $(CXX) $(flags) -o $@ $^
+       @echo =====linking======= $<
+       @$(CXX) $(flags) -o $@ $^
 
 
 
@@ -172,7 +166,7 @@ veryclean: clean
 all-cc-files = $(shell echo *.cc)
 
 Make.depend: $(all-cc-files)
-       @echo =====Dependencies=== Make.depend
+       @echo =====Dependencies== Make.depend
        @$(CXX) $(flags) $^ -M > $@
        @perl -pi~ -e 's/(^[^.]+)\.o:/\1.o \1.go:/;' $@
 
index b49b2cee6042a509d87ce18ed4844effb58d98d7..f23dc45e2380a5ddc88c49c2c2f20332a341820d 100644 (file)
@@ -80,7 +80,7 @@ SparseMatrix<double>, /*PreconditionRelaxation<SparseMatrix<double> ,*/
 Coarse;
 
 
-main()
+int main()
 {
   ofstream logfile("mg.output");
   deallog.attach(logfile);
index ea131b4cde90a0d0dbbdbfa06297d82277f3b3da..662a191f779f1cd23314e6c5d0fde827bea5eb6d 100644 (file)
@@ -73,7 +73,7 @@ class MGTest
       }
 };
 
-main()
+int main()
 {
   ofstream logfile("mgbase.output");
   deallog.attach(logfile);
index 8129986a41c6c204d95154232ada3b83ec76093f..6ba1c218040c7bcf6402705974b184950a763281 100644 (file)
@@ -79,32 +79,32 @@ main()
       deallog << "SOR-diff:" << res*res << endl;
       
       deallog.push("no");
-      {
-       check_method(cg,A,u,f,prec_no);
-       check_method(bicgstab,A,u,f,prec_no);
-       check_method(gmres,A,u,f,prec_no);
-       check_method(qmrs,A,u,f,prec_no);
-      };
+
+      check_method(cg,A,u,f,prec_no);
+      check_method(bicgstab,A,u,f,prec_no);
+      check_method(gmres,A,u,f,prec_no);
+      check_method(qmrs,A,u,f,prec_no);
+
       deallog.pop();
       
-      deallog.push("ssor");      
-      {
-       check_method(rich,A,u,f,prec_ssor);
-       check_method(cg,A,u,f,prec_ssor);
-       check_method(bicgstab,A,u,f,prec_ssor);
-       check_method(gmres,A,u,f,prec_ssor);
-       check_method(qmrs,A,u,f,prec_ssor);
-      };
+      deallog.push("ssor");
+
+      check_method(rich,A,u,f,prec_ssor);
+      check_method(cg,A,u,f,prec_ssor);
+      check_method(bicgstab,A,u,f,prec_ssor);
+      check_method(gmres,A,u,f,prec_ssor);
+      check_method(qmrs,A,u,f,prec_ssor);
+
       deallog.pop();
 
-      deallog.push("sor");      
-      {
-       check_method(rich,A,u,f,prec_sor);
-       check_method(cg,A,u,f,prec_sor);
-       check_method(bicgstab,A,u,f,prec_sor);
-       check_method(gmres,A,u,f,prec_sor);
-       check_method(qmrs,A,u,f,prec_sor);
-      };
+      deallog.push("sor");
+
+      check_method(rich,A,u,f,prec_sor);
+      check_method(cg,A,u,f,prec_sor);
+      check_method(bicgstab,A,u,f,prec_sor);
+      check_method(gmres,A,u,f,prec_sor);
+      check_method(qmrs,A,u,f,prec_sor);
+
       deallog.pop();
     };
 };

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.