Skip to content

Commit

Permalink
Updated map, restaurant and minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
royfrancis committed Oct 31, 2024
1 parent ae363c9 commit 4213020
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions assets/_child-info.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ htmltools::div(
style = "margin-bottom:1em;",
htmltools::tagList(leaflet(height = 450, width = "auto", elementId = paste0("leaflet-", p)) %>%
addTiles(urlTemplate = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png") %>%
addAwesomeMarkers(lat = dfr1$lat, lng = dfr1$lon, label = dfr1$label, popup = dfr1$popup, icon = icons) %>%
setView(lat = dfr1$lat[1], lng = dfr1$lon[1], zoom = 13))
addAwesomeMarkers(lat = dfr2$lat, lng = dfr2$lon, label = dfr2$label, popup = dfr2$popup, icon = icons) %>%
setView(lat = dfr2$lat[1], lng = dfr2$lon[1], zoom = 13))
)
```
3 changes: 2 additions & 1 deletion home_info.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ for (i in seq_along(loc)) {
dfr1 <- dfr[dfr$location %in% p, , drop = FALSE]
dfr1$address <- gsub(";|; ", "<br>", dfr1$address)
dfr1$popup <- gsub(";|; ", "<br>", dfr1$popup)
icons <- awesomeIcons(icon = dfr1$marker_icon, markerColor = dfr1$marker_colour, iconColor = "#FFFFFF", library = "fa")
dfr2 <- dfr1[complete.cases(dfr1$lat, dfr1$lon), ]
icons <- awesomeIcons(icon = dfr2$marker_icon, markerColor = dfr2$marker_colour, iconColor = "#FFFFFF", library = "fa")
if(p != "online") {
cat(knitr::knit_child(input = "assets/_child-info.qmd", envir = environment(), quiet = TRUE))
cat("\n")
Expand Down
Binary file modified info.xlsx
Binary file not shown.
Binary file modified schedule.xlsx
Binary file not shown.
5 changes: 2 additions & 3 deletions topics/other/lab_connect_pdc.qmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Connecting to PDC"
description: "Connecting to PDC through SSH and GUI (Browser and ThinLinc)"
subtitle: "Connecting to PDC through SSH and GUI (Browser and ThinLinc)"
date: ""
format: html
---
Expand Down Expand Up @@ -135,5 +135,4 @@ There is a ThinLinc server running at one of the login nodes which allows users

6. When you are done with working with the remote desktop, press the power icon {{< fa power-off >}} in the top-right corner of the screen and select `Log Out`.
For more detailed instruction, please look here: <a href="https://intra.kth.se/en/2.79567/support/documents/login/interactive_hpc.html" target="_blank" rel="noopener noreferrer">https://intra.kth.se/en/2.79567/support/documents/login/interactive_hpc.html</a>
For more detailed instructions, please look here: <a href="https://www.pdc.kth.se/support/documents/login/interactive_hpc.html" target="_blank" rel="noopener noreferrer">https://www.pdc.kth.se/support/documents/login/interactive_hpc.html</a>
2 changes: 1 addition & 1 deletion topics/other/lab_connect_uppmax.qmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Connecting to UPPMAX"
description: "Connecting to UPPMAX through SSH and GUI (Browser and ThinLinc)"
subtitle: "Connecting to UPPMAX through SSH and GUI (Browser and ThinLinc)"
date: ""
format: html
---
Expand Down
13 changes: 9 additions & 4 deletions topics/other/lab_troubleshooting.qmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Status & Troubleshooting"
description: "Utility commands/scripts, troubleshooting, tips and suggestions."
subtitle: "Utility commands/scripts, troubleshooting, tips and suggestions."
date: ""
sidebar: false
format: html
Expand All @@ -15,7 +15,7 @@ id_project <- yaml::read_yaml(here("_quarto.yml"))$id_project

## Status

Useful commands for monitoring status and user activity on UPPMAX.
Useful commands for monitoring status and user activity on HPC.

### List jobs

Expand Down Expand Up @@ -160,7 +160,8 @@ finger username
- Open the Xquartz terminal and connect to Uppmax
- In my recent macos (10.xxx) , x-forwarding only works if I explicitly run the Xquartz terminal

`ssh -XY [email protected]`
`ssh -XY username@{{< meta url_cluster >}}`
`ssh -XY username@{{< meta url_cluster_backup >}}`

Also use this when logging in to the compute node!

Expand All @@ -180,7 +181,7 @@ First ensure X-forwarding works, then run `firefox --no-remote filename.html`

### SCP fails with *

Sometimes students have problems to download files with SCP when there is a `*` in the end of the line. For example; `scp user@rackham.uppmax.uu.se:/proj/bla/HG00097.bam* .`. It needs to be changed to `scp user@rackham.uppmax.uu.se:/proj/bla/HG00097.bam\* .`.
Sometimes students have problems to download files with SCP when there is a `*` in the end of the line. For example; `scp user@{{< meta url_cluster >}}:~/ngsintro/HG00097.bam* .`. It needs to be changed to `scp user@{{< meta url_cluster >}}:~/ngsintro/HG00097.bam\* .`.

### Thinlinc

Expand Down Expand Up @@ -212,4 +213,8 @@ As documented [here](https://github.com/XQuartz/XQuartz/issues/31), run:
defaults write org.xquartz.X11 enable_render_extension 0
```

### Thinlinc client installs in Swedish

There seems to be no option to change language in the app. So one will have to reinstall with some changes. In region settings, if English is set as primary and Swedish as secondary, it still installs in Swedish. The solution is to remove Swedish from the list completely and then reinstall.

***

0 comments on commit 4213020

Please sign in to comment.