diff --git a/EXCEL/Modele.xlsx b/EXCEL/Modele.xlsx new file mode 100644 index 0000000..69bf1bb Binary files /dev/null and b/EXCEL/Modele.xlsx differ diff --git a/EXCEL/Modele_EnD.xlsx b/EXCEL/Modele_EnD.xlsx new file mode 100644 index 0000000..93c6432 Binary files /dev/null and b/EXCEL/Modele_EnD.xlsx differ diff --git a/EXCEL/Modele_n11.xlsx b/EXCEL/Modele_n11.xlsx new file mode 100644 index 0000000..bc52acc Binary files /dev/null and b/EXCEL/Modele_n11.xlsx differ diff --git a/EXCEL/Modele_nED.xlsx b/EXCEL/Modele_nED.xlsx new file mode 100644 index 0000000..ed52d37 Binary files /dev/null and b/EXCEL/Modele_nED.xlsx differ diff --git a/EXCEL/Modele_phi.xlsx b/EXCEL/Modele_phi.xlsx new file mode 100644 index 0000000..00006fb Binary files /dev/null and b/EXCEL/Modele_phi.xlsx differ diff --git a/EXCEL/old/Modele.xlsx b/EXCEL/old/Modele.xlsx new file mode 100644 index 0000000..4b1ed94 Binary files /dev/null and b/EXCEL/old/Modele.xlsx differ diff --git a/EXCEL/old/Modele_old.xlsx b/EXCEL/old/Modele_old.xlsx new file mode 100644 index 0000000..8fed2a9 Binary files /dev/null and b/EXCEL/old/Modele_old.xlsx differ diff --git a/EXCEL/old/Modele_v2.xlsx b/EXCEL/old/Modele_v2.xlsx new file mode 100644 index 0000000..d05f9a8 Binary files /dev/null and b/EXCEL/old/Modele_v2.xlsx differ diff --git a/EXCEL/~$Modele.xlsx b/EXCEL/~$Modele.xlsx new file mode 100644 index 0000000..8cb6bb5 Binary files /dev/null and b/EXCEL/~$Modele.xlsx differ diff --git a/PP_routine.exe b/PP_routine.exe new file mode 100644 index 0000000..62fbb44 Binary files /dev/null and b/PP_routine.exe differ diff --git a/latex_new_logos.tex b/latex_new_logos.tex new file mode 100644 index 0000000..d24751a --- /dev/null +++ b/latex_new_logos.tex @@ -0,0 +1,213 @@ + +\documentclass[a4paper, 11pt]{article} +%\documentclass[threecolumn]{article} +\usepackage{graphicx} +\usepackage{comment} +\usepackage{fancyhdr} +\usepackage{lastpage} +\usepackage{ifthen} %for ifthenelse funtion +\usepackage{amsmath,bm} % For equations +\usepackage{colortbl} % pour "bfseries" dans les tabular +\usepackage{float} +\usepackage{booktabs} +%\usepackage{dblfloatfix} +%\usepackage[ + % height=9in, % height of the text block + % width=7in, % width of the text block +\usepackage{blindtext} + +\usepackage{siunitx} +\usepackage{enumitem} + %top=78pt, % distance of the text block from the top of the page + %headheight=48pt, % height for the header block + %headsep=12pt, % distance from the header block to the text block + %heightrounded, % ensure an integer number of lines + %showframe, % show the main blocks + %verbose, % show the values of the parameters in the log file +%]{geometry} +\usepackage{siunitx} % to write units proprely +%\usepackage{subfigure} +%\usepackage{lipsum} +\usepackage{tabularx} +\renewcommand\tabularxcolumn[1]{m{#1}}% +\usepackage{caption} +\usepackage{subcaption} +\usepackage{helvet} +\usepackage[export]{adjustbox} +\renewcommand{\familydefault}{\sfdefault} +\usepackage[left=2cm,right=2cm,top=2.5cm,bottom=2.5cm]{geometry} +\usepackage{amsmath} +\usepackage{sfmath} +\newcommand{\foo}[1]{\bm{\mathrm{#1}}} + + + + +\definecolor{Gray}{gray}{0.85} +%\newcolumntype{a}{>{\columncolor{Gray}}c} % for coloring tabulars +\pagenumbering{gobble} + +%% change all subscripts to roman ! +\catcode`_=\active +\newcommand_[1]{\ensuremath{\sb{\mathrm{#1}}}} % + + +\pagestyle{fancy} + + +%\rhead{\includegraphics[width=2cm]{Logos/LogoLMH.png}} +%\lhead{\includegraphics[width=2cm]{Logos/EPFL2.png} \\ 709-15-12} +%\chead{Yiangjang \\ Pressure fluctuations \ \\ salut} + +%\fancyhead[CE,CO,LE,LO,RE,RO]{} %% clear out all headers +\fancyhead[C]{% + \begin{tabular}{m{3.0cm} m{10.0cm} m{3cm}} + \includegraphics[height=1cm]{Logos/EPFL2.png} & &\hfill \includegraphics[height=1cm]{Logos/LogoPTMH.png} + \end{tabular} + } + + +\renewcommand{\footrulewidth}{0.4pt} +\fancyfoot[L]{\includegraphics[height=1cm,valign=c]{Logos/FooterPTMH.pdf}} +%\fancyfoot[C]{\begin{tabular}{@{}c@{}}Footer \\ more footer\end{tabular}} + + +\begin{document} + +\begin{table}[t!] +\begin{tabular}{m{3.0cm} m{10cm} m{3cm}} +\rowcolor{Gray} +%entete +\textbf{709-05-05} & \centering \textbf{Yangjiang} & \hfill \textbf{date} +\end{tabular} +\end{table} + +\begin{table}[h!] +\centering +\begin{tabularx}{\textwidth}{>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X} +%coeffs +\textit{\textbf{MP}} & $\boldsymbol{\alpha}$ & $\boldsymbol{n_{11}}$ & $\boldsymbol{Q_{11}}$& $\boldsymbol{H_m}$ & $\boldsymbol{f_n}$ & $\boldsymbol{\sigma}$ \\ +\toprule +%donnee1 +21 & 3 & 37 & 0.004 & 12.99 & 8.335 &0.748 \\ +\bottomrule +\end{tabularx} +\newline +\vspace*{0.5 cm} +\newline +\begin{tabularx}{\textwidth}{>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X} +%channels +\textbf{Channel 1} & \textbf{Channel 1} & \textbf{Channel 1} & \textbf{Channel 1} \\ +\toprule +%donnee2 +21 & 3 & 37 & 0.004 \\ +\bottomrule +\end{tabularx} +\end{table} + +%\begin{comment} + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %% all pressure fluctuations graphs %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\begin{figure}[h] + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time1 + \includegraphicss[height=3cm]]{images/timeplot1.jpg} + %\vspace{0.50mm} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq1 + \includegraphicss[height=3cm]{images/freqplot1.jpg} + \end{subfigure} + \hfill + %label{fig:three graphs} + % \vspace{0.20mm} + +%graph2 + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time2 + \includegraphicss[height=3cm]{images/timeplot2.jpg} + %\vspace{0.20mm} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq2 + \includegraphics[height=3cm]{images/freqplot2.jpg} + \end{subfigure} + \hfill + %label{fig:three graphs} + + + + +%graph3 + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time3 + \includegraphics[height=3cm]{images/timeplot3.jpg} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq3 + \includegraphics[height=3cm]{images/freqplot3.jpg} + %\vspace{0.20mm} + \end{subfigure} + \hfill + %label{fig:three graphs} + +%graph4 + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time4 + \includegraphics[height=3.5cm]{images/timeplot4.jpg} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq4 + \includegraphics[height=3.5cm]{images/freqplot4.jpg} + \end{subfigure} + \hfill + %label{fig:three graphs} +\end{figure} + + +%Final table + +\begin{table}[b!] +\begin{center} +\setlength{\tabcolsep}{13.5pt} +\begin{tabular}{SSSSSSS} +%entete last +\textbf{Channel n} & $\boldsymbol{\frac{\Delta{H}_{max,97\%}}{H_M}}$ & $\boldsymbol{\frac{\Delta{H}_{min,97\%}}{H_M}}$ & $\boldsymbol{\frac{\Delta{H}_{pp,97\%}}{H_M}}$ &$\boldsymbol{f_{dominant}}$ & $\boldsymbol{\frac{\Delta{H}_{f,dominant}}{H_M}}$ & $\boldsymbol{\frac{f_{dominant}}{f_{n}}}$ \\ +{(-)} & {(\%)}& {(\%)} & {(\%)} & ${(s^{-1})}$ & {(\%)} & {(-)} \\ +\toprule +%final datas +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +\bottomrule + & & & & & & \\ + +\end{tabular} +\end{center} +\end{table} + + +\end{document} \ No newline at end of file diff --git a/latex_new_logos_append.tex b/latex_new_logos_append.tex new file mode 100644 index 0000000..e03629b --- /dev/null +++ b/latex_new_logos_append.tex @@ -0,0 +1,191 @@ + +\documentclass[a4paper, 11pt]{article} +\usepackage{graphicx} +\usepackage{comment} +\usepackage{fancyhdr} +\usepackage{lastpage} +\usepackage{ifthen} %for ifthenelse funtion +\usepackage{amsmath,bm} % For equations +\usepackage{colortbl} % pour "bfseries" dans les tabular +\usepackage{float} +\usepackage{booktabs} +\usepackage{blindtext} + +\usepackage{siunitx} +\usepackage{enumitem} +\usepackage{siunitx} % to write units proprely +\usepackage{tabularx} +\renewcommand\tabularxcolumn[1]{m{#1}}% +\usepackage{caption} +\usepackage{subcaption} +\usepackage{helvet} +\usepackage[export]{adjustbox} +\renewcommand{\familydefault}{\sfdefault} +\usepackage[left=2cm,right=2cm,top=2.5cm,bottom=2.5cm,headsep=-0.4cm,headheight=2.5cm]{geometry} +\usepackage{amsmath} +\usepackage{sfmath} +\newcommand{\foo}[1]{\bm{\mathrm{#1}}} + + + +\definecolor{Gray}{gray}{0.85} +%\newcolumntype{a}{>{\columncolor{Gray}}c} % for coloring tabulars +\pagenumbering{gobble} + +%% change all subscripts to roman ! +\catcode`_=\active +\newcommand_[1]{\ensuremath{\sb{\mathrm{#1}}}} % + + +\pagestyle{fancy} + +\fancyhead[C]{% + \begin{tabular}{m{3.0cm} m{10.0cm} m{3cm}} + \includegraphics[height=1cm]{Logos/EPFL2.png} & &\hfill \includegraphics[height=1cm]{Logos/LogoPTMH.png} + \end{tabular} + } + +\renewcommand{\headrulewidth}{0pt} +\renewcommand{\footrulewidth}{0.4pt} +\fancyfoot[L]{\includegraphics[height=1cm,valign=c]{Logos/FooterPTMH.pdf}} +%\fancyfoot[C]{\begin{tabular}{@{}c@{}}Footer \\ more footer\end{tabular}} + + +\begin{document} +%start +\begin{table}[t!] +\begin{tabular}{m{3.0cm} m{10cm} m{3cm}} +\rowcolor{Gray} +%entete +\textbf{709-05-05} & \centering \textbf{Yangjiang} & \hfill \textbf{date} +\end{tabular} +\end{table} + +\begin{table}[h!] +\centering +\begin{tabularx}{\textwidth}{>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X} +%coeffs +\textit{\textbf{MP}} & $\boldsymbol{\alpha}$ & $\boldsymbol{n_{11}}$ & $\boldsymbol{Q_{11}}$& $\boldsymbol{H_m}$ & $\boldsymbol{f_n}$ & $\boldsymbol{\sigma}$ \\ +\toprule +%donnee1 +21 & 3 & 37 & 0.004 & 12.99 & 8.335 &0.748 \\ +\bottomrule +\end{tabularx} +\newline +\vspace*{0.5 cm} +\newline +\begin{tabularx}{\textwidth}{>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X>{\centering\arraybackslash}X} +%channels +\textbf{Channel 1} & \textbf{Channel 1} & \textbf{Channel 1} & \textbf{Channel 1} \\ +\toprule +%donnee2 +21 & 3 & 37 & 0.004 \\ +\bottomrule +\end{tabularx} +\end{table} + +%\begin{comment} + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %% all pressure fluctuations graphs %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\begin{figure}[h] + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time1 + \includegraphicss[height=3cm]]{images/timeplot1.jpg} + %\vspace{0.50mm} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq1 + \includegraphicss[height=3cm]{images/freqplot1.jpg} + \end{subfigure} + \hfill + %label{fig:three graphs} + % \vspace{0.20mm} + +%graph2 + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time2 + \includegraphicss[height=3cm]{images/timeplot2.jpg} + %\vspace{0.20mm} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq2 + \includegraphics[height=3cm]{images/freqplot2.jpg} + \end{subfigure} + \hfill + %label{fig:three graphs} + + + + +%graph3 + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time3 + \includegraphics[height=3cm]{images/timeplot3.jpg} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq3 + \includegraphics[height=3cm]{images/freqplot3.jpg} + %\vspace{0.20mm} + \end{subfigure} + \hfill + %label{fig:three graphs} + +%graph4 + \centering + \begin{subfigure}[h]{.49\linewidth} + \centering +%time4 + \includegraphics[height=3.5cm]{images/timeplot4.jpg} + \end{subfigure} + \hfill + \begin{subfigure}[h]{.49\linewidth} + \centering +%freq4 + \includegraphics[height=3.5cm]{images/freqplot4.jpg} + \end{subfigure} + \hfill + %label{fig:three graphs} +\end{figure} + + +%Final table + +\begin{table}[b!] +\begin{center} +\setlength{\tabcolsep}{13.5pt} +\begin{tabular}{SSSSSSS} +%entete last +\textbf{Channel n} & $\boldsymbol{\frac{\Delta{H}_{max,97\%}}{H_M}}$ & $\boldsymbol{\frac{\Delta{H}_{min,97\%}}{H_M}}$ & $\boldsymbol{\frac{\Delta{H}_{pp,97\%}}{H_M}}$ &$\boldsymbol{f_{dominant}}$ & $\boldsymbol{\frac{\Delta{H}_{f,dominant}}{H_M}}$ & $\boldsymbol{\frac{f_{dominant}}{f_{n}}}$ \\ +{(-)} & {(\%)}& {(\%)} & {(\%)} & ${(s^{-1})}$ & {(\%)} & {(-)} \\ +\toprule +%final datas +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +21 & 3 & 37 & 0.004 & 0.004& 0.004 & 0.004 \\ +\bottomrule + & & & & & & \\ + +\end{tabular} +\end{center} +\end{table} +%end +\newpage \ No newline at end of file