diff --git a/Inst_eddies/Tests/examine_eddy.f90 b/Inst_eddies/Tests/examine_eddy.f90 index aa4ec1707eecf6bad7ccc9792075af8229d4cfe3..3ba59b9ffaf6b71f42f1a9d49ec9e6f1c9202f5d 100644 --- a/Inst_eddies/Tests/examine_eddy.f90 +++ b/Inst_eddies/Tests/examine_eddy.f90 @@ -4,7 +4,7 @@ program examine_eddy ! outside_points all the extrema of opposite sign (including those ! not associated to an eddy) plus the extrema of same sign ! associated to an eddy. Note that coord and outside_points may not - ! be exactly equal to waht they were in inst_eddies because: there + ! be exactly equal to what they were in inst_eddies because: there ! is a multiplication of coord by rad_to_deg when writing the ! shapefile and a multiplication by deg_to_rad when reading it; ! set_all_extr is called with a different value of dummy argument diff --git a/Inst_eddies/inst_eddies.py.in b/Inst_eddies/inst_eddies.py.in index c25df85034b9497c46336df3fb57567965726669..288e7a285159d30b4bb03687804e12198353cb38 100644 --- a/Inst_eddies/inst_eddies.py.in +++ b/Inst_eddies/inst_eddies.py.in @@ -18,10 +18,10 @@ import time import csv def loop_inst_eddies(files, bbox, d, my_slice): - """files is a sequence of file paths. The first file must exist, - others can be missing. bbox is a tuple of four real numbers. d is - a date index (integer value) for the first date. my_slice is the - slice index (integer value) in the SHPC. + """files is a sequence or iterator of file paths. The first file must + exist, others can be missing. bbox is a tuple of four real + numbers. d is a date index (integer value) for the first + date. my_slice is the slice index (integer value) in the SHPC. """ diff --git a/Trajectories/Documentation_texfol/documentation.tex b/Trajectories/Documentation_texfol/documentation.tex index ae11b4b6d93d34573fcfdd42bbee906cc585a28d..855c437ca297e938f78f17482a49ca4912e39ca2 100644 --- a/Trajectories/Documentation_texfol/documentation.tex +++ b/Trajectories/Documentation_texfol/documentation.tex @@ -44,8 +44,8 @@ le graphe en composantes connexes, ou chercher le graphe amont ou aval à partir d'un noeud du graphe. Des bibliothèques Python de traitement de graphe semblent bien -adaptées pour cette partie. En Python. Création d'une liste de chemins -qui recouvrent tout le graphe. +adaptées pour cette partie. Création d'une liste de chemins qui +recouvrent tout le graphe. Vocabulaire : fusion pour \Eng{merging} et division pour \Eng{splitting}. @@ -121,6 +121,22 @@ Mémoire vive nécessaire pour charger le graphe global sur 28 ans, sans attributs, avec Graph-tool : environ \np{6.1} GiB. Il faut au moins 11 GiB avec Networkx. +Script \verb+trajectory.py+. Cf. tableau \ref{tab:trajectory}. +\begin{table}[htbp] + \centering + \begin{tabular}{llll} + Cas & v0.28 & v0.29 & v0.30 \\ + \hline + Greece\_trajectories & OK & KO & OK \\ + Division\_fusion & KO & OK & OK \\ + Test\_order\_edges & OK & KO & OK \\ + Traj\_component & KO & KO & OK \\ + \end{tabular} + \caption{Tests du script \texttt{trajectory.py}. KO signifie que les + trajectoires obtenues par le script ne sont pas satisfaisantes.} + \label{tab:trajectory} +\end{table} + \section{\texttt{segments.py}} Définition d'un segment : si un tourbillon se divise, c'est-à -dire si diff --git a/Trajectories/cost_function.py b/Trajectories/cost_function.py index 17a3696480b122b8f0bf7b68e550dadd3ab31336..b4fec82e48a01223b953a6d42e92e201006470a2 100755 --- a/Trajectories/cost_function.py +++ b/Trajectories/cost_function.py @@ -11,7 +11,10 @@ Input: Output: the graph of segments with cost. -The inst_eddies property of vertices is not modified by this script. +The inst_eddies property of vertices is not modified by this +script. All the content of the input graph is part of the output graph +so the input file may be removed, if desired, after running this +script. """ diff --git a/Trajectories/draw_segments.py b/Trajectories/draw_segments.py index 8fb08473e1aec8338bbe12c3e3a2b1c76102499e..215976e8e3bd52d5d28a61003538547047db8725 100755 --- a/Trajectories/draw_segments.py +++ b/Trajectories/draw_segments.py @@ -2,9 +2,9 @@ """This script reads a graph of segments in graph-tool or graphml format and creates the corresponding Graphviz file. If the graph has -cost values then the edges are labeled with them. If the file -traj_segm.json is found then the label of each node tells which -trajectory the segment belongs to. +cost values then the edges are labeled with them. If the option -t is +given then the label of each node tells which trajectory the segment +belongs to. """