From 3fb4044c9a7fd0999c24d4a80544627531cdfd23 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Sat, 22 Jun 2024 06:12:56 +0200 Subject: [PATCH 1/6] Add participating institutions to README/docs Supersedes #1880. Note I also fixed a few discrepancies between the README and the docs. --- README.md | 16 ++++++++++++++++ docs/src/index.md | 30 +++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e0706d4fc7b..eeea22004ac 100644 --- a/README.md +++ b/README.md @@ -280,6 +280,22 @@ To get in touch with the developers, or [create an issue](https://github.com/trixi-framework/Trixi.jl/issues/new). +## Participating research groups +Participating research groups in alphabetical order: + +[Applied and Computational Mathematics, RWTH Aachen University :de:](https://www.acom.rwth-aachen.de) + +[Applied Mathematics, Linköping University :sweden:](https://liu.se/en/employee/andwi94) + +[Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) + +[High-Performance Scientific Computing, University of Augsburg :de:](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) + +[Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz :de:](https://ranocha.de) + +[Numerical Simulation, Department of Mathematics and Computer Science, University of Cologne :de:](https://www.mi.uni-koeln.de/NumSim/) + + ## Acknowledgments

+ + [**Trixi.jl**](https://github.com/trixi-framework/Trixi.jl) is a numerical simulation framework for conservation @@ -47,7 +51,7 @@ installation and postprocessing procedures. Its features include: * Hyperbolic diffusion equations for elliptic problems * Lattice-Boltzmann equations (D2Q9 and D3Q27 schemes) * Shallow water equations - * Scalar advection + * Several scalar conservation laws (e.g., linear advection, Burgers' equation, LWR traffic flow) * Multi-physics simulations * [Self-gravitating gas dynamics](https://github.com/trixi-framework/paper-self-gravitating-gas-dynamics) * Shared-memory parallelization via multithreading @@ -93,11 +97,11 @@ If the installed version does not match the current release, please check the [Troubleshooting](@ref old-release) section. The commands above can also be used to update Trixi.jl. A brief list of notable -changes to Trixi.jl is available in [`NEWS.md`](https://github.com/trixi-framework/Trixi.jl/NEWS.md). +changes to Trixi.jl is available in the [`Changelog`](@ref). ### [For developers](@id for-developers) -If you plan on editing Trixi.jl itself, you can download Trixi.jl to a local folder -and use the code from the cloned directory: +If you plan on editing Trixi.jl itself, you can download Trixi.jl locally and use the +code from the cloned directory: ```bash git clone git@github.com:trixi-framework/Trixi.jl.git cd Trixi.jl @@ -327,7 +331,7 @@ Schlottke-Lakemper](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) (University of Augsburg, Germany) and [Gregor Gassner](https://www.mi.uni-koeln.de/NumSim/gregor-gassner) (University of Cologne, Germany). Together with [Hendrik Ranocha](https://ranocha.de) -(Johannes Gutenberg University Mainz, Germany) and [Andrew Winters](https://liu.se/en/employee/andwi94) +(Johannes Gutenberg University Mainz, Germany), [Andrew Winters](https://liu.se/en/employee/andwi94) (Linköping University, Sweden), and [Jesse Chan](https://jlchan.github.io) (Rice University, US), they are the principal developers of Trixi.jl. The full list of contributors can be found under [Authors](@ref). @@ -344,6 +348,22 @@ To get in touch with the developers, or [create an issue](https://github.com/trixi-framework/Trixi.jl/issues/new). +## Participating research groups +Participating research groups in alphabetical order: + +[Applied and Computational Mathematics, RWTH Aachen University :de:](https://www.acom.rwth-aachen.de) + +[Applied Mathematics, Linköping University :sweden:](https://liu.se/en/employee/andwi94) + +[Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) + +[High-Performance Scientific Computing, University of Augsburg :de:](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) + +[Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz :de:](https://ranocha.de) + +[Numerical Simulation, Department of Mathematics and Computer Science, University of Cologne :de:](https://www.mi.uni-koeln.de/NumSim/) + + ## Acknowledgments ```@raw html From e980c1245201dc70bc8a7212b13dcf1826b1a815 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 25 Jun 2024 11:11:43 +0200 Subject: [PATCH 2/6] Apply suggestions from code review Co-authored-by: Hendrik Ranocha --- README.md | 2 ++ docs/src/index.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index eeea22004ac..2319e583864 100644 --- a/README.md +++ b/README.md @@ -285,6 +285,8 @@ Participating research groups in alphabetical order: [Applied and Computational Mathematics, RWTH Aachen University :de:](https://www.acom.rwth-aachen.de) +[Applied Mathematics, Department of Mathematics, University of Hamburg :de:](https://www.math.uni-hamburg.de/en/forschung/bereiche/am.html) + [Applied Mathematics, Linköping University :sweden:](https://liu.se/en/employee/andwi94) [Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) diff --git a/docs/src/index.md b/docs/src/index.md index 3ae707ae8f1..dd0a7b28f8e 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -353,6 +353,8 @@ Participating research groups in alphabetical order: [Applied and Computational Mathematics, RWTH Aachen University :de:](https://www.acom.rwth-aachen.de) +[Applied Mathematics, Department of Mathematics, University of Hamburg :de:](https://www.math.uni-hamburg.de/en/forschung/bereiche/am.html) + [Applied Mathematics, Linköping University :sweden:](https://liu.se/en/employee/andwi94) [Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) From 0d491eaf60b511e1472460f92ee1d5bbc4ec8bdc Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 25 Jun 2024 11:46:47 +0200 Subject: [PATCH 3/6] Apply suggestions from code review --- README.md | 2 ++ docs/src/index.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 2319e583864..06b8d1e3952 100644 --- a/README.md +++ b/README.md @@ -291,6 +291,8 @@ Participating research groups in alphabetical order: [Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) +[High-Performance Computing, Institute of Software Technology, German Aerospace Center (DLR) :de:](https://www.dlr.de/en/sc/about-us/departments/high-performance-computing) + [High-Performance Scientific Computing, University of Augsburg :de:](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) [Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz :de:](https://ranocha.de) diff --git a/docs/src/index.md b/docs/src/index.md index dd0a7b28f8e..e5700d295b0 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -359,6 +359,8 @@ Participating research groups in alphabetical order: [Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) +[High-Performance Computing, Institute of Software Technology, German Aerospace Center (DLR) :de:](https://www.dlr.de/en/sc/about-us/departments/high-performance-computing) + [High-Performance Scientific Computing, University of Augsburg :de:](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) [Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz :de:](https://ranocha.de) From 86a878a19e5ec2bcf0155a25ca89e408ce60114b Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Wed, 26 Jun 2024 19:38:07 +0200 Subject: [PATCH 4/6] Update docs/src/index.md --- docs/src/index.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/src/index.md b/docs/src/index.md index e5700d295b0..c207f89f4a2 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -351,21 +351,21 @@ or [create an issue](https://github.com/trixi-framework/Trixi.jl/issues/new). ## Participating research groups Participating research groups in alphabetical order: -[Applied and Computational Mathematics, RWTH Aachen University :de:](https://www.acom.rwth-aachen.de) +[Applied and Computational Mathematics, RWTH Aachen University 🇩🇪](https://www.acom.rwth-aachen.de) -[Applied Mathematics, Department of Mathematics, University of Hamburg :de:](https://www.math.uni-hamburg.de/en/forschung/bereiche/am.html) +[Applied Mathematics, Department of Mathematics, University of Hamburg 🇩🇪](https://www.math.uni-hamburg.de/en/forschung/bereiche/am.html) -[Applied Mathematics, Linköping University :sweden:](https://liu.se/en/employee/andwi94) +[Applied Mathematics, Linköping University 🇸🇪](https://liu.se/en/employee/andwi94) -[Computational and Applied Mathematics, Rice University :us:](https://jlchan.github.io/) +[Computational and Applied Mathematics, Rice University 🇺🇸](https://jlchan.github.io/) -[High-Performance Computing, Institute of Software Technology, German Aerospace Center (DLR) :de:](https://www.dlr.de/en/sc/about-us/departments/high-performance-computing) +[High-Performance Computing, Institute of Software Technology, German Aerospace Center (DLR) 🇩🇪](https://www.dlr.de/en/sc/about-us/departments/high-performance-computing) -[High-Performance Scientific Computing, University of Augsburg :de:](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) +[High-Performance Scientific Computing, University of Augsburg 🇩🇪](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) -[Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz :de:](https://ranocha.de) +[Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz 🇩🇪](https://ranocha.de) -[Numerical Simulation, Department of Mathematics and Computer Science, University of Cologne :de:](https://www.mi.uni-koeln.de/NumSim/) +[Numerical Simulation, Department of Mathematics and Computer Science, University of Cologne 🇩🇪](https://www.mi.uni-koeln.de/NumSim/) ## Acknowledgments From 7a44b9af6ba696070abbe444730ce46d84b86056 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 2 Dec 2024 06:29:36 +0100 Subject: [PATCH 5/6] Update docs/src/index.md --- docs/src/index.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/src/index.md b/docs/src/index.md index c207f89f4a2..d3e28aa7a3b 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -11,9 +11,6 @@ [![License: MIT](https://img.shields.io/badge/License-MIT-success.svg)](https://opensource.org/licenses/MIT) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3996439.svg)](https://doi.org/10.5281/zenodo.3996439) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8695/badge)](https://www.bestpractices.dev/projects/8695) - - - [**Trixi.jl**](https://github.com/trixi-framework/Trixi.jl) is a numerical simulation framework for conservation From db21d72e119d8524f5a8b3e15a2a8f0a71216fba Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 2 Dec 2024 06:33:34 +0100 Subject: [PATCH 6/6] Apply suggestions from code review --- README.md | 2 +- docs/src/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4a2dda380ad..4cc037fe208 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ Participating research groups in alphabetical order: [High-Performance Computing, Institute of Software Technology, German Aerospace Center (DLR) :de:](https://www.dlr.de/en/sc/about-us/departments/high-performance-computing) -[High-Performance Scientific Computing, University of Augsburg :de:](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) +[High-Performance Scientific Computing, University of Augsburg :de:](https://hpsc.math.uni-augsburg.de) [Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz :de:](https://ranocha.de) diff --git a/docs/src/index.md b/docs/src/index.md index 00dc1824279..8e476cde693 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -363,7 +363,7 @@ Participating research groups in alphabetical order: [High-Performance Computing, Institute of Software Technology, German Aerospace Center (DLR) 🇩🇪](https://www.dlr.de/en/sc/about-us/departments/high-performance-computing) -[High-Performance Scientific Computing, University of Augsburg 🇩🇪](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc) +[High-Performance Scientific Computing, University of Augsburg 🇩🇪](https://hpsc.math.uni-augsburg.de) [Numerical Mathematics, Institute of Mathematics, Johannes Gutenberg University Mainz 🇩🇪](https://ranocha.de)