diff --git a/Convert_Matlab/id_child.m b/Convert_Matlab/id_child.m index c2c0b94e67356fe8ec8f91c64320bf4ff3571274..84993f6a03a3e2c5c4b32b47075dd501d8c114c2 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 f01e4d3b5829868eee0db460098630746f630005..64d727209375574a9c9e23c215341af8995041d8 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 6a4ba8e6e5df5698524379a151dcee2a48431c1e..56e7ec33213762c584d8756bcd25c4f9b79432c9 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 ced9e185a429b74e9ecf309efacff8955d6a33b1..4cbe12f79026da496d8f1b4e8fe9ef57e1b0cee1 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 = []