DAS-2270 - Check for dimension ordering done for SMAP L3 2d variables #19
Conversation
hoss/coordinate_utilities.py
Outdated
| dimension_indices: list, | ||
| dimension_size: int, | ||
| index_for_dimension: int, | ||
| x_or_y_index: int, |
There was a problem hiding this comment.
index_for_dimension => use_row_not_col (boolean)
x_or_y_index => dim_order_is_y_x (boolean)
Invocations should use parameter name when providing direct values, e.g., use_row_not_col=False
And implementation should convert booleans into array indices, perhaps with comments to clarify.
This will hopefully make things a bit clearer.
Also, possibly, this routine should get the dimension_names, rather than passing this list around. But I realize that may not make sense given the parameters required for getting the dimension_names.
hoss/coordinate_utilities.py
Outdated
| lat_arr, lon_arr, latitude_coordinate, longitude_coordinate | ||
| ) | ||
|
|
||
| y_x_order, projected_y = get_dimension_order( |
There was a problem hiding this comment.
dim_order_is_y_x, projected_dim_name = (
hoss/coordinate_utilities.py
Outdated
| ) | ||
| # if is row, the index_for_dimension is 0 | ||
| y_dim = get_dimension_array_from_geo_points( | ||
| lat_arr, lon_arr, crs, row_indices, row_size, 0, y_x_order |
There was a problem hiding this comment.
lat_arr, lon_arr, crs, row_indices, row_size, dim_order_is_y_x, use_row_not_col=False
hoss/coordinate_utilities.py
Outdated
| lat_arr, lon_arr, crs, row_indices, row_size, 0, y_x_order | ||
| ) | ||
|
|
||
| x_y_order, projected_x = get_dimension_order( |
There was a problem hiding this comment.
dim_order_is_y_x, projected_dim_name = (
hoss/coordinate_utilities.py
Outdated
| ) | ||
| # if is column, the index_for_dimension is 1 | ||
| x_dim = get_dimension_array_from_geo_points( | ||
| lat_arr, lon_arr, crs, col_indices, col_size, 1, x_y_order |
There was a problem hiding this comment.
lat_arr, lon_arr, crs, row_indices, row_size, dim_order_is_y_x, use_row_not_col=True
hoss/coordinate_utilities.py
Outdated
| # and call it y | ||
| if is_row is True and np.all(np.diff(lat_arr_values) != 0): | ||
| return (1, projected_y) | ||
|
|
There was a problem hiding this comment.
I wonder if we should be using not is_close for floating point, rather than an absolute != 0? (and in following statements)
There was a problem hiding this comment.
np.isclose is for comparing two arrays I think. will check into it
There was a problem hiding this comment.
will change it to np.allclose(lat_arr_values, lat_arr_values[0])
…r grid_mapping_name
Description
This PR includes changes to determine the right dimension order when doing spatial subsets for SMAP L3. The
latitude and longitude coordinates are used to make the determination. SMAP L3 does not have dimension scales and is not CF compliant.
This PR does not include tests for multiple grids which is part of the ticket. which will be a separate commit
Jira Issue ID
DAS-2270
Local Test Steps
both AM and PM groups
http://localhost:3000/C1268452378-EEDTEST/ogc-api-coverages/1.0.0/collections/parameter_vars/coverage/rangeset?forceAsync=true&granuleId=G1268452388-EEDTEST&subset=lat(54%3A72)&subset=lon(2%3A42)&format=application%2Fx-netcdf4&variable=Soil_Moisture_Retrieval_Data_AM%2Fsurface_flag%2CSoil_Moisture_Retrieval_Data_PM%2Fsurface_flag_pm&skipPreview=true
Should show the following in the log:
variables_with_ranges: /Soil_Moisture_Retrieval_Data_PM/surface_flag_pm[9:38][487:594], /Soil_Moisture_Retrieval_Data_AM/surface_flag[9:38][487:594], /Soil_Moisture_Retrieval_Data_AM/longitude[9:38][487:594], /Soil_Moisture_Retrieval_Data_PM/longitude_pm[9:38][487:594], /Soil_Moisture_Retrieval_Data_AM/latitude[9:38][487:594], /Soil_Moisture_Retrieval_Data_PM/latitude_pm[9:38][487:594]
PR Acceptance Checklist
CHANGELOG.mdupdated to include high level summary of PR changes.docker/service_version.txtupdated if publishing a release.