Asp timings

Makefile

@@ -6,7 +6,8 @@ export SHELL = /bin/bash
 
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
-JEKYLL=bundle config --local set path .vendor/bundle && bundle install && bundle update && bundle exec jekyll
+#JEKYLL=bundle config --local set path .vendor/bundle && bundle install && bundle update && bundle exec jekyll
+JEKYLL=bundle exec jekyll
 HPC_JEKYLL_CONFIG?=
 PARSER=bin/markdown_ast.rb
 DST=_site

SETUP_FOR_INSTRUCTORS.md

@@ -9,10 +9,10 @@ mkdir <workshop name>
 Get files.
 
 ```
-wget
-wget
-wget
-wget
+wget https://raw.githubusercontent.com/nesi/hpc-intro/gh-pages-nesi/_includes/example_scripts/example-job.sh
+wget https://raw.githubusercontent.com/nesi/hpc-intro/gh-pages-nesi/_includes/example_scripts/array_sum2.r -O {{ site.example.script }} 
+wget https://raw.githubusercontent.com/nesi/hpc-intro/gh-pages-nesi/_includes/example_scripts/whothis.sh
+wget 
 wget
 ```
 

_config.yml

@@ -50,10 +50,17 @@ sched:
 # For 'R'
 example:
   lang: "R"
-  shell: "Rscript"
+  shell: "Rscript "
   script: "array_sum.r"
   module: "R/4.3.1-gimkl-2022a"
 
+# For 'python'
+# example:
+#   lang: "Python"
+#   shell: "python"
+#   script: "array_sum.py"
+#   module: "Python/3.11.3-gimkl-2022a"
+
 episode_order:
   - 01-cluster
   - 02-filedir
@@ -62,10 +69,10 @@ episode_order:
   - 05-scheduler
   - 06-lunch
   - 07-resources
+  - 095-writing-good-code
   - 08-break2
   - 064-parallel
   - 09-scaling
-  # - 095-writing-good-code
 
 
 #------------------------------------------------------------
@@ -103,7 +110,7 @@ working_dir:
 
 # Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am).
 # 600 is 10am
-start_time: 600
+start_time: 540
 # Start time for people wanting to skip bash content
 hpc_start_time: 780
 # Lesson to start at.

_episodes/01-cluster.md

@@ -1,7 +1,7 @@
 ---
 title: "Working on a remote HPC system"
 # teaching: 10
-teaching: 20
+teaching: 30
 exercises: 0
 questions:
 - "What is an HPC system?"

_episodes/02-filedir.md

@@ -1,7 +1,7 @@
 ---
 title: "Navigating Files and Directories"
-teaching: 30
-exercises: 10
+teaching: 40
+exercises: 20
 questions:
 - "How can I move around the cluster filesystem"
 - "How can I see what files and directories I have?"
@@ -695,10 +695,10 @@ draft.txt
 
 ## Copying files and directories
 
-In a future lesson, we will be running the R script ```{{ site.working_dir | join: '/' }}/array_sum.r```, but as we can't all work on the same file at once you will need to take your own copy. This can be done with the **c**o**p**y command `cp`, at least two arguments are needed the file (or directory) you want to copy, and the directory (or file) where you want the copy to be created. We will be copying the file into the directory we made previously, as this should be your current directory the second argument can be a simple `.`.
+In a future lesson, we will be running the R script ```{{ site.working_dir | join: '/' }}/{{ site.example.script }} ```, but as we can't all work on the same file at once you will need to take your own copy. This can be done with the **c**o**p**y command `cp`, at least two arguments are needed the file (or directory) you want to copy, and the directory (or file) where you want the copy to be created. We will be copying the file into the directory we made previously, as this should be your current directory the second argument can be a simple `.`.
 
 ```
-{{ site.remote.prompt }} cp {{ site.working_dir | join: '/' }}/array_sum.r .
+{{ site.remote.prompt }} cp {{ site.working_dir | join: '/' }}/{{ site.example.script }}  .
 ```
 
 {: .output}
@@ -712,7 +712,7 @@ We can check that it did the right thing using `ls`
 {: .language-bash}
 
 ```
-draft.txt   array_sum.r
+draft.txt   {{ site.example.script }} 
 ```
 
 {: .output}

_episodes/03-break1.md

@@ -1,5 +1,5 @@
 ---
-title: "Break #1"
+title: "Morning Break"
 layout: break
-break: 10
+break: 30
 ---

_episodes/04-modules.md

@@ -1,6 +1,6 @@
 ---
 title: "Accessing software via Modules"
-teaching: 20
+teaching: 30
 exercises: 10
 questions:
 - "How do we load and unload software packages?"
@@ -98,8 +98,7 @@ We can get a full list of environment variables using the command,
 {: .language-bash}
 {% include {{ site.snippets }}/modules/env-output.snip %}
 
-> These variables control many aspects of how your terminal, and any software launched from your terminal works.
-{: .callout}
+These variables control many aspects of how your terminal, and any software launched from your terminal works.
 
 ## Environment Modules
 

_episodes/05-scheduler.md

@@ -1,7 +1,7 @@
 ---
 title: "Scheduler Fundamentals"
-teaching: 20
-exercises: 10
+teaching: 30
+exercises: 20
 questions:
 - "What is a scheduler and why does a cluster need one?"
 - "How do I launch a program to run on a compute node in the cluster?"

_episodes/06-lunch.md

@@ -1,5 +1,5 @@
 ---
 title: "Lunch"
 layout: break
-break: 45
+break: 60
 ---