From 487df603f455d560cacc30b4dd6930476caa40ea Mon Sep 17 00:00:00 2001 From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de> Date: Tue, 1 Oct 2013 15:23:00 +0000 Subject: [PATCH] [handbook] Replace xfig graphics by TikZ graphics in tutorial. thanks to Laura for help with the TikZ figures. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11591 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- doc/handbook/EPS/Ex2_Boundary.eps | 238 ----- doc/handbook/EPS/Ex2_Domain.eps | 245 ------ doc/handbook/EPS/exercise1_c.eps | 154 ---- .../EPS/tutorial-problemconfiguration.eps | 818 ------------------ doc/handbook/XFIG/Ex2_Boundary.fig | 44 - doc/handbook/XFIG/Ex2_Domain.fig | 77 -- doc/handbook/XFIG/exercise1_c.fig | 37 - doc/handbook/XFIG/exercise_1a.fig | 31 - doc/handbook/dumux-handbook.tex | 5 +- doc/handbook/tutorial-coupled.tex | 134 ++- doc/handbook/tutorial-decoupled.tex | 132 ++- 11 files changed, 185 insertions(+), 1730 deletions(-) delete mode 100644 doc/handbook/EPS/Ex2_Boundary.eps delete mode 100644 doc/handbook/EPS/Ex2_Domain.eps delete mode 100644 doc/handbook/EPS/exercise1_c.eps delete mode 100644 doc/handbook/EPS/tutorial-problemconfiguration.eps delete mode 100644 doc/handbook/XFIG/Ex2_Boundary.fig delete mode 100644 doc/handbook/XFIG/Ex2_Domain.fig delete mode 100644 doc/handbook/XFIG/exercise1_c.fig delete mode 100644 doc/handbook/XFIG/exercise_1a.fig diff --git a/doc/handbook/EPS/Ex2_Boundary.eps b/doc/handbook/EPS/Ex2_Boundary.eps deleted file mode 100644 index 652614b5e5..0000000000 --- a/doc/handbook/EPS/Ex2_Boundary.eps +++ /dev/null @@ -1,238 +0,0 @@ -%!PS-Adobe-2.0 EPSF-2.0 -%%Title: Ex2_Boundary.fig -%%Creator: fig2dev Version 3.2 Patchlevel 5 -%%CreationDate: Fri Nov 14 16:44:03 2008 -%%For: melanie@alvine (Melanie Darcis) -%%BoundingBox: 0 0 557 252 -%Magnification: 1.0000 -%%EndComments -/MyAppDict 100 dict dup begin def -/$F2psDict 200 dict def -$F2psDict begin -$F2psDict /mtrx matrix put -/col-1 {0 setgray} bind def -/col0 {0.000 0.000 0.000 srgb} bind def -/col1 {0.000 0.000 1.000 srgb} bind def -/col2 {0.000 1.000 0.000 srgb} bind def -/col3 {0.000 1.000 1.000 srgb} bind def -/col4 {1.000 0.000 0.000 srgb} bind def -/col5 {1.000 0.000 1.000 srgb} bind def -/col6 {1.000 1.000 0.000 srgb} bind def -/col7 {1.000 1.000 1.000 srgb} bind def -/col8 {0.000 0.000 0.560 srgb} bind def -/col9 {0.000 0.000 0.690 srgb} bind def -/col10 {0.000 0.000 0.820 srgb} bind def -/col11 {0.530 0.810 1.000 srgb} bind def -/col12 {0.000 0.560 0.000 srgb} bind def -/col13 {0.000 0.690 0.000 srgb} bind def -/col14 {0.000 0.820 0.000 srgb} bind def -/col15 {0.000 0.560 0.560 srgb} bind def -/col16 {0.000 0.690 0.690 srgb} bind def -/col17 {0.000 0.820 0.820 srgb} bind def -/col18 {0.560 0.000 0.000 srgb} bind def -/col19 {0.690 0.000 0.000 srgb} bind def -/col20 {0.820 0.000 0.000 srgb} bind def -/col21 {0.560 0.000 0.560 srgb} bind def -/col22 {0.690 0.000 0.690 srgb} bind def -/col23 {0.820 0.000 0.820 srgb} bind def -/col24 {0.500 0.190 0.000 srgb} bind def -/col25 {0.630 0.250 0.000 srgb} bind def -/col26 {0.750 0.380 0.000 srgb} bind def -/col27 {1.000 0.500 0.500 srgb} bind def -/col28 {1.000 0.630 0.630 srgb} bind def -/col29 {1.000 0.750 0.750 srgb} bind def -/col30 {1.000 0.880 0.880 srgb} bind def -/col31 {1.000 0.840 0.000 srgb} bind def - -end -save -newpath 0 252 moveto 0 0 lineto 557 0 lineto 557 252 lineto closepath clip newpath --72.8 457.3 translate -1 -1 scale - -% left30 -<< - /PatternType 1 - /PaintType 2 - /TilingType 2 - /BBox [-2 -4 10 5] - /XStep 8 - /YStep 4 - /PaintProc - { - pop - newpath - .7 setlinewidth - -2 -1 moveto - 12 6 rlineto - stroke - } bind - ->> - -matrix -makepattern -/P1 exch def - -/cp {closepath} bind def -/ef {eofill} bind def -/gr {grestore} bind def -/gs {gsave} bind def -/sa {save} bind def -/rs {restore} bind def -/l {lineto} bind def -/m {moveto} bind def -/rm {rmoveto} bind def -/n {newpath} bind def -/s {stroke} bind def -/sh {show} bind def -/slc {setlinecap} bind def -/slj {setlinejoin} bind def -/slw {setlinewidth} bind def -/srgb {setrgbcolor} bind def -/rot {rotate} bind def -/sc {scale} bind def -/sd {setdash} bind def -/ff {findfont} bind def -/sf {setfont} bind def -/scf {scalefont} bind def -/sw {stringwidth} bind def -/tr {translate} bind def -/tnt {dup dup currentrgbcolor - 4 -2 roll dup 1 exch sub 3 -1 roll mul add - 4 -2 roll dup 1 exch sub 3 -1 roll mul add - 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb} - bind def -/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul - 4 -2 roll mul srgb} bind def -/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def -/$F2psEnd {$F2psEnteredState restore end} def - -$F2psBegin -10 setmiterlimit -0 slj 0 slc - 0.06299 0.06299 sc -% -% Fig objects follow -% -% -% here starts figure with depth 50 -% Polyline -0 slj -0 slc -7.500 slw -n 3015 3870 m 8775 3870 l 8775 6615 l 3015 6615 l - cp gs col0 s gr -% Polyline -n 4095 4770 m 7650 4770 l 7650 5760 l 4095 5760 l - cp gs col31 1.00 shd ef gr gs col0 s gr -% Polyline - [15 45] 45 sd -n 3015 6615 m 8775 6615 l 8775 6795 l 3015 6795 l - cp -% Fill with pattern background color -gs /DeviceRGB setcolorspace 1.00 1.00 1.00 setcolor fill gr - -% Fill with pattern pen color -gs /DeviceRGB setcolorspace 0.00 0.00 0.00 P1 setpattern fill gr - -gs col0 s gr [] 0 sd -% Polyline - [15 45] 45 sd -n 3015 3690 m 8775 3690 l 8775 3870 l 3015 3870 l - cp -% Fill with pattern background color -gs /DeviceRGB setcolorspace 1.00 1.00 1.00 setcolor fill gr - -% Fill with pattern pen color -gs /DeviceRGB setcolorspace 0.00 0.00 0.00 P1 setpattern fill gr - -gs col0 s gr [] 0 sd -% Polyline -gs clippath -9320 4462 m 9465 4462 l 9465 4357 l 9320 4357 l 9320 4357 l 9440 4410 l 9320 4462 l cp -eoclip -n 9000 4410 m - 9450 4410 l gs col0 s gr gr - -% arrowhead -n 9320 4462 m 9440 4410 l 9320 4357 l col0 s -% Polyline -gs clippath -9320 4867 m 9465 4867 l 9465 4762 l 9320 4762 l 9320 4762 l 9440 4815 l 9320 4867 l cp -eoclip -n 9000 4815 m - 9450 4815 l gs col0 s gr gr - -% arrowhead -n 9320 4867 m 9440 4815 l 9320 4762 l col0 s -% Polyline -gs clippath -9320 5272 m 9465 5272 l 9465 5167 l 9320 5167 l 9320 5167 l 9440 5220 l 9320 5272 l cp -eoclip -n 9000 5220 m - 9450 5220 l gs col0 s gr gr - -% arrowhead -n 9320 5272 m 9440 5220 l 9320 5167 l col0 s -% Polyline -gs clippath -9320 5722 m 9465 5722 l 9465 5617 l 9320 5617 l 9320 5617 l 9440 5670 l 9320 5722 l cp -eoclip -n 9045 5670 m - 9450 5670 l gs col0 s gr gr - -% arrowhead -n 9320 5722 m 9440 5670 l 9320 5617 l col0 s -% Polyline -gs clippath -9320 6127 m 9465 6127 l 9465 6022 l 9320 6022 l 9320 6022 l 9440 6075 l 9320 6127 l cp -eoclip -n 9045 6075 m - 9450 6075 l gs col0 s gr gr - -% arrowhead -n 9320 6127 m 9440 6075 l 9320 6022 l col0 s -% Polyline -gs clippath -9320 6532 m 9465 6532 l 9465 6427 l 9320 6427 l 9320 6427 l 9440 6480 l 9320 6532 l cp -eoclip -n 9045 6480 m - 9450 6480 l gs col0 s gr gr - -% arrowhead -n 9320 6532 m 9440 6480 l 9320 6427 l col0 s -% Polyline -gs clippath -9320 4057 m 9465 4057 l 9465 3952 l 9320 3952 l 9320 3952 l 9440 4005 l 9320 4057 l cp -eoclip -n 9000 4005 m - 9450 4005 l gs col0 s gr gr - -% arrowhead -n 9320 4057 m 9440 4005 l 9320 3952 l col0 s -/Times-Roman ff 190.50 scf sf -5535 7245 m -gs 1 -1 sc (no flow) col0 sh gr -/Times-Roman ff 190.50 scf sf -5535 3420 m -gs 1 -1 sc (no flow) col0 sh gr -/Times-Roman ff 190.50 scf sf -9720 4995 m -gs 1 -1 sc (qw) col0 sh gr -/Times-Roman ff 190.50 scf sf -9765 5490 m -gs 1 -1 sc (qo) col0 sh gr -/Times-Roman ff 190.50 scf sf -1170 4815 m -gs 1 -1 sc (pw) col0 sh gr -/Times-Roman ff 190.50 scf sf -1170 5310 m -gs 1 -1 sc (S) col0 sh gr -% here ends figure; -$F2psEnd -rs -end -showpage -%%Trailer -%EOF diff --git a/doc/handbook/EPS/Ex2_Domain.eps b/doc/handbook/EPS/Ex2_Domain.eps deleted file mode 100644 index 2d1dea6447..0000000000 --- a/doc/handbook/EPS/Ex2_Domain.eps +++ /dev/null @@ -1,245 +0,0 @@ -%!PS-Adobe-2.0 EPSF-2.0 -%%Title: Ex2_Domain.fig -%%Creator: fig2dev Version 3.2 Patchlevel 5 -%%CreationDate: Wed Oct 6 11:40:41 2010 -%%For: faigle@indo (Benjamin Faigle, Diplomarbeiter bei Jenny) -%%BoundingBox: 0 0 493 283 -%Magnification: 1.0000 -%%EndComments -%%BeginProlog -/$F2psDict 200 dict def -$F2psDict begin -$F2psDict /mtrx matrix put -/col-1 {0 setgray} bind def -/col0 {0.000 0.000 0.000 srgb} bind def -/col1 {0.000 0.000 1.000 srgb} bind def -/col2 {0.000 1.000 0.000 srgb} bind def -/col3 {0.000 1.000 1.000 srgb} bind def -/col4 {1.000 0.000 0.000 srgb} bind def -/col5 {1.000 0.000 1.000 srgb} bind def -/col6 {1.000 1.000 0.000 srgb} bind def -/col7 {1.000 1.000 1.000 srgb} bind def -/col8 {0.000 0.000 0.560 srgb} bind def -/col9 {0.000 0.000 0.690 srgb} bind def -/col10 {0.000 0.000 0.820 srgb} bind def -/col11 {0.530 0.810 1.000 srgb} bind def -/col12 {0.000 0.560 0.000 srgb} bind def -/col13 {0.000 0.690 0.000 srgb} bind def -/col14 {0.000 0.820 0.000 srgb} bind def -/col15 {0.000 0.560 0.560 srgb} bind def -/col16 {0.000 0.690 0.690 srgb} bind def -/col17 {0.000 0.820 0.820 srgb} bind def -/col18 {0.560 0.000 0.000 srgb} bind def -/col19 {0.690 0.000 0.000 srgb} bind def -/col20 {0.820 0.000 0.000 srgb} bind def -/col21 {0.560 0.000 0.560 srgb} bind def -/col22 {0.690 0.000 0.690 srgb} bind def -/col23 {0.820 0.000 0.820 srgb} bind def -/col24 {0.500 0.190 0.000 srgb} bind def -/col25 {0.630 0.250 0.000 srgb} bind def -/col26 {0.750 0.380 0.000 srgb} bind def -/col27 {1.000 0.500 0.500 srgb} bind def -/col28 {1.000 0.630 0.630 srgb} bind def -/col29 {1.000 0.750 0.750 srgb} bind def -/col30 {1.000 0.880 0.880 srgb} bind def -/col31 {1.000 0.840 0.000 srgb} bind def - -end -save -newpath 0 283 moveto 0 0 lineto 493 0 lineto 493 283 lineto closepath clip newpath --132.3 508.2 translate -1 -1 scale - -/cp {closepath} bind def -/ef {eofill} bind def -/gr {grestore} bind def -/gs {gsave} bind def -/sa {save} bind def -/rs {restore} bind def -/l {lineto} bind def -/m {moveto} bind def -/rm {rmoveto} bind def -/n {newpath} bind def -/s {stroke} bind def -/sh {show} bind def -/slc {setlinecap} bind def -/slj {setlinejoin} bind def -/slw {setlinewidth} bind def -/srgb {setrgbcolor} bind def -/rot {rotate} bind def -/sc {scale} bind def -/sd {setdash} bind def -/ff {findfont} bind def -/sf {setfont} bind def -/scf {scalefont} bind def -/sw {stringwidth} bind def -/tr {translate} bind def -/tnt {dup dup currentrgbcolor - 4 -2 roll dup 1 exch sub 3 -1 roll mul add - 4 -2 roll dup 1 exch sub 3 -1 roll mul add - 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb} - bind def -/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul - 4 -2 roll mul srgb} bind def -/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def -/$F2psEnd {$F2psEnteredState restore end} def - -$F2psBegin -10 setmiterlimit -0 slj 0 slc - 0.06299 0.06299 sc -%%EndProlog -% -% Fig objects follow -% -% -% here starts figure with depth 50 -% Polyline -0 slj -0 slc -7.500 slw -n 3015 3870 m 8775 3870 l 8775 6615 l 3015 6615 l - cp gs col0 s gr -% Polyline -n 2610 3870 m - 2610 4950 l gs col0 s gr -% Polyline -n 2610 5535 m - 2610 6615 l gs col0 s gr -% Polyline -n 6435 3690 m - 8775 3690 l gs col0 s gr -% Polyline -n 4860 5805 m - 4860 6075 l gs col0 s gr -% Polyline -n 4860 6390 m - 4860 6615 l gs col0 s gr -% Polyline -n 3870 4770 m - 3870 5085 l gs col0 s gr -% Polyline -n 3870 5445 m - 3870 5760 l gs col0 s gr -% Polyline -n 3915 4770 m - 3780 4770 l gs col0 s gr -% Polyline -n 3915 5760 m - 3780 5760 l gs col0 s gr -% Polyline -n 3015 3690 m - 5355 3690 l gs col0 s gr -% Polyline -n 4140 4590 m - 5580 4590 l gs col0 s gr -% Polyline -n 6390 4590 m - 7650 4590 l gs col0 s gr -% Polyline -n 8550 5220 m - 8775 5220 l gs col0 s gr -% Polyline -n 7695 5220 m - 7920 5220 l gs col0 s gr -% Polyline -n 4095 4770 m 7650 4770 l 7650 5760 l 4095 5760 l - cp gs col31 1.00 shd ef gr gs col0 s gr -% Polyline -gs clippath -6113 5413 m 5991 5322 l 5955 5370 l 6077 5461 l 6077 5461 l 6023 5383 l 6113 5413 l cp -eoclip -n 7965 6840 m - 5985 5355 l gs col0 s gr gr - -% arrowhead -30.000 slw -n 6113 5413 m 6023 5383 l 6077 5461 l 6119 5455 l 6113 5413 l - cp gs 0.00 setgray ef gr col0 s -% Polyline -7.500 slw -gs clippath -6073 6363 m 6196 6273 l 6161 6224 l 6038 6314 l 6038 6314 l 6129 6286 l 6073 6363 l cp -eoclip -n 5380 6827 m - 6167 6258 l gs col0 s gr gr - -% arrowhead -30.000 slw -n 6073 6363 m 6129 6286 l 6038 6314 l 6031 6356 l 6073 6363 l - cp gs 0.00 setgray ef gr col0 s -% Polyline -7.500 slw -n 2700 3870 m - 2565 3870 l gs col0 s gr -% Polyline -n 2700 6615 m - 2565 6615 l gs col0 s gr -% Polyline -n 3015 3780 m - 3015 3600 l gs col0 s gr -% Polyline -n 8775 3780 m - 8775 3600 l gs col0 s gr -% Polyline -n 7650 4680 m - 7650 4500 l gs col0 s gr -% Polyline -n 4095 4680 m - 4095 4500 l gs col0 s gr -% Polyline - [15 45] 45 sd -n 6615 6840 m 9900 6840 l 9900 8055 l 6615 8055 l - cp gs col0 s gr [] 0 sd -% Polyline - [15 45] 45 sd -n 2835 6840 m 6075 6840 l 6075 8055 l 2835 8055 l - cp gs col0 s gr [] 0 sd -/Times-Roman ff 190.50 scf sf -7965 5265 m -gs 1 -1 sc (L3x) col0 sh gr -/Times-Roman ff 190.50 scf sf -5670 4635 m -gs 1 -1 sc (L2x) col0 sh gr -/Times-Roman ff 190.50 scf sf -5445 3780 m -gs 1 -1 sc (L1x) col0 sh gr -/Times-Roman ff 190.50 scf sf -4455 6300 m -gs 1 -1 sc (H2y) col0 sh gr -/Times-Roman ff 190.50 scf sf -3330 5310 m -gs 1 -1 sc (H3y) col0 sh gr -/Times-Roman ff 190.50 scf sf -2115 5310 m -gs 1 -1 sc (H1y) col0 sh gr -/Times-Roman ff 190.50 scf sf -2970 7695 m -gs 1 -1 sc (Lin) col0 sh gr -/Times-Roman ff 190.50 scf sf -2970 7425 m -gs 1 -1 sc (phi1) col0 sh gr -/Times-Roman ff 190.50 scf sf -2970 7155 m -gs 1 -1 sc (K1) col0 sh gr -/Times-Roman ff 190.50 scf sf -6750 7155 m -gs 1 -1 sc (K2) col0 sh gr -/Times-Roman ff 190.50 scf sf -6750 7380 m -gs 1 -1 sc (phi2) col0 sh gr -/Times-Roman ff 190.50 scf sf -6750 7650 m -gs 1 -1 sc (BC1) col0 sh gr -/Times-Roman ff 190.50 scf sf -6750 7920 m -gs 1 -1 sc (BC2) col0 sh gr -/Times-Roman ff 190.50 scf sf -2970 7920 m -gs 1 -1 sc (Lin2) col0 sh gr -% here ends figure; -$F2psEnd -rs -showpage -%%Trailer -%EOF diff --git a/doc/handbook/EPS/exercise1_c.eps b/doc/handbook/EPS/exercise1_c.eps deleted file mode 100644 index 38ccf34e96..0000000000 --- a/doc/handbook/EPS/exercise1_c.eps +++ /dev/null @@ -1,154 +0,0 @@ -%!PS-Adobe-2.0 EPSF-2.0 -%%Title: exercise1_c.fig -%%Creator: fig2dev Version 3.2 Patchlevel 5 -%%CreationDate: Mon Nov 10 16:50:24 2008 -%%For: melanie@alvine (Melanie Darcis) -%%BoundingBox: 0 0 283 107 -%Magnification: 1.0000 -%%EndComments -/$F2psDict 200 dict def -$F2psDict begin -$F2psDict /mtrx matrix put -/col-1 {0 setgray} bind def -/col0 {0.000 0.000 0.000 srgb} bind def -/col1 {0.000 0.000 1.000 srgb} bind def -/col2 {0.000 1.000 0.000 srgb} bind def -/col3 {0.000 1.000 1.000 srgb} bind def -/col4 {1.000 0.000 0.000 srgb} bind def -/col5 {1.000 0.000 1.000 srgb} bind def -/col6 {1.000 1.000 0.000 srgb} bind def -/col7 {1.000 1.000 1.000 srgb} bind def -/col8 {0.000 0.000 0.560 srgb} bind def -/col9 {0.000 0.000 0.690 srgb} bind def -/col10 {0.000 0.000 0.820 srgb} bind def -/col11 {0.530 0.810 1.000 srgb} bind def -/col12 {0.000 0.560 0.000 srgb} bind def -/col13 {0.000 0.690 0.000 srgb} bind def -/col14 {0.000 0.820 0.000 srgb} bind def -/col15 {0.000 0.560 0.560 srgb} bind def -/col16 {0.000 0.690 0.690 srgb} bind def -/col17 {0.000 0.820 0.820 srgb} bind def -/col18 {0.560 0.000 0.000 srgb} bind def -/col19 {0.690 0.000 0.000 srgb} bind def -/col20 {0.820 0.000 0.000 srgb} bind def -/col21 {0.560 0.000 0.560 srgb} bind def -/col22 {0.690 0.000 0.690 srgb} bind def -/col23 {0.820 0.000 0.820 srgb} bind def -/col24 {0.500 0.190 0.000 srgb} bind def -/col25 {0.630 0.250 0.000 srgb} bind def -/col26 {0.750 0.380 0.000 srgb} bind def -/col27 {1.000 0.500 0.500 srgb} bind def -/col28 {1.000 0.630 0.630 srgb} bind def -/col29 {1.000 0.750 0.750 srgb} bind def -/col30 {1.000 0.880 0.880 srgb} bind def -/col31 {1.000 0.840 0.000 srgb} bind def - -end -save -newpath 0 107 moveto 0 0 lineto 283 0 lineto 283 107 lineto closepath clip newpath --169.1 349.4 translate -1 -1 scale - -/cp {closepath} bind def -/ef {eofill} bind def -/gr {grestore} bind def -/gs {gsave} bind def -/sa {save} bind def -/rs {restore} bind def -/l {lineto} bind def -/m {moveto} bind def -/rm {rmoveto} bind def -/n {newpath} bind def -/s {stroke} bind def -/sh {show} bind def -/slc {setlinecap} bind def -/slj {setlinejoin} bind def -/slw {setlinewidth} bind def -/srgb {setrgbcolor} bind def -/rot {rotate} bind def -/sc {scale} bind def -/sd {setdash} bind def -/ff {findfont} bind def -/sf {setfont} bind def -/scf {scalefont} bind def -/sw {stringwidth} bind def -/tr {translate} bind def -/tnt {dup dup currentrgbcolor - 4 -2 roll dup 1 exch sub 3 -1 roll mul add - 4 -2 roll dup 1 exch sub 3 -1 roll mul add - 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb} - bind def -/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul - 4 -2 roll mul srgb} bind def -/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def -/$F2psEnd {$F2psEnteredState restore end} def - -$F2psBegin -10 setmiterlimit -0 slj 0 slc - 0.06299 0.06299 sc -% -% Fig objects follow -% -% -% here starts figure with depth 50 -% Polyline -0 slj -0 slc -7.500 slw -n 3285 5310 m - 3285 5535 l gs col0 s gr -% Polyline -n 3285 5445 m - 4905 5445 l gs col0 s gr -% Polyline -n 5715 5445 m - 7155 5445 l gs col0 s gr -% Polyline -n 7155 5310 m - 7155 5535 l gs col0 s gr -% Polyline -n 3060 4725 m - 3060 5040 l gs col0 s gr -% Polyline -n 2970 5130 m - 3150 5130 l gs col0 s gr -% Polyline -n 3060 4680 m - 3060 5130 l gs col0 s gr -% Polyline -n 3240 3870 m 7155 3870 l 7155 5130 l 3240 5130 l - cp gs col0 s gr -% Polyline -n 5265 3870 m 7155 3870 l 7155 5130 l 5265 5130 l - cp gs col15 1.00 shd ef gr gs col0 s gr -% Polyline -n 3060 3870 m - 3060 4320 l gs col0 s gr -% Polyline -n 2970 3870 m - 3150 3870 l gs col0 s gr -/Times-Roman ff 190.50 scf sf -3870 4365 m -gs 1 -1 sc (K1 =) col0 sh gr -/Times-Roman ff 190.50 scf sf -3870 4590 m -gs 1 -1 sc (phi1 =) col0 sh gr -/Times-Roman ff 190.50 scf sf -5760 4365 m -gs 1 -1 sc (K2 =) col7 sh gr -/Times-Roman ff 190.50 scf sf -5760 4545 m -gs 1 -1 sc (phi2 =) col7 sh gr -/Times-Roman ff 190.50 scf sf -2700 4590 m -gs 1 -1 sc (300 m) col0 sh gr -/Times-Roman ff 190.50 scf sf -5085 5490 m -gs 1 -1 sc (600 m) col0 sh gr -% here ends figure; -$F2psEnd -rs -showpage -%%Trailer -%EOF diff --git a/doc/handbook/EPS/tutorial-problemconfiguration.eps b/doc/handbook/EPS/tutorial-problemconfiguration.eps deleted file mode 100644 index f2b25c5c62..0000000000 --- a/doc/handbook/EPS/tutorial-problemconfiguration.eps +++ /dev/null @@ -1,818 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: inkscape 0.45.1 -%%Pages: 1 -%%Orientation: Portrait -%%BoundingBox: -32 -17 872 181 -%%HiResBoundingBox: -32.663784 -17.447649 871.52299 180.7467 -%%EndComments -%%Page: 1 1 -0 208 translate -0.8 -0.8 scale -0 0 0 setrgbcolor -[] 0 setdash -1 setlinewidth -0 setlinejoin -0 setlinecap -gsave [1 0 0 1 0 0] concat -gsave [1 0 0 1 93.027596 35.692988] concat -0 0 0 setrgbcolor -[] 0 setdash -3 setlinewidth -1 setlinejoin -0 setlinecap -newpath -109.14135 54.647896 moveto -629.14434 54.647896 lineto -629.93493 54.647896 630.5714 55.284364 630.5714 56.074955 curveto -630.5714 158.93512 lineto -630.5714 159.72571 629.93493 160.36218 629.14434 160.36218 curveto -109.14135 160.36218 lineto -108.35076 160.36218 107.71429 159.72571 107.71429 158.93512 curveto -107.71429 56.074955 lineto -107.71429 55.284364 108.35076 54.647896 109.14135 54.647896 curveto -closepath -stroke -0 0 0 setrgbcolor -[3 1.5] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -265 54.814998 moveto -265 160.20923 lineto -stroke -gsave -0.50980395 0.1882353 0.06666667 setrgbcolor -newpath -268.18165 55.866428 moveto -626.36676 55.866428 lineto -627.81029 55.866428 628.97241 57.028551 628.97241 58.472085 curveto -628.97241 156.23226 lineto -628.97241 157.67579 627.81029 158.83792 626.36676 158.83792 curveto -268.18165 158.83792 lineto -266.73811 158.83792 265.57599 157.67579 265.57599 156.23226 curveto -265.57599 58.472085 lineto -265.57599 57.028551 266.73811 55.866428 268.18165 55.866428 curveto -closepath -fill -grestore -gsave [1 0 0 1 4 0] concat -gsave [1 0 0 1 236.47088 0.080825925] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -gsave [1 0 0 1 59.384214 -0.077555686] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -grestore -grestore -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -483.17157 161.25369 moveto -461.8029 186.06893 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -502.41559 161.30119 moveto -481.04692 186.11643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -522.38957 161.14608 moveto -501.0209 185.96132 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -542.55578 161.17613 moveto -521.18711 185.99137 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -561.7998 161.22363 moveto -540.43113 186.03887 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -581.77378 161.06852 moveto -560.40511 185.88376 lineto -stroke -gsave [1 0 0 1 -1.0160692 0.080825925] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -gsave [1 0 0 1 59.384214 -0.077555686] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -grestore -gsave [1 0 0 1 119.0805 0.1216738] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -gsave [1 0 0 1 59.384214 -0.077555686] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -grestore -grestore -grestore -gsave [1 0 0 1 39.791519 0.077559725] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -561.7998 161.22363 moveto -540.43113 186.03887 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -581.77378 161.06852 moveto -560.40511 185.88376 lineto -stroke -grestore -grestore -gsave [1 0 0 1 6.657105 -131.88046] concat -gsave [1 0 0 1 236.47088 0.080825925] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -gsave [1 0 0 1 59.384214 -0.077555686] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -grestore -grestore -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -483.17157 161.25369 moveto -461.8029 186.06893 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -502.41559 161.30119 moveto -481.04692 186.11643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -522.38957 161.14608 moveto -501.0209 185.96132 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -542.55578 161.17613 moveto -521.18711 185.99137 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -561.7998 161.22363 moveto -540.43113 186.03887 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -581.77378 161.06852 moveto -560.40511 185.88376 lineto -stroke -gsave [1 0 0 1 -1.0160692 0.080825925] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -gsave [1 0 0 1 59.384214 -0.077555686] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -grestore -gsave [1 0 0 1 119.0805 0.1216738] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -gsave [1 0 0 1 59.384214 -0.077555686] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -127.62019 161.05119 moveto -106.25152 185.86643 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -146.86421 161.09869 moveto -125.49554 185.91393 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -166.83819 160.94358 moveto -145.46952 185.75882 lineto -stroke -grestore -grestore -grestore -gsave [1 0 0 1 39.791519 0.077559725] concat -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -561.7998 161.22363 moveto -540.43113 186.03887 lineto -stroke -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -581.77378 161.06852 moveto -560.40511 185.88376 lineto -stroke -grestore -grestore -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -105.93588 217.9543 moveto -151.7385 217.33432 lineto -stroke -gsave [-1.6498489 0.022332201 -0.022332201 -1.6498489 150.08865 217.35665] concat -gsave -0 0 0 setrgbcolor -newpath -8.7185878 4.0337352 moveto --2.2072895 0.016013256 lineto -8.7185884 -4.0017078 lineto -6.97309 -1.6296469 6.9831476 1.6157441 8.7185878 4.0337352 curveto -closepath -eofill -grestore -grestore -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -106.54211 218.35483 moveto -106.86591 172.54916 lineto -stroke -gsave [-0.011663548 1.6499588 -1.6499588 -0.011663548 106.85425 174.19912] concat -gsave -0 0 0 setrgbcolor -newpath -8.7185878 4.0337352 moveto --2.2072895 0.016013256 lineto -8.7185884 -4.0017078 lineto -6.97309 -1.6296469 6.9831476 1.6157441 8.7185878 4.0337352 curveto -closepath -eofill -grestore -grestore -gsave [1 0 0 1 -209.68808 -53.894489] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/newlatin1font {findfont dup length dict copy dup /Encoding ISOLatin1Encoding put definefont} def -/LucidaBright-ISOLatin1 /LucidaBright newlatin1font -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(x) show -grestore -grestore -grestore -gsave [1 0 0 1 -266.24459 -115.33296] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(y) show -grestore -grestore -grestore -gsave [1 0 0 1 -482.72842 -206.03089] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(p_w = 2 x 10^5 [Pa]) show -grestore -grestore -grestore -gsave [1 0 0 1 -482.97404 -169.14546] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(S_n = 0) show -grestore -grestore -grestore -gsave [1 0 0 1 317.23412 -207.53706] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(q_w = 0 [kg/m^2s]) show -grestore -grestore -grestore -gsave [1 0 0 1 318.18473 -163.20014] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(q_n = -3 x 10^-4 [kg/m^2s]) show -grestore -grestore -grestore -gsave -0.66666669 0.63921571 1 setrgbcolor -newpath -111.72864 55.385635 moveto -261.40382 55.385635 lineto -262.85783 55.385635 264.02838 56.556191 264.02838 58.010199 curveto -264.02838 156.47972 lineto -264.02838 157.93372 262.85783 159.10428 261.40382 159.10428 curveto -111.72864 159.10428 lineto -110.27464 159.10428 109.10408 157.93372 109.10408 156.47972 curveto -109.10408 58.010199 lineto -109.10408 56.556191 110.27464 55.385635 111.72864 55.385635 curveto -closepath -fill -grestore -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -76.75 108.48518 moveto -137.23061 108.48518 lineto -stroke -gsave [-1.65 0 0 -1.65 135.58061 108.48518] concat -gsave -0 0 0 setrgbcolor -newpath -8.7185878 4.0337352 moveto --2.2072895 0.016013256 lineto -8.7185884 -4.0017078 lineto -6.97309 -1.6296469 6.9831476 1.6157441 8.7185878 4.0337352 curveto -closepath -eofill -grestore -grestore -0 0 0 setrgbcolor -[] 0 setdash -1.5 setlinewidth -0 setlinejoin -0 setlinecap -newpath -598.47643 107.48605 moveto -658.95704 107.48605 lineto -stroke -gsave [-1.65 0 0 -1.65 657.30704 107.48605] concat -gsave -0 0 0 setrgbcolor -newpath -8.7185878 4.0337352 moveto --2.2072895 0.016013256 lineto -8.7185884 -4.0017078 lineto -6.97309 -1.6296469 6.9831476 1.6157441 8.7185878 4.0337352 curveto -closepath -eofill -grestore -grestore -gsave [1 0 0 1 -52.189782 -204.20014] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(p_w_initial = 2 x 10^5 [Pa]) show -grestore -grestore -grestore -gsave [1 0 0 1 -52.436547 -169.40732] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(S_n_initial = 0) show -grestore -grestore -grestore -gsave [1 0 0 1 -24.043935 -282.84055] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(no flow) show -grestore -grestore -grestore -gsave [1 0 0 1 -24.00547 -81.002179] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(no flow) show -grestore -grestore -grestore -gsave [1 0 0 1 -234.24002 -167.99702] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(water) show -grestore -grestore -grestore -gsave [1 0 0 1 246.87279 -166.71041] concat -gsave [1 0 0 -1 348.4375 299.18834] concat -gsave -/LucidaBright-ISOLatin1 findfont -24 scalefont -setfont -0 0 0 setrgbcolor -newpath -0 0 moveto -(oil) show -grestore -grestore -grestore -grestore -grestore -showpage -%%EOF diff --git a/doc/handbook/XFIG/Ex2_Boundary.fig b/doc/handbook/XFIG/Ex2_Boundary.fig deleted file mode 100644 index 0fabd55b11..0000000000 --- a/doc/handbook/XFIG/Ex2_Boundary.fig +++ /dev/null @@ -1,44 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3015 3870 8775 3870 8775 6615 3015 6615 3015 3870 -2 2 0 1 0 31 50 -1 20 0.000 0 0 -1 0 0 5 - 4095 4770 7650 4770 7650 5760 4095 5760 4095 4770 -2 2 2 1 0 7 50 -1 41 3.000 0 0 -1 0 0 5 - 3015 6615 8775 6615 8775 6795 3015 6795 3015 6615 -2 2 2 1 0 7 50 -1 41 3.000 0 0 -1 0 0 5 - 3015 3690 8775 3690 8775 3870 3015 3870 3015 3690 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9000 4410 9450 4410 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9000 4815 9450 4815 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9000 5220 9450 5220 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9045 5670 9450 5670 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9045 6075 9450 6075 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9045 6480 9450 6480 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 105.00 120.00 - 9000 4005 9450 4005 -4 0 0 50 -1 0 12 0.0000 4 135 615 5535 7245 no flow\001 -4 0 0 50 -1 0 12 0.0000 4 135 615 5535 3420 no flow\001 -4 0 0 50 -1 0 12 0.0000 4 135 240 9720 4995 qw\001 -4 0 0 50 -1 0 12 0.0000 4 135 210 9765 5490 qo\001 -4 0 0 50 -1 0 12 0.0000 4 135 240 1170 4815 pw\001 -4 0 0 50 -1 0 12 0.0000 4 135 105 1170 5310 S\001 diff --git a/doc/handbook/XFIG/Ex2_Domain.fig b/doc/handbook/XFIG/Ex2_Domain.fig deleted file mode 100644 index b22a847134..0000000000 --- a/doc/handbook/XFIG/Ex2_Domain.fig +++ /dev/null @@ -1,77 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3015 3870 8775 3870 8775 6615 3015 6615 3015 3870 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2610 3870 2610 4950 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2610 5535 2610 6615 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 6435 3690 8775 3690 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 4860 5805 4860 6075 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 4860 6390 4860 6615 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3870 4770 3870 5085 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3870 5445 3870 5760 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3915 4770 3780 4770 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3915 5760 3780 5760 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3015 3690 5355 3690 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 4140 4590 5580 4590 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 6390 4590 7650 4590 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 8550 5220 8775 5220 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 7695 5220 7920 5220 -2 2 0 1 0 31 50 -1 20 0.000 0 0 -1 0 0 5 - 4095 4770 7650 4770 7650 5760 4095 5760 4095 4770 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 3 1 3.00 60.00 120.00 - 7965 6840 5985 5355 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 3 1 3.00 60.00 120.00 - 5380 6827 6167 6258 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2700 3870 2565 3870 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2700 6615 2565 6615 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3015 3780 3015 3600 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 8775 3780 8775 3600 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 7650 4680 7650 4500 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 4095 4680 4095 4500 -2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5 - 6615 6840 9900 6840 9900 8055 6615 8055 6615 6840 -2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5 - 2835 6840 6075 6840 6075 8055 2835 8055 2835 6840 -4 0 0 50 -1 0 12 0.0000 4 135 330 7965 5265 L3x\001 -4 0 0 50 -1 0 12 0.0000 4 135 330 5670 4635 L2x\001 -4 0 0 50 -1 0 12 0.0000 4 135 330 5445 3780 L1x\001 -4 0 0 50 -1 0 12 0.0000 4 180 345 4455 6300 H2y\001 -4 0 0 50 -1 0 12 0.0000 4 180 345 3330 5310 H3y\001 -4 0 0 50 -1 0 12 0.0000 4 180 345 2115 5310 H1y\001 -4 0 0 50 -1 0 12 0.0000 4 135 285 2970 7695 Lin\001 -4 0 0 50 -1 0 12 0.0000 4 180 375 2970 7425 phi1\001 -4 0 0 50 -1 0 12 0.0000 4 135 240 2970 7155 K1\001 -4 0 0 50 -1 0 12 0.0000 4 135 240 6750 7155 K2\001 -4 0 0 50 -1 0 12 0.0000 4 180 375 6750 7380 phi2\001 -4 0 0 50 -1 0 12 0.0000 4 135 375 6750 7650 BC1\001 -4 0 0 50 -1 0 12 0.0000 4 135 375 6750 7920 BC2\001 -4 0 0 50 -1 0 12 0.0000 4 135 390 2970 7920 Lin2\001 diff --git a/doc/handbook/XFIG/exercise1_c.fig b/doc/handbook/XFIG/exercise1_c.fig deleted file mode 100644 index 74ec7f550e..0000000000 --- a/doc/handbook/XFIG/exercise1_c.fig +++ /dev/null @@ -1,37 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3285 5310 3285 5535 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3285 5445 4905 5445 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 5715 5445 7155 5445 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 7155 5310 7155 5535 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3060 4725 3060 5040 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2970 5130 3150 5130 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3060 4680 3060 5130 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3240 3870 7155 3870 7155 5130 3240 5130 3240 3870 -2 2 0 1 0 15 50 -1 20 0.000 0 0 -1 0 0 5 - 5265 3870 7155 3870 7155 5130 5265 5130 5265 3870 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3060 3870 3060 4320 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2970 3870 3150 3870 -4 0 0 50 -1 0 12 0.0000 4 135 390 3870 4365 K1 =\001 -4 0 0 50 -1 0 12 0.0000 4 180 525 3870 4590 phi1 =\001 -4 0 7 50 -1 0 12 0.0000 4 135 390 5760 4365 K2 =\001 -4 0 7 50 -1 0 12 0.0000 4 180 525 5760 4545 phi2 =\001 -4 0 0 50 -1 0 12 0.0000 4 135 510 2700 4590 300 m\001 -4 0 0 50 -1 0 12 0.0000 4 135 510 5085 5490 600 m\001 diff --git a/doc/handbook/XFIG/exercise_1a.fig b/doc/handbook/XFIG/exercise_1a.fig deleted file mode 100644 index 58564300ff..0000000000 --- a/doc/handbook/XFIG/exercise_1a.fig +++ /dev/null @@ -1,31 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1980 2205 3780 2205 3780 3915 1980 3915 1980 2205 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1890 3915 1755 3915 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1800 3915 1800 3240 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1800 2880 1800 2205 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1845 2205 1710 2205 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1845 3915 1710 3915 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3195 4095 3780 4095 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3780 4005 3780 4140 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1980 4005 1980 4140 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 1980 4095 2565 4095 -4 0 0 50 -1 0 12 0.0000 4 135 105 1575 3105 y\001 -4 0 0 50 -1 0 12 0.0000 4 90 105 2655 4140 x\001 diff --git a/doc/handbook/dumux-handbook.tex b/doc/handbook/dumux-handbook.tex index 4157b68931..4f3ac3ad39 100644 --- a/doc/handbook/dumux-handbook.tex +++ b/doc/handbook/dumux-handbook.tex @@ -6,7 +6,7 @@ \usepackage{amssymb} \usepackage{booktabs} \usepackage{theorem} -\usepackage{color} +\usepackage{xcolor} \usepackage{listings} \lstset{language=C++, basicstyle=\ttfamily, keywordstyle=\color{black}\bfseries, tabsize=4, stringstyle=\ttfamily, @@ -82,6 +82,9 @@ \newcommand{\Dune}{{DUNE}\xspace} % DuMuX logo \newcommand{\Dumux}{\texorpdfstring{Du\-Mu$^\text{x}$\xspace}{DuMuX}} +% DuMuX logo colors +\definecolor{dumuxYellow}{HTML}{E19417} +\definecolor{dumuxBlue}{HTML}{0C73CF} % beautify C++ \DeclareRobustCommand\Cplusplus{\texorpdfstring{C\raisebox{2pt}{{\relsize{-3}++}}\xspace}{C++}} diff --git a/doc/handbook/tutorial-coupled.tex b/doc/handbook/tutorial-coupled.tex index 8de55f66b3..27dc0f1b21 100644 --- a/doc/handbook/tutorial-coupled.tex +++ b/doc/handbook/tutorial-coupled.tex @@ -13,20 +13,33 @@ A rectangular domain with no-flow boundaries on the top and on the bottom, which Water infiltrates from the left side into the domain and replaces the oil. Gravity effects are neglected here. \begin{figure}[ht] -\psfrag{x}{x} -\psfrag{y}{y} -\psfrag{no flow}{no flow} -\psfrag{water}{\textbf{water}} -\psfrag{oil}{\textcolor{white}{\textbf{oil}}} -\psfrag{p_w = 2 x 10^5 [Pa]}{$p_w = 2 \times 10^5$ [Pa]} -\psfrag{p_w_initial = 2 x 10^5 [Pa]}{\textcolor{white}{\textbf{$\mathbf{p_{w_{initial}} = 2 \times 10^5}$ [Pa]}}} -\psfrag{S_n = 0}{$S_n = 0$} -\psfrag{S_n_initial = 0}{\textcolor{white}{$\mathbf{S_{n_{initial}} = 1}$}} -\psfrag{q_w = 0 [kg/m^2s]}{$q_w = 0$ $\left[\frac{\textnormal{kg}}{\textnormal{m}^2 \textnormal{s}}\right]$} -\psfrag{q_n = -3 x 10^-4 [kg/m^2s]}{$q_n = 3 \times 10^{-2}$ $\left[\frac{\textnormal{kg}}{\textnormal{m}^2 \textnormal{s}}\right]$} \centering -\includegraphics[width=0.9\linewidth,keepaspectratio]{EPS/tutorial-problemconfiguration} -\caption{Geometry of the tutorial problem with initial and boundary conditions.}\label{tutorial-coupled:problemfigure} +\begin{tikzpicture}[>=latex] + % basic sketch + \fill [fill=dumuxBlue](0,0) rectangle ++(2,1.5); + \fill [fill=dumuxYellow](2,0) rectangle ++(5,1.5); + \draw (0,0) rectangle ++(7,1.5); + \foreach \x in {0,0.25,...,6.75} + \draw (\x,1.5) -- ++(0.25,0.25); + \foreach \x in {0,0.25,...,6.75} + \draw (\x,-0.25) -- ++(0.25,0.25); + % labels + \draw [->](-0.5,-0.5) -- ++(0,0.7) node [anchor=east]{$y$}; + \draw [->](-0.5,-0.5) -- ++(0.7,0) node [anchor=north]{$x$}; + \node at(3.5,1.75)[anchor=south]{no flow}; + \node at(3.5,-0.25)[anchor=north]{no flow}; + \draw[->,thick](-0.4,0.75) -- ++(0.9,0) node[anchor=north]{water}; + \draw[->,thick](6.5,0.75)node[anchor=north]{oil} -- ++(0.9,0); + % equations + \node [anchor=west] at (2,1.1){$p_{w_\text{initial}} = \unit[2 \cdot 10^5]{Pa}$}; + \node [anchor=west] at (2,0.4){$S_{n_\text{initial}} = 1$}; + \node [anchor=west] at (-3,1.1){$p_w = \unit[2 \cdot 10^5]{Pa}$}; + \node [anchor=west] at (-3,0.4){$S_n = 0$}; + \node [anchor=west] at (7.5,1.1){$q_w = \unitfrac[0]{kg}{m^2s}$}; + \node [anchor=west] at (7.5,0.4){$q_n = \unitfrac[3 \cdot 10^{-2}] {kg}{m^2s}$}; +\end{tikzpicture} +\caption{Geometry of the tutorial problem with initial and boundary conditions.} +\label{tutorial-coupled:problemfigure} \end{figure} The solved equations are the mass balances of water and oil: @@ -431,16 +444,25 @@ Call the \texttt{set}-functions from the constructor of the \texttt{tutorialspat Set up a model domain with the soil properties given in Figure \ref{tutorial-coupled:exercise1_d}. Adjust the boundary conditions so that water is again flowing from the left to the right of the -\begin{figure}[ht] -\psfrag{K1 =}{$\mathbf{K} = 10^{-8}\;\text{m}^2$} -\psfrag{phi1 =}{$\phi = 0.15$} -\psfrag{K2 =}{\textcolor{white}{$\mathbf{K} = 10^{-9}\;\text{m}^2$}} -\psfrag{phi2 =}{\textcolor{white}{$\phi = 0.3$}} -\psfrag{600 m}{$600 \;\text{m}$} -\psfrag{300 m}{$300 \;\text{m}$} +\begin{figure}[bt] \centering -\includegraphics[width=0.5\linewidth,keepaspectratio]{EPS/exercise1_c.eps} -\caption{Exercise 1g: Set-up of a model domain with a heterogeneity. Grid spacing: $\Delta x = 20 \;\text{m}$ $\Delta y = 20\;\text{m}$.}\label{tutorial-coupled:exercise1_d} +\begin{tikzpicture}[>=latex] + % basic sketch + \fill [dumuxBlue](3,0) rectangle ++(3,3); + \draw (3,0) -- ++(0,3); + \draw (0,0) rectangle ++(6,3); + % arrows + \draw [|<->|](0,-0.3) -- ++(6,0); + \node at (3,-0.3)[anchor=north]{$\unit[600]{m}$}; + \draw [|<->|](-0.3,0) -- ++(0,3); + \node at(-0.3,1.5)[anchor=east]{$\unit[300]{m}$}; + % labels + \node [anchor=west] at (0.2,1.5){$\mathbf{K}=\unit[10^{-8}]{m^2}$}; + \node [anchor=west] at (0.2,1){$\phi=0.15$}; + \node [anchor=west] at (3.2,1.5){$\mathbf{K}=\unit[10^{-9}]{m^2}$}; + \node [anchor=west] at (3.2,1){$\phi=0.3$}; +\end{tikzpicture} +\caption{Exercise 1g: Set-up of a model domain with a heterogeneity. Grid spacing: $\Delta x = \unit[20]{m}$ $\Delta y = \unit[20]{m}$.}\label{tutorial-coupled:exercise1_d} \end{figure} domain. You can use the fluids of exercise 1b).\\ \textbf{Hint:} The current position of the control volume can be obtained using \texttt{element\allowbreak.geometry()\allowbreak.corner(scvIdx)}, which @@ -488,33 +510,59 @@ initial time step size of $100\;\text{s}$. Then, you can compile the program. \begin{figure}[ht] -\psfrag{K1}{K $= 10^{-7}\;\text{m}^2$} -\psfrag{phi1}{$\phi = 0.2$} -\psfrag{Lin}{\textsc{Brooks}-\textsc{Corey} Law} -\psfrag{Lin2}{$\lambda = 1.8$, $p_e = 1000\;\text{Pa}$} -\psfrag{K2}{K $= 10^{-9}\;\text{m}^2$} -\psfrag{phi2}{$\phi = 0.15$} -\psfrag{BC1}{\textsc{Brooks}-\textsc{Corey} Law} -\psfrag{BC2}{$\lambda = 2$, $p_e = 1500\;\text{Pa}$} -\psfrag{H1y}{$50\;\text{m}$} -\psfrag{H2y}{$15\;\text{m}$} -\psfrag{H3y}{$20\;\text{m}$} -\psfrag{L1x}{$100\;\text{m}$} -\psfrag{L2x}{$50\;\text{m}$} -\psfrag{L3x}{$25\;\text{m}$} \centering -\includegraphics[width=0.8\linewidth,keepaspectratio]{EPS/Ex2_Domain.eps} +\begin{tikzpicture}[scale=0.7,>=latex] + % basic sketch + \draw (0,0) rectangle ++(10,5); + \draw [fill=dumuxYellow] (2.5,1.5) rectangle ++(5,2); + % arrows + \draw[|<->|] (-0.2,0) -- ++(0,5); + \node [anchor=east] at (-0.2,2.5){$\unit[50]{m}$}; + \draw[|<->|] (0,5.2) -- ++(10,0); + \node [anchor=south] at (5,5.2){$\unit[100]{m}$}; + \draw[|<->|] (2.3,1.5) -- ++(0,2); + \node [anchor=east] at (2.3,2.5){$\unit[20]{m}$}; + \draw[|<->|] (2.3,0) -- ++(0,1.5); + \node [anchor=east] at (2.3,0.75){$\unit[15]{m}$}; + \draw[|<->|] (2.5,3.7) -- ++(5,0); + \node [anchor=south] at (5,3.7){$\unit[50]{m}$}; + \draw[|<->|] (7.5,3.7) -- ++(2.5,0); + \node [anchor=south] at (8.25,3.7){$\unit[25]{m}$}; + % labels + \draw [dashed] (11,3) rectangle ++(7,3.5); + \node [anchor=south west] at (11,5.4){$\mathbf{K} = \unit[10^{-7}]{m^2}$}; + \node [anchor=south west] at (11,4.6){$\phi = 0.2$}; + \node [anchor=south west] at (11,3.8){\textsc{Brooks-Corey Law}}; + \node [anchor=south west] at (11,3.0){$\lambda = 1.8, p_e = \unit[1000]{Pa}$}; + \draw [->] (11,4) -- (9.5,2.5); + \draw [dashed] (11,-1) rectangle ++(7,3.5); + \node [anchor=south west] at (11,1.4){$\mathbf{K} = \unit[10^{-9}]{m^2}$}; + \node [anchor=south west] at (11,0.6){$\phi = 0.15$}; + \node [anchor=south west] at (11,-0.2){\textsc{Brooks-Corey Law}}; + \node [anchor=south west] at (11,-1.0){$\lambda = 2, p_e = \unit[1500]{Pa}$}; + \draw [->] (11,1.5) -- (7,2.5); +\end{tikzpicture} \caption{Set-up of the model domain and the soil parameters}\label{tutorial-coupled:ex2_Domain} \end{figure} \begin{figure}[ht] -\psfrag{pw}{$p_w = 5 \times 10^5\;\text{Pa}$} -\psfrag{S}{$S_n = 1.0$} -\psfrag{qw}{$q_w = 2 \times 10^{-4} \;\text{kg}/\text{m}^2\text{s}$} -\psfrag{qo}{$q_n = 0.0 \;\text{kg}/\text{m}^2\text{s}$} -\psfrag{no flow}{no flow} \centering -\includegraphics[width=0.8\linewidth,keepaspectratio]{EPS/Ex2_Boundary.eps} +\begin{tikzpicture}[scale=0.7,>=latex] + % basic sketch + \fill [pattern=north west lines] (0,0) rectangle ++(10,-0.25); + \fill [pattern=north west lines] (0,5) rectangle ++(10,0.25); + \draw (0,0) rectangle ++(10,5); + \draw [fill=dumuxYellow] (2.5,1.5) rectangle ++(5,2); + \foreach \y in {0.5,1.5,...,4.5} + \draw [->](10.2,\y) -- ++(0.8,0); + % labels + \node [anchor=south] at (5,5.25){no flow}; + \node [anchor=north] at (5,-0.25){no flow}; + \node [anchor=west] at(11,2){$q_n = 0$}; + \node [anchor=west] at(11,3){$q_w = \unitfrac[2 \cdot 10^{-4}]{kg}{m^2 s}$}; + \node [anchor=west] at(-4,2){$S_n = 1$}; + \node [anchor=west] at(-4,3){$p_w = \unit[5 \cdot 10^5]{Pa}$}; +\end{tikzpicture} \caption{Boundary Conditions}\label{tutorial-coupled:ex2_BC} \end{figure} diff --git a/doc/handbook/tutorial-decoupled.tex b/doc/handbook/tutorial-decoupled.tex index bd829e0abc..4d9d529be4 100644 --- a/doc/handbook/tutorial-decoupled.tex +++ b/doc/handbook/tutorial-decoupled.tex @@ -23,19 +23,31 @@ is considered. Water infiltrates from the left side into the domain. Gravity effects are neglected. \begin{figure}[ht] -\psfrag{x}{x} -\psfrag{y}{y} -\psfrag{no flow}{no flow} -\psfrag{water}{\textbf{water}} -\psfrag{oil}{\textcolor{white}{\textbf{oil}}} -\psfrag{p_w = 2 x 10^5 [Pa]}{$p_w = 2 \times 10^5$ [Pa]} -\psfrag{p_w_initial = 2 x 10^5 [Pa]}{\textcolor{white}{\textbf{$\mathbf{p_{w_{initial}} = 2 \times 10^5}$ [Pa]}}} -\psfrag{S_n = 0}{$S_w = 1$} -\psfrag{S_n_initial = 0}{\textcolor{white}{$\mathbf{S_{w_{initial}} = 0}$}} -\psfrag{q_w = 0 [kg/m^2s]}{$q_w = 0$ $\left[\frac{\textnormal{kg}}{\textnormal{m}^2 \textnormal{s}}\right]$} -\psfrag{q_n = -3 x 10^-4 [kg/m^2s]}{$q_n = 3 \times 10^-2$ $\left[\frac{\textnormal{kg}}{\textnormal{m}^2 \textnormal{s}}\right]$} \centering -\includegraphics[width=0.9\linewidth,keepaspectratio]{EPS/tutorial-problemconfiguration} +\begin{tikzpicture}[>=latex] + % basic sketch + \fill [fill=dumuxBlue](0,0) rectangle ++(2,1.5); + \fill [fill=dumuxYellow](2,0) rectangle ++(5,1.5); + \draw (0,0) rectangle ++(7,1.5); + \foreach \x in {0,0.25,...,6.75} + \draw (\x,1.5) -- ++(0.25,0.25); + \foreach \x in {0,0.25,...,6.75} + \draw (\x,-0.25) -- ++(0.25,0.25); + % labels + \draw [->](-0.5,-0.5) -- ++(0,0.7) node [anchor=east]{$y$}; + \draw [->](-0.5,-0.5) -- ++(0.7,0) node [anchor=north]{$x$}; + \node at(3.5,1.75)[anchor=south]{no flow}; + \node at(3.5,-0.25)[anchor=north]{no flow}; + \draw[->,thick](-0.4,0.75) -- ++(0.9,0) node[anchor=north]{water}; + \draw[->,thick](6.5,0.75)node[anchor=north]{oil} -- ++(0.9,0); + % equations + \node [anchor=west] at (2,1.1){$p_{w_\text{initial}} = \unit[2 \cdot 10^5]{Pa}$}; + \node [anchor=west] at (2,0.4){$S_{w_\text{initial}} = 0$}; + \node [anchor=west] at (-3,1.1){$p_w = \unit[2 \cdot 10^5]{Pa}$}; + \node [anchor=west] at (-3,0.4){$S_w = 1$}; + \node [anchor=west] at (7.5,1.1){$q_w = \unitfrac[0]{kg}{m^2s}$}; + \node [anchor=west] at (7.5,0.4){$q_n = \unitfrac[3 \cdot 10^{-2}] {kg}{m^2s}$}; +\end{tikzpicture} \caption{Geometry of the tutorial problem with initial and boundary conditions.}\label{tutorial-decoupled:problemfigure} \end{figure} @@ -212,16 +224,26 @@ Please reverse the changes of this example, as we still use bulk phases and henc \item \textbf{Heterogeneities} \\ Set up a model domain with the soil properties given in figure \ref{tutorial-deoucpled:exercise1_d}. Adjust the boundary conditions so that water is again flowing from left to right. -\begin{figure}[ht] -\psfrag{K1 =}{K $= 10^{-8}\text{ m}^2$} -\psfrag{phi1 =}{$\phi = 0.15$} -\psfrag{K2 =}{\textcolor{white}{K $= 10^{-9}\text{ m}^2$}} -\psfrag{phi2 =}{\textcolor{white}{$\phi = 0.3$}} -\psfrag{600 m}{600 m} -\psfrag{300 m}{300 m} +\begin{figure}[bt] \centering -\includegraphics[width=0.5\linewidth,keepaspectratio]{EPS/exercise1_c.eps} -\caption{Exercise 1d: Set-up of a model domain a heterogeneity. $\Delta \text{x} = 20$ m $\Delta \text{y} = 20$ m.}\label{tutorial-deoucpled:exercise1_d} +\begin{tikzpicture}[>=latex] + % basic sketch + \fill [dumuxBlue](3,0) rectangle ++(3,3); + \draw (3,0) -- ++(0,3); + \draw (0,0) rectangle ++(6,3); + % arrows + \draw [|<->|](0,-0.3) -- ++(6,0); + \node at (3,-0.3)[anchor=north]{$\unit[600]{m}$}; + \draw [|<->|](-0.3,0) -- ++(0,3); + \node at(-0.3,1.5)[anchor=east]{$\unit[300]{m}$}; + % labels + \node [anchor=west] at (0.2,1.5){$\mathbf{K}=\unit[10^{-8}]{m^2}$}; + \node [anchor=west] at (0.2,1){$\phi=0.15$}; + \node [anchor=west] at (3.2,1.5){$\mathbf{K}=\unit[10^{-9}]{m^2}$}; + \node [anchor=west] at (3.2,1){$\phi=0.3$}; +\end{tikzpicture} +\caption{Exercise 1d: Set-up of a model domain a heterogeneity. $\Delta x = \Delta y = \unit[20]{m}$.} +\label{tutorial-deoucpled:exercise1_d} \end{figure} When does the front cross the material border? In paraview, the option \textit{View} $\rightarrow$ \textit{Animation View} is nice to get a rough feeling of the timestep sizes. \end{enumerate} @@ -260,33 +282,59 @@ compile the program. \begin{figure}[ht] -\psfrag{K1}{K $= 10^{-7}\text{ m}^2$} -\psfrag{phi1}{$\phi = 0.2$} -\psfrag{Lin}{Brooks Corey Law} -\psfrag{Lin2}{$\lambda = 1.8$, $p_b = 100$} -\psfrag{K2}{K $= 10^{-9}\text{ m}^2$} -\psfrag{phi2}{$\phi = 0.15$} -\psfrag{BC1}{Brooks Corey Law} -\psfrag{BC2}{$\lambda = 2$, $p_b = 500$} -\psfrag{H1y}{50 m} -\psfrag{H2y}{15 m} -\psfrag{H3y}{20 m} -\psfrag{L1x}{100 m} -\psfrag{L2x}{50 m} -\psfrag{L3x}{25 m} \centering -\includegraphics[width=0.8\linewidth,keepaspectratio]{EPS/Ex2_Domain.eps} +\begin{tikzpicture}[scale=0.7,>=latex] + % basic sketch + \draw (0,0) rectangle ++(10,5); + \draw [fill=dumuxYellow] (2.5,1.5) rectangle ++(5,2); + % arrows + \draw[|<->|] (-0.2,0) -- ++(0,5); + \node [anchor=east] at (-0.2,2.5){$\unit[50]{m}$}; + \draw[|<->|] (0,5.2) -- ++(10,0); + \node [anchor=south] at (5,5.2){$\unit[100]{m}$}; + \draw[|<->|] (2.3,1.5) -- ++(0,2); + \node [anchor=east] at (2.3,2.5){$\unit[20]{m}$}; + \draw[|<->|] (2.3,0) -- ++(0,1.5); + \node [anchor=east] at (2.3,0.75){$\unit[15]{m}$}; + \draw[|<->|] (2.5,3.7) -- ++(5,0); + \node [anchor=south] at (5,3.7){$\unit[50]{m}$}; + \draw[|<->|] (7.5,3.7) -- ++(2.5,0); + \node [anchor=south] at (8.25,3.7){$\unit[25]{m}$}; + % labels + \draw [dashed] (11,3) rectangle ++(7,3.5); + \node [anchor=south west] at (11,5.4){$\mathbf{K} = \unit[10^{-7}]{m^2}$}; + \node [anchor=south west] at (11,4.6){$\phi = 0.2$}; + \node [anchor=south west] at (11,3.8){\textsc{Brooks-Corey Law}}; + \node [anchor=south west] at (11,3.0){$\lambda = 1.8, p_b = \unit[1000]{Pa}$}; + \draw [->] (11,4) -- (9.5,2.5); + \draw [dashed] (11,-1) rectangle ++(7,3.5); + \node [anchor=south west] at (11,1.4){$\mathbf{K} = \unit[10^{-9}]{m^2}$}; + \node [anchor=south west] at (11,0.6){$\phi = 0.15$}; + \node [anchor=south west] at (11,-0.2){\textsc{Brooks-Corey Law}}; + \node [anchor=south west] at (11,-1.0){$\lambda = 2, p_b = \unit[500]{Pa}$}; + \draw [->] (11,1.5) -- (7,2.5); +\end{tikzpicture} \caption{Set-up of the model domain and the soil parameters}\label{tutorial-decoupled:ex2_Domain} \end{figure} \begin{figure}[ht] -\psfrag{pw}{$p_w = 2 \times 10^5$ [\text{Pa}]} -\psfrag{S}{$S_w = 0.0$} -\psfrag{qw}{$q_w = 3 \times 10^{-4}$ [kg/$\text{m}^2$s]} -\psfrag{qo}{$q_n = 0.0$ [kg/$\text{m}^2$s]} -\psfrag{no flow}{no flow} \centering -\includegraphics[width=0.8\linewidth,keepaspectratio]{EPS/Ex2_Boundary.eps} +\begin{tikzpicture}[scale=0.7,>=latex] + % basic sketch + \fill [pattern=north west lines] (0,0) rectangle ++(10,-0.25); + \fill [pattern=north west lines] (0,5) rectangle ++(10,0.25); + \draw (0,0) rectangle ++(10,5); + \draw [fill=dumuxYellow] (2.5,1.5) rectangle ++(5,2); + \foreach \y in {0.5,1.5,...,4.5} + \draw [->](10.2,\y) -- ++(0.8,0); + % labels + \node [anchor=south] at (5,5.25){no flow}; + \node [anchor=north] at (5,-0.25){no flow}; + \node [anchor=west] at(11,2){$q_n = 0$}; + \node [anchor=west] at(11,3){$q_w = \unitfrac[3 \cdot 10^{-4}]{kg}{m^2 s}$}; + \node [anchor=west] at(-4,2){$S_w = 0$}; + \node [anchor=west] at(-4,3){$p_w = \unit[2 \cdot 10^5]{Pa}$}; +\end{tikzpicture} \caption{Boundary Conditions}\label{tutorial-decoupled:ex2_BC} \end{figure} -- GitLab