Merge branch 'fix-doc-and-description-links' into 'master'

Fixes to user manual and GitLab description templates

See merge request !174

.gitlab/issue_templates/patch-release.md

@@ -49,6 +49,5 @@ Close this issue!
 [new branch]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/-/branches/new
 [new mr]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/merge_requests/new
 [new tag]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/-/tags/new
-[changelog]: (https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/blob/master/CHANGELOG.md)
 [DockerHub description]: https://hub.docker.com/r/dorie/dorie
 [badge]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/edit

.gitlab/issue_templates/version-rollout.md

@@ -41,7 +41,7 @@ Close this issue!
 
 [new branch]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/-/branches/new
 [new tag]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/-/tags/new
-[changelog]: (https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/blob/master/CHANGELOG.md)
+[changelog]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/blob/master/CHANGELOG.md
 [new label]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/-/labels/new
 [DockerHub description]: https://hub.docker.com/r/dorie/dorie
 [badge]: https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/edit

.gitlab/merge_request_templates/MR-from-task.md

@@ -16,6 +16,7 @@ _Fill this in_
 - [ ] Delete branch option set <!-- unless there's a good reason -->
 - [ ] Added entry to `CHANGELOG.md`
 
+_**Assignee:** If the Squash option is set, check/update the commit message right before merging!_
 
 ### Related issues
 

doc/cookbook/1-infiltration-sand/tutorial.rst

@@ -164,7 +164,7 @@ configuration file. A typical DORiE simulation has the following output:
   [18:27:32.768 I]  Creating output directory: ./
   [18:27:32.768 I]  Creating a rectangular grid in 2D
   [18:27:32.776 I] [RIC]  Loading parameter data file: richards_param.yml
-  [18:27:32.779 I] [RIC]  Reading boundary condition data file: 2d_infiltr.bcdat
+  [18:27:32.779 I] [RIC]  Reading boundary condition data file: infiltration.yml
   [18:27:32.784 I] [RIC]  Setup complete
   [18:27:33.296 I] [RIC]  Time Step 0: 0.00e+00 + 1.00e+01 -> 1.00e+01
   [18:27:33.581 I] [RIC]  Time Step 1: 1.00e+01 + 1.50e+01 -> 2.50e+01

doc/cookbook/index.rst

@@ -57,10 +57,8 @@ current folder. Explore them!
 
   =============  ======================================================================
   Configuration  :download:`config.ini </default_files/config.ini>`
-  Boundary       :download:`2d_infiltr.bcdat <../default_files/2d_infiltr.bcdat>`,
-                 :download:`3d_infiltr.bcdat </default_files/3d_infiltr.bcdat>`,
-                 :download:`2d_solute.bcdat </default_files/2d_solute.bcdat>`,
-                 :download:`3d_solute.bcdat </default_files/3d_solute.bcdat>`
+  Boundary       :download:`infiltration.yml <../default_files/infiltration.yml>`,
+                 :download:`solute.yml </default_files/solute.yml>`
   Parameters     :download:`richards_param.yml </default_files/richards_param.yml>`,
                  :download:`transport_param.yml </default_files/transport_param.yml>`
   =============  ======================================================================

doc/cookbook/restart.rst

@@ -5,7 +5,7 @@ Restart
 
 Currently, DORiE does not have an option to restart simulations. However, it
 is possible to make a pseudo-restart from a past simulation using
-:doc:`initial conditions<initial>` from output data files.
+:doc:`initial conditions </manual/initial>` from output data files.
 
 Pseudo-restart
 --------------
@@ -77,4 +77,4 @@ degenerated! Hence, strictly speaking, a pseudo-restart will lead to different
 results compared with respect to a one-run simulation.
 
 .. todo:: Add files
-.. todo:: Add test
\ No newline at end of file
+.. todo:: Add test