diff --git a/Common/get_ori_slice_dir.f90 b/Common/get_ori_slice_dir.f90 index 91eb7f8fd65ed6fdcfbacadb098ce371248484dc..ade88d136b0dacf122d108ef5c7e562d957b1858 100644 --- a/Common/get_ori_slice_dir.f90 +++ b/Common/get_ori_slice_dir.f90 @@ -1,12 +1,12 @@ -module get_slice_dir_m +module get_ori_slice_dir_m implicit none contains - pure function get_slice_dir(shpc_dir, cyclone, slice) + pure function get_ori_slice_dir(shpc_dir, cyclone, slice) - character(len = :), allocatable:: get_slice_dir + character(len = :), allocatable:: get_ori_slice_dir character(len = *), intent(in):: shpc_dir logical, intent(in):: cyclone integer, intent(in):: slice @@ -19,11 +19,12 @@ contains write(unit = slice_part, fmt = "(a, i0)") "Slice_", slice if (cyclone) then - get_slice_dir = shpc_dir // "/" // trim(slice_part) // "/Cyclones" + get_ori_slice_dir = shpc_dir // "/" // trim(slice_part) // "/Cyclones" else - get_slice_dir = shpc_dir // "/" // trim(slice_part) // "/Anticyclones" + get_ori_slice_dir = shpc_dir // "/" // trim(slice_part) & + // "/Anticyclones" end if - end function get_slice_dir + end function get_ori_slice_dir -end module get_slice_dir_m +end module get_ori_slice_dir_m diff --git a/Common/ori_slice_open.f90 b/Common/ori_slice_open.f90 index 8737f126ab59894a0497f6494f665c72031b61e4..325a4bf48f337ea1a09203703e6e227bc3c0e4c5 100644 --- a/Common/ori_slice_open.f90 +++ b/Common/ori_slice_open.f90 @@ -16,7 +16,7 @@ contains use shapelib_03, only: shp_open_03 use derived_types, only: ori_slice_handler - use get_slice_dir_m, only: get_slice_dir + use get_ori_slice_dir_m, only: get_ori_slice_dir use read_field_indices_m, only: read_field_indices TYPE(ori_slice_handler), intent(out):: hshp @@ -32,7 +32,7 @@ contains !-------------------------------------------------------------------- - hshp%dir = get_slice_dir(shpc_dir, cyclone, slice) + hshp%dir = get_ori_slice_dir(shpc_dir, cyclone, slice) call shp_open_03(hshp%extremum, hshp%dir // "/extremum", pszaccess, & iostat_local) if (present(iostat)) iostat = iostat_local diff --git a/Inst_eddies/shpc_create.f90 b/Inst_eddies/shpc_create.f90 index b0fd4dc27951d8f4d3008f00b967f12d975793a8..823c1a83021bfe39a7e899af3d9ecbbc552a5469 100644 --- a/Inst_eddies/shpc_create.f90 +++ b/Inst_eddies/shpc_create.f90 @@ -14,7 +14,7 @@ contains use shapelib_03, only: shp_create_03, dbf_add_field_03 use derived_types, only: ori_slice_handler - use get_slice_dir_m, only: get_slice_dir + use get_ori_slice_dir_m, only: get_ori_slice_dir TYPE(ori_slice_handler), intent(out):: hshp character(len = *), intent(in):: shpc_dir @@ -28,7 +28,7 @@ contains !--------------------------------------------------------------------- - hshp%dir = get_slice_dir(shpc_dir, cyclone, slice) + hshp%dir = get_ori_slice_dir(shpc_dir, cyclone, slice) ! extremum shapefile: call shp_create_03(hshp%dir // "/extremum", shpt_point, &