Skip to content

Commit 6573428

Browse files
committed
Merge remote-tracking branch 'origin/main' into update_configuration_episode
2 parents 2e18fc6 + db278e6 commit 6573428

File tree

3 files changed

+39
-51
lines changed

3 files changed

+39
-51
lines changed

_episodes/01-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Quickstart guide"
33
teaching: 2
44
exercises: 8
5-
compatibility: ESMValTool v2.11.0
5+
compatibility: ESMValTool v2.12.0
66

77
questions:
88

_episodes/02-installation.md

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Installation"
33
teaching: 10
44
exercises: 10
5-
compatibility: ESMValTool v2.11.0
5+
compatibility: ESMValTool v2.12.0
66
questions:
77
- "What are the prerequisites for installing ESMValTool?"
88
- "How do I confirm that the installation was successful?"
@@ -146,52 +146,6 @@ installed in it.
146146
>
147147
{: .callout}
148148

149-
### Install Julia
150-
151-
Some ESMValTool diagnostics are written in the Julia programming language.
152-
If you want a full installation of ESMValTool including Julia diagnostics, you need
153-
to make sure Julia is installed before installing ESMValTool.
154-
155-
In this tutorial, we will not use Julia, but for reference, we have listed the steps
156-
to install Julia below.
157-
Complete instructions for installing Julia can be found on the [Julia
158-
installation page](https://julialang.org/downloads/platform/#linux_and_freebsd).
159-
160-
> ## Julia installation instructions
161-
>
162-
> First, open a bash terminal and activate the newly created `esmvaltool` environment.
163-
>
164-
> ```bash
165-
> conda activate esmvaltool
166-
> ```
167-
>
168-
> Next, to install Julia via `mamba`, you can use the following command:
169-
>
170-
> ```bash
171-
> mamba install julia
172-
> ```
173-
>
174-
> To check that the Julia executable can be found, run
175-
>
176-
> ```bash
177-
> which julia
178-
> ```
179-
>
180-
> to display the path to the Julia executable, it should be
181-
>
182-
> ```
183-
> ~/mambaforge/envs/esmvaltool/bin/julia
184-
> ```
185-
> {: .output}
186-
>
187-
> To test that Julia is installed correctly, run
188-
>
189-
> ```bash
190-
> julia
191-
> ```
192-
>
193-
> to start the interactive Julia interpreter. Press `Ctrl+D` to exit.
194-
{: .solution}
195149

196150
### Test that the installation was successful
197151

@@ -229,13 +183,13 @@ to display the command line help.
229183
> > {: .bash}
230184
> > The version of ESMValTool installed should be displayed on the screen as:
231185
> > ~~~
232-
> > ESMValCore: 2.11.0
233-
> > ESMValTool: 2.11.0
186+
> > ESMValCore: 2.12.0
187+
> > ESMValTool: 2.12.0
234188
> > ~~~
235189
> > {: .output}
236190
> Note that on HPC servers such as JASMIN, sometimes a more recent development
237191
> version may be displayed for ESMValTool, for e.g.
238-
> `ESMValTool: 2.11.0.dev71+g2c60b4d97`
192+
> `ESMValTool: 2.12.0.dev71+g2c60b4d97`
239193
> {: .solution}
240194
{: .challenge}
241195

_includes/lesson_footer.html

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@
44

55
{% include gh_variables.html %}
66

7+
<head>
8+
<script type="text/javascript">
9+
function mail(user,domain,mailbody)
10+
{
11+
if (!domain) {
12+
domain="dlr.de";
13+
}
14+
if (!mailbody){
15+
mailbody=""
16+
}
17+
url="mail"+"to:"+user+"@"+domain+"?body="+mailbody;
18+
window.location.href=url;
19+
}
20+
</script>
21+
</head>
22+
723
<footer>
824
<div class="row">
925
<div class="col-md-6 copyright" align="left">
@@ -51,4 +67,22 @@
5167
version <a href="https://github.com/carpentries/styles/releases/tag/v9.5.3">9.5.3</a>.
5268
</div>
5369
</div>
70+
71+
<table>
72+
<tr>
73+
<th>Contact</th>
74+
<th>Impressum</th>
75+
<!-- <th>Privacy</th>-->
76+
<th>Terms of use</th>
77+
<th>Acknowledgements</th>
78+
</tr>
79+
<tr>
80+
<td><p style="font-size:95%;"><a href="javascript:mail('birgit.hassler','dlr.de')">Birgit Hassler (Project Co-PI)</a><br>
81+
<a href="javascript:mail('axel.lauer','dlr.de')">Axel Lauer (Core Developer)</a><br></p></td>
82+
<td><p style="font-size:95%;"><a href="https://esmvaltool.org/legal_notice/">Legal Notice</a></p></td>
83+
<!-- <td><p style="font-size:95%;"><a href="https://esmvaltool.org/privacy/">Privacy Notice</a></p></td>-->
84+
<td><p style="font-size:95%;"><a href="https://esmvaltool.org/terms_of_use/">Terms of use</a></p></td>
85+
<td><p style="font-size:95%;"><a href="https://esmvaltool.org/acknowledgements/">ESMValTool Funding</a></p></td>
86+
</tr>
87+
</table>
5488
</footer>

0 commit comments

Comments
 (0)