]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Revamp output code to move output to a subdirectory and let the diverse scripts opera...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Feb 1999 09:21:39 +0000 (09:21 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Feb 1999 09:21:39 +0000 (09:21 +0000)
git-svn-id: https://svn.dealii.org/trunk@826 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/Attic/examples/dof/Makefile
deal.II/deal.II/Attic/examples/dof/dof_test.cc
deal.II/deal.II/Attic/examples/dof/dof_test.prm
deal.II/deal.II/Attic/examples/dof/make_ps
deal.II/deal.II/Attic/examples/dof/results/.cvsignore [new file with mode: 0644]
tests/big-tests/dof/Makefile
tests/big-tests/dof/dof_test.cc
tests/big-tests/dof/dof_test.prm
tests/big-tests/dof/make_ps
tests/big-tests/dof/results/.cvsignore [new file with mode: 0644]

index 0de18e871a6a2f65393b7f35ed23fbba82bb832f..bc79a24a6ef97d344858bccd501822f55e09822c 100644 (file)
@@ -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.*
 
 
 
index 729dac3c90d34dfabc9e1808e2113bcdfadddf76..5b3176c8562c0275996d980668c50b96d4f00e4a 100644 (file)
@@ -245,8 +245,12 @@ void TestCases<dim>::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<dim>::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<dim>::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);
 
 
index eac9d72a6b815f87c561ea9d80fafe73d64d1cf2..84697993f452030373ffac80b4ebeb86b358a024 100644 (file)
@@ -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
index 5c6280e614ea5b63529cf60f70ae190981affec1..281a20bc8b3764c7856d01c6b21359738d46939a 100644 (file)
@@ -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 <grid.zoom_in.eps>"
-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 <grid.ball.eps>"
-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 <grid.curved_line.eps>"
-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 <grid.random.eps>"
-set output "grid.random.eps"
-plot "grid.random"
 
 
 
 set data style dots
 
-!echo "  Making <sparsity.zoom_in.eps>"
-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 <sparsity.ball.eps>"
-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 <sparsity.curved_line.eps>"
-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 <sparsity.random.eps>"
-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 <sparsity.c.zoom_in.eps>"
-set output "sparsity.c.zoom_in.eps"
-plot "sparsity.c.zoom_in"
 
-!echo "  Making <sparsity.c.ball.eps>"
-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 <sparsity.c.curved_line.eps>"
-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 <sparsity.c.random.eps>"
-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 (file)
index 0000000..480cb85
--- /dev/null
@@ -0,0 +1 @@
+?d.*
index 0de18e871a6a2f65393b7f35ed23fbba82bb832f..bc79a24a6ef97d344858bccd501822f55e09822c 100644 (file)
@@ -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.*
 
 
 
index 729dac3c90d34dfabc9e1808e2113bcdfadddf76..5b3176c8562c0275996d980668c50b96d4f00e4a 100644 (file)
@@ -245,8 +245,12 @@ void TestCases<dim>::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<dim>::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<dim>::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);
 
 
index eac9d72a6b815f87c561ea9d80fafe73d64d1cf2..84697993f452030373ffac80b4ebeb86b358a024 100644 (file)
@@ -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
index 5c6280e614ea5b63529cf60f70ae190981affec1..281a20bc8b3764c7856d01c6b21359738d46939a 100644 (file)
@@ -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 <grid.zoom_in.eps>"
-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 <grid.ball.eps>"
-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 <grid.curved_line.eps>"
-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 <grid.random.eps>"
-set output "grid.random.eps"
-plot "grid.random"
 
 
 
 set data style dots
 
-!echo "  Making <sparsity.zoom_in.eps>"
-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 <sparsity.ball.eps>"
-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 <sparsity.curved_line.eps>"
-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 <sparsity.random.eps>"
-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 <sparsity.c.zoom_in.eps>"
-set output "sparsity.c.zoom_in.eps"
-plot "sparsity.c.zoom_in"
 
-!echo "  Making <sparsity.c.ball.eps>"
-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 <sparsity.c.curved_line.eps>"
-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 <sparsity.c.random.eps>"
-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 (file)
index 0000000..480cb85
--- /dev/null
@@ -0,0 +1 @@
+?d.*

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.