Skip to content

Commit 4e42205

Browse files
Merge pull request #125 from ESMValGroup/patch_fix_typos
Fix typos and small issues with the tutorial
2 parents 064d7ee + 68a01f6 commit 4e42205

File tree

8 files changed

+112
-88
lines changed

8 files changed

+112
-88
lines changed

_episodes/01-introduction.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ keypoints:
2323

2424
---
2525

26-
## What is ESMValTool
26+
## What is ESMValTool?
2727

28-
EMSValTool is first and foremost a tool to analyse climate data. But you
28+
ESMValTool is first and foremost a tool to analyse climate data. But you
2929
probably already knew that and we like to think there's more to it than that. So
3030
let's start with a quick check to synchronize our expectations.
3131

@@ -55,7 +55,7 @@ let's start with a quick check to synchronize our expectations.
5555
> > way to go. The tool is intended for robust, repeatable and shareable climate
5656
> > analysis. That *does* require a bit more effort.
5757
> >
58-
> > ✓ **A community effort.** EMSValTool is developed and maintained by a
58+
> > ✓ **A community effort.** ESMValTool is developed and maintained by a
5959
> > large team of climate scientists and software engineers. It is an open
6060
> > source project to which anyone can contribute. Its longevity depends on
6161
> > these contributions.

_episodes/02-installation.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ documentation](https://docs.conda.io/projects/conda/en/latest/user-guide/install
3535

3636
### Linux
3737

38-
1. Please download Miniconda3 for Linux at [the miniconda
39-
page](https://docs.conda.io/en/latest/miniconda.html). The 64 bit version
40-
should work on any recent system. If you have problems in the next step(s)
41-
you can alternatively try a 32 bit version.
38+
1. Please download Miniconda3 by running:
39+
40+
```bash
41+
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
42+
```
43+
44+
It is also possible to download Miniconda3 for Linux on the [miniconda page](https://docs.conda.io/en/latest/miniconda.html). If you have problems with the 64 bit version in the next step(s) you can alternatively try a 32 bit version.
4245

4346
2. Next, run the installer from the place where you downloaded it
4447

@@ -91,7 +94,7 @@ documentation](https://docs.conda.io/projects/conda/en/latest/user-guide/install
9194

9295
```bash
9396
conda list
94-
````
97+
```
9598

9699
Should output something like
97100

@@ -131,14 +134,10 @@ mkdir ~/julia
131134
cd ~/julia
132135
```
133136

134-
Next, download the file
135-
[`julia-1.0.5-linux-x86_64.tar.gz`](https://julialang-s3.julialang.org/bin/linux/x64/1.0/julia-1.0.5-linux-x86_64.tar.gz)
136-
by clicking the link or going to the [Julia downloads
137-
page](https://julialang.org/downloads/). Download the file directly to the
138-
`~/julia` directory or move it there after downloading. To extract the file, you
139-
can use the following command:
137+
Next, to download and extract the file `julia-1.0.5-linux-x86_64.tar.gz`, you can use the following commands::
140138

141139
```bash
140+
wget https://julialang-s3.julialang.org/bin/linux/x64/1.0/julia-1.0.5-linux-x86_64.tar.gz
142141
tar -xvzf julia-1.0.5-linux-x86\_64.tar.gz
143142
```
144143

_episodes/03-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ In general there is no need to change the settings listed above.
103103
## Destination directory
104104
105105
The destination directory is the rootpath where ESMValTool will store its output folders containing
106-
i.e. figures, data, logs, etc. With every run, ESMValTool automatically generates
106+
e.g. figures, data, logs, etc. With every run, ESMValTool automatically generates
107107
a new output folder determined by recipe name, and date and time using
108108
the format: YYYYMMDD_HHMMSS.
109109
This folder contains four further subfolders: ``plots``, ``preproc``, ``run``, ``work``.

_episodes/04-recipe.md

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ diagnostics and description.
3434
- the MIP (Model Intercomparison Project, like atmospheric realm of MIP
3535
monthly data: Amon),
3636
- ensemble member,
37-
- the experiment (i.e. historical, ssp125, etc.),
37+
- the experiment (e.g. historical, ssp125),
3838
- and the grid type (necessary for CMIP6 only).
3939

4040
- preprocessors: general operations applied to a dataset before handling it in
@@ -275,7 +275,7 @@ Please note the following sections:
275275
>
276276
> Use the command:
277277
> ~~~bash
278-
> esmvaltool run --config_file ./path_to_file/user-config.yml ./path_to_file/recipe_example.yml
278+
> esmvaltool run ./path_to_file/recipe_example.yml
279279
> ~~~
280280
>
281281
> Follow the terminal guiding you through the subprocesses that are running. Can
@@ -398,16 +398,20 @@ Exemplary output (depending on the directory paths and package versions that are
398398
available) can be found below. Note that the timestamps differ.
399399
400400
> ## Your output plot(s).
401-
> Plot for the dataset(s):
402-
>
401+
> Plots for the dataset(s) are located in `./recipe_example_#_#/plots/timeseries_diag/`
402+
>
403+
> For a single dataset:
404+
>
403405
> ![single dataset](../fig/diag_CMIP5_HadGEM2-ES_Omon_historical_r1i1p1_thetaoga_prep_timeseries_diag_timeseries_temperature_1859_2005_timeseries_0.png "single dataset")
404406
>
405-
> Overlay plot, if multiple datasets are defined:
407+
> Or an overlay plot, if multiple datasets are defined:
406408
>
407409
> ![multiple datasets](../fig/MultipleModels__thetaoga_prep_timeseries_diag_timeseries_temperature_1859_2005_timeseries_.png "multiple datasets")
408410
{: .solution}
409411
410412
> ## Your main output log file.
413+
> The main output file is located at `./recipe_example_#_#/run/main_log.txt/`
414+
>
411415
> ~~~bash
412416
> INFO [33433]
413417
> ______________________________________________________________________
@@ -494,6 +498,8 @@ available) can be found below. Note that the timestamps differ.
494498
{: .solution}
495499
496500
> ## Your settings.yml file.
501+
> This file is located at `./recipe_example_#_#/run/diag_timeseries_temperature/timeseries_diag/settings.yaml`.
502+
>
497503
> ```YAML
498504
> auxiliary_data_dir: /mnt/lustre01/pf/b/b380506/work/auxiliary_data
499505
> input_files:
@@ -513,6 +519,9 @@ available) can be found below. Note that the timestamps differ.
513519
{: .solution}
514520
515521
> ## A metadata.yml file.
522+
>
523+
> This file is located at `./recipe_example_#_#/preproc/diag_timeseries_temperature/timeseries_variable/metadata.yml`.
524+
>
516525
> ```YAML
517526
> ? /scratch/b/b380506/recipe_example_20200701_082257/preproc/diag_timeseries_temperature/timeseries_variable/CMIP5_HadGEM2-ES_Omon_historical_r1i1p1_thetaoga_1859-2005.nc
518527
> : alias: HadGEM2-ES
@@ -542,6 +551,8 @@ available) can be found below. Note that the timestamps differ.
542551
{: .solution}
543552
544553
> ## The diagnostic log file.
554+
> This file is located at `./recipe_example_#_#/run/diag_timeseries_temperature/timeseries_diag/log.txt`
555+
>
545556
> ~~~bash
546557
> Starting diagnostic script timeseries_diag with configuration:
547558
> auxiliary_data_dir: /mnt/lustre01/pf/b/b380506/work/auxiliary_data
@@ -613,7 +624,7 @@ available) can be found below. Note that the timestamps differ.
613624
>
614625
> - the dataset:
615626
>
616-
> - mip, start_year, end_year
627+
> - `mip`, `start_year`, `end_year`
617628
>
618629
> - the preprocessor:
619630
>
@@ -635,7 +646,7 @@ The snippets for the edits can be found below:
635646
636647
> ## Land surface average temperature
637648
>
638-
> In the `diff` file below you will see the changes we have made to the file. The top 2 lines are the filenames and the lines like @@ -20,12 +20,14 @@ indicate the line numbers in the original and modified file, respectively. For more info on this format, see [here](https://en.wikipedia.org/wiki/Diff#Unified_format)
649+
> In the `diff` file below you will see the changes we have made to the file. The top 2 lines are the filenames and the lines like @@ -20,12 +20,14 @@ indicate the line numbers in the original and modified file, respectively. For more info on this format, see [here](https://en.wikipedia.org/wiki/Diff#Unified_format).
639650
>
640651
> ```diff
641652
> --- data/recipe_example.yml
@@ -755,21 +766,21 @@ The snippets for the edits can be found below:
755766
## Common issues & tips
756767
757768
> ## esmvaltool not found
758-
> Can you run the command esmvaltool -h. If no, then it’s possible that the
769+
> Can you run the command `esmvaltool -h`. If no, then it’s possible that the
759770
> conda environment isn’t activated. Please return to the in
760771
> [installation section]({{ page.root }}{% link _episodes/02-installation.md %}).
761772
{: .solution}
762773
763774
> ## The error message is `esmvalcore._recipe_checks.RecipeError: Missing data`
764775
> ESMValTool can’t locate the data.
765776
>
766-
> Which computing machine are you using? Does your user-config.yml file reflect
777+
> Which computing machine are you using? Does your `user-config.yml` file reflect
767778
> your machine's settings? Is the dataset’s name in the correct order?
768779
{: .solution}
769780
770781
> ## Diagnostic path problems
771782
> The directory path to your diagnostics code is set relative to the
772-
> esmvaltool/diag_scripts subdirectory. Is the code placed in this subdirectory?
783+
> `esmvaltool/diag_scripts` subdirectory. Is the code placed in this subdirectory?
773784
> Is it spelled correctly?
774785
{: .solution}
775786
@@ -781,7 +792,7 @@ The snippets for the edits can be found below:
781792
> ## The preprocessor works but the diagnostic fails
782793
> If your preprocessor works fine but your diagnostic script fails,
783794
> congratulations! A failed diagnostic means that you won’t need to re-run the
784-
> preprocessor. In your run/main_log.txt run output, you should see a line
795+
> preprocessor. In your `run/main_log.txt` run output, you should see a line
785796
> that reads: “To re-run this diagnostic script, run:”, followed by a line with
786797
> a command that will allow you to re-run your diagnostic script only. Append
787798
> this line with the “-i” option after the python script you call to re-run your

0 commit comments

Comments
 (0)