From 2ec512c56379294ecb4083c64023e7634d444b7e Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Fri, 3 Nov 2023 10:45:42 +0100 Subject: [PATCH] Add NumFOCUS + ACTRIX to acknowledgments (#1697) * Add NumFOCUS + ACTRIX to acknowledgments * Try to avoid spaces * Another try to avoid gaps between images * Hopefully fix image alignment in docs * Try new logo formats * Use smaller DUBS logo and add DUBS funding statement * Add markdown-based table for logos in docs * Try another table approach * Hopefully get a layout that finally *works*... * Arrrrrrgggggghhhhh --- README.md | 45 ++++++++++++++++++++++++++------------ docs/src/index.md | 55 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 73 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 673708d8b89..1d52089ae3e 100644 --- a/README.md +++ b/README.md @@ -256,31 +256,48 @@ or [create an issue](https://github.com/trixi-framework/Trixi.jl/issues/new). ## Acknowledgments -

- +

-This project has benefited from funding by the Deutsche Forschungsgemeinschaft (DFG, German Research Foundation) -under Germany's Excellence Strategy EXC 2044-390685587, Mathematics Münster: -Dynamics-Geometry-Structure. - -This project has benefited from funding by the Deutsche Forschungsgemeinschaft (DFG, German Research Foundation) -through the research unit FOR 5409 "Structure-Preserving Numerical Methods for Bulk- and -Interface Coupling of Heterogeneous Models (SNuBIC)" (project number 463312734). +This project has benefited from funding by the [Deutsche +Forschungsgemeinschaft](https://www.dfg.de/) (DFG, German Research Foundation) +through the following grants: +* Excellence Strategy EXC 2044-390685587, Mathematics Münster: Dynamics-Geometry-Structure. +* Research unit FOR 5409 "Structure-Preserving Numerical Methods for Bulk- and + Interface Coupling of Heterogeneous Models (SNuBIC)" (project number 463312734). +* Individual grant no. 528753982. -This project has benefited from funding from the European Research Council through the +This project has benefited from funding from the [European Research Council](https://erc.europa.eu) +through the ERC Starting Grant "An Exascale aware and Un-crashable Space-Time-Adaptive Discontinuous Spectral Element Solver for Non-Linear Conservation Laws" (Extreme), ERC grant agreement no. 714487. -This project has benefited from funding from Vetenskapsrådet (VR, Swedish Research Council), Sweden +This project has benefited from funding from [Vetenskapsrådet](https://www.vr.se) +(VR, Swedish Research Council), Sweden through the VR Starting Grant "Shallow water flows including sediment transport and morphodynamics", VR grant agreement 2020-03642 VR. -This project has benefited from funding from the United States National Science Foundation under awards +This project has benefited from funding from the United States +[National Science Foundation](https://www.nsf.gov/) (NSF) under awards DMS-1719818 and DMS-1943186. -This project has benefited from funding from the German Federal Ministry of -Education and Research through the project grant "Adaptive earth system modeling +This project has benefited from funding from the German +[Federal Ministry of Education and Research](https://www.bmbf.de) (BMBF) +through the project grant "Adaptive earth system modeling with significantly reduced computation time for exascale supercomputers (ADAPTEX)" (funding id: 16ME0668K). + +This project has benefited from funding by the +[Daimler und Benz Stiftung](https://www.daimler-benz-stiftung.de) (Daimler and Benz Foundation) +through grant no. 32-10/22. + +Trixi.jl is supported by [NumFOCUS](https://numfocus.org/) as an Affiliated Project. diff --git a/docs/src/index.md b/docs/src/index.md index 9ffaee26c40..fd923348928 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -344,29 +344,58 @@ or [create an issue](https://github.com/trixi-framework/Trixi.jl/issues/new). ## Acknowledgments -![funding-logo](https://user-images.githubusercontent.com/3637659/233821022-84910be7-8649-4999-a0ff-22d5e20f0b90.jpg) - -This project has benefited from funding by the Deutsche Forschungsgemeinschaft (DFG, German Research Foundation) -under Germany's Excellence Strategy EXC 2044-390685587, Mathematics Münster: -Dynamics-Geometry-Structure. +```@raw html +
+
+
+
+
+
+
+
+``` -This project has benefited from funding by the Deutsche Forschungsgemeinschaft (DFG, German Research Foundation) -through the research unit FOR 5409 "Structure-Preserving Numerical Methods for Bulk- and -Interface Coupling of Heterogeneous Models (SNuBIC)" (project number 463312734). +This project has benefited from funding by the [Deutsche +Forschungsgemeinschaft](https://www.dfg.de/) (DFG, German Research Foundation) +through the following grants: +* Excellence Strategy EXC 2044-390685587, Mathematics Münster: Dynamics-Geometry-Structure. +* Research unit FOR 5409 "Structure-Preserving Numerical Methods for Bulk- and + Interface Coupling of Heterogeneous Models (SNuBIC)" (project number 463312734). +* Individual grant no. 528753982. -This project has benefited from funding from the European Research Council through the +This project has benefited from funding from the [European Research Council](https://erc.europa.eu) +through the ERC Starting Grant "An Exascale aware and Un-crashable Space-Time-Adaptive Discontinuous Spectral Element Solver for Non-Linear Conservation Laws" (Extreme), ERC grant agreement no. 714487. -This project has benefited from funding from Vetenskapsrådet (VR, Swedish Research Council), Sweden +This project has benefited from funding from [Vetenskapsrådet](https://www.vr.se) +(VR, Swedish Research Council), Sweden through the VR Starting Grant "Shallow water flows including sediment transport and morphodynamics", VR grant agreement 2020-03642 VR. -This project has benefited from funding from the United States National Science Foundation under awards +This project has benefited from funding from the United States +[National Science Foundation](https://www.nsf.gov/) (NSF) under awards DMS-1719818 and DMS-1943186. -This project has benefited from funding from the German Federal Ministry of -Education and Research through the project grant "Adaptive earth system modeling +This project has benefited from funding from the German +[Federal Ministry of Education and Research](https://www.bmbf.de) (BMBF) +through the project grant "Adaptive earth system modeling with significantly reduced computation time for exascale supercomputers (ADAPTEX)" (funding id: 16ME0668K). + +This project has benefited from funding by the +[Daimler und Benz Stiftung](https://www.daimler-benz-stiftung.de) (Daimler and Benz Foundation) +through grant no. 32-10/22. + +Trixi.jl is supported by [NumFOCUS](https://numfocus.org/) as an Affiliated Project.