Skip to content

Commit 4a61560

Browse files
committed
Merged in theme-integration (pull request #1)
Theme integration
2 parents 7c1092f + 6676377 commit 4a61560

File tree

171 files changed

+6767
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+6767
-840
lines changed

.buildkite/build.pipeline.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
steps:
2+
- label: "Build & Push Staging Docker Image"
3+
commands:
4+
- echo $$REGISTRY_PASSWORD | docker login adabay.azurecr.io --username $$REGISTRY_USERNAME --password-stdin
5+
- docker run --rm -v "$$PWD":/usr/src/app -w /usr/src/app ruby:3.2.2 bash -c "bundle config set --local path '/usr/src/app/vendor' && bundle install"
6+
- docker run --rm -v "$$PWD":/usr/src/app -w /usr/src/app ruby:3.2.2 bash -c "bundle config set --local path '/usr/src/app/vendor' && bundle exec jekyll build"
7+
- docker build --pull --progress plain -f Staging.Dockerfile -t adabay.azurecr.io/fz-juelich/website/parallel-in-time:latest .
8+
- docker push adabay.azurecr.io/fz-juelich/website/parallel-in-time:latest
9+
- docker logout adabay.azurecr.io
10+
plugins:
11+
- adabay/vault-key-value#v0.9.5:
12+
secrets:
13+
- secret_path: "static/ci/username-password-combinations/adabay.azurecr.io"
14+
secret_key: "username"
15+
exported_env_variable_name: "REGISTRY_USERNAME"
16+
- secret_path: "static/ci/username-password-combinations/adabay.azurecr.io"
17+
secret_key: "password"
18+
exported_env_variable_name: "REGISTRY_PASSWORD"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@ Temporary Items
7979

8080
### IDEs ###
8181
.idea/
82+
.vscode/

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ gem 'jekyll-feed'
1717
gem 'jekyll-sitemap'
1818
gem 'jekyll-scholar'
1919
gem 'liquid-tag-parser'
20+
gem 'bulma-clean-theme'
2021
# gem 'jekyll-archives'
2122

2223
gem 'jgd'

Gemfile.lock

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.4)
4+
addressable (2.8.5)
55
public_suffix (>= 2.0.2, < 6.0)
66
autoprefixer-rails (10.4.13.0)
77
execjs (~> 2)
88
bibtex-ruby (6.0.0)
99
latex-decode (~> 0.0)
10+
bulma-clean-theme (0.13.3)
11+
jekyll (>= 3.9, < 5.0)
12+
jekyll-feed (~> 0.15)
13+
jekyll-paginate (~> 1.1)
14+
jekyll-seo-tag (~> 2.7)
15+
jekyll-sitemap (~> 1.4)
16+
kramdown-parser-gfm (~> 1.1)
1017
citeproc (1.0.10)
1118
namae (~> 1.0)
1219
citeproc-ruby (1.1.14)
@@ -32,7 +39,7 @@ GEM
3239
forwardable-extended (~> 2.5)
3340
ffi (1.15.5)
3441
forwardable-extended (2.6.0)
35-
google-protobuf (3.23.4-aarch64-linux)
42+
google-protobuf (3.24.0-aarch64-linux)
3643
http_parser.rb (0.8.0)
3744
i18n (1.14.1)
3845
concurrent-ruby (~> 1.0)
@@ -62,6 +69,8 @@ GEM
6269
citeproc-ruby (~> 1.0)
6370
csl-styles (~> 1.0)
6471
jekyll (~> 4.0)
72+
jekyll-seo-tag (2.8.0)
73+
jekyll (>= 3.8, < 5.0)
6574
jekyll-sitemap (1.4.0)
6675
jekyll (>= 3.7, < 5.0)
6776
jekyll-watch (2.2.1)
@@ -91,11 +100,11 @@ GEM
91100
rb-inotify (0.10.1)
92101
ffi (~> 1.0)
93102
rexml (3.2.6)
94-
rouge (4.1.2)
103+
rouge (4.1.3)
95104
safe_yaml (1.0.5)
96105
sass (3.7.4)
97106
sass-listen (~> 4.0.0)
98-
sass-embedded (1.64.1-aarch64-linux-gnu)
107+
sass-embedded (1.64.2-aarch64-linux-gnu)
99108
google-protobuf (~> 3.23)
100109
sass-listen (4.0.0)
101110
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -113,6 +122,7 @@ PLATFORMS
113122

114123
DEPENDENCIES
115124
autoprefixer-rails
125+
bulma-clean-theme
116126
coffee-script
117127
jekyll (>= 4.2)
118128
jekyll-feed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ We use **docker** to *prevent version* and *system differences*. So please, espe
1515
#### Run this in your console to update your dependencies
1616

1717
```bash
18-
docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app ruby:3.2.2 bash -c "bundle config set --local path '/usr/src/app/vendor' && bundle install"
18+
docker-compose -f docker-compose-bundle.yml up
1919
```
2020

2121
### Start the live preview of the page
@@ -25,7 +25,7 @@ docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app ruby:3.2.2 bash -c "bundl
2525
#### Run this in your console to start the local preview
2626

2727
```bash
28-
docker run --rm -p 35729:35729 -p 4000:4000 -v "$PWD":/usr/src/app -w /usr/src/app ruby:3.2.2 bash -c "bundle config set --local path '/usr/src/app/vendor' && bundle exec jekyll serve --livereload --host=0.0.0.0"
28+
docker-compose up
2929
```
3030

3131
## III. Troubleshooting
@@ -49,7 +49,7 @@ If the live preview fails and you don't know the cause, follow these steps:
4949
- either close the program(s) that need(s) the port(s)
5050
- or specify another port
5151

52-
If you want to specify another port, append one of the args to the bash script that the docker container will run:
52+
If you want to specify another port go to the docker compose file, append one of the args to the bash script that the docker container will run:
5353

5454
- `--port [YOUR PORT]` (the port where the page is accessible at)
5555
- `--livereload-port [YOUR PORT]` (the port where the live reload script is accessible at)

Staging.Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM httpd:2.4
2+
3+
COPY --chown=www-data:www-data _site /usr/local/apache2/htdocs/

_codes/libridc.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
layout: page_code
3+
hide_hero: true
34
title: "libridc"
45
date: 2015-06-10 16:45 +0200
56
updated: 2016-06-10 11:45:00 +0100
67
navbar: Codes
78
subnavbar: libridc
8-
logo:
9+
logo:
910
code_url: http://mathgeek.us/software.html
1011
language: C++
1112
github_repo: "ongbw/ridc"
@@ -23,7 +24,7 @@ developers:
2324
short_desc: A C++ library for RIDC.
2425
---
2526

26-
A modern C++ library for the RIDC algorithm.
27+
A modern C++ library for the RIDC algorithm.
2728

2829
The libridc is a C++ library which implements the parallel-in-time [RIDC](/methods/ridc.html)
2930
methods for solving systems of ODEs.

_codes/pararealf90.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
layout: page_code
3+
hide_hero: true
34
title: "PararealF90"
45
date: 2015-09-24 16:45 +0200
56
navbar: Codes
67
subnavbar: pararealf90
7-
logo:
8+
logo:
89
code_url: https://github.com/Parallel-in-Time/PararealF90
910
language: F90
1011
github_repo: "Parallel-in-Time/PararealF90"

_codes/pfasst.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
layout: page_code
3+
hide_hero: true
34
title: "PFASST++"
45
date: 2014-06-15 16:45 +0200
56
updated: 2015-06-03 10:30:00 +0200
67
navbar: Codes
78
subnavbar: pfasst
8-
logo:
9+
logo:
910
code_url: https://github.com/Parallel-in-Time/PFASST
1011
language: C++
1112
github_repo: "Parallel-in-Time/PFASST"
@@ -48,12 +49,12 @@ developers:
4849
short_desc: A C++ library for SDC, MLSDC and PFASST.
4950
---
5051

51-
A modern C++ library for the PFASST algorithm.
52+
A modern C++ library for the PFASST algorithm.
5253

53-
The PFASST project is a C++ implementation of the parallel full approximation
54-
scheme in space and time (PFASST {% cite EmmettMinion2012 %}) algorithm, which in turn is a time-parallel
54+
The PFASST project is a C++ implementation of the parallel full approximation
55+
scheme in space and time (PFASST {% cite EmmettMinion2012 %}) algorithm, which in turn is a time-parallel
5556
algorithm for solving ODEs and PDEs.
56-
It also contains basic implementations of the spectral deferred correction (SDC)
57+
It also contains basic implementations of the spectral deferred correction (SDC)
5758
and multi-level spectral deferred correction (MLSDC) algorithms.
5859

5960
{% bibliography --cited %}

_codes/pinttf.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
---
22
layout: page_code
3+
hide_hero: true
34
title: "PinT-TF"
45
date: 2018-03-09 13:02 +0900
5-
updated: 2018-03-09 13:02 +0900
6+
updated: 2018-03-09 13:02 +0900
67
navbar: Codes
7-
subnavbar: pinttf
8-
logo:
8+
subnavbar: pinttf
9+
logo:
910
code_url: https://github.com/xjtju/PinT
10-
language: C++,F90
11-
license: MIT
11+
language: C++,F90
12+
license: MIT
1213
github_repo: "xjtju/PinT"
1314
developers:
14-
- name: Jian Xiao
15-
15+
- name: Jian Xiao
16+
1617
lead_developer: true
17-
- name: Mikio Iizuka
18-
19-
- name: Kenji Ono
20-
21-
short_desc: A performance and convergency testing framework for Parallel-in-Time methods, currently only for Parareal.
18+
- name: Mikio Iizuka
19+
20+
- name: Kenji Ono
21+
22+
short_desc: A performance and convergency testing framework for Parallel-in-Time methods, currently only for Parareal.
2223
---
23-
In order to quickly explore the applicability of the [Parareal](/methods/parareal.html) algorithm, we have built the very light-weighted framework. As a path finder of applying the parareal algorithm to real-world computing problems, it provides a basic space-time parallel and performance profiling functionalities.
24+
In order to quickly explore the applicability of the [Parareal](/methods/parareal.html) algorithm, we have built the very light-weighted framework. As a path finder of applying the parareal algorithm to real-world computing problems, it provides a basic space-time parallel and performance profiling functionalities.
2425

2526
The framework implemented the Parareal skeleton on an uniform mesh(1D/2D/3D), and some common linear solvers and time integrators, including SOR, BiCGStab, Newton-Raphson etc. For running a test, You only need to provide problem-specific stencil code, and then choose a proper combination of solvers. All the parameters controlling the space-time domain division, convergence check, coarsening factor etc. can be predefined through an .INI file, easily be changed and tuned. If some default function cannot be able to support some specific problem, it can be easily be extended by writting a new implementation in problem-specific sub classes.
2627

27-
The framework is mainly written by C++ for good template and extension, most BLAS related calculations is performed by Fortran for performance reason and easy matrix manipulation. It is very light-weighted, the only necessary third library is [inih](https://github.com/benhoyt/inih), a small but excellent .INI file parser. HDF5 output and performance monitoring are also optionally supported by [HDF5](https://www.hdfgroup.org/HDF5) library and [PMLlib](https://github.com/avr-aics-riken/PMlib) respectively.
28+
The framework is mainly written by C++ for good template and extension, most BLAS related calculations is performed by Fortran for performance reason and easy matrix manipulation. It is very light-weighted, the only necessary third library is [inih](https://github.com/benhoyt/inih), a small but excellent .INI file parser. HDF5 output and performance monitoring are also optionally supported by [HDF5](https://www.hdfgroup.org/HDF5) library and [PMLlib](https://github.com/avr-aics-riken/PMlib) respectively.
2829

29-
At current release, the code has provided two examples for heat equation and Allen-Cahn equation. We will continue to improve the generality and adaptability of it.
30+
At current release, the code has provided two examples for heat equation and Allen-Cahn equation. We will continue to improve the generality and adaptability of it.

0 commit comments

Comments
 (0)