From 92bf103c879f2accccb4ed8ccdffc9e8509c3fab Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 13:12:50 +0100 Subject: [PATCH 1/8] new MxD05 products and start scan time on MxD06 --- satpy/etc/readers/modis_l2.yaml | 76 +++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index b03ec2529d..9da34cedfb 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -9,6 +9,11 @@ reader: sensors: [modis] file_types: + mod05_hdf: + file_patterns: + - 'M{platform_indicator:1s}D05_L2.A{start_time:%Y%j.%H%M}.{collection:03d}.{production_time:%Y%j%H%M%S}.hdf' + - '{platform_indicator:1s}1.{start_time:%y%j.%H%M}.mod05.hdf' + file_reader: !!python/name:satpy.readers.modis_l2.ModisL2HDFFileHandler mod35_hdf: file_patterns: - 'M{platform_indicator:1s}D35_L2.A{start_time:%Y%j.%H%M}.{collection:03d}.{production_time:%Y%j%H%M%S}.hdf' @@ -74,9 +79,9 @@ datasets: name: longitude resolution: 5000: - file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf] + file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf, mod05_hdf] 1000: - file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf] + file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf, mod05_hdf] 500: file_type: hdf_eos_geo 250: @@ -89,9 +94,9 @@ datasets: resolution: 5000: # For EUM reduced (thinned) files - file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf] + file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf, mod05_hdf] 1000: - file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf] + file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf, mod05_hdf] 500: file_type: hdf_eos_geo 250: @@ -143,12 +148,75 @@ datasets: file_type: mod35_hdf coordinates: [longitude, latitude] +########################## +#Datasets in file mod05_l2 +########################## + scan_start_time: + name: scan_start_time + long_name: TAI time at start of scan replicated across the swath + units: seconds since 1993-1-1 00:00:00.0 0 + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Scan_Start_Time + + sensor_zenith: + name: sensor_zenith + long_name: Sensor Zenith Angle, Cell to Sensor + units: degree + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Sensor_Zenith + + water_vapor_correction_factor: + name: water_vapor_correction_factor + long_name: Aerosol Correction Factor for Water Vapor - Near Infrared Retrieval + units: None + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 1000: + file_key: Water_Vapor_Correction_Factor + + water_vapor_near_infrared: + name: water_vapor_near_infrared + long_name: Total Column Precipitable Water Vapor - Near Infrared Retrieval + units: cm + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 1000: + file_key: Water_Vapor_Near_Infrared + + water_vapor_infrared: + name: water_vapor_infrared + long_name: Total Column Precipitable Water Vapor - Infrared Retrieval + units: cm + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Water_Vapor_Infrared + ########################## #Datasets in file mod06_l2 ########################## # file contents: https://atmosphere-imager.gsfc.nasa.gov/sites/default/files/ModAtmo/MOD06_L2_CDL_fs.txt + scan_start_time: + name: scan_start_time + long_name: TAI time at start of scan replicated across the swath + units: seconds since 1993-1-1 00:00:00.0 0 + file_type: mod06_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Scan_Start_Time + brightness_temperature: name: brightness_temperature long_name: Observed Brightness Temperature from Averaged Radiances in a 5x5 1-km Pixel Region From ddb178cb1d9fc9433fab783065caa3f1a2547bb9 Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 13:12:50 +0100 Subject: [PATCH 2/8] new MxD05 products and start scan time on MxD06 --- satpy/etc/readers/modis_l2.yaml | 76 +++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index b03ec2529d..9da34cedfb 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -9,6 +9,11 @@ reader: sensors: [modis] file_types: + mod05_hdf: + file_patterns: + - 'M{platform_indicator:1s}D05_L2.A{start_time:%Y%j.%H%M}.{collection:03d}.{production_time:%Y%j%H%M%S}.hdf' + - '{platform_indicator:1s}1.{start_time:%y%j.%H%M}.mod05.hdf' + file_reader: !!python/name:satpy.readers.modis_l2.ModisL2HDFFileHandler mod35_hdf: file_patterns: - 'M{platform_indicator:1s}D35_L2.A{start_time:%Y%j.%H%M}.{collection:03d}.{production_time:%Y%j%H%M%S}.hdf' @@ -74,9 +79,9 @@ datasets: name: longitude resolution: 5000: - file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf] + file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf, mod05_hdf] 1000: - file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf] + file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf, mod05_hdf] 500: file_type: hdf_eos_geo 250: @@ -89,9 +94,9 @@ datasets: resolution: 5000: # For EUM reduced (thinned) files - file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf] + file_type: [mod35_hdf, mod06_hdf, mod06ct_hdf, mod07_hdf, mod05_hdf] 1000: - file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf] + file_type: [hdf_eos_geo, mod35_hdf, mod06_hdf, mod05_hdf] 500: file_type: hdf_eos_geo 250: @@ -143,12 +148,75 @@ datasets: file_type: mod35_hdf coordinates: [longitude, latitude] +########################## +#Datasets in file mod05_l2 +########################## + scan_start_time: + name: scan_start_time + long_name: TAI time at start of scan replicated across the swath + units: seconds since 1993-1-1 00:00:00.0 0 + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Scan_Start_Time + + sensor_zenith: + name: sensor_zenith + long_name: Sensor Zenith Angle, Cell to Sensor + units: degree + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Sensor_Zenith + + water_vapor_correction_factor: + name: water_vapor_correction_factor + long_name: Aerosol Correction Factor for Water Vapor - Near Infrared Retrieval + units: None + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 1000: + file_key: Water_Vapor_Correction_Factor + + water_vapor_near_infrared: + name: water_vapor_near_infrared + long_name: Total Column Precipitable Water Vapor - Near Infrared Retrieval + units: cm + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 1000: + file_key: Water_Vapor_Near_Infrared + + water_vapor_infrared: + name: water_vapor_infrared + long_name: Total Column Precipitable Water Vapor - Infrared Retrieval + units: cm + file_type: mod05_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Water_Vapor_Infrared + ########################## #Datasets in file mod06_l2 ########################## # file contents: https://atmosphere-imager.gsfc.nasa.gov/sites/default/files/ModAtmo/MOD06_L2_CDL_fs.txt + scan_start_time: + name: scan_start_time + long_name: TAI time at start of scan replicated across the swath + units: seconds since 1993-1-1 00:00:00.0 0 + file_type: mod06_hdf + coordinates: [longitude, latitude] + resolution: + 5000: + file_key: Scan_Start_Time + brightness_temperature: name: brightness_temperature long_name: Observed Brightness Temperature from Averaged Radiances in a 5x5 1-km Pixel Region From fe92f9a78e1d9ead793ac7b8ffede88179f5969d Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 16:57:02 +0100 Subject: [PATCH 3/8] new MxD05 products and start scan time on MxD06 --- satpy/etc/readers/modis_l2.yaml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index 9da34cedfb..af29d5546b 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -155,14 +155,14 @@ datasets: name: scan_start_time long_name: TAI time at start of scan replicated across the swath units: seconds since 1993-1-1 00:00:00.0 0 - file_type: mod05_hdf + file_type: [mod05_hdf, mod06_hdf] coordinates: [longitude, latitude] resolution: 5000: file_key: Scan_Start_Time - sensor_zenith: - name: sensor_zenith + sensor_zenith_angle: + name: sensor_zenith_angle long_name: Sensor Zenith Angle, Cell to Sensor units: degree file_type: mod05_hdf @@ -207,16 +207,6 @@ datasets: # file contents: https://atmosphere-imager.gsfc.nasa.gov/sites/default/files/ModAtmo/MOD06_L2_CDL_fs.txt - scan_start_time: - name: scan_start_time - long_name: TAI time at start of scan replicated across the swath - units: seconds since 1993-1-1 00:00:00.0 0 - file_type: mod06_hdf - coordinates: [longitude, latitude] - resolution: - 5000: - file_key: Scan_Start_Time - brightness_temperature: name: brightness_temperature long_name: Observed Brightness Temperature from Averaged Radiances in a 5x5 1-km Pixel Region From 3b8413883a7f0570408dc7061c03fc7fb86d9510 Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 17:03:49 +0100 Subject: [PATCH 4/8] sensor zenith angle in mod05 and mod06 --- satpy/etc/readers/modis_l2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index af29d5546b..c77a7dab20 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -165,7 +165,7 @@ datasets: name: sensor_zenith_angle long_name: Sensor Zenith Angle, Cell to Sensor units: degree - file_type: mod05_hdf + file_type: [mod05_hdf, mod06_hdf] coordinates: [longitude, latitude] resolution: 5000: From 5a988284fc891e0fc8fd0c9d869326fdf868bec2 Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 17:11:53 +0100 Subject: [PATCH 5/8] remove duplicated key --- satpy/etc/readers/modis_l2.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index 66383165c2..c77a7dab20 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -207,16 +207,6 @@ datasets: # file contents: https://atmosphere-imager.gsfc.nasa.gov/sites/default/files/ModAtmo/MOD06_L2_CDL_fs.txt - scan_start_time: - name: scan_start_time - long_name: TAI time at start of scan replicated across the swath - units: seconds since 1993-1-1 00:00:00.0 0 - file_type: mod06_hdf - coordinates: [longitude, latitude] - resolution: - 5000: - file_key: Scan_Start_Time - brightness_temperature: name: brightness_temperature long_name: Observed Brightness Temperature from Averaged Radiances in a 5x5 1-km Pixel Region From f1a5c712b5598af1135b513fd3aedab0ba5d68bd Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 17:16:58 +0100 Subject: [PATCH 6/8] changed from sensor_zenith to satellite_zenith_angle --- satpy/etc/readers/modis_l2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index c77a7dab20..c1696c434a 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -161,8 +161,8 @@ datasets: 5000: file_key: Scan_Start_Time - sensor_zenith_angle: - name: sensor_zenith_angle + satellite_zenith_angle: + name: satellite_zenith_angle long_name: Sensor Zenith Angle, Cell to Sensor units: degree file_type: [mod05_hdf, mod06_hdf] From 39f9de7a80dcc9abfb9d0bcca03131d7ced356e7 Mon Sep 17 00:00:00 2001 From: Dario Stelitano Date: Thu, 23 Mar 2023 19:32:28 +0100 Subject: [PATCH 7/8] Fix unit water vapor correction --- satpy/etc/readers/modis_l2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/satpy/etc/readers/modis_l2.yaml b/satpy/etc/readers/modis_l2.yaml index c1696c434a..c1556a6544 100644 --- a/satpy/etc/readers/modis_l2.yaml +++ b/satpy/etc/readers/modis_l2.yaml @@ -174,7 +174,7 @@ datasets: water_vapor_correction_factor: name: water_vapor_correction_factor long_name: Aerosol Correction Factor for Water Vapor - Near Infrared Retrieval - units: None + units: "1" file_type: mod05_hdf coordinates: [longitude, latitude] resolution: From 21541b5219d96bcf22c81c0c855a3692f6271976 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Thu, 23 Mar 2023 20:00:03 -0500 Subject: [PATCH 8/8] Update condition of xarray version in CF writer tests --- satpy/tests/writer_tests/test_cf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/satpy/tests/writer_tests/test_cf.py b/satpy/tests/writer_tests/test_cf.py index 0e4e442586..b89c6a9813 100644 --- a/satpy/tests/writer_tests/test_cf.py +++ b/satpy/tests/writer_tests/test_cf.py @@ -1457,5 +1457,5 @@ def _should_use_compression_keyword(): versions = _get_backend_versions() return ( versions["libnetcdf"] >= Version("4.9.0") and - versions["xarray"] >= Version("2023.03") + versions["xarray"] >= Version("2023.04") )