Skip to content
Snippets Groups Projects
Commit bba67bb2 authored by Lionel GUEZ's avatar Lionel GUEZ
Browse files

Remove interpolat field from shapefiles

Thus remove too component interpolated of derived type eddy and
component `extr_interp` of derived type shpc.
parent c440ce20
No related branches found
No related tags found
No related merge requests found
......@@ -25,8 +25,6 @@ module derived_types
logical valid ! valid out_cont found: not a null contour, and
! with sufficient area
logical interpolated
integer:: delta_in = huge(0)
! Minimum difference in time subscript where there is a direct
! predecessor. Huge means there is no direct predecessor.
......@@ -73,8 +71,7 @@ module derived_types
logical cyclone
! Field identifiers:
integer extr_ssh, extr_date, extr_eddy_index, extr_interp, extr_valid, &
extr_speed
integer extr_ssh, extr_date, extr_eddy_index, extr_valid, extr_speed
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, &
max_speed_eddy_index
......
......@@ -40,10 +40,6 @@ contains
call dbf_read_attribute_03(d, hshp%extremum, hshp%extr_date, ishape)
call dbf_read_attribute_03(i, hshp%extremum, hshp%extr_eddy_index, ishape)
call dbf_read_attribute_03(int_attr, hshp%extremum, hshp%extr_interp, &
ishape)
e%interpolated = int_attr == 1
e%cyclone = hshp%cyclone
call dbf_read_attribute_03(int_attr, hshp%extremum, hshp%extr_valid, &
......
......@@ -22,8 +22,6 @@ contains
call dbf_get_field_index_03(hshp%extremum, "days_1950", 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, "interpolat", &
hshp%extr_interp)
call dbf_get_field_index_03(hshp%extremum, "valid", hshp%extr_valid)
call dbf_get_field_index_03(hshp%extremum, "speed", hshp%extr_speed)
......@@ -40,7 +38,6 @@ contains
call ezmpi_bcast(hshp%extr_ssh, root = 0)
call ezmpi_bcast(hshp%extr_date, root = 0)
call ezmpi_bcast(hshp%extr_eddy_index, root = 0)
call ezmpi_bcast(hshp%extr_interp, root = 0)
call ezmpi_bcast(hshp%extr_valid, root = 0)
call ezmpi_bcast(hshp%extr_speed, root = 0)
call ezmpi_bcast(hshp%out_r_eq_area, root = 0)
......
......@@ -30,8 +30,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_interp, hshp%extremum, 'interpolat', &
ftinteger, nwidth = 1, 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, &
......
......@@ -35,8 +35,6 @@ contains
call dbf_write_attribute_03(hshp%extremum, ishape, hshp%extr_date, &
days_1950)
call dbf_write_attribute_03(hshp%extremum, ishape, hshp%extr_eddy_index, i)
call dbf_write_attribute_03(hshp%extremum, ishape, hshp%extr_interp, &
merge(1, 0, e%interpolated))
call dbf_write_attribute_03(hshp%extremum, ishape, hshp%extr_valid, &
merge(1, 0, e%valid))
......
......@@ -109,7 +109,6 @@ program test_get_1_outerm
e%max_speed = missing_speed
e%radius4 = - 1
e%valid = .true.
e%interpolated = .false.
call shpc_create(hshp, shpc_dir = "SHPC", cyclone = cyclone)
call write_eddy(e, hshp, days_1950, i = 1)
CALL shpc_close(hshp)
......
......@@ -110,7 +110,6 @@ contains
s%list_vis(i)%ssh_extr = ssh(s%ind_extr(1, i), s%ind_extr(2, i))
s%list_vis(i)%cyclone = cyclone(i)
s%list_vis(i)%interpolated = .false.
s%list_vis(i)%valid = .true.
! must be intialized to true because it is used in nearby_extr
......
......@@ -37,7 +37,6 @@ contains
call recv_ssh_contour(s%list_vis(i)%speed_cont, source, tag)
call ezmpi_recv(s%list_vis(i)%max_speed, source, tag)
call ezmpi_recv(s%list_vis(i)%valid, source, tag)
call ezmpi_recv(s%list_vis(i)%interpolated, source, tag)
call ezmpi_recv(s%list_vis(i)%delta_in, source, tag)
call ezmpi_recv(s%list_vis(i)%delta_out, source, tag)
call ezmpi_recv(s%list_vis(i)%radius4, source, tag)
......
......@@ -32,7 +32,6 @@ contains
call send_ssh_contour(s%list_vis(i)%speed_cont, dest, tag)
call ezmpi_send(s%list_vis(i)%max_speed, dest, tag)
call ezmpi_send(s%list_vis(i)%valid, dest, tag)
call ezmpi_send(s%list_vis(i)%interpolated, dest, tag)
call ezmpi_send(s%list_vis(i)%delta_in, dest, tag)
call ezmpi_send(s%list_vis(i)%delta_out, dest, tag)
call ezmpi_send(s%list_vis(i)%radius4, dest, tag)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment