Skip to content

Commit f156a26

Browse files
committed
Fix links and clarify
1 parent ecf7b59 commit f156a26

File tree

3 files changed

+59
-34
lines changed

3 files changed

+59
-34
lines changed

_episodes/03-configuration.md

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ You can generate the default configuration file by running:
3131
esmvaltool config get_config_user
3232
~~~
3333

34-
It will save the file to: ``{HOME}/.esmvaltool/config-user.yml``.
34+
It will save the file to: `~/.esmvaltool/config-user.yml`, where `~` is the
35+
path to your home directory. Note that files and directories starting with a
36+
period are "hidden", to see the `.esmvaltool` directory in the terminal use
37+
`ls -la ~`.
3538

36-
Now, let's change our working directory in a terminal window to
37-
``{HOME}/.esmvaltool``. Then, we run a text editor called Nano to have a look
38-
inside the configuration file:
39+
We run a text editor called Nano to have a look inside the configuration file:
3940

4041
~~~bash
41-
nano config-user.yml
42+
nano ~/.esmvaltool/config-user.yml
4243
~~~
4344

4445
This file contains the information for:
@@ -91,12 +92,14 @@ remove_preproc_dir: true
9192

9293
# Path to custom config-developer file, to customise project configurations.
9394
# See config-developer.yml for an example. Set to [null] to use the default
94-
config_developer_file: null
95+
config_developer_file: null
9596
# Get profiling information for diagnostics
9697
# Only available for Python diagnostics
9798
profile_diagnostic: false
9899
```
99100
101+
In general there is no need to change the settings listed above.
102+
100103
## Destination directory
101104
102105
The destination directory is the rootpath where ESMValTool will store its output folders containing
@@ -169,7 +172,7 @@ for input data based on their source. The current categories in the configuratio
169172
file are mentioned below. For example, CMIP is used for a dataset from
170173
the climate model intercomparison project whereas OBS is used for an observational dataset.
171174
We can find more information about the projects in the ESMValTool
172-
[documentation](https://docs.esmvaltool.org/en/latest/input.html).
175+
[documentation](https://docs.esmvaltool.org/projects/esmvalcore/en/latest/quickstart/find_data.html).
173176
The ``rootpath`` specifies the directories where ESMValTool will look for input data.
174177
For each category, you can define either one path or several paths as a list.
175178
@@ -181,7 +184,7 @@ rootpath:
181184
default: ~/default_inputpath
182185
CORDEX: ~/default_inputpath
183186
```
184-
Site-specific entries for Jasmin, DKRZ and ETHZ are listed at the end of the example configuration file.
187+
Site-specific entries for Jasmin, DKRZ and ETHZ are listed at the end of the example configuration file.
185188
186189
In this lesson, we will work with data from
187190
[CMIP5](https://esgf-node.llnl.gov/projects/cmip5/).
@@ -195,10 +198,10 @@ We add the root path of the folder where our/your data is available.
195198
196199
> ## Setting the correct rootpath
197200
>
198-
> - To get the data (or its correct rootpath), check instruction in [Setup]({{
199-
> page.root }}{% link setup.md %}).
201+
> - To get the data (or its correct rootpath), check instruction in
202+
> [Setup]({{ page.root }}{% link setup.md %}).
200203
> - For more information about setting the rootpath, see also the ESMValTool
201-
> [documentation](https://esmvaltool.readthedocs.io/projects/esmvalcore/en/latest/esmvalcore/datafinder.html).
204+
> [documentation](https://docs.esmvaltool.org/projects/esmvalcore/en/latest/esmvalcore/datafinder.html).
202205
{: .callout}
203206
204207
## Directory structure for the data from different projects
@@ -225,7 +228,7 @@ drs:
225228
> ## Make your own configuration file
226229
>
227230
> It is possible to have several configuration files with different purposes,
228-
> for example: config-user_formalised_runs.yml, config-user_debugging.yml
231+
> for example: config-user_formalised_runs.yml, config-user_debugging.yml
229232
{: .callout}
230233
231234
> ## Saving preprocessed data
@@ -235,11 +238,13 @@ drs:
235238
>
236239
>> ## Solution
237240
>>
238-
> > If the option ``save_intermediary_cubes`` is set to true in the
239-
> > config-user.yml file, then the intermediary cubes will also be saved in the
240-
> > folder ``preproc``. Also, if the option ``remove_preproc_dir`` is set to
241-
> > ``false``, then the ``preproc/`` directory contains all the preprocessed
242-
> > data and the metadata interface files.
241+
> > If the option ``remove_preproc_dir`` is set to ``false``, then the
242+
> > ``preproc/`` directory contains all the pre-processed data and the
243+
> > metadata interface files.
244+
> > If the option ``save_intermediary_cubes`` is set to ``true``
245+
> > then data will also be saved after each preprocessor step in the folder
246+
> > ``preproc``. Note that saving all intermediate results to file will result
247+
> > in a considerable slowdown.
243248
> {: .solution}
244249
{: .challenge}
245250

_episodes/04-recipe.md

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,31 @@ manual](https://docs.esmvaltool.org/projects/esmvalcore/en/latest/recipe/overvie
7070

7171
## How to run ESMValTool
7272

73-
Once you’ve set up your conda environment and installed ESMValTool (see[ episode
74-
#2]({{ page.root}}{% link _episodes/02-installation.md %})) and set up your `config-user.yml` file to correctly match your local
75-
environment, (see [episode #3]({{ page.root}}{% link _episodes/03-configuration.md %})), ESMValTool is invoked using a simple
76-
command:
77-
78-
~~~
79-
esmvaltool run recipe
73+
Once you’ve set up your conda environment and installed ESMValTool (see
74+
[episode #2]({{ page.root}}{% link _episodes/02-installation.md %})
75+
) and set up your `config-user.yml` file to correctly match your local
76+
environment, (see
77+
[episode #3]({{ page.root}}{% link _episodes/03-configuration.md %})
78+
), ESMValTool is invoked using the command:
79+
80+
~~~bash
81+
esmvaltool run /path/to/recipe_example.yml
8082
~~~
8183
{: .source}
8284

83-
If the configuration file is not in the default {HOME}\.esmvaltool\ path you can pass its path explicitly:
85+
If the configuration file is not in the default location
86+
`~/.esmvaltool/config-user.yml`, you can pass its path explicitly:
8487

88+
~~~bash
89+
esmvaltool run --config_file /path/to/config-user.yml /path/to/recipe_example.yml
8590
~~~
86-
esmvaltool run --config_file configuration recipe
91+
{: .source}
92+
93+
Note that the path to the recipe can be either a path to a recipe file or it can
94+
be the name of an installed recipe.
95+
To view the list of installed recipes, run
96+
~~~bash
97+
esmvaltool recipes list
8798
~~~
8899
{: .source}
89100

@@ -93,8 +104,13 @@ To try your hand with a basic recipe, please work through this episode.
93104
The recipe presented here is a simple, basic recipe that takes a single dataset
94105
and produces a time series plot.
95106

96-
Please download the following recipe into your ESMValTool working directory with
97-
the name: [recipe_example.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example.yml)
107+
Please download [recipe_example.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example.yml)
108+
into your ESMValTool working directory:
109+
110+
~~~bash
111+
wget https://raw.githubusercontent.com/ESMValGroup/ESMValTool_Tutorial/master/data/recipe_example.yml
112+
~~~
113+
{: .source}
98114

99115
> ## recipe_example.yml
100116
> ```YAML
@@ -153,7 +169,7 @@ the name: [recipe_example.yml](https://github.com/ESMValGroup/ESMValTool_Tutoria
153169
Please note the following sections:
154170
155171
- documentation: lines 4-20
156-
172+
157173
The documentation consists of the following information:
158174
159175
- description: a short description of the recipe
@@ -204,8 +220,11 @@ Please note the following sections:
204220
- scripts: a definition of all scripts that are used in this diagnostic
205221
- the next indent (here: timeseries_diag) is the scripts’ names (a string
206222
without whitespace) for the script to use
207-
- script: a executable script with a directory relative to the
208-
`esmvaltool/diag_scripts/` directory
223+
- script: a script that will produce the plots. The path can be either
224+
relative the ESMValTool installation with subdirectory
225+
[`esmvaltool/diag_scripts/`](https://github.com/ESMValGroup/ESMValTool/tree/master/esmvaltool/diag_scripts)
226+
or an absolute path. In this case, it is a diagnostic script that is
227+
installed with ESMValTool.
209228
210229
> ## Please answer the following questions:
211230
> What is the short_name of the variable being analyzed?
@@ -222,7 +241,8 @@ Please note the following sections:
222241
{: .solution}
223242
224243
> ## What is the diagnostic script being used?
225-
> `ocean/diagnostic_timeseries.py`
244+
> The installed copy of
245+
> [`ocean/diagnostic_timeseries.py`](https://github.com/ESMValGroup/ESMValTool/blob/master/esmvaltool/diag_scripts/ocean/diagnostic_timeseries.py)
226246
{: .solution}
227247
228248
> ## How many years of data are being analyzed?

_episodes/06-debugging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ conda activate esmvaltool
5050

5151
> ## conda environment
5252
>
53-
> More information about conda environment can be found at [Installation]({{
54-
> page.root }}{% link _episodes/02-installation.md %})
53+
> More information about the conda environment can be found at
54+
> [Installation]({{ page.root }}{% link _episodes/02-installation.md %}).
5555
{: .callout}
5656

5757
Let's change the working directory to the folder ``run`` and list its files:

0 commit comments

Comments
 (0)