Skip to content

Commit 2da0f5b

Browse files
committed
Merge branch 'master' into gpu
2 parents 91a59a0 + ed26ae9 commit 2da0f5b

Some content is hidden

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

54 files changed

+1582
-696
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipeline {
2626
sh 'mkdir tmp'
2727
dir('tmp') {
2828
timestamps {
29-
sh '../scripts/firedrake-install --package-branch tsfc gpu --package-branch PyOP2 gpu --disable-ssh --minimal-petsc --slepc --documentation-dependencies --install thetis --install gusto --install icepack --no-package-manager || (cat firedrake-install.log && /bin/false)'
29+
sh '../scripts/firedrake-install --package-branch tsfc gpu --package-branch PyOP2 gpu --disable-ssh --minimal-petsc --slepc --documentation-dependencies --install thetis --install gusto --install icepack --install irksome --no-package-manager || (cat firedrake-install.log && /bin/false)'
3030
}
3131
}
3232
}

docs/source/download.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ they have the system dependencies:
8989
* autoconf, automake, libtool
9090
* CMake
9191
* zlib
92+
* flex, bison
9293

9394
Firedrake has been successfully installed on Windows 10 using the
9495
Windows Subsystem for Linux. There are more detailed

docs/source/images/daniel.jpg

514 KB
Loading

docs/source/images/jack.jpg

34.8 KB
Loading

docs/source/images/nacime.jpg

203 KB
Loading

docs/source/images/reuben.jpg

17.1 KB
Loading

docs/source/images/sophia.jpg

208 KB
Loading

docs/source/images/tom.jpg

136 KB
Loading

docs/source/team.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,21 @@
1111
("Lawrence Mitchell",
1212
"https://www.dur.ac.uk/computer.science/staff/profile/?id=17243"),
1313
("Thomas Gibson", "http://www.imperial.ac.uk/people/t.gibson15"),
14-
("Tianjiao (TJ) Sun", "https://www.doc.ic.ac.uk/~ts2914/"),
1514
("Miklós Homolya", "http://www.imperial.ac.uk/people/m.homolya14"),
16-
("Andrew McRae", "https://www2.physics.ox.ac.uk/contacts/people/mcraea"),
1715
("Colin Cotter", "http://www.imperial.ac.uk/people/colin.cotter"),
1816
("Rob Kirby", "http://www.baylor.edu/math/index.php?id=90540"),
19-
("Koki Sagiyama", "http://www.imperial.ac.uk/people/k.sagiyama")
17+
("Koki Sagiyama", "http://www.imperial.ac.uk/people/k.sagiyama"),
18+
("Nacime Bouziani", "https://www.imperial.ac.uk/people/n.bouziani18"),
19+
("Sophia Vorderwuelbecke", "https://www.imperial.ac.uk/people/s.vorderwuelbecke18"),
20+
("Tom Gregory", "https://www.imperial.ac.uk/people/t.gregory18"),
21+
("Jack Betteridge", "https://www.imperial.ac.uk/people/j.betteridge"),
22+
("Daniel Shapero", "http://psc.apl.uw.edu/people/investigators/daniel-shapero/"),
23+
("Reuben Hill", "https://www.imperial.ac.uk/people/reuben.hill10"),
2024
])
2125
elif outfile == "teaminactive.rst":
2226
team = OrderedDict([
27+
("Tianjiao (TJ) Sun", "https://www.doc.ic.ac.uk/~ts2914/"),
28+
("Andrew McRae", "https://www2.physics.ox.ac.uk/contacts/people/mcraea"),
2329
("Fabio Luporini", "http://www.imperial.ac.uk/people/f.luporini12"),
2430
("Alastair Gregory", "http://www.imperial.ac.uk/people/a.gregory14"),
2531
("Michael Lange", "https://www.linkedin.com/in/michael-lange-56675994/"),
@@ -56,7 +62,7 @@ def blank(n):
5662

5763
def imagename(name):
5864
puny = name.split()[0].lower().encode("punycode").decode()
59-
return puny[:-1] if puny[-1]=="-" else puny
65+
return puny[:-1] if puny[-1]=="-" else puny
6066

6167
# Write substitution rules for member images.
6268
for member, url in team.items():

docs/source/team.rst

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ Firedrake is brought to you by the departments of `Mathematics
88
Engineering <http://www.imperial.ac.uk/ese/>`_ at `Imperial College
99
London <http://www.imperial.ac.uk>`_, the `Department of Computer
1010
Science <https://www.dur.ac.uk/computer.science/>`_ at `Durham
11-
University <https://www.dur.ac.uk>`_, and the `Department of
12-
Mathematics <https://www.baylor.edu/math>`_ at `Baylor University <https://www.baylor.edu>`_.
11+
University <https://www.dur.ac.uk>`_, the `Department of
12+
Mathematics <https://www.baylor.edu/math>`_ at `Baylor University
13+
<https://www.baylor.edu>`_, the `Applied Physics Laboratory
14+
<http://www.apl.washington.edu/>`_ at the `University of Washington
15+
<http://www.washington.edu/>`_ and the broad community of Firedrake
16+
users who contribute to its development.
1317

1418
Active team members
1519
-------------------
@@ -21,7 +25,7 @@ Former team members
2125

2226
.. include:: teaminactive.rst
2327

24-
28+
2529
Other contributors
2630
------------------
2731

@@ -39,3 +43,21 @@ Joshua Coutinho
3943

4044
Kaho Sato
4145

46+
`Stephan Kramer <https://www.imperial.ac.uk/people/s.kramer>`_
47+
48+
`Florian Wechsung <https://florianwechsung.github.io>`_
49+
50+
`Alberto Paganini <https://www2.le.ac.uk/departments/mathematics/extranet/staff-material/staff-profiles/alberto-paganini>`_
51+
52+
`Tuomas Kärnä <https://www.tuomaskarna.com/>`_
53+
54+
`Nicolas Barral <https://nicolasbarral.fr>`_
55+
56+
Darko Janeković
57+
58+
`Patrick E. Farrell <https://www.maths.ox.ac.uk/people/patrick.farrell>`_
59+
60+
`Joe Wallwork <https://www.imperial.ac.uk/people/j.wallwork16>`_
61+
62+
And more! Please contact us if you believe your name has been left off
63+
this list in error.

0 commit comments

Comments
 (0)