From 09b31e9eeeb15027a9e608ee185d57fe93f5b046 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Tue, 17 Jan 2023 13:51:47 -0900 Subject: [PATCH 01/12] Update job spec for new tropospheric model parameter --- job_spec/INSAR_ISCE.yml | 12 ++++++++++++ job_spec/INSAR_ISCE_TEST.yml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 28da27a9a..164d82b51 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -27,6 +27,16 @@ INSAR_ISCE: minLength: 67 maxLength: 67 example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 + tropospheric_model: + api_schema: + description: Weather model applied in trophospheric correction + default: none + type: string + enum: + - none + - HRRR + - HRES + - GMAO bucket_prefix: default: '""' validators: [] @@ -42,6 +52,8 @@ INSAR_ISCE: - Ref::granules - --secondary-scenes - Ref::secondary_granules + - --tropospheric_model + - Ref::tropospheric_model timeout: 10800 vcpu: 1 memory: 7500 diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index bb353eec6..f02501d92 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -27,6 +27,16 @@ INSAR_ISCE_TEST: minLength: 67 maxLength: 67 example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 + tropospheric_model: + api_schema: + description: Weather model applied in trophospheric correction + default: none + type: string + enum: + - none + - HRRR + - HRES + - GMAO bucket_prefix: default: '""' validators: [] @@ -43,6 +53,8 @@ INSAR_ISCE_TEST: - Ref::granules - --secondary-scenes - Ref::secondary_granules + - --tropospheric_model + - Ref::tropospheric_model timeout: 10800 vcpu: 1 memory: 7500 From aa5b2a84607a22046085465c3932e37732672689 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Tue, 17 Jan 2023 13:55:39 -0900 Subject: [PATCH 02/12] switch around dashes and underscores --- job_spec/INSAR_ISCE.yml | 2 +- job_spec/INSAR_ISCE_TEST.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 164d82b51..84c290344 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -52,7 +52,7 @@ INSAR_ISCE: - Ref::granules - --secondary-scenes - Ref::secondary_granules - - --tropospheric_model + - --tropospheric-model - Ref::tropospheric_model timeout: 10800 vcpu: 1 diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index f02501d92..625475e36 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -53,7 +53,7 @@ INSAR_ISCE_TEST: - Ref::granules - --secondary-scenes - Ref::secondary_granules - - --tropospheric_model + - --tropospheric-model - Ref::tropospheric_model timeout: 10800 vcpu: 1 From 12b72fe33eda0b2c359d146f736809984da3f9c0 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Tue, 17 Jan 2023 17:10:56 -0900 Subject: [PATCH 03/12] add in second command --- job_spec/INSAR_ISCE.yml | 12 ++++++++++++ job_spec/INSAR_ISCE_TEST.yml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 84c290344..c97fa12c5 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -57,3 +57,15 @@ INSAR_ISCE: timeout: 10800 vcpu: 1 memory: 7500 + - name: 'RAiDER' + image: ghcr.io/dbekaert/raider:latest + command: + - --bucket + - '!Ref Bucket' + - --bucket-prefix + - Ref::bucket_prefix + - --tropospheric-model + - Ref::tropospheric_model + timeout: TODO + vcpu: TODO + memory: TODO diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index 625475e36..5eabd5c30 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -58,3 +58,15 @@ INSAR_ISCE_TEST: timeout: 10800 vcpu: 1 memory: 7500 + - name: 'RAiDER' + image: ghcr.io/dbekaert/raider:latest + command: + - --bucket + - '!Ref Bucket' + - --bucket-prefix + - Ref::bucket_prefix + - --tropospheric-model + - Ref::tropospheric_model + timeout: TODO + vcpu: TODO + memory: TODO From 54853dbde821cd3e8527e370a92278e37451c591 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Tue, 17 Jan 2023 17:12:48 -0900 Subject: [PATCH 04/12] add in TODO notes --- job_spec/INSAR_ISCE.yml | 4 +++- job_spec/INSAR_ISCE_TEST.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index c97fa12c5..d2dd0cb8e 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -58,7 +58,7 @@ INSAR_ISCE: vcpu: 1 memory: 7500 - name: 'RAiDER' - image: ghcr.io/dbekaert/raider:latest + image: ghcr.io/dbekaert/raider #TODO: Specify image? command: - --bucket - '!Ref Bucket' @@ -69,3 +69,5 @@ INSAR_ISCE: timeout: TODO vcpu: TODO memory: TODO + + # TODO : how to pass in nc file name to raider? \ No newline at end of file diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index 5eabd5c30..ec95abf83 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -59,7 +59,7 @@ INSAR_ISCE_TEST: vcpu: 1 memory: 7500 - name: 'RAiDER' - image: ghcr.io/dbekaert/raider:latest + image: ghcr.io/dbekaert/raider #Specify image? command: - --bucket - '!Ref Bucket' @@ -70,3 +70,5 @@ INSAR_ISCE_TEST: timeout: TODO vcpu: TODO memory: TODO + + # TODO : how to pass in nc file name to raider? From 15fed0834f5888cba4ab8e3abe0e22f162e6932f Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 10:11:12 -0900 Subject: [PATCH 05/12] update after monring meeting --- job_spec/INSAR_ISCE.yml | 18 +++++++----------- job_spec/INSAR_ISCE_TEST.yml | 19 ++++++++----------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index d2dd0cb8e..583b217d7 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -30,10 +30,10 @@ INSAR_ISCE: tropospheric_model: api_schema: description: Weather model applied in trophospheric correction - default: none + default: None type: string enum: - - none + - None - HRRR - HRES - GMAO @@ -52,13 +52,11 @@ INSAR_ISCE: - Ref::granules - --secondary-scenes - Ref::secondary_granules - - --tropospheric-model - - Ref::tropospheric_model timeout: 10800 vcpu: 1 memory: 7500 - - name: 'RAiDER' - image: ghcr.io/dbekaert/raider #TODO: Specify image? + - name: TROPOSPHERE + image: ghcr.io/dbekaert/raider command: - --bucket - '!Ref Bucket' @@ -66,8 +64,6 @@ INSAR_ISCE: - Ref::bucket_prefix - --tropospheric-model - Ref::tropospheric_model - timeout: TODO - vcpu: TODO - memory: TODO - - # TODO : how to pass in nc file name to raider? \ No newline at end of file + timeout: 10800 + vcpu: 1 + memory: 7500 \ No newline at end of file diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index ec95abf83..894677f27 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -30,10 +30,10 @@ INSAR_ISCE_TEST: tropospheric_model: api_schema: description: Weather model applied in trophospheric correction - default: none + default: None type: string enum: - - none + - None - HRRR - HRES - GMAO @@ -53,13 +53,12 @@ INSAR_ISCE_TEST: - Ref::granules - --secondary-scenes - Ref::secondary_granules - - --tropospheric-model - - Ref::tropospheric_model timeout: 10800 vcpu: 1 memory: 7500 - - name: 'RAiDER' - image: ghcr.io/dbekaert/raider #Specify image? + - name: TROPOSPHERE + image: ghcr.io/dbekaert/raider + image_tag: test command: - --bucket - '!Ref Bucket' @@ -67,8 +66,6 @@ INSAR_ISCE_TEST: - Ref::bucket_prefix - --tropospheric-model - Ref::tropospheric_model - timeout: TODO - vcpu: TODO - memory: TODO - - # TODO : how to pass in nc file name to raider? + timeout: 10800 + vcpu: 1 + memory: 7500 \ No newline at end of file From 3d58e8051d8fad75f3502475ee7a9df14a79ffc2 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 10:13:29 -0900 Subject: [PATCH 06/12] add in process calcdelaysgunw --- job_spec/INSAR_ISCE.yml | 2 ++ job_spec/INSAR_ISCE_TEST.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 583b217d7..515ba2f0a 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -58,6 +58,8 @@ INSAR_ISCE: - name: TROPOSPHERE image: ghcr.io/dbekaert/raider command: + - ++process + - calcDelaysGunw - --bucket - '!Ref Bucket' - --bucket-prefix diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index 894677f27..2dd315c45 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -60,6 +60,8 @@ INSAR_ISCE_TEST: image: ghcr.io/dbekaert/raider image_tag: test command: + - ++process + - calcDelaysGunw - --bucket - '!Ref Bucket' - --bucket-prefix From 7ead3c2417e6c14e8da5e882d870365b78edca9e Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 10:18:14 -0900 Subject: [PATCH 07/12] refine trophospheric model description --- job_spec/INSAR_ISCE.yml | 2 +- job_spec/INSAR_ISCE_TEST.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 515ba2f0a..80cc6c5bd 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -29,7 +29,7 @@ INSAR_ISCE: example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 tropospheric_model: api_schema: - description: Weather model applied in trophospheric correction + description: Weather model used to generate tropospheric data layers default: None type: string enum: diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index 2dd315c45..e1934d54b 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -29,7 +29,7 @@ INSAR_ISCE_TEST: example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 tropospheric_model: api_schema: - description: Weather model applied in trophospheric correction + description: Weather model used to generate tropospheric data layers default: None type: string enum: From e6190815f7a4fec28bd8a631d2800799a716c49c Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 10:20:49 -0900 Subject: [PATCH 08/12] more refinement of tropo parameter descritpion --- job_spec/INSAR_ISCE.yml | 2 +- job_spec/INSAR_ISCE_TEST.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 80cc6c5bd..818c0028a 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -29,7 +29,7 @@ INSAR_ISCE: example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 tropospheric_model: api_schema: - description: Weather model used to generate tropospheric data layers + description: Weather model used to generate tropospheric delay estimations default: None type: string enum: diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index e1934d54b..4ef3ad2e3 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -29,7 +29,7 @@ INSAR_ISCE_TEST: example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 tropospheric_model: api_schema: - description: Weather model used to generate tropospheric data layers + description: Weather model used to generate tropospheric delay estimations default: None type: string enum: From f8f1b566175fc7faf087f337710cd0a7824cdfe9 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 10:27:27 -0900 Subject: [PATCH 09/12] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6278cd6dc..6cef9e671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.24.1] +### Added +- `INSAR_ISCE` and `INSAR_ISCE_TEST` jobs now accept a `tropospheric_model` parameter to include trophospheric delay + estimations. + ## [2.24.0] ### Added - Made `resolution=10.0` parameter option for RTC_GAMMA and WATER_MAP jobs available in all deployments From 45c95a57177f9989924f5fdbfa709f349ea69d4e Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 13:25:07 -0900 Subject: [PATCH 10/12] change troposphere_model to weather_model --- CHANGELOG.md | 2 +- job_spec/INSAR_ISCE.yml | 6 +++--- job_spec/INSAR_ISCE_TEST.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cef9e671..2dc720289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.24.1] ### Added -- `INSAR_ISCE` and `INSAR_ISCE_TEST` jobs now accept a `tropospheric_model` parameter to include trophospheric delay +- `INSAR_ISCE` and `INSAR_ISCE_TEST` jobs now accept a `weather_model` parameter to include trophospheric delay estimations. ## [2.24.0] diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 818c0028a..79df754a2 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -27,7 +27,7 @@ INSAR_ISCE: minLength: 67 maxLength: 67 example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 - tropospheric_model: + weather_model: api_schema: description: Weather model used to generate tropospheric delay estimations default: None @@ -64,8 +64,8 @@ INSAR_ISCE: - '!Ref Bucket' - --bucket-prefix - Ref::bucket_prefix - - --tropospheric-model - - Ref::tropospheric_model + - --weather-model + - Ref::weather_model timeout: 10800 vcpu: 1 memory: 7500 \ No newline at end of file diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index 4ef3ad2e3..baa888cc6 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -27,7 +27,7 @@ INSAR_ISCE_TEST: minLength: 67 maxLength: 67 example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 - tropospheric_model: + weather_model: api_schema: description: Weather model used to generate tropospheric delay estimations default: None @@ -66,8 +66,8 @@ INSAR_ISCE_TEST: - '!Ref Bucket' - --bucket-prefix - Ref::bucket_prefix - - --tropospheric-model - - Ref::tropospheric_model + - --weather-model + - Ref::weather_model timeout: 10800 vcpu: 1 memory: 7500 \ No newline at end of file From e7aa2e0bfeeee24a6083f1a79165a3a2cea09c3b Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 13:27:19 -0900 Subject: [PATCH 11/12] Reword Changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dc720289..61d4f3e0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.24.1] ### Added -- `INSAR_ISCE` and `INSAR_ISCE_TEST` jobs now accept a `weather_model` parameter to include trophospheric delay - estimations. +- `INSAR_ISCE` and `INSAR_ISCE_TEST` jobs now accept a `weather_model` parameter to specify which weather model to use + when estimating trophospheric delay data. ## [2.24.0] ### Added From 04c3be45570392bafd343cfb6a05387e30558e26 Mon Sep 17 00:00:00 2001 From: jacquelynsmale <34557291+jacquelynsmale@users.noreply.github.com> Date: Wed, 18 Jan 2023 13:31:42 -0900 Subject: [PATCH 12/12] add in new line at end of yml files --- job_spec/INSAR_ISCE.yml | 2 +- job_spec/INSAR_ISCE_TEST.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 79df754a2..4b0d58d83 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -68,4 +68,4 @@ INSAR_ISCE: - Ref::weather_model timeout: 10800 vcpu: 1 - memory: 7500 \ No newline at end of file + memory: 7500 diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index baa888cc6..76eb60b1e 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -70,4 +70,4 @@ INSAR_ISCE_TEST: - Ref::weather_model timeout: 10800 vcpu: 1 - memory: 7500 \ No newline at end of file + memory: 7500