Skip to content

Commit 2b1eb7f

Browse files
committed
English corrections & missing changelog version
1 parent 700f91c commit 2b1eb7f

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

CHANGELOG.rst

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,25 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
1010
------------
1111
Changed
1212
^^^^^^^
13-
- Now time will be allow second precision in storage on uint32 from 01/01/1950 to 01/01/2086
14-
new identification will be produce with this type, old file could be still loaded.
15-
If you use old identification to track use `--unraw` option to unpack old time and store in new format.
16-
- Now amplitude is stored with .1 mm of precision, same advice than time.
13+
14+
- Now time allows second precision (instead of daily precision) in storage on uint32 from 01/01/1950 to 01/01/2086
15+
New identifications are produced with this type, old files could still be loaded.
16+
If you use old identifications for tracking use the `--unraw` option to unpack old times and store data with the new format.
17+
- Now amplitude is stored with .1 mm of precision (instead of 1 mm), same advice as for time.
1718

1819
Fixed
1920
^^^^^
20-
- GridCollection get_next_time_step & get_previous_time_step needed more files to work in the dataset list.
21-
The loop needed explicitly self.dataset[i+-1] even when i==0, therefore indice went out of range
21+
2222
Added
2323
^^^^^
2424

25+
[3.5.0] - 2021-06-22
26+
--------------------
27+
28+
Fixed
29+
^^^^^
30+
- GridCollection get_next_time_step & get_previous_time_step needed more files to work in the dataset list.
31+
The loop needed explicitly self.dataset[i+-1] even when i==0, therefore indice went out of range
2532

2633
[3.4.0] - 2021-03-29
2734
--------------------

doc/run_tracking.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Tracking
55
Requirements
66
************
77

8-
Before to run tracking, you will need to run identification on every time step of the period (period of your study).
8+
Before tracking, you will need to run identification on every time step of the period (period of your study).
99

10-
**Advice** : Before to run tracking, displaying some identification file allows to learn a lot
10+
**Advice** : Before tracking, displaying some identification files. You will learn a lot
1111

1212
Default method
1313
**************
@@ -24,9 +24,9 @@ Example of conf.yaml
2424
FILES_PATTERN: MY_IDENTIFICATION_PATH/Anticyclonic*.nc
2525
SAVE_DIR: MY_OUTPUT_PATH
2626
27-
# Number of timestep for missing detection
27+
# Number of consecutive timesteps with missing detection allowed
2828
VIRTUAL_LENGTH_MAX: 3
29-
# Minimal number of timesteps to consider as a long track
29+
# Minimal number of timesteps to considered as a long trajectory
3030
TRACK_DURATION_MIN: 10
3131
3232
To run:
@@ -63,13 +63,13 @@ With yaml you could also select another tracker:
6363
.. code-block:: yaml
6464
6565
PATHS:
66-
# Files produces with EddyIdentification
66+
# Files produced with EddyIdentification
6767
FILES_PATTERN: MY/IDENTIFICATION_PATH/Anticyclonic*.nc
6868
SAVE_DIR: MY_OUTPUT_PATH
6969
70-
# Number of timesteps for missing detection
70+
# Number of consecutive timesteps with missing detection allowed
7171
VIRTUAL_LENGTH_MAX: 3
72-
# Minimal number of timesteps to consider as a long track
72+
# Minimal number of timesteps to considered as a long trajectory
7373
TRACK_DURATION_MIN: 10
7474
7575
CLASS:

share/tracking.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PATHS:
2-
# Files produces with EddyIdentification
2+
# Files produced with EddyIdentification
33
FILES_PATTERN: /home/emason/toto/Anticyclonic_*.nc
4-
# Path for saving of outputs
4+
# Path to save outputs
55
SAVE_DIR: '/home/emason/toto/'
66

7-
# Minimal number of timesteps to consider as a long track
8-
TRACK_DURATION_MIN: 4
9-
# Number of timesteps for missing detection
7+
# Number of consecutive timesteps with missing detection allowed
108
VIRTUAL_LENGTH_MAX: 0
9+
# Minimal number of timesteps to considered as a long trajectory
10+
TRACK_DURATION_MIN: 4
1111

1212
CLASS:
1313
MODULE: py_eddy_tracker.featured_tracking.area_tracker

src/py_eddy_tracker/appli/eddies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def browse_dataset_in(
281281
dataset_list.sort(order=["date", "filename"])
282282
steps = unique(dataset_list["date"][1:] - dataset_list["date"][:-1])
283283
if len(steps) > 1:
284-
raise Exception("Several days steps in grid dataset %s" % steps)
284+
raise Exception("Several timesteps in grid dataset %s" % steps)
285285

286286
if sub_sampling_step != 1:
287287
logger.info("Grid subsampling %d", sub_sampling_step)

0 commit comments

Comments
 (0)