From 20e08ca65c7e57808b169120d15b994cc5a2f4cf Mon Sep 17 00:00:00 2001
From: Dirk Pleiter <pleiter@kth.se>
Date: Thu, 4 Aug 2022 14:54:05 +0200
Subject: [PATCH] Smaller updates
---
README.md | 4 ++--
advanced_lab/README.md | 4 ++--
intro_lab/README.md | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 04236df..7d0b4a5 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ ml PrgEnv-gnu
First it is necessary to book a node for interactive use:
```
-salloc -A <allocation-name> -p main -N 1 -t 1:0:0
+salloc -p shared --nodes=1 --cpus-per-task=32 -t 0:30:00 -A edu22.summer --reservation=<name-of-reservation>
```
You might also need to specify a **reservation** by adding the flag ``--reservation=<name-of-reservation>``.
@@ -66,4 +66,4 @@ It is important to use the `srun` command since otherwise the job will run on th
The aim of these exercises is to give an introduction to OpenMP programming. All examples are available in both C and Fortran90.
- [OpenMP Intro lab](intro_lab/README.md)
-- [OpenMP Advanced Lab](advanced_lab/README.md)
\ No newline at end of file
+- [OpenMP Advanced Lab](advanced_lab/README.md)
diff --git a/advanced_lab/README.md b/advanced_lab/README.md
index a5dca5f..30aa8a8 100644
--- a/advanced_lab/README.md
+++ b/advanced_lab/README.md
@@ -83,7 +83,7 @@ Recall from the OpenMP exercises that the number of threads is determined by an
The given serial code is not optimal, why? If you have time, go ahead and try to make it faster. Try to decrease the serial run time. Once the serial performance is optimal, redo the speedup measurements and comment on the result.
-For debugging purposes you might want to visualize the computed solution. Uncomment the line ``save_vtk``. The result will be stored in ``result.vtk``, which can be opened in ParaView, available on Tegner after ``module add paraview``. Beware that the resulting file could be rather large, unless the space discretization (M,N) is decreased.
+For debugging purposes you might want to visualize the computed solution. Uncomment the line ``save_vtk``. The result will be stored in ``result.vtk``, which can be opened in ParaView, available on Dardel after ``ml paraview``. Beware that the resulting file could be rather large, unless the space discretization (M,N) is decreased.
## A. About the Finite-Volume solver
@@ -123,4 +123,4 @@ C shell:
foreach n (`seq 1 1 16`)
env OMP_NUM_THREADS=$n srun -n 1 ./a.out
end
-```
\ No newline at end of file
+```
diff --git a/intro_lab/README.md b/intro_lab/README.md
index 47053af..f9d988d 100644
--- a/intro_lab/README.md
+++ b/intro_lab/README.md
@@ -12,17 +12,16 @@ To compile your C OpenMP code using ``gcc``, therefore, use
gcc -O2 -fopenmp -o myprog.x myprog.c -lm
```
-In Fortran, it is recommended to use the Intel compiler
+For Fortran use
```
-module load i-compilers
-ifort -O2 -qopenmp -o myprog.x myprog.f90 -lm
+gfortran -O2 -fopenmp -o myprog.x myprog.f90 -lm
```
To run your code, you will need to have an (e.g., interactive) allocation:
```
-salloc -N 1 -t 4:00:00 -A <name-of-allocation> --reservation=<name-of-reservation>
+salloc -p shared --nodes=1 --cpus-per-task=32 -t 0:30:00 -A edu22.summer --reservation=<name-of-reservation>
```
To set the number of threads, you need to set the OpenMP environment variable:
--
GitLab