diff --git a/Analysis/plot_traj.py b/Analysis/plot_traj.py index c15da3e4ea9edb7a7a548e462c68d50f1376e435..3b7221ff9fd87b22ea14615baa2da1ecee710f34 100755 --- a/Analysis/plot_traj.py +++ b/Analysis/plot_traj.py @@ -185,7 +185,7 @@ if __name__ == "__main__": G_cyclo = report_graph.read_eddy_graph("edgelist_cyclo.csv", args.shp_tr_dir) G_anti = report_graph.read_eddy_graph("edgelist_anti.csv", - args.shp_tr_dir) + args.shp_tr_dir) if args.time: t1 = time.perf_counter() diff --git a/Analysis/report_graph.py b/Analysis/report_graph.py index 85ddb3dd0f08a5381fd253198c27e8e9af0b1d08..a803b09847750c5ae7649ca745eed7b56b857eb1 100755 --- a/Analysis/report_graph.py +++ b/Analysis/report_graph.py @@ -50,6 +50,8 @@ def read_eddy_graph(edgelist, shp_tr_dir = None, read_interp = True): # Read and set attributes of Visible eddies: extremum = path.join(shp_tr_dir, "extremum") set_attribute(G, extremum) + else: + print(edgelist, "not readable") return G diff --git a/Convert_Matlab/Documentation_texfol/documentation.tex b/Convert_Matlab/Documentation_texfol/documentation.tex index a097e3680e8b7e5139a2f1c6010e82b88ce4f839..7c03fbc43b4f0c022401680b0b125a4caab229bf 100644 --- a/Convert_Matlab/Documentation_texfol/documentation.tex +++ b/Convert_Matlab/Documentation_texfol/documentation.tex @@ -61,7 +61,7 @@ départ. \section{Identification of instantaneous eddies} \label{sec:identification} -Instantaneous eddies with a given orientation are identified in two, +Instantaneous eddies with a given orientation are identified in two equivalent ways: either by a couple date $d$ and eddy index $e$ at that date, or by a unique identifier $n$, which we can call a \og node index\fg{}. @@ -76,7 +76,7 @@ So the first value of $k$ is 0. Let $e_{\mathrm{max}, o}(k)$ be the number of instantaneous eddies with orientation $o$ at date index $k$. $e_{\mathrm{max}, o}(k)$ is -stored in Matlab variables Nanti et Ncyclo. We assume we know an +stored in Matlab variables Nanti and Ncyclo. We assume we know an overestimate $E$ of $e_{\mathrm{max}, o}(k)$ for all $k$ and both orientations. That is, we guarantee that: \begin{equation*} @@ -131,7 +131,7 @@ directories \verb+SHPC_(anti|cyclo)+. Cf. figure \ref{fig:convert_Matlab}. \includegraphics[width=\textwidth]{convert_Matlab} \caption{Correspondance between input Matlab files and files converted from them. Below the names of Matlab files are indicated - the names of the variables which were used inside those files, and + the names of the variables which are used inside those files, and the fields used inside those variables.} \label{fig:convert_Matlab} \end{figure}