tMerge branch 'master' of src.adamsgaard.dk:src/adamsgaard.dk - adamsgaard.dk -… | |
git clone git://src.adamsgaard.dk/adamsgaard.dk | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b860ba6b53f30dd26ba4bb3e13cf6f4e06f239aa | |
parent 02c3f1fc9c59c30e8a99319ea83557f38e31a68f | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 1 Nov 2019 14:08:05 +0100 | |
Merge branch 'master' of src.adamsgaard.dk:src/adamsgaard.dk | |
Diffstat: | |
M output/bookmark.html | 21 +++++++++++++++++++++ | |
M templates/research.html/header.html | 1 + | |
2 files changed, 22 insertions(+), 0 deletions(-) | |
--- | |
diff --git a/output/bookmark.html b/output/bookmark.html | |
t@@ -27,8 +27,10 @@ | |
</style> | |
<article> | |
<header> | |
+ | |
<h1><a href="bookmarks.html">Bookmarks</a></h1> | |
</header> | |
+ | |
<h3>Personal</h3> | |
<ul> | |
<li><a href="https://adamsgaard.dk/weather.php">Weather</a> | |
t@@ -36,6 +38,7 @@ | |
<li><a href="https://src.adamsgaard.dk">src.adamsgaard.dk</a> | |
<li><a href="https://andersdamsgaard.com">andersdamsgaard.com</a> | |
</ul> | |
+ | |
<h3>Search</h3> | |
<ul> | |
<li><a href="https://duckduckgo.com/lite/">DuckDuckGo (https)</a> | |
t@@ -44,6 +47,7 @@ | |
<li><a href="https://codemadness.org/idiotbox/">Idiotbox</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>News</h3> | |
<ul> | |
<li><a href="https://text.npr.org/">NPR (text only)</a> | |
t@@ -53,12 +57,14 @@ | |
<li><a href="https://news.ycombinator.com/">Hacker News</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Security</h3> | |
<ul> | |
<li><a href="https://check.torproject.org/">Tor check</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
<h3>Photography</h3> | |
+ | |
<ul> | |
<li><a href="https://www.photrio.com/forum/categories/darkroom.84">Photrio - D… | |
<li><a href="https://www.photrio.com/forum/categories/analog-equipment.68">Pho… | |
t@@ -71,6 +77,7 @@ | |
<li><a href="https://digitaltruth.com/devchart.php">Massive Dev Chart</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Development</h3> | |
<ul> | |
<li><a href="https://my.vultr.com">Vultr</a> | |
t@@ -80,6 +87,7 @@ | |
<li><a href="https://travis-ci.org/anders-dc/Granular.jl">Travis-CI/anders-dc/… | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Software</h3> | |
<ul> | |
<li><a href="http://cat-v.org/">cat-v.org</a> | |
t@@ -89,6 +97,7 @@ | |
<li><a href="gopher://bitreich.org/">bitreich (gopher)</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Package managers</h3> | |
<ul> | |
<li><a href="https://packages.debian.org">Debian packages</a> | |
t@@ -99,6 +108,7 @@ | |
<li><a href="https://openports.pl/">OpenBSD ports</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Local</h3> | |
<ul> | |
<li><a href="http://www.skoerpingskole.dk/Fi">Skørping Skole Forældreintra</… | |
t@@ -106,6 +116,7 @@ | |
<li><a href="https://rebild.inst.dk/Login.aspx?ReturnUrl=%2fUser%2fEntryPoint.… | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Academia</h3> | |
<ul> | |
<li><a href="https://outlook.office365.com/owa/">AU Webmail</a> | |
t@@ -113,6 +124,7 @@ | |
<li><a href="https://www.library.caltech.edu/journal-title-abbreviations">Jour… | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Docs</h3> | |
<ul> | |
<li><a href="https://docs.julialang.org/en/latest/">Julia (latest)</a> | |
t@@ -125,6 +137,7 @@ | |
<li><a href="https://www.openbsd.org/faq/index.html">OpenBSD FAQ</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
<h3>Weather and Location</h3> | |
<ul> | |
<li><a href="http://www.dmi.dk/vejr/maalinger/radar-nedboer/">DMI: Radar</a> | |
t@@ -136,4 +149,12 @@ | |
<li><a href="https://worldview.earthdata.nasa.gov/">NASA EOSDIS WorldView</a> | |
<!--End of section (do not delete this comment)--> | |
</ul> | |
+ | |
+<h3>Entertainment</h3> | |
+<ul> | |
+<li><a href="https://www.dr.dk/tv">DR: TV</a> | |
+<li><a href="https://www.dr.dk/bonanza">DR: Bonanza</a> | |
+<!--End of section (do not delete this comment)--> | |
+</ul> | |
+ | |
</article> | |
diff --git a/templates/research.html/header.html b/templates/research.html/head… | |
t@@ -19,6 +19,7 @@ If you would like to collaborate on a scientific problem ple… | |
<ul> | |
<li> | |
<strong>A. Damsgaard</strong>, A. Adcroft, and O. Sergienko | |
+2018 | |
<a href="https://doi.org/10.1029/2018MS001299"> | |
"Application of discrete-element methods to approximate sea-ice dynamics"</a> | |
Journal of Advances in Modeling Earth Systems, vol. 10, 2228-2244 |