diff --git a/Common/derived_types.f90 b/Common/derived_types.f90 index ff2edafd1d1a9547ab6820cc0a34883153c0da71..33a228318bf266c549ea3ed6ff85c28338cd1f42 100644 --- a/Common/derived_types.f90 +++ b/Common/derived_types.f90 @@ -84,7 +84,7 @@ module derived_types logical cyclone ! Field identifiers in the DBF files: - integer extr_ssh, extr_date, extr_eddy_index, extr_valid, extr_speed + integer extr_ssh, extr_date, extr_eddy_index, extr_speed integer extr_proj_date, extr_proj_eddy_index integer out_r_eq_area, out_ssh, out_date, out_eddy_index, out_radius4 integer max_speed_r_eq_area, max_speed_ssh, max_speed_date, & diff --git a/Common/read_field_indices.f90 b/Common/read_field_indices.f90 index ff0edbe7758e0eb9bca0dcf0e8608f56047e72a9..5ed90cddfeb64f4a9b29af8a92515573a9c74da2 100644 --- a/Common/read_field_indices.f90 +++ b/Common/read_field_indices.f90 @@ -20,7 +20,6 @@ contains call dbf_get_field_index_03(hshp%extremum, "date", hshp%extr_date) call dbf_get_field_index_03(hshp%extremum, "eddy_index", & hshp%extr_eddy_index) - call dbf_get_field_index_03(hshp%extremum, "valid", hshp%extr_valid) call dbf_get_field_index_03(hshp%extremum, "speed", hshp%extr_speed) if (.not. dbffileisnull(hshp%extr_proj)) then diff --git a/Convert_Matlab/inst_eddies_v6.py b/Convert_Matlab/inst_eddies_v6.py index 51437a00c14be47519e16d6d7c051ca528b0ab67..411c0dd42309ad349d1c62415079587c7383b9dd 100755 --- a/Convert_Matlab/inst_eddies_v6.py +++ b/Convert_Matlab/inst_eddies_v6.py @@ -32,7 +32,6 @@ def define_fields(writers): writers["extr"].field("ssh", "N", 13, 6) writers["extr"].field("date", "N", 5) writers["extr"].field("eddy_index", "N", 5) - writers["extr"].field("valid", "N", 1) writers["extr"].field("speed", "N", 13, 6) writers["centroid"].field("date", "N", 5) @@ -79,9 +78,8 @@ def write_to_shp(writers, cyclone, d, cell = None, X = None, Y = None, i = np.argwhere(X == eddy[0]).item() j = np.argwhere(Y == eddy[1]).item() speed = 1e4 if np.isnan(eddy[12]) else eddy[12] # Azimuthal Vit - writers["extr"].record(ssh = ADT[i, j], valid = 1, - date = d, eddy_index = eddy_index, - speed = speed) + writers["extr"].record(ssh = ADT[i, j], date = d, + eddy_index = eddy_index, speed = speed) # Amplitude Out: if cyclone: diff --git a/Inst_eddies/shpc_create.f90 b/Inst_eddies/shpc_create.f90 index 1c6283d025f5d02447d617665379329f1e394e8d..1f17a973a8bb9a3e721b43479d7ff868bdcfbe8d 100644 --- a/Inst_eddies/shpc_create.f90 +++ b/Inst_eddies/shpc_create.f90 @@ -33,8 +33,6 @@ contains ftinteger, nwidth = 5, ndecimals = 0) call dbf_add_field_03(hshp%extr_eddy_index, hshp%extremum, 'eddy_index', & ftinteger, nwidth = 5, ndecimals = 0) - call dbf_add_field_03(hshp%extr_valid, hshp%extremum, 'valid', & - ftinteger, nwidth = 1, ndecimals = 0) call dbf_add_field_03(hshp%extr_speed, hshp%extremum, 'speed', ftdouble, & nwidth = 13, ndecimals = 6) diff --git a/Inst_eddies/write_eddy.f90 b/Inst_eddies/write_eddy.f90 index bcadfbefe11c39f6c1df717f85f418ae78329aae..168660bee012dbea1c2d63db2b24e367e3f85715 100644 --- a/Inst_eddies/write_eddy.f90 +++ b/Inst_eddies/write_eddy.f90 @@ -36,8 +36,6 @@ contains call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_date, date) call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_eddy_index, & i) - call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_valid, & - merge(1, 0, e%out_cont%closed)) if (ieee_is_nan(e%max_speed)) then call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_speed, & diff --git a/test_write_null.f90 b/test_write_null.f90 index 8ce866dfe86fabed71139eca107ac213b61c4748..cc31e48293c52c9be7922678d4ae7d992e11ec6e 100644 --- a/test_write_null.f90 +++ b/test_write_null.f90 @@ -37,7 +37,6 @@ program test_write_null call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_date, 0) call dbf_write_attribute_03(hshpc%extremum, ishape, & hshpc%extr_eddy_index, i) - call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_valid, 1) call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_speed, & 0.) call shp_append_null_03(ishape, hshpc%outermost) @@ -68,7 +67,6 @@ program test_write_null call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_date, 0) call dbf_write_attribute_03(hshpc%extremum, ishape, & hshpc%extr_eddy_index, i) - call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_valid, 1) call dbf_write_attribute_03(hshpc%extremum, ishape, hshpc%extr_speed, & 0.) end do