diff --git a/methods/secular/Secular_Requirement_Validation.ipynb b/methods/secular/Secular_Requirement_Validation.ipynb
index ffc1939..b55b0e6 100644
--- a/methods/secular/Secular_Requirement_Validation.ipynb
+++ b/methods/secular/Secular_Requirement_Validation.ipynb
@@ -155,8 +155,8 @@
"aria_gunw_version = '3_0_1'\n",
"\n",
"# The date and version of this Cal/Val run\n",
- "rundate = '20240909'\n",
- "version = '1'\n",
+ "rundate = '20250208'\n",
+ "version = '2'\n",
"\n",
"# Provide the file where you keep your customized list of sites.\n",
"custom_sites = '/home/jovyan/my_sites.txt'\n",
diff --git a/my_sites.txt b/my_sites.txt
index 292d948..4150c77 100644
--- a/my_sites.txt
+++ b/my_sites.txt
@@ -1,453 +1,441 @@
-{
- "Info" : ["List of CalVal Sites:",
-
-"New NISAR calval sites with Sentinel tracks:",
-
-"CentralValleyA137 : Central Valley",
-"LosAngelesA64 : Los Angeles Basin",
-"MojaveA64 : Mojave Desert",
-"LongValleyD144 : Long Valley Caldera",
-"MejillonesD54 : Mejillones, Chile, Sentinel-1 descending track 54",
-"MejillonesD156 : Mejillones, Chile, Sentinel-1 descending track 156",
-"WesternOregonD13 : Western Oregon",
-"HokkaidoD46 : Hokkaido, Japan",
-"HoustonA34 : Houston/Galveston",
-"HawaiiA124 : Big Island of Hawaii, Sentinel-1 ascending track 124",
-"HawaiiD87 : Big Island of Hawaii, Sentinel-1 descending track 87",
-"KiwiA81 : North Island, New Zealand",
-
-"Old NISAR calval sites:",
-
-"CentralValleyA144 : Central Valley",
-"OklahomaA107 : Oklahoma",
-"PuertoRicoD98 : Puerto Rico (Earthquake M6.4 on 20200107) - Descending track",
-"PuertoRicoA135 : Puerto Rico (Earthquake M6.4 on 20200107 & large aftershock on 20200703) - Ascending track",
-"RidgecrestD71 : Ridgecrest (Earthquake M7.2 on 20190705) - Descending track",
-"RidgecrestA64 : Ridgecrest (Earthquake M7.2 on 20190705) - Ascending track",
-"MojaveD173 : Mojave desert (Ridgecrest Earthquake M7.2 on 20190705) - Descending track",
-"MojaveD173_3year : Mojave desert (Ridgecrest Earthquake M7.2 on 20190705) - Descending track",
-"LA_A64 : Los Angeles basin - Ascending track",
-"LA_A64_3years : Los Angeles basin - Ascending track 3 years",
-
-"ARIA & MintPy parameters:",
-"calval_location : name",
-"download_region : download box in S,N,W,E format",
-"analysis_region : analysis box in S,N,W,E format (must be within download_region)",
-"reference_lalo : latitute,longitude in geographic coordinates (default: auto)",
-"download_start_date : download start date as YYYMMDD",
-"download_end_date : download end date as YYYMMDD",
-"earthquakeDate : arbitrary date for testing with the central_valley dataset or actual earthquake",
-"noEarthquakeDate : arbitrary date with no earthquake for coseismic notebook",
-"sentinel_track : sentinel track to download",
-"gps_ref_site_name : Name of the GPS site for InSAR re-referencing",
-"tempBaseMax : maximum number of days, 'don't use interferograms longer than this value",
-"ifgExcludeList : default is not to exclude any interferograms",
-"maskWater : interior locations don't need to mask water"],
-
-"sites" : {
-
- "Info" : "########## NOTEBOOK TESTING ##############",
-
- "test": {
- "calval_location" : "test",
- "download_region" : "'34.5 35.60 -116.62 -114.39'",
- "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
- "reference_lalo" : "35.20495,-115.81229",
- "download_start_date" : "20190101",
- "download_end_date" : "20190401",
- "earthquakeDate" : "20190205",
- "noEarthquakeDate" : "20190305",
- "sentinel_track" : "173",
- "gps_ref_site_name" : "P619",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## CENTRAL VALLEY ##############",
-
- "CentralValleyA137" : {
- "calval_location" : "Central_Valley",
- "download_region" : "'34.9 36.9 -120.8 -119.0'",
- "analysis_region" : "'34.9 36.9 -120.8 -119.0'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "137",
- "gps_ref_site_name" : "CAWO",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## LOS ANGELES ##############",
-
- "LosAngelesA64" : {
- "calval_location" : "Los_Angeles",
- "download_region" : "'33.4 34.5 -119.0 -117.4'",
- "analysis_region" : "'33.4 34.5 -119.0 -117.4'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "64",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## MOJAVE DESERT ##############",
-
- "MojaveA64" : {
- "calval_location" : "Mojave",
- "download_region" : "'34.5 35.7 -116.5 -114.2'",
- "analysis_region" : "'34.5 35.7 -116.5 -114.2'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "64",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## LONG VALLEY CALDERA ##############",
-
- "LongValleyD144" : {
- "calval_location" : "Long_Valley",
- "download_region" : "'37.1 38.2 -119.5 -118.1'",
- "analysis_region" : "'37.1 38.2 -119.5 -118.1'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "144",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## MEJILLONES, CHILE, D54 ##############",
-
- "MejillonesD54" : {
- "calval_location" : "Mejillones_Chile",
- "download_region" : "'-24.0 -22.0 -70.7 -67.0'",
- "analysis_region" : "'-24.0 -22.0 -70.7 -67.0'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "54",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## MEJILLONES, CHILE, D156 ##############",
-
- "MejillonesD156" : {
- "calval_location" : "Mejillones_Chile",
- "download_region" : "'-24.0 -22.0 -70.7 -67.0'",
- "analysis_region" : "'-24.0 -22.0 -70.7 -67.0'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "156",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## WESTERN OREGON ##############",
-
- "WesternOregonD13" : {
- "calval_location" : "Western_Oregon",
- "download_region" : "'43.5 45.5 -124.4 -121.5'",
- "analysis_region" : "'43.5 45.5 -124.4 -121.5'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "13",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## HOKKAIDO JAPAN ##############",
-
- "HokkaidoD46" : {
- "calval_location" : "Hokkaido_Japan",
- "download_region" : "'41.8 44.4 139.8 143.3'",
- "analysis_region" : "'41.8 44.4 139.8 143.3'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "46",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## HOUSTON GALVESTON ##############",
-
- "HoustonA34" : {
- "calval_location" : "Houston_Galveston",
- "download_region" : "'28.5 31.0 -97.3 -93.5'",
- "analysis_region" : "'28.5 31.0 -97.3 -93.5'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "34",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## BIG ISLAND HAWAII A124 ##############",
-
- "HawaiiA124" : {
- "calval_location" : "Big_Island",
- "download_region" : "'18.9 20.3 -156.2 -154.7'",
- "analysis_region" : "'18.9 20.3 -156.2 -154.7'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "124",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## BIG ISLAND HAWAII D87 ##############",
-
- "HawaiiD87" : {
- "calval_location" : "Big_Island",
- "download_region" : "'18.9 20.3 -156.2 -154.7'",
- "analysis_region" : "'18.9 20.3 -156.2 -154.7'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "87",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## NORTH ISLAND NEW ZEALAND ##############",
-
- "KiwiA81" : {
- "calval_location" : "New_Zealand",
- "download_region" : "'-40.6 -37.0 173.6 176.2'",
- "analysis_region" : "'-40.6 -37.0 173.6 176.2'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "81",
- "gps_ref_site_name" : "auto",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## CENTRAL VALLEY OLD ##############",
-
- "CentralValleyA144" : {
- "calval_location" : "Central_Valley",
- "download_region" : "'36.18 36.26 -119.91 -119.77'",
- "analysis_region" : "'35.77 36.75 -120.61 -118.06'",
- "reference_lalo" : "auto",
- "download_start_date" : "20180101",
- "download_end_date" : "20190101",
- "earthquakeDate" : "20180412",
- "sentinel_track" : "144",
- "gps_ref_site_name" : "CAWO",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## OKLAHOMA ##############",
-
- "OklahomaA107" : {
- "calval_location" : "Oklahoma",
- "download_region" : "'31.7 37.4 -103.3 -93.5'",
- "analysis_region" : "'35.25 36.5 -100.5 -98.5'",
- "reference_lalo" : "auto",
- "download_start_date" : "20210101",
- "download_end_date" : "20210801",
- "earthquakeDate" : "20210328",
- "sentinel_track" : "107",
- "gps_ref_site_name" : "OKCL",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## PUERTO RICO ##############",
-
- "PuertoRicoD98" : {
- "calval_location" : "PuertoRicoDesc",
- "download_region" : "'17.5 18.9 -67.5 -66.0'",
- "analysis_region" : "'17.9 18.5 -67.3 -66.2'",
- "reference_lalo" : "auto",
- "download_start_date" : "20190701",
- "download_end_date" : "20200930",
- "earthquakeDate" : "20200107",
- "sentinel_track" : "98",
- "gps_ref_site_name" : "PRLT",
- "tempBaseMax" : 24,
- "ifgExcludeList" : "auto",
- "maskWater" : "True"},
-
- "PuertoRicoA135" : {
- "calval_location" : "PuertoRicoAsc",
- "download_region" : "'17.5 18.9 -67.5 -66.0'",
- "analysis_region" : "'17.9 18.5 -67.3 -66.2'",
- "reference_lalo" : "auto",
- "download_start_date" : "20190701",
- "download_end_date" : "20200930",
- "earthquakeDate" : "20200107",
- "earthquakeDate2" : "20200703",
- "sentinel_track" : "135",
- "gps_ref_site_name" : "PRLT",
- "tempBaseMax" : 24,
- "ifgExcludeList" : "auto",
- "maskWater" : "True"},
-
- "Info" : "########## RIDGECREST ##############",
-
- "RidgecrestD71": {
- "calval_location" : "RidgecrestD71",
- "download_region" : "'34.5 37.5 -119.0 -116.0'",
- "analysis_region" : "'34.7 37.2 -118.9 -116.1'",
- "reference_lalo" : "auto",
- "download_start_date" : "20190601",
- "download_end_date" : "20190831",
- "earthquakeDate" : "20190705",
- "sentinel_track" : "71",
- "gps_ref_site_name" : "ISLK",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "RidgecrestA64": {
- "calval_location" : "RidgecrestA64",
- "download_region" : "'34.5 37.5 -119.0 -116.0'",
- "analysis_region" : "'34.7 37.2 -118.9 -116.1'",
- "reference_lalo" : "auto",
- "download_start_date" : "20190101",
- "download_end_date" : "20190831",
- "earthquakeDate" : "20190705",
- "sentinel_track" : "64",
- "gps_ref_site_name" : "ISLK",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "none",
- "maskWater" : "False"},
-
- "Info" : "########## MOJAVE ##############",
-
- "oldMojaveD173": {
- "calval_location" : "MojaveD173",
- "download_region" : "'34.5 35.6 -116.62 -114.39'",
- "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
- "reference_lalo" : "35.20495,-115.81229",
- "download_start_date" : "20180101",
- "download_end_date" : "20181231",
- "earthquakeDate" : "20180705",
- "sentinel_track" : "173",
- "gps_ref_site_name" : "P619",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "MojaveD173": {
- "calval_location" : "MojaveD173",
- "download_region" : "'34.5 35.60 -116.62 -114.39'",
- "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
- "reference_lalo" : "35.20495,-115.81229",
- "download_start_date" : "20190101",
- "download_end_date" : "20200101",
- "earthquakeDate" : "20190705",
- "noEarthquakeDate" : "20190405",
- "sentinel_track" : "173",
- "gps_ref_site_name" : "P619",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "MojaveA64": {
- "calval_location" : "MojaveA64",
- "download_region" : "'34.50 35.60 -118.8 -116.6'",
- "analysis_region" : "'34.50 35.60 -118.8 -116.6'",
- "reference_lalo" : "34.919,-117.012",
- "download_start_date" : "20191201",
- "download_end_date" : "20200101",
- "earthquakeDate" : "20190705",
- "noEarthquakeDate" : "20190405",
- "sentinel_track" : "64",
- "gps_ref_site_name" : "BSRY",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "MojaveD173_3year": {
- "calval_location" : "MojaveD173_3year",
- "download_region" : "'34.5 35.6 -116.62 -114.39'",
- "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
- "reference_lalo" : "35.20495,-115.81229",
- "download_start_date" : "20160101",
- "download_end_date" : "20181231",
- "earthquakeDate" : "20190705",
- "sentinel_track" : "173",
- "gps_ref_site_name" : "P619",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## Los Angeles ##############",
-
- "LA_A64": {
- "calval_location" : "LA_A64",
- "download_region" : "'33.4 34.5 -119.0 -117.4'",
- "analysis_region" : "'33.6 34.3 -118.5 -117.5'",
- "reference_lalo" : "auto",
- "download_start_date" : "20190101",
- "download_end_date" : "20191231",
- "earthquakeDate" : "20190705",
- "noEarthquakeDate" : "20190405",
- "sentinel_track" : "64",
- "gps_ref_site_name" : "CAPE",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "LA_A64_3years": {
- "calval_location" : "LA_A64_3years",
- "download_region" : "'33.4 34.5 -119.0 -117.4'",
- "analysis_region" : "'33.6 34.3 -118.5 -117.5'",
- "reference_lalo" : "auto",
- "download_start_date" : "20190101",
- "download_end_date" : "20221231",
- "earthquakeDate" : "20190705",
- "sentinel_track" : "64",
- "gps_ref_site_name" : "JPLM",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"},
-
- "Info" : "########## ALOS SIMULATED DATA ##############",
-
- "NISAR_ALOS1" : {
- "calval_location" : "ALOS_small",
- "reference_lalo" : "auto",
- "download_start_date" : "20071210",
- "download_end_date" : "20110320",
- "tempBaseMax" : "auto",
- "ifgExcludeList" : "auto",
- "maskWater" : "False"}
-}
-}
+{
+ "Info" : ["List of CalVal Sites:",
+
+"######## NISAR CALVAL SITES ########",
+
+"CalVal_S1_CentralValleyA137 : Central Valley CA",
+"CalVal_S1_LosAngelesA64 : Los Angeles Basin",
+"CalVal_S1_MojaveA64 : Mojave Desert",
+"CalVal_S1_LongValleyD144 : Long Valley Caldera",
+"CalVal_S1_MejillonesD54 : Mejillones, Chile, Sentinel-1 descending track 54",
+"CalVal_S1_MejillonesD156 : Mejillones, Chile, Sentinel-1 descending track 156",
+"CalVal_S1_WesternOregonD13 : Western Oregon",
+"CalVal_S1_HokkaidoD46 : Hokkaido, Japan",
+"CalVal_S1_HoustonA34 : Houston/Galveston",
+"CalVal_S1_HawaiiA124 : Big Island, Hawaii, Sentinel-1 ascending track 124",
+"CalVal_S1_HawaiiD87 : Big Island, Hawaii, Sentinel-1 descending track 87",
+"CalVal_S1_KiwiA81 : North Island, New Zealand",
+
+"######## OTHER SITES ########",
+
+"CentralValleyA144 : Central Valley",
+"OklahomaA107 : Oklahoma",
+"PuertoRicoD98 : Puerto Rico (Earthquake M6.4 on 20200107) - Descending track",
+"PuertoRicoA135 : Puerto Rico (Earthquake M6.4 on 20200107 & large aftershock on 20200703) - Ascending track",
+"RidgecrestD71 : Ridgecrest (Earthquake M7.2 on 20190705) - Descending track",
+"RidgecrestA64 : Ridgecrest (Earthquake M7.2 on 20190705) - Ascending track",
+"MojaveD173 : Mojave desert (Ridgecrest Earthquake M7.2 on 20190705) - Descending track",
+"MojaveD173_3year : Mojave desert (Ridgecrest Earthquake M7.2 on 20190705) - Descending track, 3 years",
+"MojaveA64 : Mojave desert (Ridgecrest Earthquake M7.2 on 20190705) - Ascending track",
+"LA_A64 : Los Angeles basin - Ascending track",
+"LA_A64_3years : Los Angeles basin - Ascending track 3 years",
+"NISAR_ALOS1 : Simulated NISAR data from ALOS1",
+
+"######## GLOSSARY OF PARAMETERS ########",
+
+"calval_location : name",
+"download_region : download box in S,N,W,E format",
+"analysis_region : analysis box in S,N,W,E format (must be within download_region)",
+"reference_lalo : latitute,longitude in geographic coordinates (default: auto)",
+"download_start_date : download start date as YYYMMDD",
+"download_end_date : download end date as YYYMMDD",
+"earthquakeDate : arbitrary date for testing with the central_valley dataset or actual earthquake",
+"noEarthquakeDate : arbitrary date with no earthquake for coseismic notebook",
+"sentinel_track : sentinel track to download",
+"gps_ref_site_name : Name of the GPS site for InSAR re-referencing",
+"tempBaseMax : maximum number of days, 'don't use interferograms longer than this value",
+"ifgExcludeList : default is not to exclude any interferograms",
+"maskWater : interior locations don't need to mask water"],
+
+"sites" : {
+
+ "Info" : "######## NOTEBOOK TESTING ##############",
+
+ "test": {
+ "calval_location" : "test",
+ "download_region" : "'34.5 35.60 -116.62 -114.39'",
+ "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
+ "reference_lalo" : "35.20495,-115.81229",
+ "download_start_date" : "20190101",
+ "download_end_date" : "20190401",
+ "earthquakeDate" : "20190205",
+ "noEarthquakeDate" : "20190305",
+ "sentinel_track" : "173",
+ "gps_ref_site_name" : "P619",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## NISAR CALVAL SITES ########",
+ "Info" : "######## CENTRAL VALLEY CA ########",
+
+ "CalVal_S1_CentralValleyA137" : {
+ "calval_location" : "Central_Valley",
+ "download_region" : "'34.9 36.9 -120.8 -119.0'",
+ "analysis_region" : "'34.9 36.9 -120.8 -119.0'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "137",
+ "gps_ref_site_name" : "CAWO",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## LOS ANGELES BASIN ########",
+
+ "CalVal_S1_LosAngelesA64" : {
+ "calval_location" : "Los_Angeles",
+ "download_region" : "'33.4 34.5 -119.0 -117.4'",
+ "analysis_region" : "'33.4 34.5 -119.0 -117.4'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "64",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## MOJAVE DESERT ########",
+
+ "CalVal_S1_MojaveA64" : {
+ "calval_location" : "Mojave",
+ "download_region" : "'34.5 35.7 -116.5 -114.2'",
+ "analysis_region" : "'34.5 35.7 -116.5 -114.2'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "64",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## LONG VALLEY CALDERA ########",
+
+ "CalVal_S1_LongValleyD144" : {
+ "calval_location" : "Long_Valley",
+ "download_region" : "'37.1 38.2 -119.5 -118.1'",
+ "analysis_region" : "'37.1 38.2 -119.5 -118.1'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "144",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## MEJILLONES, CHILE ########",
+
+ "CalVal_S1_MejillonesD54" : {
+ "calval_location" : "Mejillones_Chile",
+ "download_region" : "'-24.0 -22.0 -70.7 -67.0'",
+ "analysis_region" : "'-24.0 -22.0 -70.7 -67.0'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "54",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "CalVal_S1_MejillonesD156" : {
+ "calval_location" : "Mejillones_Chile",
+ "download_region" : "'-24.0 -22.0 -70.7 -67.0'",
+ "analysis_region" : "'-24.0 -22.0 -70.7 -67.0'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "156",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## WESTERN OREGON ########",
+
+ "CalVal_S1_WesternOregonD13" : {
+ "calval_location" : "Western_Oregon",
+ "download_region" : "'43.5 45.5 -124.4 -121.5'",
+ "analysis_region" : "'43.5 45.5 -124.4 -121.5'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "13",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## HOKKAIDO, JAPAN ########",
+
+ "CalVal_S1_HokkaidoD46" : {
+ "calval_location" : "Hokkaido_Japan",
+ "download_region" : "'41.8 44.4 139.8 143.3'",
+ "analysis_region" : "'41.8 44.4 139.8 143.3'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "46",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## HOUSTON/GALVESTON ########",
+
+ "CalVal_S1_HoustonA34" : {
+ "calval_location" : "Houston_Galveston",
+ "download_region" : "'28.5 31.0 -97.3 -93.5'",
+ "analysis_region" : "'28.5 31.0 -97.3 -93.5'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "34",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## BIG ISLAND, HAWAII ########",
+
+ "CalVal_S1_HawaiiA124" : {
+ "calval_location" : "Big_Island",
+ "download_region" : "'18.9 20.3 -156.2 -154.7'",
+ "analysis_region" : "'18.9 20.3 -156.2 -154.7'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "124",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "CalVal_S1_HawaiiD87" : {
+ "calval_location" : "Big_Island",
+ "download_region" : "'18.9 20.3 -156.2 -154.7'",
+ "analysis_region" : "'18.9 20.3 -156.2 -154.7'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "87",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## NORTH ISLAND, NEW ZEALAND ########",
+
+ "CalVal_S1_KiwiA81" : {
+ "calval_location" : "New_Zealand",
+ "download_region" : "'-40.6 -37.0 173.6 176.2'",
+ "analysis_region" : "'-40.6 -37.0 173.6 176.2'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "81",
+ "gps_ref_site_name" : "auto",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+
+ "Info" : "######## OTHER SITES ########",
+ "Info" : "######## CENTRAL VALLEY OLD ########",
+
+ "CentralValleyA144" : {
+ "calval_location" : "Central_Valley",
+ "download_region" : "'36.18 36.26 -119.91 -119.77'",
+ "analysis_region" : "'35.77 36.75 -120.61 -118.06'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20180101",
+ "download_end_date" : "20190101",
+ "earthquakeDate" : "20180412",
+ "sentinel_track" : "144",
+ "gps_ref_site_name" : "CAWO",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## OKLAHOMA ########",
+
+ "OklahomaA107" : {
+ "calval_location" : "Oklahoma",
+ "download_region" : "'31.7 37.4 -103.3 -93.5'",
+ "analysis_region" : "'35.25 36.5 -100.5 -98.5'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20210101",
+ "download_end_date" : "20210801",
+ "earthquakeDate" : "20210328",
+ "sentinel_track" : "107",
+ "gps_ref_site_name" : "OKCL",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## PUERTO RICO ########",
+
+ "PuertoRicoD98" : {
+ "calval_location" : "PuertoRicoDesc",
+ "download_region" : "'17.5 18.9 -67.5 -66.0'",
+ "analysis_region" : "'17.9 18.5 -67.3 -66.2'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20190701",
+ "download_end_date" : "20200930",
+ "earthquakeDate" : "20200107",
+ "sentinel_track" : "98",
+ "gps_ref_site_name" : "PRLT",
+ "tempBaseMax" : 24,
+ "ifgExcludeList" : "auto",
+ "maskWater" : "True"},
+
+ "PuertoRicoA135" : {
+ "calval_location" : "PuertoRicoAsc",
+ "download_region" : "'17.5 18.9 -67.5 -66.0'",
+ "analysis_region" : "'17.9 18.5 -67.3 -66.2'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20190701",
+ "download_end_date" : "20200930",
+ "earthquakeDate" : "20200107",
+ "earthquakeDate2" : "20200703",
+ "sentinel_track" : "135",
+ "gps_ref_site_name" : "PRLT",
+ "tempBaseMax" : 24,
+ "ifgExcludeList" : "auto",
+ "maskWater" : "True"},
+
+ "Info" : "######## RIDGECREST ########",
+
+ "RidgecrestD71": {
+ "calval_location" : "RidgecrestD71",
+ "download_region" : "'34.5 37.5 -119.0 -116.0'",
+ "analysis_region" : "'34.7 37.2 -118.9 -116.1'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20190601",
+ "download_end_date" : "20190831",
+ "earthquakeDate" : "20190705",
+ "sentinel_track" : "71",
+ "gps_ref_site_name" : "ISLK",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "RidgecrestA64": {
+ "calval_location" : "RidgecrestA64",
+ "download_region" : "'34.5 37.5 -119.0 -116.0'",
+ "analysis_region" : "'34.7 37.2 -118.9 -116.1'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20190101",
+ "download_end_date" : "20190831",
+ "earthquakeDate" : "20190705",
+ "sentinel_track" : "64",
+ "gps_ref_site_name" : "ISLK",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "none",
+ "maskWater" : "False"},
+
+ "Info" : "######## MOJAVE ########",
+
+ "MojaveD173": {
+ "calval_location" : "MojaveD173",
+ "download_region" : "'34.5 35.60 -116.62 -114.39'",
+ "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
+ "reference_lalo" : "35.20495,-115.81229",
+ "download_start_date" : "20190101",
+ "download_end_date" : "20200101",
+ "earthquakeDate" : "20190705",
+ "noEarthquakeDate" : "20190405",
+ "sentinel_track" : "173",
+ "gps_ref_site_name" : "P619",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "MojaveD173_3year": {
+ "calval_location" : "MojaveD173_3year",
+ "download_region" : "'34.5 35.6 -116.62 -114.39'",
+ "analysis_region" : "'34.66 35.60 -116.62 -114.39'",
+ "reference_lalo" : "35.20495,-115.81229",
+ "download_start_date" : "20160101",
+ "download_end_date" : "20181231",
+ "earthquakeDate" : "20190705",
+ "sentinel_track" : "173",
+ "gps_ref_site_name" : "P619",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "MojaveA64": {
+ "calval_location" : "MojaveA64",
+ "download_region" : "'34.50 35.60 -118.8 -116.6'",
+ "analysis_region" : "'34.50 35.60 -118.8 -116.6'",
+ "reference_lalo" : "34.919,-117.012",
+ "download_start_date" : "20191201",
+ "download_end_date" : "20200101",
+ "earthquakeDate" : "20190705",
+ "noEarthquakeDate" : "20190405",
+ "sentinel_track" : "64",
+ "gps_ref_site_name" : "BSRY",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## Los Angeles ########",
+
+ "LA_A64": {
+ "calval_location" : "LA_A64",
+ "download_region" : "'33.4 34.5 -119.0 -117.4'",
+ "analysis_region" : "'33.6 34.3 -118.5 -117.5'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20190101",
+ "download_end_date" : "20191231",
+ "earthquakeDate" : "20190705",
+ "noEarthquakeDate" : "20190405",
+ "sentinel_track" : "64",
+ "gps_ref_site_name" : "CAPE",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "LA_A64_3years": {
+ "calval_location" : "LA_A64_3years",
+ "download_region" : "'33.4 34.5 -119.0 -117.4'",
+ "analysis_region" : "'33.6 34.3 -118.5 -117.5'",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20190101",
+ "download_end_date" : "20221231",
+ "earthquakeDate" : "20190705",
+ "sentinel_track" : "64",
+ "gps_ref_site_name" : "JPLM",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"},
+
+ "Info" : "######## ALOS SIMULATED DATA ########",
+
+ "NISAR_ALOS1" : {
+ "calval_location" : "ALOS_small",
+ "reference_lalo" : "auto",
+ "download_start_date" : "20071210",
+ "download_end_date" : "20110320",
+ "tempBaseMax" : "auto",
+ "ifgExcludeList" : "auto",
+ "maskWater" : "False"}
+}
+}
diff --git a/prep/ARIA_prep.ipynb b/prep/ARIA_prep.ipynb
index 3c625c0..8a4ecf4 100644
--- a/prep/ARIA_prep.ipynb
+++ b/prep/ARIA_prep.ipynb
@@ -123,8 +123,8 @@
"aria_gunw_version = '3_0_1'\n",
"\n",
"# The date and version of this Cal/Val run\n",
- "rundate = '20240909'\n",
- "version = '1'\n",
+ "rundate = '20250208'\n",
+ "version = '2'\n",
"\n",
"# Provide the file where you keep your customized list of sites.\n",
"custom_sites = '/home/jovyan/my_sites.txt'\n",
@@ -141,7 +141,7 @@
"# Load metadata for calval locations\n",
"with open(custom_sites,'r') as fid:\n",
" sitedata = json.load(fid)\n",
- "#sitedata['sites'][site]"
+ "sitedata['sites'][site]"
]
},
{
@@ -264,8 +264,10 @@
},
{
"cell_type": "markdown",
- "id": "6d34d6ea-49df-4a6f-acc5-6655b55e12a2",
- "metadata": {},
+ "id": "73e9d838-98b7-4289-a5f7-d1ab2c3f8cec",
+ "metadata": {
+ "tags": []
+ },
"source": [
"### 1.1. Download GUNW Interferograms "
]
@@ -273,7 +275,23 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "02993248-e7e4-43f5-ae5c-3bf906d361f7",
+ "id": "b28e2e90-eed9-43cf-9cec-7d997c20c951",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "bbox = sitedata['sites'][site]['download_region']\n",
+ "start = sitedata['sites'][site]['download_start_date']\n",
+ "end = sitedata['sites'][site]['download_end_date']\n",
+ "track = sitedata['sites'][site]['sentinel_track']\n",
+ "\n",
+ "!ariaDownload.py --num_threads 16 -b {bbox} -u {earthdata_user} -p {earthdata_password} -s {start} -e {end} \\\n",
+ " -t {track} --workdir {gunw_dir} --version {aria_gunw_version} -o Count --verbose"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "79cfb967-6a1a-4922-b4ff-4ff7e4f1e9dc",
"metadata": {
"tags": []
},
@@ -282,8 +300,8 @@
"print('CalVal site: {}\\n'.format(site))\n",
"\n",
"# Make ARIA_download command\n",
- "aria_download = '''ariaDownload.py --num_threads 16 -b {bbox} -u {user} -p \"{password}\" -s {start} -e {end} \\\n",
- " -t {track} --workdir {workdir} --version {version} -o Count'''\n",
+ "aria_download = 'ariaDownload.py --num_threads 16 -b {bbox} -u {user} -p \"{password}\" -s {start} -e {end} \\\n",
+ " -t {track} --workdir {workdir} --version {version} -o Url'\n",
"command = aria_download.format(bbox = sitedata['sites'][site]['download_region'],\n",
" start = sitedata['sites'][site]['download_start_date'],\n",
" end = sitedata['sites'][site]['download_end_date'],\n",
@@ -296,8 +314,18 @@
"# Search for GUNW products\n",
"print(' Searching for available GUNW products:\\n')\n",
"process = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text = True, shell = True)\n",
- "print(process.stdout, process.stderr)\n",
- "\n",
+ "print(process.stdout, process.stderr)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "874f9d43-d37f-46fd-954c-cc2a278e3238",
+ "metadata": {
+ "tags": []
+ },
+ "outputs": [],
+ "source": [
"# Download GUNW products\n",
"print(' Downloading GUNW files\\n')\n",
"os.system(command.split(' -o')[0])\n",
@@ -318,38 +346,49 @@
"tags": []
},
"source": [
- "### 1.2. Crop Interferograms "
+ "### 1.2. Crop and Mask Interferograms "
]
},
{
"cell_type": "code",
"execution_count": null,
- "id": "aa49e37b-7f04-47ee-b9a6-c46c6bb80bc3",
+ "id": "f142035a-b639-443e-beac-057dd8b1a42b",
"metadata": {
"tags": []
},
"outputs": [],
"source": [
- "# Crop Interferograms to Analysis Region\n",
+ "# Identify subset of available GUNW files within user-specified period\n",
+ "startdate = int(sitedata['sites'][site]['download_start_date'])\n",
+ "enddate = int(sitedata['sites'][site]['download_end_date'])\n",
+ "product_dir = os.path.join(site_dir, 'products')\n",
+ "product_list = []\n",
+ "for file in os.listdir(product_dir):\n",
+ " if file.endswith(\".nc\"):\n",
+ " date1 = int(file[30:38])\n",
+ " date2 = int(file[21:29])\n",
+ " if date1 >= startdate and date2 <= enddate:\n",
+ " product_list.append(os.path.join(product_dir, file))\n",
+ "product_glob = ','.join(product_list)\n",
+ "\n",
+ "# Crop interferograms to analysis region and optionally mask data with GSHHS water mask\n",
"os.chdir(work_dir)\n",
"mask_file = 'auto'\n",
- "product_glob = '\"'+os.path.join(site_dir,'products','*.nc')+'\"'\n",
- "\n",
- "# Set up ARIA product and mask data with GSHHS water mask:\n",
"if not os.path.exists(os.path.join(work_dir,'stack')):\n",
" if not os.path.exists('/home/jovyan/.topoapi'): # if OpenTopo API key not already installed\n",
" os.system('echo \"{api_key}\" > /home/jovyan/.topoapi; chmod 600 /home/jovyan/.topoapi'.format(api_key = str(opentopography_api_key)))\n",
" print('Preparing GUNWs for MintPY....')\n",
" if sitedata['sites'][site]['maskWater'] != 'False':\n",
+ " command = 'ariaTSsetup.py -f ' + product_glob + ' -b ' + sitedata['sites'][site]['analysis_region'] + ' --mask Download --croptounion --verbose'\n",
" mask_file = '../mask/watermask.msk'\n",
- " command = 'ariaTSsetup.py -f ' + product_glob + ' -b ' + sitedata['sites'][site]['analysis_region'] + ' --mask Download --croptounion --verbose -nt 16' # slow\n",
" else: # skip slow mask download when we don't need to mask water\n",
- " command = 'ariaTSsetup.py -f ' + product_glob + ' -b ' + sitedata['sites'][site]['analysis_region'] + ' --croptounion --verbose -nt 16'\n",
- "\n",
+ " command = 'ariaTSsetup.py -f ' + product_glob + ' -b ' + sitedata['sites'][site]['analysis_region'] + ' --croptounion --verbose'\n",
" # Crop and prepare stack\n",
- " print(command)\n",
+ " #print(command)\n",
" os.system(command)\n",
- " print('Finished preparing GUNWs for MintPy!!')"
+ " print('Finished preparing GUNWs for MintPy!!')\n",
+ "else:\n",
+ " print('Stack directory detected and not overwritten.')"
]
},
{
@@ -449,6 +488,14 @@
"print('Mintpy input files:')\n",
"[x for x in os.listdir('inputs') if x.endswith('.h5')]"
]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "b175b0a7-28db-43c3-85a9-03be16897674",
+ "metadata": {},
+ "outputs": [],
+ "source": []
}
],
"metadata": {
@@ -467,7 +514,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.12.5"
+ "version": "3.12.8"
}
},
"nbformat": 4,