From 6898955464e8dd5054e98fdc87915ddbbe277733 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 5 Oct 2021 18:50:33 +0200
Subject: [PATCH] Polish
---
Convert_Matlab/id_child.m | 2 +-
Convert_Matlab/inst_eddies_v6.py | 10 +++++-----
Convert_Matlab/overlap.m | 4 ++--
Convert_Matlab/overlap_v6.py | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Convert_Matlab/id_child.m b/Convert_Matlab/id_child.m
index c2c0b94e..84993f6a 100644
--- a/Convert_Matlab/id_child.m
+++ b/Convert_Matlab/id_child.m
@@ -1,5 +1,5 @@
% This is a Matlab script. This script converts to Matlab v6 format
-% some output of TOEddies: what is necessary for the script
+% some output of TOEddies: id_child, which is necessary for the script
% overlap_v6.py.
clear
diff --git a/Convert_Matlab/inst_eddies_v6.py b/Convert_Matlab/inst_eddies_v6.py
index f01e4d3b..64d72720 100755
--- a/Convert_Matlab/inst_eddies_v6.py
+++ b/Convert_Matlab/inst_eddies_v6.py
@@ -2,11 +2,11 @@
"""Converts adt_YYYY-MM-DD.mat files to two collections of shapefiles,
SHPC_anti and SHPC_cyclo. The mat files are assumed to be in v7.3
-(HDF5) format and will be converted to v6 format before being read in
-Python. The data in each input file is the set of detected
-instantaneous eddies at a given date. The second, optional, argument
-of this script is the final date processed. The script inst_eddies.m
-must be in the current directory at run-time.
+(HDF5) format and will be converted to v6 format, launching Matlab,
+before being read in Python. The data in each input file is the set of
+detected instantaneous eddies at a given date. The second, optional,
+argument of this script is the final date processed. The script
+inst_eddies.m must be in the current directory at run-time.
"""
diff --git a/Convert_Matlab/overlap.m b/Convert_Matlab/overlap.m
index 6a4ba8e6..56e7ec33 100644
--- a/Convert_Matlab/overlap.m
+++ b/Convert_Matlab/overlap.m
@@ -1,6 +1,6 @@
% This is a Matlab script. This script converts to Matlab v6 format
-% some output of TOEddies: part of what is necessary for the script
-% overlap_v6.py.
+% some output of TOEddies: Nanti, date_num and Ncyclo, which are
+% necessary for the script overlap_v6.py.
disp('Processing Parameters_Anticyclonic_Eddies...')
load('Parameters_Anticyclonic_Eddies.mat', 'Nanti', 'date_num')
diff --git a/Convert_Matlab/overlap_v6.py b/Convert_Matlab/overlap_v6.py
index ced9e185..4cbe12f7 100755
--- a/Convert_Matlab/overlap_v6.py
+++ b/Convert_Matlab/overlap_v6.py
@@ -27,7 +27,7 @@ def adjust_n(n_Matlab):
return n_Matlab + (k - k_Matlab) * e_overestim
if __name__ == "__main__":
- n_files = input("Number of files = ? ")
+ n_files = input("Number of input files id_child_*.mat? ")
n_files = int(n_files)
id_child_list = []
--
GitLab