From: wolf Date: Wed, 17 Feb 1999 09:21:39 +0000 (+0000) Subject: Revamp output code to move output to a subdirectory and let the diverse scripts opera... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77653db2a7b3d7cb11381052daa6cfaf3b193167;p=dealii-svn.git Revamp output code to move output to a subdirectory and let the diverse scripts operate there. git-svn-id: https://svn.dealii.org/trunk@826 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index 0de18e871a..bc79a24a6e 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -28,7 +28,7 @@ additional-run-action = gnuplot make_ps # To specify which files are to be deleted by "make clean" (apart from # the usual ones: object files, executables, backups, etc), fill in the # following list -delete-files = grid* sparsity* *.eps +delete-files = results/?d.* diff --git a/deal.II/deal.II/Attic/examples/dof/dof_test.cc b/deal.II/deal.II/Attic/examples/dof/dof_test.cc index 729dac3c90..5b3176c856 100644 --- a/deal.II/deal.II/Attic/examples/dof/dof_test.cc +++ b/deal.II/deal.II/Attic/examples/dof/dof_test.cc @@ -245,8 +245,12 @@ void TestCases::run (ParameterHandler &prm) { }; // output the grid + string file_prefix ("results/"); + file_prefix += ('0'+dim); + file_prefix += "d."; + cout << " Writing grid..." << endl; - ofstream out(prm.get("Grid file").c_str()); + ofstream out((file_prefix + prm.get("Grid file")).c_str()); tria->print_gnuplot (out); @@ -267,7 +271,7 @@ void TestCases::run (ParameterHandler &prm) { int unconstrained_bandwidth = sparsity.bandwidth(); cout << " Writing sparsity pattern..." << endl; - ofstream sparsity_out (prm.get("Sparsity file").c_str()); + ofstream sparsity_out ((file_prefix + prm.get("Sparsity file")).c_str()); sparsity.print_gnuplot (sparsity_out); @@ -278,8 +282,9 @@ void TestCases::run (ParameterHandler &prm) { dof->make_constraint_matrix (constraints); constraints.condense (sparsity); - cout << " Writing condensed sparsity pattern... (This may take a while)" << endl; - ofstream c_sparsity_out (prm.get("Condensed sparsity file").c_str()); + cout << " Writing condensed sparsity pattern..." << endl; + ofstream c_sparsity_out ((file_prefix + + prm.get("Condensed sparsity file")).c_str()); sparsity.print_gnuplot (c_sparsity_out); diff --git a/deal.II/deal.II/Attic/examples/dof/dof_test.prm b/deal.II/deal.II/Attic/examples/dof/dof_test.prm index eac9d72a6b..84697993f4 100644 --- a/deal.II/deal.II/Attic/examples/dof/dof_test.prm +++ b/deal.II/deal.II/Attic/examples/dof/dof_test.prm @@ -1,4 +1,4 @@ set Test run = { zoom in | ball | curved line | random } -set Grid file = grid.{{ zoom_in | ball | curved_line | random }} -set Sparsity file = sparsity.{{ zoom_in | ball | curved_line | random }} -set Condensed sparsity file = sparsity.c.{{ zoom_in | ball | curved_line | random }} \ No newline at end of file +set Grid file = {{ zoom_in | ball | curved_line | random }}.grid +set Sparsity file = {{ zoom_in | ball | curved_line | random }}.sparsity +set Condensed sparsity file = {{ zoom_in | ball | curved_line | random }}.sparsity.c \ No newline at end of file diff --git a/deal.II/deal.II/Attic/examples/dof/make_ps b/deal.II/deal.II/Attic/examples/dof/make_ps index 5c6280e614..281a20bc8b 100644 --- a/deal.II/deal.II/Attic/examples/dof/make_ps +++ b/deal.II/deal.II/Attic/examples/dof/make_ps @@ -2,61 +2,121 @@ set size 0.721,1 set data style lines set noxtics set noytics +set noztics set noxzeroaxis set noyzeroaxis set nokey set term postscript eps -!echo " Making " -set output "grid.zoom_in.eps" -plot "grid.zoom_in" +!echo " Making <2d.zoom_in.grid.eps>" +set output "results/2d.zoom_in.grid.eps" +plot "results/2d.zoom_in.grid" -!echo " Making " -set output "grid.ball.eps" -plot "grid.ball" +!echo " Making <2d.ball.grid.eps>" +set output "results/2d.ball.grid.eps" +plot "results/2d.ball.grid" -!echo " Making " -set output "grid.curved_line.eps" -plot "grid.curved_line" +!echo " Making <2d.curved_line.grid.eps>" +set output "results/2d.curved_line.grid.eps" +plot "results/2d.curved_line.grid" + +!echo " Making <2d.random.grid.eps>" +set output "results/2d.random.grid.eps" +plot "results/2d.random.grid" + + + + +!echo " Making <3d.zoom_in.grid.eps>" +set output "results/3d.zoom_in.grid.eps" +splot "results/3d.zoom_in.grid" + +!echo " Making <3d.ball.grid.eps>" +set output "results/3d.ball.grid.eps" +splot "results/3d.ball.grid" + +!echo " Making <3d.curved_line.grid.eps>" +set output "results/3d.curved_line.grid.eps" +splot "results/3d.curved_line.grid" + +!echo " Making <3d.random.grid.eps>" +set output "results/3d.random.grid.eps" +splot "results/3d.random.grid" -!echo " Making " -set output "grid.random.eps" -plot "grid.random" set data style dots -!echo " Making " -set output "sparsity.zoom_in.eps" -plot "sparsity.zoom_in" +!echo " Making <2d.zoom_in.sparsity.eps>" +set output "results/2d.zoom_in.sparsity.eps" +plot "results/2d.zoom_in.sparsity" + +!echo " Making <2d.zoom_in.sparsity.c.eps>" +set output "results/2d.zoom_in.sparsity.c.eps" +plot "results/2d.zoom_in.sparsity.c" + + +!echo " Making <2d.ball.sparsity.eps>" +set output "results/2d.ball.sparsity.eps" +plot "results/2d.ball.sparsity" + +!echo " Making <2d.ball.sparsity.c.eps>" +set output "results/2d.ball.sparsity.c.eps" +plot "results/2d.ball.sparsity.c" + + +!echo " Making <2d.curved_line.sparsity.eps>" +set output "results/2d.curved_line.sparsity.eps" +plot "results/2d.curved_line.sparsity" + +!echo " Making <2d.curved_line.sparsity.c.eps>" +set output "results/2d.curved_line.sparsity.c.eps" +plot "results/2d.curved_line.sparsity.c" + + +!echo " Making <2d.random.sparsity.eps>" +set output "results/2d.random.sparsity.eps" +plot "results/2d.random.sparsity" + +!echo " Making <2d.random.sparsity.c.eps>" +set output "results/2d.random.sparsity.c.eps" +plot "results/2d.random.sparsity.c" + + + +!echo " Making <3d.zoom_in.sparsity.eps>" +set output "results/3d.zoom_in.sparsity.eps" +plot "results/3d.zoom_in.sparsity" + +!echo " Making <3d.zoom_in.sparsity.c.eps>" +set output "results/3d.zoom_in.sparsity.c.eps" +plot "results/3d.zoom_in.sparsity.c" + -!echo " Making " -set output "sparsity.ball.eps" -plot "sparsity.ball" +!echo " Making <3d.ball.sparsity.eps>" +set output "results/3d.ball.sparsity.eps" +plot "results/3d.ball.sparsity" -!echo " Making " -set output "sparsity.curved_line.eps" -plot "sparsity.curved_line" +!echo " Making <3d.ball.sparsity.c.eps>" +set output "results/3d.ball.sparsity.c.eps" +plot "results/3d.ball.sparsity.c" -!echo " Making " -set output "sparsity.random.eps" -plot "sparsity.random" +!echo " Making <3d.curved_line.sparsity.eps>" +set output "results/3d.curved_line.sparsity.eps" +plot "results/3d.curved_line.sparsity" +!echo " Making <3d.curved_line.sparsity.c.eps>" +set output "results/3d.curved_line.sparsity.c.eps" +plot "results/3d.curved_line.sparsity.c" -!echo " Making " -set output "sparsity.c.zoom_in.eps" -plot "sparsity.c.zoom_in" -!echo " Making " -set output "sparsity.c.ball.eps" -plot "sparsity.c.ball" +!echo " Making <3d.random.sparsity.eps>" +set output "results/3d.random.sparsity.eps" +plot "results/3d.random.sparsity" -!echo " Making " -set output "sparsity.c.curved_line.eps" -plot "sparsity.c.curved_line" +!echo " Making <3d.random.sparsity.c.eps>" +set output "results/3d.random.sparsity.c.eps" +plot "results/3d.random.sparsity.c" -!echo " Making " -set output "sparsity.c.random.eps" -plot "sparsity.c.random" diff --git a/deal.II/deal.II/Attic/examples/dof/results/.cvsignore b/deal.II/deal.II/Attic/examples/dof/results/.cvsignore new file mode 100644 index 0000000000..480cb8565d --- /dev/null +++ b/deal.II/deal.II/Attic/examples/dof/results/.cvsignore @@ -0,0 +1 @@ +?d.* diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 0de18e871a..bc79a24a6e 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -28,7 +28,7 @@ additional-run-action = gnuplot make_ps # To specify which files are to be deleted by "make clean" (apart from # the usual ones: object files, executables, backups, etc), fill in the # following list -delete-files = grid* sparsity* *.eps +delete-files = results/?d.* diff --git a/tests/big-tests/dof/dof_test.cc b/tests/big-tests/dof/dof_test.cc index 729dac3c90..5b3176c856 100644 --- a/tests/big-tests/dof/dof_test.cc +++ b/tests/big-tests/dof/dof_test.cc @@ -245,8 +245,12 @@ void TestCases::run (ParameterHandler &prm) { }; // output the grid + string file_prefix ("results/"); + file_prefix += ('0'+dim); + file_prefix += "d."; + cout << " Writing grid..." << endl; - ofstream out(prm.get("Grid file").c_str()); + ofstream out((file_prefix + prm.get("Grid file")).c_str()); tria->print_gnuplot (out); @@ -267,7 +271,7 @@ void TestCases::run (ParameterHandler &prm) { int unconstrained_bandwidth = sparsity.bandwidth(); cout << " Writing sparsity pattern..." << endl; - ofstream sparsity_out (prm.get("Sparsity file").c_str()); + ofstream sparsity_out ((file_prefix + prm.get("Sparsity file")).c_str()); sparsity.print_gnuplot (sparsity_out); @@ -278,8 +282,9 @@ void TestCases::run (ParameterHandler &prm) { dof->make_constraint_matrix (constraints); constraints.condense (sparsity); - cout << " Writing condensed sparsity pattern... (This may take a while)" << endl; - ofstream c_sparsity_out (prm.get("Condensed sparsity file").c_str()); + cout << " Writing condensed sparsity pattern..." << endl; + ofstream c_sparsity_out ((file_prefix + + prm.get("Condensed sparsity file")).c_str()); sparsity.print_gnuplot (c_sparsity_out); diff --git a/tests/big-tests/dof/dof_test.prm b/tests/big-tests/dof/dof_test.prm index eac9d72a6b..84697993f4 100644 --- a/tests/big-tests/dof/dof_test.prm +++ b/tests/big-tests/dof/dof_test.prm @@ -1,4 +1,4 @@ set Test run = { zoom in | ball | curved line | random } -set Grid file = grid.{{ zoom_in | ball | curved_line | random }} -set Sparsity file = sparsity.{{ zoom_in | ball | curved_line | random }} -set Condensed sparsity file = sparsity.c.{{ zoom_in | ball | curved_line | random }} \ No newline at end of file +set Grid file = {{ zoom_in | ball | curved_line | random }}.grid +set Sparsity file = {{ zoom_in | ball | curved_line | random }}.sparsity +set Condensed sparsity file = {{ zoom_in | ball | curved_line | random }}.sparsity.c \ No newline at end of file diff --git a/tests/big-tests/dof/make_ps b/tests/big-tests/dof/make_ps index 5c6280e614..281a20bc8b 100644 --- a/tests/big-tests/dof/make_ps +++ b/tests/big-tests/dof/make_ps @@ -2,61 +2,121 @@ set size 0.721,1 set data style lines set noxtics set noytics +set noztics set noxzeroaxis set noyzeroaxis set nokey set term postscript eps -!echo " Making " -set output "grid.zoom_in.eps" -plot "grid.zoom_in" +!echo " Making <2d.zoom_in.grid.eps>" +set output "results/2d.zoom_in.grid.eps" +plot "results/2d.zoom_in.grid" -!echo " Making " -set output "grid.ball.eps" -plot "grid.ball" +!echo " Making <2d.ball.grid.eps>" +set output "results/2d.ball.grid.eps" +plot "results/2d.ball.grid" -!echo " Making " -set output "grid.curved_line.eps" -plot "grid.curved_line" +!echo " Making <2d.curved_line.grid.eps>" +set output "results/2d.curved_line.grid.eps" +plot "results/2d.curved_line.grid" + +!echo " Making <2d.random.grid.eps>" +set output "results/2d.random.grid.eps" +plot "results/2d.random.grid" + + + + +!echo " Making <3d.zoom_in.grid.eps>" +set output "results/3d.zoom_in.grid.eps" +splot "results/3d.zoom_in.grid" + +!echo " Making <3d.ball.grid.eps>" +set output "results/3d.ball.grid.eps" +splot "results/3d.ball.grid" + +!echo " Making <3d.curved_line.grid.eps>" +set output "results/3d.curved_line.grid.eps" +splot "results/3d.curved_line.grid" + +!echo " Making <3d.random.grid.eps>" +set output "results/3d.random.grid.eps" +splot "results/3d.random.grid" -!echo " Making " -set output "grid.random.eps" -plot "grid.random" set data style dots -!echo " Making " -set output "sparsity.zoom_in.eps" -plot "sparsity.zoom_in" +!echo " Making <2d.zoom_in.sparsity.eps>" +set output "results/2d.zoom_in.sparsity.eps" +plot "results/2d.zoom_in.sparsity" + +!echo " Making <2d.zoom_in.sparsity.c.eps>" +set output "results/2d.zoom_in.sparsity.c.eps" +plot "results/2d.zoom_in.sparsity.c" + + +!echo " Making <2d.ball.sparsity.eps>" +set output "results/2d.ball.sparsity.eps" +plot "results/2d.ball.sparsity" + +!echo " Making <2d.ball.sparsity.c.eps>" +set output "results/2d.ball.sparsity.c.eps" +plot "results/2d.ball.sparsity.c" + + +!echo " Making <2d.curved_line.sparsity.eps>" +set output "results/2d.curved_line.sparsity.eps" +plot "results/2d.curved_line.sparsity" + +!echo " Making <2d.curved_line.sparsity.c.eps>" +set output "results/2d.curved_line.sparsity.c.eps" +plot "results/2d.curved_line.sparsity.c" + + +!echo " Making <2d.random.sparsity.eps>" +set output "results/2d.random.sparsity.eps" +plot "results/2d.random.sparsity" + +!echo " Making <2d.random.sparsity.c.eps>" +set output "results/2d.random.sparsity.c.eps" +plot "results/2d.random.sparsity.c" + + + +!echo " Making <3d.zoom_in.sparsity.eps>" +set output "results/3d.zoom_in.sparsity.eps" +plot "results/3d.zoom_in.sparsity" + +!echo " Making <3d.zoom_in.sparsity.c.eps>" +set output "results/3d.zoom_in.sparsity.c.eps" +plot "results/3d.zoom_in.sparsity.c" + -!echo " Making " -set output "sparsity.ball.eps" -plot "sparsity.ball" +!echo " Making <3d.ball.sparsity.eps>" +set output "results/3d.ball.sparsity.eps" +plot "results/3d.ball.sparsity" -!echo " Making " -set output "sparsity.curved_line.eps" -plot "sparsity.curved_line" +!echo " Making <3d.ball.sparsity.c.eps>" +set output "results/3d.ball.sparsity.c.eps" +plot "results/3d.ball.sparsity.c" -!echo " Making " -set output "sparsity.random.eps" -plot "sparsity.random" +!echo " Making <3d.curved_line.sparsity.eps>" +set output "results/3d.curved_line.sparsity.eps" +plot "results/3d.curved_line.sparsity" +!echo " Making <3d.curved_line.sparsity.c.eps>" +set output "results/3d.curved_line.sparsity.c.eps" +plot "results/3d.curved_line.sparsity.c" -!echo " Making " -set output "sparsity.c.zoom_in.eps" -plot "sparsity.c.zoom_in" -!echo " Making " -set output "sparsity.c.ball.eps" -plot "sparsity.c.ball" +!echo " Making <3d.random.sparsity.eps>" +set output "results/3d.random.sparsity.eps" +plot "results/3d.random.sparsity" -!echo " Making " -set output "sparsity.c.curved_line.eps" -plot "sparsity.c.curved_line" +!echo " Making <3d.random.sparsity.c.eps>" +set output "results/3d.random.sparsity.c.eps" +plot "results/3d.random.sparsity.c" -!echo " Making " -set output "sparsity.c.random.eps" -plot "sparsity.c.random" diff --git a/tests/big-tests/dof/results/.cvsignore b/tests/big-tests/dof/results/.cvsignore new file mode 100644 index 0000000000..480cb8565d --- /dev/null +++ b/tests/big-tests/dof/results/.cvsignore @@ -0,0 +1 @@ +?d.*