Skip to content

Commit

Permalink
Merge branch 'wp6-update' of github.com:numpex/exa-ma-d7.1 into wp6-u…
Browse files Browse the repository at this point in the history
…pdate
  • Loading branch information
GAUCHY Clement 261643 committed Oct 14, 2024
2 parents 869ac6f + 8ec8486 commit cd4e305
Show file tree
Hide file tree
Showing 39 changed files with 1,706 additions and 502 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"latex-workshop.latex.autoBuild.enabled": true,
"latex-workshop.latex.build.showOutput": "always",
"latex-workshop.latex.outDir": "%DIR%",
"latex-workshop.message.badbox.show": "none"
"latex-workshop.message.badbox.show": "none",
"workbench.editor.pinnedTabsOnSeparateRow": true
}
6 changes: 6 additions & 0 deletions chapters/00-index.tex
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
\chapter{WP1 - Discretization}
\label{chap:wp1}
\clearpage
\subimport{./WP1}{00-index}

\chapter{WP2 - Model order, Surrogate, Scientific Machine Learning methods}
\label{chap:wp2}
\clearpage
\subimport{./WP2}{00-index}

\chapter{WP3 - Solvers}
\label{chap:wp3}
\clearpage
\subimport{./WP3}{00-index}

\chapter{WP4 - Data assimilation}
\label{chap:wp4}
\clearpage
\subimport{./WP4}{00-index}

\chapter{WP5 - Optimization}
\label{chap:wp5}
\clearpage
\subimport{./WP5}{00-index}

\chapter{WP6 - Uncertainty quantification}
\label{chap:wp6}
\clearpage
\subimport{./WP6}{00-index}

2 changes: 1 addition & 1 deletion chapters/software.tex
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ \subsection{DevOps - Testing}
\input{software/freefempp/freefempp.tex}
\input{software/hawen/hawen.tex}
\input{software/hpddm/hpddm.tex}
\input{software/mahyco/mahyco.tex}
%%\input{software/mahyco/mahyco.tex}
\input{software/manta/manta.tex}
\input{software/pbb/pbb.tex}
\input{software/samurai/samurai.tex}
Expand Down
14 changes: 7 additions & 7 deletions exa-ma-d7.1.tex
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
\usepackage{pgfplots}
\usepackage{pgfplotstable}
\pgfplotsset{compat=newest}
\usepackage{tikz}
\usetikzlibrary{positioning,fit,matrix}

\definecolor{bgcolor}{gray}{0.95}
Expand All @@ -54,7 +53,7 @@
\definecolor{CustomBlue}{rgb}{0.25, 0.41, 0.88} % RoyalBlue
\hypersetup{
pdftitle={Benchmarking analysis report},
pdfauthor={[Names of co-authors (partners short names)]},
pdfauthor={[Christophe Prud'homme (UNISTRA), Pierre Alliez (INRIA), Vincent Chabannes (UNISTRA), Rudy Chocat (CEA), Emmanuel Franck (INRIA), Vincent Fraucher (CEA), Floriant Faucher (INRIA), Clément Gauchy (CEA), Christos Georgiadis (INRIA), Luc Giraud (INRIA), Frédéric Hecht (SU), Pierre Jolivet (CNRS), Pierre Ledac (CEA), Gilles Marait (INRIA), Victor Michel-Dansac (INRIA), Frédéric Nataf (SU), Lucas Palazzolo (INRIA), Yannick Privat (UL), Thomas Saigre-Tardif (UNISTRA), Christophe Trophime (CNRS), Pierre Henri Tournier (SU), Céline Van Landeghem (UNISTRA), Raphael Zanella (SU)]},
pdfkeywords={HPC, Exascale, Benchmarking},
bookmarksnumbered,linktocpage,
colorlinks=true,
Expand Down Expand Up @@ -123,17 +122,17 @@
\delivResponsible{UNISTRA}

% Deliverable Version, Contractual and Actual Date, Dissemination Level, Type
\delivVersion{v0.0.6}
\delivVersion{v0.2.0}
\ContractualDate{15/10/2024}
\ActualDate{\today}
\delivDissLevel{PU} % PU, PP, RE, CO
\delivType{Report}

% List of Main Authors (usually from the responsible partner)
\delivAuthor{[Names of co-authors (partners short names)]}
\delivAuthor{[Christophe Prud'homme (UNISTRA)]}

% List of Co-Authors (all other co-authors should be listed here)
\delivFPAuthor{[Names of co-authors (partners short names)]}
\delivFPAuthor{[Pierre Alliez (INRIA), Vincent Chabannes (UNISTRA), Rudy Chocat (CEA), Emmanuel Franck (INRIA), Vincent Fraucher (CEA), Floriant Faucher (INRIA), Clément Gauchy (CEA), Christos Georgiadis (INRIA), Luc Giraud (INRIA), Frédéric Hecht (SU), Olivier Jamond (CEA), Pierre Jolivet (CNRS), Pierre Ledac (CEA), Gilles Marait (INRIA), Victor Michel-Dansac (INRIA), Frédéric Nataf (SU), Lucas Palazzolo (INRIA), Yannick Privat (UL), Thomas Saigre-Tardif (UNISTRA), Christophe Trophime (CNRS), Pierre Henri Tournier (SU), Céline Van Landeghem (UNISTRA), Raphael Zanella (SU) ]}

% Provision of Keywords (about 5-10)
\delivKeywords{HPC, Exascale, Benchmarking, Software}
Expand All @@ -145,15 +144,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Change Log
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\istChange{08/10/2024}{v0.2.0}{Prud'homme Christophe (UNISTRA), Thomas Saigre (UNISTRA), Vincent Chabannes(UNISTRA), Céline Van Landeghem (UNISTRA), Victor Dansac(UNISTRA,INRIA),Christos Georgiadis (INRIA), Pierre Alliez(INRIA), Clément Gauchy (CEA), Rudy Rochat(CEA)}{Initial contributions}
\istChange{11/10/2024}{v0.2.0}{\href{https://github.com/numpex/exa-ma-d7.1/graphs/contributors}{+14 Contributors}}{Initial contributions}
\istChange{30/09/2024}{v0.1.0}{Prud'homme Christophe (UNISTRA)}{setup architecture of D7.1, update profiling tools in toc, updates in methodology chapter, add information store in excel sheet in the report,update benchmark methodology}
\istChange{27/09/2024}{v0.0.6}{Prud'homme Christophe (UNISTRA)}{In the methodology chapter, link the deliverable to the bottlenecks identified in Exa-MA scientific document. Add resilience stats and methdology, benchmark mmg and parmmg indirectly.}
\istChange{26/09/2024}{v0.0.6}{Pierre Jolivet (CNRS)}{Review of the document}
\istChange{16/09/2024}{v0.0.5}{Prud'homme Christophe (UNISTRA)}{ToC: add list of computer science features per software, add list of math features per workpackage, add statistics about Exa-MA software in chapter Software}
\istChange{02/09/2024}{v0.0.4}{Prud'homme Christophe (UNISTRA)}{ToC: add profiling tools in methodology chapter and udated the chapter overall}
\istChange{30/08/2024}{v0.0.3}{Prud'homme Christophe (UNISTRA)}{ToC: setup architecture of D7.1;add benchmarking methodology chapter;add samurai software to be benchmarked}
\istChange{20/08/2024}{v0.0.1}{Prud'homme Christophe (UNISTRA)}{Draft report template}
\istChange{}{}{}{}
%%\istChange{}{}{}{}


\begin{document}
Expand Down Expand Up @@ -207,6 +206,7 @@ \chapter{Introduction}
\import{chapters/}{00-index}

\chapter{Conclusions}
\label{chap:conclusions}
\input{sections/conclusions}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down
22 changes: 11 additions & 11 deletions gitHeadLocal.gin
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
\usepackage[%
shash={b26bd7c},
lhash={b26bd7c5389f87390796c7310db5829e332eb9b6},
shash={33226e4},
lhash={33226e4c3c8eb1f0f7aafc37af995d5e65515962},
authname={Christophe Prud'homme},
authemail={christophe.prudhomme@cemosis.fr},
authsdate={2024-09-27},
authidate={2024-09-27 13:21:07 +0200},
authudate={1727436067},
authsdate={2024-10-11},
authidate={2024-10-11 09:05:41 +0200},
authudate={1728630341},
commname={Christophe Prud'homme},
commemail={christophe.prudhomme@cemosis.fr},
commsdate={2024-09-27},
commidate={2024-09-27 13:21:07 +0200},
commudate={1727436067},
refnames={ (HEAD -> main, tag: v0.1.0, origin/main, origin/HEAD)},
firsttagdescribe={v0.1.0},
reltag={v0.1.0-0-gb26bd7c}
commsdate={2024-10-11},
commidate={2024-10-11 09:05:41 +0200},
commudate={1728630341},
refnames={ (HEAD -> main, tag: v0.2.0, origin/main, origin/HEAD)},
firsttagdescribe={v0.2.0},
reltag={v0.2.0-0-g33226e4}
]{gitexinfo}
Binary file added graphics/composyx/composyx-solverstack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
172 changes: 172 additions & 0 deletions graphics/composyx/composyx-solverstack.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/freefempp/samplecode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/freefempp/sampleplot.pdf
Binary file not shown.
Binary file added graphics/hawen/haven_inversion.pdf
Binary file not shown.
Loading

0 comments on commit cd4e305

Please sign in to comment.