Skip to content
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.

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

Solid Earth Tides correction #91

Merged
merged 38 commits into from
Mar 7, 2023
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
348e6c2
Add geometry functionalities
vbrancat Feb 13, 2023
08410be
Add SET functionality
vbrancat Feb 13, 2023
046bc1d
Pep8 notation
vbrancat Feb 13, 2023
e9a1221
Keep only LOS SET
vbrancat Feb 13, 2023
8789629
Add SET in CSLC product
vbrancat Feb 13, 2023
2fc5527
Fix metadata allocation for RG SET
vbrancat Feb 13, 2023
afa1b28
Add SET component in az direction
vbrancat Feb 13, 2023
b7afe0d
Numpy docstring for geometry_utils.py
vbrancat Feb 15, 2023
fb774b6
Move open_raster in helper.py
vbrancat Feb 15, 2023
254ea3d
Have rdr2geo outside the SET computation
vbrancat Feb 17, 2023
1595bb4
Compute radar grid using rg_step and az_step from runconfig
vbrancat Feb 17, 2023
2c5953a
Revert "Compute radar grid using rg_step and az_step from runconfig"
vbrancat Feb 17, 2023
c28a32e
Revert "Have rdr2geo outside the SET computation"
vbrancat Feb 17, 2023
47e3b1a
Remove azimut SET for testing
vbrancat Feb 17, 2023
aaaa181
move rdr2geo computation outside SET
vbrancat Feb 17, 2023
23eae01
pep8 formatting and numpy docstring
vbrancat Feb 17, 2023
4285a58
Merge remote-tracking branch 'upstream/main' into set_test
vbrancat Feb 17, 2023
0f99be1
improve numpy docstring and change division of geometry doppler
vbrancat Feb 19, 2023
56fcb3c
correct sign of heading angle
vbrancat Feb 21, 2023
4cb12f9
Remove datatype return from open_raster function
vbrancat Feb 21, 2023
3b62259
Move ellipsoid params inside rdr2geo function
vbrancat Feb 21, 2023
0e79b52
Return paths to rdr2geo rasters
vbrancat Feb 21, 2023
2405f9f
Simplify rdr2geo raster generation logic, Add check on DEM
vbrancat Feb 21, 2023
f6c3d05
Reorganize imports
vbrancat Feb 21, 2023
c7bd9f1
Clarify azimuth angle doc string, cite source code
vbrancat Feb 22, 2023
0abe932
Refactor azimuth FM-rate mismatch to use same grid as SET
vbrancat Mar 4, 2023
429ff96
Decimate lat/lon/inc/head for SET computation
vbrancat Mar 4, 2023
33470e0
Resolve conflicts with main branch
vbrancat Mar 7, 2023
7a2f8bc
Push complete list of reqs for CI unit test
vbrancat Mar 7, 2023
f2204a9
docker use s1-reader main
LiangJYu Mar 7, 2023
94eae40
Merge pull request #6 from LiangJYu/set_test
vbrancat Mar 7, 2023
c62a36f
explicit call out slant range SET
LiangJYu Mar 7, 2023
e2425b5
less repitition with rdr2geo raster load
LiangJYu Mar 7, 2023
3a12cea
less repitition in SET computation
LiangJYu Mar 7, 2023
1fd4888
nit - add space
LiangJYu Mar 7, 2023
f1d78b0
fix typo
LiangJYu Mar 7, 2023
f19d73c
fix raster order
LiangJYu Mar 7, 2023
0f85cce
Merge pull request #7 from LiangJYu/set_test
vbrancat Mar 7, 2023
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
Prev Previous commit
Next Next commit
Return paths to rdr2geo rasters
vbrancat committed Feb 21, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 0e79b52bd179059b963e53d4db5836e79c034c4f
29 changes: 23 additions & 6 deletions src/compass/utils/lut.py
Original file line number Diff line number Diff line change
@@ -142,14 +142,15 @@ def compute_geocoding_correction_luts(burst, dem_path,

# Get solid Earth tides on a very coarse grid
# Run rdr2geo on a very coarse grid
compute_rdr2geo_rasters(burst, dem_raster, output_path,
rg_step * 10, az_step * 10)
lon_path, lat_path, inc_path, head_path = \
compute_rdr2geo_rasters(burst, dem_raster, output_path,
rg_step * 10, az_step * 10)

# Open rdr2geo layers and feed them to SET computation
lat = open_raster(f'{output_path}/y.rdr')
lon = open_raster(f'{output_path}/x.rdr')
inc_angle = open_raster(f'{output_path}/incidence_angle.rdr')
head_angle = open_raster(f'{output_path}/heading_angle.rdr')
lat = open_raster(lat_path)
lon = open_raster(lon_path)
inc_angle = open_raster(inc_path)
head_angle = open_raster(head_path)

# compute Solid Earth Tides (using pySolid)
rg_set_temp, az_set_temp = solid_earth_tides(burst, lat, lon,
@@ -267,6 +268,17 @@ def compute_rdr2geo_rasters(burst, dem_raster, output_path,
Spacing of radar grid along slant range
az_step: float
Spacing of the radar grid along azimuth

Returns
-------
x_path: str
Path to longitude raster
y_path: str
Path to latitude raster
inc_path: str
Path to incidence angle raster
head_path: str
Path to heading angle raster
'''

# Some ancillary inputs
@@ -314,6 +326,11 @@ def compute_rdr2geo_rasters(burst, dem_raster, output_path,
incidence_angle_raster=incidence_raster,
heading_angle_raster=heading_raster)

vbrancat marked this conversation as resolved.
Show resolved Hide resolved
# Return file path to rdr2geo layers
paths = [f'{output_path}/{fname}.rdr' for fname in topo_output.keys()]

return paths[0], paths[1], paths[2], paths[3]


def resample_set(geo_tide, pts_src, pts_dest):
'''