From aed7b4d7647d52aa669a8dd53f09370bbb57b106 Mon Sep 17 00:00:00 2001 From: cvs Date: Mon, 1 Nov 1999 21:29:47 +0000 Subject: [PATCH] new gcc git-svn-id: https://svn.dealii.org/trunk@1814 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/base/Makefile | 6 +++++- tests/base/logtest.cc | 5 ++++- tests/base/reference.cc | 4 +++- tests/base/tensor.cc | 2 ++ tests/lac/Makefile | 20 +++++++------------ tests/lac/mg.cc | 2 +- tests/lac/mgbase.cc | 2 +- tests/lac/solver.cc | 44 ++++++++++++++++++++--------------------- 8 files changed, 45 insertions(+), 40 deletions(-) diff --git a/tests/base/Makefile b/tests/base/Makefile index 963b110a0f..93b1ebe28e 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -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:/;' $@ diff --git a/tests/base/logtest.cc b/tests/base/logtest.cc index d5dd315cf2..83fdf300c2 100644 --- a/tests/base/logtest.cc +++ b/tests/base/logtest.cc @@ -1,7 +1,10 @@ +// $Id$ +// (c) Guido Kanschat, 1999 + #include #include -main() +int main() { ofstream logfile("logtest.output"); deallog.attach(logfile); diff --git a/tests/base/reference.cc b/tests/base/reference.cc index db28098f55..1811c56f4b 100644 --- a/tests/base/reference.cc +++ b/tests/base/reference.cc @@ -1,3 +1,5 @@ +// $Id$ +// (c) Guido Kanschat, 1999 #include #include @@ -29,7 +31,7 @@ public: -main() +int main() { ofstream logfile("reference.output"); deallog.attach(logfile); diff --git a/tests/base/tensor.cc b/tests/base/tensor.cc index 5abf3afaae..7a2a882b2f 100644 --- a/tests/base/tensor.cc +++ b/tests/base/tensor.cc @@ -1,3 +1,5 @@ +// $Id$ + #include #include #include diff --git a/tests/lac/Makefile b/tests/lac/Makefile index 73c284c038..ae159e3641 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -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:/;' $@ diff --git a/tests/lac/mg.cc b/tests/lac/mg.cc index b49b2cee60..f23dc45e23 100644 --- a/tests/lac/mg.cc +++ b/tests/lac/mg.cc @@ -80,7 +80,7 @@ SparseMatrix, /*PreconditionRelaxation ,*/ Coarse; -main() +int main() { ofstream logfile("mg.output"); deallog.attach(logfile); diff --git a/tests/lac/mgbase.cc b/tests/lac/mgbase.cc index ea131b4cde..662a191f77 100644 --- a/tests/lac/mgbase.cc +++ b/tests/lac/mgbase.cc @@ -73,7 +73,7 @@ class MGTest } }; -main() +int main() { ofstream logfile("mgbase.output"); deallog.attach(logfile); diff --git a/tests/lac/solver.cc b/tests/lac/solver.cc index 8129986a41..6ba1c21804 100644 --- a/tests/lac/solver.cc +++ b/tests/lac/solver.cc @@ -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(); }; }; -- 2.39.5