diff --git a/Convert_Matlab/inst_eddies_HDF5.py b/Convert_Matlab/inst_eddies_HDF5.py index 94ec1ee364134259d63375d495d1a430d471efd2..f2f73939e0e24f8602b8d72ca7911f75862b73f4 100755 --- a/Convert_Matlab/inst_eddies_HDF5.py +++ b/Convert_Matlab/inst_eddies_HDF5.py @@ -20,16 +20,12 @@ def define_fields(writers): writers["extr"].field("ssh", "N", 13, 6) writers["extr"].field("date_index", "N", 5) writers["extr"].field("eddy_index", "N", 5) - writers["extr"].field("interpolat", "N", 1) - writers["extr"].field("cyclone", "N", 1) - writers["extr"].field("valid", "N", 1) writers["extr"].field("speed", "N", 13, 6) writers["outer"].field("r_eq_area", "N", 10, 4) writers["outer"].field("ssh", "N", 13, 6) writers["outer"].field("date_index", "N", 5) writers["outer"].field("eddy_index", "N", 5) - writers["outer"].field("radius4", "N", 2) writers["max_speed"].field("r_eq_area", "N", 10, 4) writers["max_speed"].field("ssh", "N", 13, 6) @@ -57,9 +53,8 @@ def write(writers, cell, cyclone): speed = matlab_data[eddy[12]][:].item() if np.isnan(speed): speed = 1e4 writers["extr"].record(ssh = matlab_data["ADT"][j, i], - date_index = date_index, - eddy_index = eddy_index, interpolat = 0, - cyclone = cyclone, valid = 1, speed = speed) + date_index = date_index, eddy_index = eddy_index, + speed = speed) if cyclone: ssh = matlab_data["ADT"][j, i] + matlab_data[eddy[7]][:].item() @@ -69,7 +64,7 @@ def write(writers, cell, cyclone): r_eq_area = matlab_data[eddy[6]][:].item() writers["outer"].record(r_eq_area = r_eq_area, ssh = ssh, date_index = date_index, - eddy_index = eddy_index, radius4 = - 1) + eddy_index = eddy_index) lon = matlab_data[eddy[4]][:].squeeze() lat = matlab_data[eddy[5]][:].squeeze() polyline = np.stack((lon, lat), axis = 1) diff --git a/Convert_Matlab/inst_eddies_v6.py b/Convert_Matlab/inst_eddies_v6.py index e690ba9d9f51ac18aa39a4374ddbce3188d49536..f4f68ae14d413906c2fa9c58df368f35c3465561 100755 --- a/Convert_Matlab/inst_eddies_v6.py +++ b/Convert_Matlab/inst_eddies_v6.py @@ -21,16 +21,12 @@ def define_fields(writers): writers["extr"].field("ssh", "N", 13, 6) writers["extr"].field("date_index", "N", 5) writers["extr"].field("eddy_index", "N", 5) - writers["extr"].field("interpolat", "N", 1) - writers["extr"].field("cyclone", "N", 1) - writers["extr"].field("valid", "N", 1) writers["extr"].field("speed", "N", 13, 6) writers["outer"].field("r_eq_area", "N", 10, 4) writers["outer"].field("ssh", "N", 13, 6) writers["outer"].field("date_index", "N", 5) writers["outer"].field("eddy_index", "N", 5) - writers["outer"].field("radius4", "N", 2) writers["max_speed"].field("r_eq_area", "N", 10, 4) writers["max_speed"].field("ssh", "N", 13, 6) @@ -57,7 +53,6 @@ def write(writers, cell, cyclone): j = np.argwhere(matlab_data["Y"] == eddy[1]).item() speed = 1e4 if np.isnan(eddy[12]) else eddy[12] writers["extr"].record(ssh = matlab_data["ADT"][i, j], - interpolat = 0, cyclone = cyclone, valid = 1, date_index = date_index, eddy_index = eddy_index, speed = speed) @@ -67,8 +62,8 @@ def write(writers, cell, cyclone): ssh = matlab_data["ADT"][i, j] - eddy[7] writers["outer"].record(r_eq_area = eddy[6], ssh = ssh, - date_index = date_index, eddy_index = eddy_index, - radius4 = - 1) + date_index = date_index, + eddy_index = eddy_index) polyline = np.stack((eddy[4], eddy[5]), axis = 1) writers["outer"].poly([polyline])