Merge pull request #153 from ESMValGroup/improve_recipe_output

Fix episode 4 and 5 regarding output of the recipes

Author: Peter9192

.github/workflows/recipes.yml

@@ -12,11 +12,11 @@ jobs:
       - name: Cache conda
         uses: actions/cache@v1
         env:
-          # Increase this value to reset cache if data/recipe_example.yml has not changed
+          # Increase this value to reset cache if files/recipe_example.yml has not changed
           CACHE_NUMBER: 1
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('data/recipe_example.yml') }}
+          key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('files/recipe_example.yml') }}
       - uses: goanpeca/setup-miniconda@v1
       - name: Install esmvaltool
         run: conda install -n test -y -c esmvalgroup -c conda-forge esmvaltool-python
@@ -41,8 +41,8 @@ jobs:
         with:
           path: ~/default_inputpath
           key: ${{ runner.os }}-datasets-${{ env.CACHE_NUMBER }}-${{ hashFiles('data/dataset.urls') }}
-      - name: Download dataset files for data/recipe_example.yml
+      - name: Download dataset files for files/recipe_example.yml
         run: |
           head -4 data/dataset.urls | grep -v '#' | wget --input-file - --no-clobber --directory-prefix $HOME/default_inputpath/
-      - name: Run data/recipe_example.yml
-        run: $CONDA/envs/test/bin/esmvaltool run $PWD/data/recipe_example.yml
+      - name: Run files/recipe_example.yml
+        run: $CONDA/envs/test/bin/esmvaltool run $PWD/files/recipe_example.yml

_episodes/04-recipe.md

@@ -88,7 +88,7 @@ file afterwards. These do not need to be explicitly included in recipes.
 
 > ## Exercise: Adding more preprocessor steps
 >
-> Edit the [example recipe](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example.yml) to first change the variable to
+> Edit the [example recipe](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/files/recipe_example.yml) to first change the variable to
 > `thetao`, using only the years 2000-2005. Then add preprocessors to average over the latitude and longitude
 > dimensions and finally average over the depth. Now run the recipe.
 >
@@ -127,7 +127,7 @@ file afterwards. These do not need to be explicitly included in recipes.
 >>        timeseries_diag:
 >> ```
 >>
->> Complete recipe can be downloaded as [recipe_example_thetao.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example_thetao.yml)
+>> Complete recipe can be downloaded as [recipe_example_thetao.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/files/recipe_example_thetao.yml)
 >{: .solution}
 {: .challenge}
 
@@ -179,7 +179,7 @@ specific preprocessor which should be applied.
 >         script: ocean/diagnostic_timeseries.py
 > ```
 >
-> Complete recipe can be downloaded as [recipe_example_thetao_thetaoga.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example_thetao_thetaoga.yml)
+> Complete recipe can be downloaded as [recipe_example_thetao_thetaoga.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/files/recipe_example_thetao_thetaoga.yml)
 {: .solution}
 
 >## Challenge : How to write a recipe with multiple preprocessors
@@ -282,7 +282,7 @@ specific preprocessor which should be applied.
 >> ```
 >>
 >> Complete recipe can be downloaded as
->> [recipe_example_multi_preprocessors.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example_multi_preprocessors.yml).
+>> [recipe_example_multi_preprocessors.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/files/recipe_example_multi_preprocessors.yml).
 > {: .solution}
 {: .challenge}
 
@@ -331,7 +331,7 @@ simple preprocessor and diagnostic setup for that:
 >         preprocessor: prep_regrid
 >     scripts: null
 > ```
-> Complete recipe can be downloaded as [recipe_example_pr_tas.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example_pr_tas.yml).
+> Complete recipe can be downloaded as [recipe_example_pr_tas.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/files/recipe_example_pr_tas.yml).
 >
 {: .solution}
 
@@ -393,7 +393,7 @@ separate multimodel means for different CMIP5 datasets given the same variable.
 > There is no field called datasets anymore.
 > Also, note how multiple ensembles are added by using (1:2).
 > Complete recipe can be downloaded as
-> [recipe_example_tas_control_target.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/data/recipe_example_tas_control_target.yml).
+> [recipe_example_tas_control_target.yml](https://github.com/ESMValGroup/ESMValTool_Tutorial/blob/master/files/recipe_example_tas_control_target.yml).
 >
 {: .solution}