Skip to content

Commit

Permalink
Merge pull request #147 from ACCESS-Cloud-Based-InSAR/dev
Browse files Browse the repository at this point in the history
v0.2.4
  • Loading branch information
jhkennedy authored Aug 23, 2023
2 parents 0b219fa + 121e6c5 commit 2d2b888
Show file tree
Hide file tree
Showing 31 changed files with 496,477 additions and 1,448 deletions.
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ conf/settings.conf

# Include template directory
!isce2_topsapp/templates/topsapp_template.xml
!isce2_topsapp/templates/topsapp_iono_template.xml


# Tests
Expand All @@ -106,6 +107,18 @@ tests/out/*.ipynb
tests/**/*.json
!tests/sample_loc_metadata.json
!tests/midnight_crossing_metadata.json
# Test for SET GUNW 1
!tests/set_test_data/S1-GUNW-A-R-064-tops-20210723_20210711-015000-00119W_00033N-PP-6267-v2_0_6.nc
!tests/set_test_data/S1B_OPER_AUX_POEORB_OPOD_20210812T111941_V20210722T225942_20210724T005942.EOF
!tests/set_test_data/S1B_OPER_AUX_POEORB_OPOD_20210731T111940_V20210710T225942_20210712T005942.EOF
# Test for SET GUNW 2
!tests/set_test_data/S1-GUNW-A-R-064-tops-20220113_20220101-015048-00119W_00034N-PP-3b1f-v2_0_5.nc
!tests/set_test_data/S1A_OPER_AUX_POEORB_OPOD_20220121T121549_V20211231T225942_20220102T005942.EOF
!tests/set_test_data/S1A_OPER_AUX_POEORB_OPOD_20220202T081558_V20220112T225942_20220114T005942.EOF
!tests/test_data/ref_manifest.xml
!tests/test_data/ref_metadata.xml
!tests/test_data/sec_manifest.xml
!tests/test_data/sec_metadata.xml

# Use geojson zip file for ARIA s1 frame data
!isce2_topsapp/data/s1_gunw_frame_footprints.geojson.zip
Expand Down
1 change: 1 addition & 0 deletions .trufflehog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Dockerfile
tests/test_data/sec_manifest.xml
tests/test_data/ref_manifest.xml
tests/test_data/
isce2_topsapp/iono_proc.py
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,34 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.2.4]

### Added
* `++omp-num-threads` parameter to the `main()` entrypoint to limit the number of threads used by ISCE2 during
multiprocessing.

### Fixed
* For Solid Earth Tide computation, use azimuth timing to calculate solid earth tide in `science/grids/imagingGeometry` reference frame using ISCE2 rdr2geo.
* Include topsapp_iono template.
* Increases DEM buffer to .4 from .1 to ensure the extent of at least two bursts (~40 km) are added when retrieving DEM (because estimated footprint can differ from what ISCE2 generates for a GUNW extent)
* Catch warnings in tests and match messages to ensure package warnings do not fail test suite
* Read low resolution Natural Earth land masses from public url due to removal from geopandas package.
* For ionosphere computation over water, includes masking conncomp zero, phase bridging, and modified adaptive gaussian filtering
* Fix for #135, skip iono computation if there are not land (all zero values) and skip using water mask if the area is outside of SWBD coverage
* Fix for #145 and SET - duplicate orbit xmls for computing azimuth time grid with ISCE2 geo2rdr (duplicate state vectors likely culprit). Ensures orbit object is intialized with unique set of orbit xmls passed. Also, localized metadata appropriately.

### Added
* localize_data within __main__.py added option to use/not use water mask for ionosphere processing
* Added option to estimate burst phase jumps in ionosphere computation
* Added additional attributes for ionosphere computation into GUNW ionosphere layer metadata: processing_steps, water_mask, mask_connected_component_zero (flag) , do_phase_bridging (flag), swath_mode (flag), swath_ramp_removal (flag), swath_mode_description, multilook_az_rg1, multilook_az_rg2, iono_height
* Added packing of additional attributes for ionosphere computation into GUNW
* fsspec is now required in environment due to burst processing.

## [0.2.3]

### Updated
* Explode footprints polygons
* Added support for using water mask in ionospheric correction computation

### Removed
* Python 3.8 Support
Expand All @@ -25,6 +47,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* Exposes `frame-id` parameter for fixed frame cropping. Discussion, references, and examples in README.
* Latitude aligned frames and their expected extents are added as geojson in repository as zip file.
* Pins ISCE2 version to 2.6.1 and numpy / scipy to previous versions (see environment.yml) - to be amended when newest ISCE2 build is sorted out
* Includes `frame_id` and `temporal_baseline_days` in json metadata for CMR handshake. The former is the fixed frame id and the latter is the number of days between images (will be multiple of 6).
* Added support to compute and embed solid earth tide correction layers into GUNW products (see PR #91) - reference and secondary have own groups
* Raises warning if there is at least 80% of water in the IFG area using Natural Earth Land mask.

Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- flake8-blind-except
- flake8-builtins
- flake8-import-order
- fsspec
- gdal
- geopandas
- hyp3lib>=1.7
Expand Down
3 changes: 2 additions & 1 deletion isce2_topsapp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
from isce2_topsapp.localize_aux_cal import download_aux_cal
from isce2_topsapp.localize_burst import BurstParams, download_bursts, get_region_of_interest
from isce2_topsapp.localize_dem import download_dem_for_isce2
from isce2_topsapp.localize_mask import download_water_mask
from isce2_topsapp.localize_orbits import download_orbits
from isce2_topsapp.localize_slc import download_slcs, get_asf_slc_objects
from isce2_topsapp.packaging import package_gunw_product
from isce2_topsapp.topsapp_proc import topsapp_processing


try:
__version__ = version(__name__)
except PackageNotFoundError:
Expand All @@ -25,6 +25,7 @@
'get_asf_slc_objects',
'get_region_of_interest',
'download_dem_for_isce2',
'download_water_mask',
'download_aux_cal',
'download_bursts',
'BurstParams',
Expand Down
Loading

0 comments on commit 2d2b888

Please sign in to comment.