Skip to content

Commit 109c0e3

Browse files
Add image directory, modify image creation with sphinx syntax
1 parent 0862992 commit 109c0e3

File tree

8 files changed

+43
-7
lines changed

8 files changed

+43
-7
lines changed

docs/source/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@
7474
## Viewcode
7575
extensions.append("sphinx.ext.viewcode")
7676

77+
## View figures
78+
extensions.append("sphinx_subfigure")
79+
7780
## Copy Button
7881
extensions.append("sphinx_copybutton")
7982

8083
## BibTeX
81-
extensions.append("myst_parser")
8284
extensions.append("sphinxcontrib.bibtex")
8385
bibtex_bibfiles = ["references.bib"]
8486

docs/source/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
```{include} ../../README.md
1+
```{include} ./user_guide/introduction.md
22
```
33

44
```{toctree}
@@ -8,7 +8,7 @@
88
99
user_guide/installation
1010
user_guide/getting-started
11-
user_guide/CLI-interface
11+
user_guide/command-line-interface
1212
user_guide/python-interface
1313
user_guide/jupyter-interface
1414
```

docs/source/user_guide/command-line-interface.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Using the Command Line Interface (CLI)
2+
# Command Line Interface (CLI)
33

44
## Initialize Project Repository
55

105 KB
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/source/user_guide/introduction.md

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,50 @@ CADET-RDM projects are structured into two distinct repositories.
2929
1. The **project repository** that contains the input data, code, software and configurations to execute the computations. The output repository is a directory within the project repository.
3030
2. The **output repository** that contains the results of these computations, including all calculations, models and figures created by running the project code. Also stored in the output directory is the metadata used to create the specific result. This includes e.g. the software versions and requirements.
3131

32-
<img src="RDM-structure.png" alt="RDM-project architecture" width="400"/>
32+
33+
```{subfigure}
34+
:layout-sm:
35+
:gap: 8px
36+
:subcaptions: above
37+
:name: myfigure
38+
:class-grid: outline
39+
40+
.. image:: ./images/RDM-architecture-poster.png
41+
:alt: Image A
42+
```
43+
44+
```{image} images/RDM-architecture-poster.png
45+
:alt: Grapes on a vineyard
46+
:width: 200px
47+
:align: center
48+
```
49+
50+
<img src="./images/RDM-architecture-poster.png" alt="RDM-project-architecture" width="200"/>
51+
3352

3453
Both the **project** and the **output** repository are their own git repositories. The commit architecture of CADET-RDM allows for easy tracking and reproducing of results and their respective project code.
3554

3655
## RDM commit architecture
3756

3857
Every run of the project code creates a new output branch (*result branch*) in the **output directory**. The repository on this new branch uniquely contains the files created by the execution of the project code. <br> At the same time, for every run of the project code the `run_history` directory on the master branch of the output repository is updated. This directory is unique to the master branch and contains the metadata and software specifications for every branch in the output repository. This directory also links the results in the output branch to the corresponding commit in the project repository used to create them. For transparency and easy accessibility, the most important specifications for every result branch are also documented in the `log.tsv` on the master branch of the output repository.
58+
59+
```{subfigure} AB
60+
:layout-sm: AB
61+
:gap: 8px
62+
:class-grid: outline
63+
64+
```{image} images/RDM-project-commits.png
65+
:alt: Image A
66+
```
67+
68+
```{image} images/RDM-output-commits.png
69+
:alt: Image B
70+
```
71+
```
72+
3973
<p float="left">
40-
<img src="RDM-project-commits.png" alt="Bild 1" width="200"/>
41-
<img src="RDM-output-commits.png" alt="Bild 2" width="295"/>
74+
<img src="./images/RDM-project-commits.png" alt="RDM-project-commits" width="200"/>
75+
<img src="./images/RDM-output-commits.png" alt="RDM-output-commits" width="295"/>
4276
</p>
4377

4478
Because of this simultanious log of the metadata and the environment used to create a specific output, results can be reproduced easily.

0 commit comments

Comments
 (0)