Skip to content

fix longitude for tcycl annotations (now consistently in range [0,360]) #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix longitude for tcycl annotations (now consistently in range [0,360]) #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions src/pproc/tcycl/tcycl_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,21 @@ class Utils:
"""
A collection of generic TC utils
"""


@staticmethod
def to_lon_180(lon):
"""
Convert lon from [0,360] to [-180,180]
"""
return lon - lon // 180 * 360

@staticmethod
def to_lon_360(lon):
"""
Convert lon from [-180,180] to [0,360]
"""
return lon + 360 * (lon < 0)

@staticmethod
def ifs_steps(max_step):
"""
Expand All @@ -32,7 +46,7 @@ def ifs_steps(max_step):
list(range(144, min(246, max_step + 1), 6))

@staticmethod
def pxl_2_lat_lon(pixel_indexes, fields_metadata):
def pxl_2_lat_lon(pixel_indexes, fields_metadata, output_lon_format_180=False):
"""
From pixel indexes (+ fields info) to lat/lon coordinates
"""
Expand All @@ -44,14 +58,18 @@ def pxl_2_lat_lon(pixel_indexes, fields_metadata):

for tc in pixel_indexes:
lat = lat_max - tc[0] / field_shape[0] * (lat_max - lat_min)

lon = lon_min + tc[1] / field_shape[1] * (lon_max - lon_min)
lon = lon - lon // 180 * 360

if output_lon_format_180:
lon = Utils.to_lon_180(lon)

coords.append((lat, lon))

return coords

@staticmethod
def lat_lon_2_pxl(lat_lon, fields_metadata):
def lat_lon_2_pxl(lat_lon, fields_metadata, input_lon_format_180=False):
"""
Function that maps lat/lon to pixel indexes
(according to size and area range)
Expand All @@ -63,6 +81,11 @@ def lat_lon_2_pxl(lat_lon, fields_metadata):

pxl_idxs = []
for lat, lon in lat_lon:

# Convert from [180,180] to [0,360]
if input_lon_format_180:
lon = Utils.to_lon_360(lon)

pxl_x = int((lon - lon_min) / (lon_max - lon_min) * shape_x)
pxl_x = min(max(0, pxl_x), shape_x - 1)

Expand Down