Draw refinement rectangles using pdfcairo

17 files changed, 26 insertions, 16 deletions

diff --git a/img/common/knudsen_fluid.gnuplot b/img/common/knudsen_fluid.gnuplot
index 7ceb6b8..5a373fd 100644
--- a/img/common/knudsen_fluid.gnuplot
+++ b/img/common/knudsen_fluid.gnuplot
@@ -1,3 +1,5 @@
+reset
+
 set terminal pngcairo size 3520, 656
 
 set output 'tmp/'.plotname.'.png'
diff --git a/img/common/knudsen_wrapper.gnuplot b/img/common/knudsen_wrapper.gnuplot
index 5562b56..0bc189c 100644
--- a/img/common/knudsen_wrapper.gnuplot
+++ b/img/common/knudsen_wrapper.gnuplot
@@ -12,5 +12,3 @@ set cbtics ("{/Symbol \243}0" 0, "1" 1, "{/Symbol \263}2" 2)
 set cbrange [0:2]
 
 set cblabel "Verfeinerungskriterium" offset 1,0
-
-plot 'tmp/'.plotname.'.png' binary filetype=png origin=(0.00625,0.00625) dx=0.00625 dy=0.00625 with rgbimage palette
diff --git a/img/common/velocity_fluid.gnuplot b/img/common/velocity_fluid.gnuplot
index bd8e194..3a99880 100644
--- a/img/common/velocity_fluid.gnuplot
+++ b/img/common/velocity_fluid.gnuplot
@@ -1,3 +1,5 @@
+reset
+
 set terminal pngcairo size 3520, 656
 
 set output 'tmp/'.plotname.'.png'
diff --git a/img/common/velocity_wrapper.gnuplot b/img/common/velocity_wrapper.gnuplot
index 534040e..cbf2918 100644
--- a/img/common/velocity_wrapper.gnuplot
+++ b/img/common/velocity_wrapper.gnuplot
@@ -12,5 +12,3 @@ set cbtics 0,0.5,1.5
 set cbrange [0:1.5]
 
 set cblabel "Geschwindigkeitsnorm"
-
-plot 'tmp/'.plotname.'.png' binary filetype=png origin=(0.00625,0.00625) dx=0.00625 dy=0.00625 with rgbimage palette
diff --git a/img/cylinder2d_improved_grid_60s_knudsen.gnuplot b/img/cylinder2d_improved_grid_60s_knudsen.gnuplot
index 6885ca7..e0c45ac 100644
--- a/img/cylinder2d_improved_grid_60s_knudsen.gnuplot
+++ b/img/cylinder2d_improved_grid_60s_knudsen.gnuplot
@@ -3,14 +3,16 @@ knudsen = 0.000866025
 
 load 'common/knudsen_fluid.gnuplot'
 
-set obj 1 rect from 0.75,0.05 to 8.75,4.05
-set obj 1 fillstyle empty border -1 front lw 4
-
-set obj 2 rect from 1,1.05 to 5,3.05
-set obj 2 fillstyle empty border -1 front lw 4
-
 plot 'data/cylinder2d_improved_grid_twice_refined_60s_2.csv' using 6:7:(log($5/knudsen)/log(2)) palette pt 5 ps 1.3 notitle,\
      'data/cylinder2d_improved_grid_twice_refined_60s_1.csv' using 6:7:(log($5/knudsen)/log(2)) palette pt 5 ps 0.7 notitle,\
      'data/cylinder2d_improved_grid_twice_refined_60s_0.csv' using 6:7:(log($5/knudsen)/log(2)) palette pt 5 ps 0.3 notitle\
 
 load 'common/knudsen_wrapper.gnuplot'
+
+set obj 1 rect from 0.75,0.05 to 8.75,4.05
+set obj 1 fillstyle empty border -1 front lw 1
+
+set obj 2 rect from 1,1.05 to 5,3.05
+set obj 2 fillstyle empty border -1 front lw 1
+
+load 'common/include_fluid.gnuplot'
diff --git a/img/cylinder2d_single_refinement_60s.gnuplot b/img/cylinder2d_single_refinement_60s.gnuplot
index 34f9b85..037d6b4 100644
--- a/img/cylinder2d_single_refinement_60s.gnuplot
+++ b/img/cylinder2d_single_refinement_60s.gnuplot
@@ -2,10 +2,12 @@ plotname = "cylinder2d_single_refinement_60s"
 
 load 'common/velocity_fluid.gnuplot'
 
-set obj 1 rect from 0.75,0.55 to 8.75,3.55
-set obj 1 fillstyle empty border -1 front lw 4
-
 plot 'data/cylinder2d_single_level_refinement_60s_0.csv' using 6:7:(sqrt($2*$2+$3*$3)) palette pt 5 ps 1.3 notitle,\
      'data/cylinder2d_single_level_refinement_60s_1.csv' using 6:7:(sqrt($2*$2+$3*$3)) palette pt 5 ps 0.7 notitle
 
 load 'common/velocity_wrapper.gnuplot'
+
+set obj 1 rect from 0.75,0.55 to 8.75,3.55
+set obj 1 fillstyle empty border -1 front lw 1
+
+load 'common/include_fluid.gnuplot'
diff --git a/img/cylinder2d_single_refinement_60s_knudsen.gnuplot b/img/cylinder2d_single_refinement_60s_knudsen.gnuplot
index 809abc1..f777f30 100644
--- a/img/cylinder2d_single_refinement_60s_knudsen.gnuplot
+++ b/img/cylinder2d_single_refinement_60s_knudsen.gnuplot
@@ -3,10 +3,12 @@ knudsen = 0.000866025
 
 load 'common/knudsen_fluid.gnuplot'
 
-set obj 1 rect from 0.75,0.55 to 8.75,3.55
-set obj 1 fillstyle empty border -1 front lw 4
-
 plot 'data/cylinder2d_single_level_refinement_60s_0.csv' using 6:7:(log($5/knudsen)/log(2)) palette pt 5 ps 1.3 notitle,\
      'data/cylinder2d_single_level_refinement_60s_1.csv' using 6:7:(log($5/knudsen)/log(2)) palette pt 5 ps 0.7 notitle
 
 load 'common/knudsen_wrapper.gnuplot'
+
+set obj 1 rect from 0.75,0.55 to 8.75,3.55
+set obj 1 fillstyle empty border -1 front lw 1
+
+load 'common/include_fluid.gnuplot'
diff --git a/img/cylinder2d_unrefined_60s.gnuplot b/img/cylinder2d_unrefined_60s.gnuplot
index 3c6194a..d2c7608 100644
--- a/img/cylinder2d_unrefined_60s.gnuplot
+++ b/img/cylinder2d_unrefined_60s.gnuplot
@@ -5,3 +5,5 @@ load 'common/velocity_fluid.gnuplot'
 plot 'data/cylinder2d_unrefined_60s.csv' using 6:7:(sqrt($2*$2+$3*$3)) palette pt 5 ps 1.3 notitle
 
 load 'common/velocity_wrapper.gnuplot'
+
+load 'common/include_fluid.gnuplot'
diff --git a/img/cylinder2d_unrefined_60s_knudsen.gnuplot b/img/cylinder2d_unrefined_60s_knudsen.gnuplot
index 6143107..9471cf4 100644
--- a/img/cylinder2d_unrefined_60s_knudsen.gnuplot
+++ b/img/cylinder2d_unrefined_60s_knudsen.gnuplot
@@ -6,3 +6,5 @@ load 'common/knudsen_fluid.gnuplot'
 plot 'data/cylinder2d_unrefined_60s.csv' using 6:7:(log($5/knudsen)/log(2)) palette pt 5 ps 1.3 notitle
 
 load 'common/knudsen_wrapper.gnuplot'
+
+load 'common/include_fluid.gnuplot'
diff --git a/img/static/cylinder2d_improved_grid_60s_knudsen.pdf b/img/static/cylinder2d_improved_grid_60s_knudsen.pdf
index ed288cd..5249d24 100644
--- a/img/static/cylinder2d_improved_grid_60s_knudsen.pdf
+++ b/img/static/cylinder2d_improved_grid_60s_knudsen.pdf
diff --git a/img/static/cylinder2d_single_refinement_60s.pdf b/img/static/cylinder2d_single_refinement_60s.pdf
index 149e040..6a03d00 100644
--- a/img/static/cylinder2d_single_refinement_60s.pdf
+++ b/img/static/cylinder2d_single_refinement_60s.pdf
diff --git a/img/static/cylinder2d_single_refinement_60s_knudsen.pdf b/img/static/cylinder2d_single_refinement_60s_knudsen.pdf
index a641d36..38cbf3e 100644
--- a/img/static/cylinder2d_single_refinement_60s_knudsen.pdf
+++ b/img/static/cylinder2d_single_refinement_60s_knudsen.pdf
diff --git a/img/static/cylinder2d_unrefined_60s.pdf b/img/static/cylinder2d_unrefined_60s.pdf
index e81e767..73827ee 100644
--- a/img/static/cylinder2d_unrefined_60s.pdf
+++ b/img/static/cylinder2d_unrefined_60s.pdf
diff --git a/img/static/cylinder2d_unrefined_60s_knudsen.pdf b/img/static/cylinder2d_unrefined_60s_knudsen.pdf
index 72c5de8..d615b90 100644
--- a/img/static/cylinder2d_unrefined_60s_knudsen.pdf
+++ b/img/static/cylinder2d_unrefined_60s_knudsen.pdf
diff --git a/img/tmp/cylinder2d_improved_grid_60s_knudsen.png b/img/tmp/cylinder2d_improved_grid_60s_knudsen.png
index 90fbae6..a403c78 100644
--- a/img/tmp/cylinder2d_improved_grid_60s_knudsen.png
+++ b/img/tmp/cylinder2d_improved_grid_60s_knudsen.png
diff --git a/img/tmp/cylinder2d_single_refinement_60s.png b/img/tmp/cylinder2d_single_refinement_60s.png
index 847c215..3a2ad78 100644
--- a/img/tmp/cylinder2d_single_refinement_60s.png
+++ b/img/tmp/cylinder2d_single_refinement_60s.png
diff --git a/img/tmp/cylinder2d_single_refinement_60s_knudsen.png b/img/tmp/cylinder2d_single_refinement_60s_knudsen.png
index 6703f56..9e67709 100644
--- a/img/tmp/cylinder2d_single_refinement_60s_knudsen.png
+++ b/img/tmp/cylinder2d_single_refinement_60s_knudsen.png